Fix firstAncestorOfType usage.

OPM · Mar 22, 2024 · 0f703b6 · 0f703b6
1 parent 353febb
commit 0f703b6
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 35 deletions.
diff --git a/ApplicationLibCode/Commands/OperationsUsingObjReferences/RicPasteCellFiltersFeature.cpp b/ApplicationLibCode/Commands/OperationsUsingObjReferences/RicPasteCellFiltersFeature.cpp
@@ -20,6 +20,7 @@
 
 #include "RicPasteFeatureImpl.h"
 
+#include "Rim3dView.h"
 #include "RimCase.h"
 #include "RimCellFilter.h"
 #include "RimCellFilterCollection.h"
@@ -42,17 +43,9 @@ bool RicPasteCellFiltersFeature::isCommandEnabled() const
 
     std::vector<caf::PdmPointer<RimCellFilter>> typedObjects;
     objectGroup.objectsByType( &typedObjects );
-    if ( typedObjects.empty() )
-    {
-        return false;
-    }
-
-    if ( dynamic_cast<RimCellFilterCollection*>( caf::SelectionManager::instance()->selectedItem() ) )
-    {
-        return true;
-    }
+    if ( typedObjects.empty() ) return false;
 
-    return false;
+    return dynamic_cast<RimCellFilterCollection*>( caf::SelectionManager::instance()->selectedItem() ) != nullptr;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -63,7 +56,11 @@ void RicPasteCellFiltersFeature::onActionTriggered( bool isChecked )
     auto cellFilterCollection = dynamic_cast<RimCellFilterCollection*>( caf::SelectionManager::instance()->selectedItem() );
     if ( !cellFilterCollection ) return;
 
-    auto eclipseCase = cellFilterCollection->firstAncestorOfType<RimCase>();
+    auto view = cellFilterCollection->firstAncestorOfType<Rim3dView>();
+    if ( !view ) return;
+
+    auto eclipseCase = view->ownerCase();
+    if ( !eclipseCase ) return;
 
     caf::PdmObjectGroup objectGroup;
     RicPasteFeatureImpl::findObjectsFromClipboardRefs( &objectGroup );

diff --git a/ApplicationLibCode/Commands/RicVec3dPickEventHandler.cpp b/ApplicationLibCode/Commands/RicVec3dPickEventHandler.cpp
@@ -42,10 +42,9 @@ bool RicVec3dPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& eventObj
 
     cvf::Vec3d pickedPosition = eventObject.m_pickItemInfos.front().globalPickedPoint();
 
-    RimCase* ownerCase = rimView->firstAncestorOrThisOfType<RimCase>();
-    if ( ownerCase )
+    if ( rimView->ownerCase() )
     {
-        double zPickOffset = ownerCase->characteristicCellSize() * m_zOffsetFactor;
+        double zPickOffset = rimView->ownerCase()->characteristicCellSize() * m_zOffsetFactor;
         pickedPosition.z() += zPickOffset;
     }
 

