diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.cpp index 960d44a2f8..382e420d8b 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.cpp @@ -142,7 +142,6 @@ void RimAnnotationCollectionBase::fieldChangedByUi( const caf::PdmFieldHandle* c { if ( changedField == objectToggleField() ) { - updateUiIconFromToggleField(); scheduleRedrawOfRelevantViews(); } } diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp index 3641cec61d..f733796f52 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp @@ -110,7 +110,6 @@ void RimAnnotationGroupCollection::fieldChangedByUi( const caf::PdmFieldHandle* { if ( changedField == objectToggleField() ) { - updateUiIconFromToggleField(); updateViews(); } } diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp index 3d55aa6d45..aa1ca10cf6 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp @@ -226,10 +226,6 @@ void RimAnnotationInViewCollection::defineUiOrdering( QString uiConfigName, caf: //-------------------------------------------------------------------------------------------------- void RimAnnotationInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { - if ( changedField == objectToggleField() ) - { - updateUiIconFromToggleField(); - } scheduleRedrawOfRelevantViews(); } diff --git a/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInView.cpp b/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInView.cpp index 18e2c02241..9a87d17e5b 100644 --- a/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInView.cpp +++ b/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInView.cpp @@ -505,8 +505,6 @@ void RimContourMapInView::defineUiOrdering( QString uiConfigName, caf::PdmUiOrde //-------------------------------------------------------------------------------------------------- void RimContourMapInView::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { - updateUiIconFromToggleField(); - if ( changedField == &m_mapPosition || changedField == &m_projectSurfaceOnGeometry || changedField == &m_projectLinesOnGeometry || changedField == &m_lineColorMode || changedField == &m_showContourLines || changedField == &m_showMapSurface || changedField == &m_showContourLabels ) @@ -519,11 +517,3 @@ void RimContourMapInView::fieldChangedByUi( const caf::PdmFieldHandle* changedFi view->scheduleCreateDisplayModelAndRedraw(); } } - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimContourMapInView::initAfterRead() -{ - updateUiIconFromToggleField(); -} diff --git a/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInView.h b/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInView.h index 45dacb0643..20632fe624 100644 --- a/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInView.h +++ b/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInView.h @@ -108,7 +108,6 @@ public: protected: void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; - void initAfterRead() override; caf::PdmFieldHandle* userDescriptionField() override; diff --git a/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInViewCollection.cpp index 1d50685e4c..6d30907427 100644 --- a/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInViewCollection.cpp @@ -263,8 +263,6 @@ void RimContourMapInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* { RimCheckableNamedObject::fieldChangedByUi( changedField, oldValue, newValue ); - updateUiIconFromToggleField(); - if ( changedField == &m_isChecked ) { if ( auto view = firstAncestorOfType() ) @@ -273,11 +271,3 @@ void RimContourMapInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* } } } - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimContourMapInViewCollection::initAfterRead() -{ - updateUiIconFromToggleField(); -} diff --git a/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInViewCollection.h b/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInViewCollection.h index 83af1886fc..f50fd99dd8 100644 --- a/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInViewCollection.h +++ b/ApplicationLibCode/ProjectDataModel/ContourMap/RimContourMapInViewCollection.h @@ -78,7 +78,6 @@ public: protected: void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; - void initAfterRead() override; private: RimContourMapInView* findContourMapInViewForSource( const RimEclipseContourMapView* contourMapView ) const; diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.cpp index db0b0580fe..f3eaf3d5a0 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.cpp @@ -76,8 +76,6 @@ caf::PdmFieldHandle* RimFaultInView::userDescriptionField() //-------------------------------------------------------------------------------------------------- void RimFaultInView::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { - updateUiIconFromToggleField(); - if ( &faultColor == changedField || &showFault == changedField ) { auto reservoirView = firstAncestorOrThisOfType(); @@ -89,14 +87,6 @@ void RimFaultInView::fieldChangedByUi( const caf::PdmFieldHandle* changedField, } } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimFaultInView::initAfterRead() -{ - updateUiIconFromToggleField(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.h b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.h index b838c1568f..5be8c5efa7 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.h +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInView.h @@ -54,7 +54,6 @@ public: caf::PdmFieldHandle* objectToggleField() override; void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; - void initAfterRead() override; void appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const override; diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp index 59608c5fe2..d7476d3a27 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp @@ -196,8 +196,6 @@ int RimFaultInViewCollection::meshLineThickness() const //-------------------------------------------------------------------------------------------------- void RimFaultInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { - updateUiIconFromToggleField(); - if ( &m_faultLabelColor == changedField ) { parentView()->scheduleReservoirGridGeometryRegen(); diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPart.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPart.cpp index 9dee4abf86..9a2a319ab9 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPart.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPart.cpp @@ -68,8 +68,6 @@ int RimGeoMechPart::partId() const //-------------------------------------------------------------------------------------------------- void RimGeoMechPart::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { - updateUiIconFromToggleField(); - if ( changedField == objectToggleField() ) { auto ownerView = firstAncestorOrThisOfType(); diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp index 2ae4152e94..ff7e1e16af 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechView.cpp @@ -899,8 +899,6 @@ void RimGeoMechView::initAfterRead() { RimGridView::initAfterRead(); cellResult()->setGeoMechCase( m_geomechCase ); - - updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp index 95750d7c61..8c20605c49 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp @@ -480,7 +480,6 @@ void RimIntersectionCollection::fieldChangedByUi( const caf::PdmFieldHandle* cha if ( changedField == &m_isActive ) { - updateUiIconFromToggleField(); rebuildView = true; } else if ( changedField == &m_depthThresholdOverridden ) diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultDefinition.cpp index 87bb0dd7b5..73ab8fa4ac 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultDefinition.cpp @@ -349,8 +349,6 @@ void RimIntersectionResultDefinition::fieldChangedByUi( const caf::PdmFieldHandl update2dIntersectionViews(); } - - updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- @@ -457,8 +455,6 @@ void RimIntersectionResultDefinition::defineUiTreeOrdering( caf::PdmUiTreeOrderi void RimIntersectionResultDefinition::initAfterRead() { updateCaseInResultDefinitions(); - - updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp index cd304ba9c4..6e4428ec34 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp @@ -111,21 +111,11 @@ void RimIntersectionResultsDefinitionCollection::fieldChangedByUi( const caf::Pd const QVariant& oldValue, const QVariant& newValue ) { - updateUiIconFromToggleField(); - auto gridView = firstAncestorOrThisOfType(); if ( gridView ) gridView->scheduleCreateDisplayModelAndRedraw(); if ( !intersectionResultsDefinitions().empty() ) intersectionResultsDefinitions()[0]->update2dIntersectionViews(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimIntersectionResultsDefinitionCollection::initAfterRead() -{ - updateUiIconFromToggleField(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.h b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.h index 8650ad1d76..3c87d5084d 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.h @@ -47,7 +47,6 @@ public: protected: caf::PdmFieldHandle* objectToggleField() override; void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; - void initAfterRead() override; private: caf::PdmField m_isActive; diff --git a/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp b/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp index 4c8422eb7b..5b2ed0ac81 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp @@ -186,8 +186,6 @@ void RimCellEdgeColors::loadResult() //-------------------------------------------------------------------------------------------------- void RimCellEdgeColors::initAfterRead() { - updateUiIconFromToggleField(); - if ( m_singleVarEdgeResultColors_OBSOLETE->resultVariableUiName() != RiaResultNames::undefinedResultName() ) { m_selectedKeywords.v().push_back( m_singleVarEdgeResultColors_OBSOLETE->resultVariableUiName() ); @@ -202,11 +200,6 @@ void RimCellEdgeColors::fieldChangedByUi( const caf::PdmFieldHandle* changedFiel loadResult(); if ( m_reservoirView ) m_reservoirView->scheduleCreateDisplayModelAndRedraw(); - - if ( changedField == objectToggleField() ) - { - updateUiIconFromToggleField(); - } } namespace caf diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseFaultColors.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseFaultColors.cpp index 6990605095..b98457eb5d 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseFaultColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseFaultColors.cpp @@ -68,8 +68,6 @@ void RimEclipseFaultColors::setReservoirView( RimEclipseView* ownerReservoirView //-------------------------------------------------------------------------------------------------- void RimEclipseFaultColors::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { - updateUiIconFromToggleField(); - if ( m_reservoirView ) m_reservoirView->scheduleCreateDisplayModelAndRedraw(); } @@ -79,8 +77,6 @@ void RimEclipseFaultColors::fieldChangedByUi( const caf::PdmFieldHandle* changed void RimEclipseFaultColors::initAfterRead() { m_customFaultResultColors->initAfterRead(); - - updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 01563a1a19..1f41c0ab78 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -1259,8 +1259,6 @@ void RimEclipseResultDefinition::initAfterRead() m_flowSolutionUiField = m_flowSolution(); m_selectedInjectorTracersUiField = m_selectedInjectorTracers; - - updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp index f06d04a34d..7686b8fda3 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp @@ -1390,8 +1390,6 @@ void RimEclipseView::initAfterRead() // Re-resolve the data filter source (case or ensemble) now that the view is attached to the tree. propagateEclipseCaseToChildObjects(); - - updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp b/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp index d27d6742b6..2cf0d0b840 100644 --- a/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimRegularLegendConfig.cpp @@ -324,8 +324,6 @@ void RimRegularLegendConfig::fieldChangedByUi( const caf::PdmFieldHandle* change { rftPlot->onLegendDefinitionChanged(); } - - updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- @@ -674,8 +672,6 @@ void RimRegularLegendConfig::initAfterRead() } updateFieldVisibility(); - - updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp index e4c247035b..04f68e74bd 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp @@ -321,11 +321,6 @@ bool RimSimWellInViewCollection::hasVisibleWellPipes() //-------------------------------------------------------------------------------------------------- void RimSimWellInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { - if ( &isActive == changedField ) - { - updateUiIconFromToggleField(); - } - if ( &m_showWellLabel == changedField ) { for ( RimSimWellInView* w : wells ) diff --git a/ApplicationLibCode/ProjectDataModel/RimStimPlanColors.cpp b/ApplicationLibCode/ProjectDataModel/RimStimPlanColors.cpp index edef2776a0..f638b830b1 100644 --- a/ApplicationLibCode/ProjectDataModel/RimStimPlanColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimStimPlanColors.cpp @@ -192,11 +192,6 @@ void RimStimPlanColors::fieldChangedByUi( const caf::PdmFieldHandle* changedFiel sourceView->scheduleCreateDisplayModelAndRedraw(); } - if ( changedField == objectToggleField() ) - { - updateUiIconFromToggleField(); - } - if ( changedField == &m_resultNameAndUnit ) { updateStimPlanTemplates(); diff --git a/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.cpp index 11e5c7a494..81c1248594 100644 --- a/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.cpp @@ -80,16 +80,6 @@ void RimViewLinkerCollection::fieldChangedByUi( const caf::PdmFieldHandle* chang viewLinker()->updateWindowTitles(); } } - - updateUiIconFromToggleField(); -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimViewLinkerCollection::initAfterRead() -{ - updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.h b/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.h index 92fd1d6252..1c0f97238e 100644 --- a/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.h +++ b/ApplicationLibCode/ProjectDataModel/RimViewLinkerCollection.h @@ -46,5 +46,4 @@ protected: caf::PdmFieldHandle* objectToggleField() override { return &isActive; } void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override; void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; - void initAfterRead() override; }; diff --git a/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp b/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp index 626f32e6df..315297b06a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp @@ -348,7 +348,6 @@ void RimViewWindow::fieldChangedByUi( const caf::PdmFieldHandle* changedField, c { updateDockWindowVisibility(); } - uiCapability()->updateUiIconFromToggleField(); } } diff --git a/ApplicationLibCode/ProjectDataModel/RimVirtualPerforationResults.cpp b/ApplicationLibCode/ProjectDataModel/RimVirtualPerforationResults.cpp index 2710820aa3..32e917aee2 100644 --- a/ApplicationLibCode/ProjectDataModel/RimVirtualPerforationResults.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimVirtualPerforationResults.cpp @@ -98,8 +98,6 @@ void RimVirtualPerforationResults::fieldChangedByUi( const caf::PdmFieldHandle* { if ( changedField == &m_isActive ) { - updateUiIconFromToggleField(); - loadData(); } @@ -126,11 +124,3 @@ void RimVirtualPerforationResults::defineUiOrdering( QString uiConfigName, caf:: uiOrdering.skipRemainingFields( true ); } - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimVirtualPerforationResults::initAfterRead() -{ - updateUiIconFromToggleField(); -} diff --git a/ApplicationLibCode/ProjectDataModel/RimVirtualPerforationResults.h b/ApplicationLibCode/ProjectDataModel/RimVirtualPerforationResults.h index ed901f93ee..7eeeaf52e5 100644 --- a/ApplicationLibCode/ProjectDataModel/RimVirtualPerforationResults.h +++ b/ApplicationLibCode/ProjectDataModel/RimVirtualPerforationResults.h @@ -48,7 +48,6 @@ private: void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; caf::PdmFieldHandle* objectToggleField() override; void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; - void initAfterRead() override; private: caf::PdmField m_isActive; diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp index e6339a5911..dadd703af9 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.cpp @@ -288,8 +288,6 @@ void RimSurfaceInView::updateLegendRangesTextAndVisibility( RiuViewer* nativeOrO //-------------------------------------------------------------------------------------------------- void RimSurfaceInView::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { - updateUiIconFromToggleField(); - bool scheduleRedraw = false; if ( changedField == &m_useSeparateDataSource || changedField == &m_separateDataSource ) @@ -356,11 +354,3 @@ caf::PdmFieldHandle* RimSurfaceInView::userDescriptionField() { return &m_name; } - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimSurfaceInView::initAfterRead() -{ - updateUiIconFromToggleField(); -} diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.h b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.h index ceb722322c..6d8f06417a 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.h +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInView.h @@ -77,8 +77,6 @@ public: bool isMeshLinesEnabled() const; protected: - void initAfterRead() override; - private: RimIntersectionResultsDefinitionCollection* findSeparateResultsCollection() override; diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp index fb3aad453c..038990a700 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp @@ -396,8 +396,6 @@ void RimSurfaceInViewCollection::appendPartsToModel( cvf::ModelBasicList* model, //-------------------------------------------------------------------------------------------------- void RimSurfaceInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) { - updateUiIconFromToggleField(); - if ( changedField == &m_isChecked || changedField == &m_surfaceColorMode ) { auto ownerView = firstAncestorOrThisOfTypeAsserted(); @@ -405,14 +403,6 @@ void RimSurfaceInViewCollection::fieldChangedByUi( const caf::PdmFieldHandle* ch } } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimSurfaceInViewCollection::initAfterRead() -{ - updateUiIconFromToggleField(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.h b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.h index 7e01e915af..57b93ddd68 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.h @@ -84,7 +84,6 @@ public: std::vector intersectionGeometryGenerators() const; protected: - void initAfterRead() override; caf::PdmFieldHandle* userDescriptionField() override; void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectCapability.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectCapability.h index c4231c6dda..f3b9242a9d 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectCapability.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectCapability.h @@ -7,6 +7,9 @@ class PdmObjectCapability public: PdmObjectCapability() {} virtual ~PdmObjectCapability() {} + + // Called for each capability of an object after its fields are read, before PdmXmlObjectHandle::initAfterRead() + virtual void onAfterRead() {} }; } // End namespace caf diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldHandle.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldHandle.cpp index 8fb5de2c10..07e439b7d1 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldHandle.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldHandle.cpp @@ -72,6 +72,9 @@ void PdmUiFieldHandle::notifyFieldChanged( const QVariant& oldFieldValue, const PdmUiObjectHandle* uiObjHandle = uiObj( ownerObjectHandle ); if ( uiObjHandle ) { + // Keep the icon in sync with the toggle field before notifying the object + if ( fieldHandle == uiObjHandle->objectToggleField() ) uiObjHandle->updateUiIconFromToggleField(); + uiObjHandle->fieldChangedByUi( fieldHandle, oldFieldValue, newFieldValue ); uiObjHandle->updateConnectedEditors(); diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.cpp index d7744ddf2c..130e07b96d 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.cpp @@ -213,17 +213,23 @@ void PdmUiObjectHandle::expandUiTree( PdmUiTreeOrdering* root, const QString& ui //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void PdmUiObjectHandle::updateUiIconFromToggleField() +void PdmUiObjectHandle::updateUiIconFromToggleField( const QString& uiConfigName ) { - if ( objectToggleField() ) - { - PdmUiFieldHandle* uiFieldHandle = objectToggleField()->uiCapability(); - if ( uiFieldHandle ) - { - bool active = uiFieldHandle->uiValue().toBool(); - updateUiIconFromState( active ); - } - } + auto* toggleField = objectToggleField(); + if ( !toggleField ) return; + + auto* uiFieldHandle = toggleField->uiCapability(); + if ( !uiFieldHandle ) return; + + updateUiIconFromState( uiFieldHandle->uiValue().toBool(), uiConfigName ); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void PdmUiObjectHandle::onAfterRead() +{ + updateUiIconFromToggleField(); } //-------------------------------------------------------------------------------------------------- diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.h index 4fbc07dcc6..d9b1fa4db8 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.h @@ -47,7 +47,11 @@ public: /// Field used to control if field change of and object should be covered by undo/redo framework virtual bool useUndoRedoForFieldChanged() { return true; } - void updateUiIconFromToggleField(); + // Updates the icon active state from the object toggle field. Done automatically when the toggle field is changed + // and after the object is read. Call explicitly when the toggle field is set without notification + void updateUiIconFromToggleField( const QString& uiConfigName = "" ); + + void onAfterRead() override; /// Append actions to menu builder virtual void appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const {} diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.cpp index 03d6300b4f..207ad2d38e 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.cpp @@ -401,6 +401,11 @@ void PdmXmlObjectHandle::initAfterReadRecursively( PdmObjectHandle* object ) initAfterReadRecursively( children[cIdx] ); } + for ( auto& [capability, takeOwnership] : object->m_capabilities ) + { + capability->onAfterRead(); + } + PdmXmlObjectHandle* xmlObject = xmlObj( object ); if ( xmlObject ) {