Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor: Fix misspelling of "synchronize". #11330

Merged
merged 1 commit into from
Apr 5, 2024
+23 −23
Merged

Refactor: Fix misspelling of "synchronize". #11330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ApplicationLibCode/Commands/RicNewContourMapViewFeature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ RimEclipseContourMapView* RicNewContourMapViewFeature::createEclipseContourMapFr

eclipseCase->contourMapCollection()->push_back( contourMap );

contourMap->syncronizeLocalAnnotationsFromGlobal();
contourMap->synchronizeLocalAnnotationsFromGlobal();

// Resolve references after contour map has been inserted into Rim structures
std::vector<caf::PdmFieldHandle*> fieldsWithFailingResolve;
Expand Down
4 changes: 2 additions & 2 deletions ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ RimFaultInView* RimFaultInViewCollection::findFaultByName( QString name )
}

//--------------------------------------------------------------------------------------------------
/// A comparing function used to sort Faults in the RimFaultCollection::syncronizeFaults() method
/// A comparing function used to sort Faults in the RimFaultCollection::synchronizeFaults() method
//--------------------------------------------------------------------------------------------------
bool faultComparator( const cvf::ref<RigFault>& a, const cvf::ref<RigFault>& b )
{
Expand All @@ -252,7 +252,7 @@ bool faultComparator( const cvf::ref<RigFault>& a, const cvf::ref<RigFault>& b )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFaultInViewCollection::syncronizeFaults()
void RimFaultInViewCollection::synchronizeFaults()
{
if ( !( parentView() && parentView()->mainGrid() ) ) return;

Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class RimFaultInViewCollection : public caf::PdmObject
void setShowOppositeFaultFaces( bool bEnabled );
void setShowFaultLabelWithFieldChanged( bool bEnabled );

void syncronizeFaults();
void synchronizeFaults();

bool isGridVisualizationMode() const;
bool shouldApplyCellFiltersToFaults() const;
Expand Down
8 changes: 4 additions & 4 deletions ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ void RimGridCrossPlotDataSet::createCurves( const RigEclipseCrossPlotResult& res
legendConfig()->scalarMapper()->majorTickValues( &tickValues );
}

// NB : Make sure iteration of curve and groups are syncronized with createCurves()
// NB : Make sure iteration of curve and groups are synchronized with createCurves()
for ( auto it = m_groupedResults.rbegin(); it != m_groupedResults.rend(); ++it )
{
auto [groupIndex, values] = *it;
Expand Down Expand Up @@ -724,7 +724,7 @@ void RimGridCrossPlotDataSet::fillCurveDataInExistingCurves( const RigEclipseCro
}
else
{
// NB : Make sure iteration of curve and groups are syncronized with fillCurveDataInExistingCurves()
// NB : Make sure iteration of curve and groups are synchronized with fillCurveDataInExistingCurves()
auto curveIt = m_crossPlotCurves.begin();
auto groupIt = m_groupedResults.rbegin();
for ( ; curveIt != m_crossPlotCurves.end() && groupIt != m_groupedResults.rend(); ++curveIt, ++groupIt )
Expand Down Expand Up @@ -768,7 +768,7 @@ void RimGridCrossPlotDataSet::createRegressionCurves( const RigEclipseCrossPlotR
legendConfig()->scalarMapper()->majorTickValues( &tickValues );
}

// NB : Make sure iteration of curve and groups are syncronized with createCurves()
// NB : Make sure iteration of curve and groups are synchronized with createCurves()
for ( auto it = m_groupedResults.rbegin(); it != m_groupedResults.rend(); ++it )
{
auto [groupIndex, values] = *it;
Expand Down Expand Up @@ -808,7 +808,7 @@ void RimGridCrossPlotDataSet::fillCurveDataInExistingRegressionCurves( const Rig
}
else
{
// NB : Make sure iteration of curve and groups are syncronized with fillCurveDataInExistingCurves()
// NB : Make sure iteration of curve and groups are synchronized with fillCurveDataInExistingCurves()
auto curveIt = m_crossPlotRegressionCurves.begin();
auto groupIt = m_groupedResults.rbegin();
for ( ; curveIt != m_crossPlotRegressionCurves.end() && groupIt != m_groupedResults.rend(); ++curveIt, ++groupIt )
Expand Down
8 changes: 4 additions & 4 deletions ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ void RimIntersectionCollection::appendIntersectionAndUpdate( RimExtrudedCurveInt
intersection->setDepthOverride( m_depthThresholdOverridden );
intersection->setDepthOverrideParameters( m_depthUpperThreshold, m_depthLowerThreshold, m_depthFilterType() );

syncronize2dIntersectionViews();
synchronize2dIntersectionViews();

updateConnectedEditors();
Riu3DMainWindowTools::selectAsCurrentItem( intersection, allowActiveViewChange );
Expand All @@ -326,7 +326,7 @@ void RimIntersectionCollection::appendIntersectionNoUpdate( RimExtrudedCurveInte
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimIntersectionCollection::syncronize2dIntersectionViews()
void RimIntersectionCollection::synchronize2dIntersectionViews()
{
auto ownerCase = firstAncestorOrThisOfTypeAsserted<RimCase>();
ownerCase->intersectionViewCollection()->syncFromExistingIntersections( true );
Expand Down Expand Up @@ -427,7 +427,7 @@ void RimIntersectionCollection::fieldChangedByUi( const caf::PdmFieldHandle* cha
//--------------------------------------------------------------------------------------------------
void RimIntersectionCollection::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::vector<caf::PdmObjectHandle*>& referringObjects )
{
syncronize2dIntersectionViews();
synchronize2dIntersectionViews();
rebuild3dView();
}

Expand All @@ -436,7 +436,7 @@ void RimIntersectionCollection::onChildDeleted( caf::PdmChildArrayFieldHandle* c
//--------------------------------------------------------------------------------------------------
void RimIntersectionCollection::onChildAdded( caf::PdmFieldHandle* containerForNewObject )
{
syncronize2dIntersectionViews();
synchronize2dIntersectionViews();
rebuild3dView();
}

Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class RimIntersectionCollection : public caf::PdmObject

void updateIntersectionBoxGeometry();

void syncronize2dIntersectionViews();
void synchronize2dIntersectionViews();
void scheduleCreateDisplayModelAndRedraw2dIntersectionViews();

bool shouldApplyCellFiltersToIntersections() const;
Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/ProjectDataModel/Rim3dView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1845,7 +1845,7 @@ RimAnnotationInViewCollection* Rim3dView::annotationCollection() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void Rim3dView::syncronizeLocalAnnotationsFromGlobal()
void Rim3dView::synchronizeLocalAnnotationsFromGlobal()
{
RimProject* proj = RimProject::current();
if ( proj && proj->activeOilField() )
Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/ProjectDataModel/Rim3dView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class Rim3dView : public RimViewWindow, public RiuViewerToViewInterface, public
virtual void updateViewTreeItems( RiaDefines::ItemIn3dView itemType );

RimAnnotationInViewCollection* annotationCollection() const;
void syncronizeLocalAnnotationsFromGlobal();
void synchronizeLocalAnnotationsFromGlobal();

protected:
static void removeModelByName( cvf::Scene* scene, const cvf::String& modelName );
Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/ProjectDataModel/RimEclipseInputProperty.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class RimEclipseInputProperty : public caf::PdmObject
// Fields:
caf::PdmField<QString> resultName;
caf::PdmField<QString> eclipseKeyword;
caf::PdmField<caf::FilePath> fileName; // ReadOnly Serves as key to syncronize
caf::PdmField<caf::FilePath> fileName; // ReadOnly Serves as key to synchronize
// read eclipse prop data and this inputProp object.
caf::PdmField<ResolveStateEnum> resolvedState; // ReadOnly and not writable

Expand Down
10 changes: 5 additions & 5 deletions ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@ void RimEclipseView::onLoadDataAndUpdate()

m_propertyFilterCollection()->loadAndInitializePropertyFilters();

faultCollection()->syncronizeFaults();
faultCollection()->synchronizeFaults();

m_wellCollection->scaleWellDisks();

Expand All @@ -1118,9 +1118,9 @@ void RimEclipseView::onLoadDataAndUpdate()
scheduleReservoirGridGeometryRegen();
m_simWellsPartManager->clearGeometryCache();

syncronizeWellsWithResults();
synchronizeWellsWithResults();

syncronizeLocalAnnotationsFromGlobal();
synchronizeLocalAnnotationsFromGlobal();

{
// Update simulation well fractures after well cell results are imported
Expand Down Expand Up @@ -1586,7 +1586,7 @@ RimEclipseCase* RimEclipseView::eclipseCase() const

*/
//--------------------------------------------------------------------------------------------------
void RimEclipseView::syncronizeWellsWithResults()
void RimEclipseView::synchronizeWellsWithResults()
{
if ( !( eclipseCase() && eclipseCase()->eclipseCaseData() ) ) return;

Expand Down Expand Up @@ -1781,7 +1781,7 @@ void RimEclipseView::updateDisplayModelForWellResults()
m_reservoirGridPartManager->clearGeometryCache();
m_simWellsPartManager->clearGeometryCache();

syncronizeWellsWithResults();
synchronizeWellsWithResults();

onCreateDisplayModel();
updateDisplayModelVisibility();
Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/ProjectDataModel/RimEclipseView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ class RimEclipseView : public RimGridView

void updateFaultColors();

void syncronizeWellsWithResults();
void synchronizeWellsWithResults();

void onClampCurrentTimestep() override;
size_t onTimeStepCountRequested() override;
Expand Down
2 changes: 1 addition & 1 deletion ApplicationLibCode/ProjectDataModel/Seismic/RimSeismicView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ void RimSeismicView::onUpdateLegends()
void RimSeismicView::onLoadDataAndUpdate()
{
updateViewTreeItems( RiaDefines::ItemIn3dView::ALL );
syncronizeLocalAnnotationsFromGlobal();
synchronizeLocalAnnotationsFromGlobal();
onUpdateScaleTransform();

updateMdiWindowVisibility();
Expand Down