diff --git a/ApplicationLibCode/ModelVisualization/RivWellPathPartMgr.cpp b/ApplicationLibCode/ModelVisualization/RivWellPathPartMgr.cpp
@@ -388,7 +388,7 @@ void RivWellPathPartMgr::appendPerforationsToModel( cvf::ModelBasicList*
     QDateTime currentTimeStamp;
     if ( m_rimView )
     {
-        auto rimCase = m_rimView->firstAncestorOrThisOfType<RimCase>();
+        auto rimCase = m_rimView->ownerCase();
 
         if ( rimCase )
         {

diff --git a/ApplicationLibCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp b/ApplicationLibCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp
@@ -382,8 +382,13 @@ void RivSurfacePartMgr::generatePartGeometry()
 void RivSurfacePartMgr::generateNativePartGeometry()
 {
     cvf::Vec3d displayModOffset( 0, 0, 0 );
-    auto       ownerCase = m_surfaceInView->firstAncestorOrThisOfType<RimCase>();
-    if ( ownerCase ) displayModOffset = ownerCase->displayModelOffset();
+
+    auto view = m_surfaceInView->firstAncestorOrThisOfType<Rim3dView>();
+    if ( view )
+    {
+        auto ownerCase = view->ownerCase();
+        if ( ownerCase ) displayModOffset = ownerCase->displayModelOffset();
+    }
 
     m_usedSurfaceData = m_surfaceInView->surface()->surfaceData();
     if ( m_usedSurfaceData.isNull() ) return;

diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp
@@ -279,17 +279,19 @@ void RimAnnotationInViewCollection::defineEditorAttribute( const caf::PdmFieldHa
 
         if ( attr )
         {
-            auto rimCase = firstAncestorOrThisOfType<RimCase>();
-            if ( rimCase )
+            if ( auto view = firstAncestorOrThisOfType<Rim3dView>() )
             {
-                auto bb         = rimCase->allCellsBoundingBox();
-                attr->m_minimum = -bb.max().z();
-                attr->m_maximum = -bb.min().z();
-            }
-            else
-            {
-                attr->m_minimum = 0;
-                attr->m_maximum = 10000;
+                if ( auto rimCase = view->ownerCase() )
+                {
+                    auto bb         = rimCase->allCellsBoundingBox();
+                    attr->m_minimum = -bb.max().z();
+                    attr->m_maximum = -bb.min().z();
+                }
+                else
+                {
+                    attr->m_minimum = 0;
+                    attr->m_maximum = 10000;
+                }
             }
         }
     }

diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp
@@ -160,7 +160,10 @@ void RimCellFilterCollection::initAfterRead()
 
     // Copy by xml serialization does not give a RimCase parent the first time initAfterRead is called here when creating a new a contour
     // view from a 3d view. The second time we get called it is ok, so just skip setting up the filter connections if we have no case.
-    auto rimCase = firstAncestorOrThisOfType<RimCase>();
+    auto rimView = firstAncestorOrThisOfType<Rim3dView>();
+    if ( rimView == nullptr ) return;
+
+    auto rimCase = rimView->ownerCase();
     if ( rimCase == nullptr ) return;
 
     for ( const auto& filter : m_cellFilters )

diff --git a/...tionLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp b/...tionLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp
@@ -72,8 +72,13 @@ void RimIntersectionResultsDefinitionCollection::appendIntersectionResultDefinit
 
     if ( interResDef->activeCase() == nullptr )
     {
-        auto ownerCase = firstAncestorOrThisOfType<RimCase>();
-        interResDef->setActiveCase( ownerCase );
+        if ( auto gridView = firstAncestorOrThisOfType<Rim3dView>() )
+        {
+            if ( auto ownerCase = gridView->ownerCase() )
+            {
+                interResDef->setActiveCase( ownerCase );
+            }
+        }
     }
 }
 

diff --git a/ApplicationLibCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationLibCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
@@ -1013,12 +1013,14 @@ void Rim3dOverlayInfoConfig::updateSeismicInfo( RimSeismicView* seisView )
 //--------------------------------------------------------------------------------------------------
 void Rim3dOverlayInfoConfig::update3DInfoIn2dViews() const
 {
-    RimCase* rimCase = firstAncestorOrThisOfType<RimCase>();
-    if ( rimCase )
+    if ( auto rimView = firstAncestorOrThisOfType<Rim3dView>() )
     {
-        for ( Rim2dIntersectionView* view : rimCase->intersectionViewCollection()->views() )
+        if ( RimCase* rimCase = rimView->ownerCase() )
         {
-            view->update3dInfo();
+            for ( Rim2dIntersectionView* view : rimCase->intersectionViewCollection()->views() )
+            {
+                view->update3dInfo();
+            }
         }
     }
 }

diff --git a/ApplicationLibCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp b/ApplicationLibCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp
@@ -147,7 +147,7 @@ void RiuAdvancedSnapshotExportWidget::addSnapshotItemFromActiveView()
         multiSnapshot->timeStepStart = activeView->currentTimeStep();
         multiSnapshot->timeStepEnd   = activeView->currentTimeStep();
 
-        auto sourceCase = activeView->firstAncestorOrThisOfType<RimCase>();
+        auto sourceCase = activeView->ownerCase();
         if ( sourceCase )
         {
             multiSnapshot->additionalCases().push_back( sourceCase );