Update collection when adding new contour map.

OPM · Apr 3, 2024 · 78689a3 · 78689a3
1 parent dd75471
commit 78689a3
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/ApplicationLibCode/Commands/RicNewContourMapViewFeature.cpp b/ApplicationLibCode/Commands/RicNewContourMapViewFeature.cpp
@@ -24,21 +24,22 @@
 
 #include "Rim3dView.h"
 #include "RimCellEdgeColors.h"
+#include "RimCellFilterCollection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseContourMapProjection.h"
 #include "RimEclipseContourMapView.h"
 #include "RimEclipseContourMapViewCollection.h"
 #include "RimEclipseView.h"
+#include "RimFaultInViewCollection.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechContourMapView.h"
 #include "RimGeoMechContourMapViewCollection.h"
 #include "RimGeoMechView.h"
+#include "RimOilField.h"
+#include "RimProject.h"
 #include "RimRegularLegendConfig.h"
-
-#include "RimCellFilterCollection.h"
-#include "RimFaultInViewCollection.h"
 #include "RimSimWellInViewCollection.h"
 #include "RimSurfaceInViewCollection.h"
 
@@ -146,6 +147,12 @@ void RicNewContourMapViewFeature::onActionTriggered( bool isChecked )
         eclipseContourMap->createDisplayModelAndRedraw();
         eclipseContourMap->zoomAll();
 
+        RimProject* project = RimProject::current();
+
+        RimOilField* oilField = project->activeOilField();
+
+        oilField->eclipseContourMapCollection()->updateConnectedEditors();
+
         Riu3DMainWindowTools::setExpanded( eclipseContourMap );
     }
     else if ( geoMechContourMap )

diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp
@@ -292,12 +292,15 @@ void RimEclipseCase::initAfterRead()
         m_reservoirViews_OBSOLETE.clearWithoutDelete();
 
         // Move contour maps
+        auto mapViewColl = contourMapCollection();
         for ( RimEclipseContourMapView* contourMap : m_contourMapCollection_OBSOLETE->views() )
         {
             contourMap->setEclipseCase( this );
-
-            // TODO: move to root collection
+            m_contourMapCollection_OBSOLETE->removeChild( contourMap );
+            mapViewColl->push_back( contourMap );
         }
+
+        m_contourMapCollection_OBSOLETE->clearWithoutDelete();
     }
 }
 

diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapViewCollection.cpp
@@ -47,3 +47,19 @@ void RimEclipseContourMapViewCollection::onChildDeleted( caf::PdmChildArrayField
     auto eclipseCase = firstAncestorOrThisOfType<RimEclipseCase>();
     if ( eclipseCase ) eclipseCase->updateConnectedEditors();
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimEclipseContourMapViewCollection::clearWithoutDelete()
+{
+    m_contourMapViews.clearWithoutDelete();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimEclipseContourMapViewCollection::removeChild( RimEclipseContourMapView* contourMap )
+{
+    m_contourMapViews.removeChild( contourMap );
+}
diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapViewCollection.h b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapViewCollection.h
@@ -37,6 +37,9 @@ class RimEclipseContourMapViewCollection : public caf::PdmObject
 
     void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::vector<caf::PdmObjectHandle*>& referringObjects ) override;
 
+    void clearWithoutDelete();
+    void removeChild( RimEclipseContourMapView* contourMap );
+
 private:
     caf::PdmChildArrayField<RimEclipseContourMapView*> m_contourMapViews;
 };