mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Refactor: Fix misspelling of "synchronize".
This commit is contained in:
@@ -256,7 +256,7 @@ RimEclipseContourMapView* RicNewContourMapViewFeature::createEclipseContourMapFr
|
|||||||
|
|
||||||
eclipseCase->contourMapCollection()->push_back( contourMap );
|
eclipseCase->contourMapCollection()->push_back( contourMap );
|
||||||
|
|
||||||
contourMap->syncronizeLocalAnnotationsFromGlobal();
|
contourMap->synchronizeLocalAnnotationsFromGlobal();
|
||||||
|
|
||||||
// Resolve references after contour map has been inserted into Rim structures
|
// Resolve references after contour map has been inserted into Rim structures
|
||||||
std::vector<caf::PdmFieldHandle*> fieldsWithFailingResolve;
|
std::vector<caf::PdmFieldHandle*> fieldsWithFailingResolve;
|
||||||
|
|||||||
@@ -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 )
|
bool faultComparator( const cvf::ref<RigFault>& a, const cvf::ref<RigFault>& b )
|
||||||
{
|
{
|
||||||
@@ -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;
|
if ( !( parentView() && parentView()->mainGrid() ) ) return;
|
||||||
|
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ public:
|
|||||||
void setShowOppositeFaultFaces( bool bEnabled );
|
void setShowOppositeFaultFaces( bool bEnabled );
|
||||||
void setShowFaultLabelWithFieldChanged( bool bEnabled );
|
void setShowFaultLabelWithFieldChanged( bool bEnabled );
|
||||||
|
|
||||||
void syncronizeFaults();
|
void synchronizeFaults();
|
||||||
|
|
||||||
bool isGridVisualizationMode() const;
|
bool isGridVisualizationMode() const;
|
||||||
bool shouldApplyCellFiltersToFaults() const;
|
bool shouldApplyCellFiltersToFaults() const;
|
||||||
|
|||||||
@@ -688,7 +688,7 @@ void RimGridCrossPlotDataSet::createCurves( const RigEclipseCrossPlotResult& res
|
|||||||
legendConfig()->scalarMapper()->majorTickValues( &tickValues );
|
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 )
|
for ( auto it = m_groupedResults.rbegin(); it != m_groupedResults.rend(); ++it )
|
||||||
{
|
{
|
||||||
auto [groupIndex, values] = *it;
|
auto [groupIndex, values] = *it;
|
||||||
@@ -724,7 +724,7 @@ void RimGridCrossPlotDataSet::fillCurveDataInExistingCurves( const RigEclipseCro
|
|||||||
}
|
}
|
||||||
else
|
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 curveIt = m_crossPlotCurves.begin();
|
||||||
auto groupIt = m_groupedResults.rbegin();
|
auto groupIt = m_groupedResults.rbegin();
|
||||||
for ( ; curveIt != m_crossPlotCurves.end() && groupIt != m_groupedResults.rend(); ++curveIt, ++groupIt )
|
for ( ; curveIt != m_crossPlotCurves.end() && groupIt != m_groupedResults.rend(); ++curveIt, ++groupIt )
|
||||||
@@ -768,7 +768,7 @@ void RimGridCrossPlotDataSet::createRegressionCurves( const RigEclipseCrossPlotR
|
|||||||
legendConfig()->scalarMapper()->majorTickValues( &tickValues );
|
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 )
|
for ( auto it = m_groupedResults.rbegin(); it != m_groupedResults.rend(); ++it )
|
||||||
{
|
{
|
||||||
auto [groupIndex, values] = *it;
|
auto [groupIndex, values] = *it;
|
||||||
@@ -808,7 +808,7 @@ void RimGridCrossPlotDataSet::fillCurveDataInExistingRegressionCurves( const Rig
|
|||||||
}
|
}
|
||||||
else
|
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 curveIt = m_crossPlotRegressionCurves.begin();
|
||||||
auto groupIt = m_groupedResults.rbegin();
|
auto groupIt = m_groupedResults.rbegin();
|
||||||
for ( ; curveIt != m_crossPlotRegressionCurves.end() && groupIt != m_groupedResults.rend(); ++curveIt, ++groupIt )
|
for ( ; curveIt != m_crossPlotRegressionCurves.end() && groupIt != m_groupedResults.rend(); ++curveIt, ++groupIt )
|
||||||
|
|||||||
@@ -305,7 +305,7 @@ void RimIntersectionCollection::appendIntersectionAndUpdate( RimExtrudedCurveInt
|
|||||||
intersection->setDepthOverride( m_depthThresholdOverridden );
|
intersection->setDepthOverride( m_depthThresholdOverridden );
|
||||||
intersection->setDepthOverrideParameters( m_depthUpperThreshold, m_depthLowerThreshold, m_depthFilterType() );
|
intersection->setDepthOverrideParameters( m_depthUpperThreshold, m_depthLowerThreshold, m_depthFilterType() );
|
||||||
|
|
||||||
syncronize2dIntersectionViews();
|
synchronize2dIntersectionViews();
|
||||||
|
|
||||||
updateConnectedEditors();
|
updateConnectedEditors();
|
||||||
Riu3DMainWindowTools::selectAsCurrentItem( intersection, allowActiveViewChange );
|
Riu3DMainWindowTools::selectAsCurrentItem( intersection, allowActiveViewChange );
|
||||||
@@ -326,7 +326,7 @@ void RimIntersectionCollection::appendIntersectionNoUpdate( RimExtrudedCurveInte
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimIntersectionCollection::syncronize2dIntersectionViews()
|
void RimIntersectionCollection::synchronize2dIntersectionViews()
|
||||||
{
|
{
|
||||||
auto ownerCase = firstAncestorOrThisOfTypeAsserted<RimCase>();
|
auto ownerCase = firstAncestorOrThisOfTypeAsserted<RimCase>();
|
||||||
ownerCase->intersectionViewCollection()->syncFromExistingIntersections( true );
|
ownerCase->intersectionViewCollection()->syncFromExistingIntersections( true );
|
||||||
@@ -427,7 +427,7 @@ void RimIntersectionCollection::fieldChangedByUi( const caf::PdmFieldHandle* cha
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimIntersectionCollection::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::vector<caf::PdmObjectHandle*>& referringObjects )
|
void RimIntersectionCollection::onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::vector<caf::PdmObjectHandle*>& referringObjects )
|
||||||
{
|
{
|
||||||
syncronize2dIntersectionViews();
|
synchronize2dIntersectionViews();
|
||||||
rebuild3dView();
|
rebuild3dView();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -436,7 +436,7 @@ void RimIntersectionCollection::onChildDeleted( caf::PdmChildArrayFieldHandle* c
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimIntersectionCollection::onChildAdded( caf::PdmFieldHandle* containerForNewObject )
|
void RimIntersectionCollection::onChildAdded( caf::PdmFieldHandle* containerForNewObject )
|
||||||
{
|
{
|
||||||
syncronize2dIntersectionViews();
|
synchronize2dIntersectionViews();
|
||||||
rebuild3dView();
|
rebuild3dView();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ public:
|
|||||||
|
|
||||||
void updateIntersectionBoxGeometry();
|
void updateIntersectionBoxGeometry();
|
||||||
|
|
||||||
void syncronize2dIntersectionViews();
|
void synchronize2dIntersectionViews();
|
||||||
void scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
|
void scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
|
||||||
|
|
||||||
bool shouldApplyCellFiltersToIntersections() const;
|
bool shouldApplyCellFiltersToIntersections() const;
|
||||||
|
|||||||
@@ -1845,7 +1845,7 @@ RimAnnotationInViewCollection* Rim3dView::annotationCollection() const
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void Rim3dView::syncronizeLocalAnnotationsFromGlobal()
|
void Rim3dView::synchronizeLocalAnnotationsFromGlobal()
|
||||||
{
|
{
|
||||||
RimProject* proj = RimProject::current();
|
RimProject* proj = RimProject::current();
|
||||||
if ( proj && proj->activeOilField() )
|
if ( proj && proj->activeOilField() )
|
||||||
|
|||||||
@@ -195,7 +195,7 @@ public:
|
|||||||
virtual void updateViewTreeItems( RiaDefines::ItemIn3dView itemType );
|
virtual void updateViewTreeItems( RiaDefines::ItemIn3dView itemType );
|
||||||
|
|
||||||
RimAnnotationInViewCollection* annotationCollection() const;
|
RimAnnotationInViewCollection* annotationCollection() const;
|
||||||
void syncronizeLocalAnnotationsFromGlobal();
|
void synchronizeLocalAnnotationsFromGlobal();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
static void removeModelByName( cvf::Scene* scene, const cvf::String& modelName );
|
static void removeModelByName( cvf::Scene* scene, const cvf::String& modelName );
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ public:
|
|||||||
// Fields:
|
// Fields:
|
||||||
caf::PdmField<QString> resultName;
|
caf::PdmField<QString> resultName;
|
||||||
caf::PdmField<QString> eclipseKeyword;
|
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.
|
// read eclipse prop data and this inputProp object.
|
||||||
caf::PdmField<ResolveStateEnum> resolvedState; // ReadOnly and not writable
|
caf::PdmField<ResolveStateEnum> resolvedState; // ReadOnly and not writable
|
||||||
|
|
||||||
|
|||||||
@@ -1109,7 +1109,7 @@ void RimEclipseView::onLoadDataAndUpdate()
|
|||||||
|
|
||||||
m_propertyFilterCollection()->loadAndInitializePropertyFilters();
|
m_propertyFilterCollection()->loadAndInitializePropertyFilters();
|
||||||
|
|
||||||
faultCollection()->syncronizeFaults();
|
faultCollection()->synchronizeFaults();
|
||||||
|
|
||||||
m_wellCollection->scaleWellDisks();
|
m_wellCollection->scaleWellDisks();
|
||||||
|
|
||||||
@@ -1118,9 +1118,9 @@ void RimEclipseView::onLoadDataAndUpdate()
|
|||||||
scheduleReservoirGridGeometryRegen();
|
scheduleReservoirGridGeometryRegen();
|
||||||
m_simWellsPartManager->clearGeometryCache();
|
m_simWellsPartManager->clearGeometryCache();
|
||||||
|
|
||||||
syncronizeWellsWithResults();
|
synchronizeWellsWithResults();
|
||||||
|
|
||||||
syncronizeLocalAnnotationsFromGlobal();
|
synchronizeLocalAnnotationsFromGlobal();
|
||||||
|
|
||||||
{
|
{
|
||||||
// Update simulation well fractures after well cell results are imported
|
// Update simulation well fractures after well cell results are imported
|
||||||
@@ -1586,7 +1586,7 @@ RimEclipseCase* RimEclipseView::eclipseCase() const
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RimEclipseView::syncronizeWellsWithResults()
|
void RimEclipseView::synchronizeWellsWithResults()
|
||||||
{
|
{
|
||||||
if ( !( eclipseCase() && eclipseCase()->eclipseCaseData() ) ) return;
|
if ( !( eclipseCase() && eclipseCase()->eclipseCaseData() ) ) return;
|
||||||
|
|
||||||
@@ -1781,7 +1781,7 @@ void RimEclipseView::updateDisplayModelForWellResults()
|
|||||||
m_reservoirGridPartManager->clearGeometryCache();
|
m_reservoirGridPartManager->clearGeometryCache();
|
||||||
m_simWellsPartManager->clearGeometryCache();
|
m_simWellsPartManager->clearGeometryCache();
|
||||||
|
|
||||||
syncronizeWellsWithResults();
|
synchronizeWellsWithResults();
|
||||||
|
|
||||||
onCreateDisplayModel();
|
onCreateDisplayModel();
|
||||||
updateDisplayModelVisibility();
|
updateDisplayModelVisibility();
|
||||||
|
|||||||
@@ -209,7 +209,7 @@ private:
|
|||||||
|
|
||||||
void updateFaultColors();
|
void updateFaultColors();
|
||||||
|
|
||||||
void syncronizeWellsWithResults();
|
void synchronizeWellsWithResults();
|
||||||
|
|
||||||
void onClampCurrentTimestep() override;
|
void onClampCurrentTimestep() override;
|
||||||
size_t onTimeStepCountRequested() override;
|
size_t onTimeStepCountRequested() override;
|
||||||
|
|||||||
@@ -408,7 +408,7 @@ void RimSeismicView::onUpdateLegends()
|
|||||||
void RimSeismicView::onLoadDataAndUpdate()
|
void RimSeismicView::onLoadDataAndUpdate()
|
||||||
{
|
{
|
||||||
updateViewTreeItems( RiaDefines::ItemIn3dView::ALL );
|
updateViewTreeItems( RiaDefines::ItemIn3dView::ALL );
|
||||||
syncronizeLocalAnnotationsFromGlobal();
|
synchronizeLocalAnnotationsFromGlobal();
|
||||||
onUpdateScaleTransform();
|
onUpdateScaleTransform();
|
||||||
|
|
||||||
updateMdiWindowVisibility();
|
updateMdiWindowVisibility();
|
||||||
|
|||||||
Reference in New Issue
Block a user