#5285 Surface Import command. SurfaceInView tree-items. Delete.

Ready to start on visualization code

ApplicationCode/Commands/RicDeleteItemExec.cpp

@@ -22,6 +22,7 @@
 
 #include "RiaGuiApplication.h"
 
+#include "Rim2dIntersectionViewCollection.h"
 #include "Rim3dView.h"
 #include "RimAnnotationCollection.h"
 #include "RimAnnotationInViewCollection.h"
@@ -33,6 +34,7 @@
 #include "RimEnsembleCurveSet.h"
 #include "RimEnsembleCurveSetCollection.h"
 #include "RimFormationNamesCollection.h"
+#include "RimFractureTemplateCollection.h"
 #include "RimGeoMechPropertyFilterCollection.h"
 #include "RimIntersectionCollection.h"
 #include "RimIntersectionResultsDefinitionCollection.h"
@@ -41,6 +43,7 @@
 #include "RimSummaryCrossPlotCollection.h"
 #include "RimSummaryPlot.h"
 #include "RimSummaryPlotCollection.h"
+#include "RimSurfaceCollection.h"
 #include "RimViewLinkerCollection.h"
 #include "RimWellLogPlot.h"
 #include "RimWellLogPlotCollection.h"
@@ -50,9 +53,6 @@
 
 #include "RiuPlotMainWindow.h"
 
-#include "RimFractureTemplateCollection.h"
-
-#include "Rim2dIntersectionViewCollection.h"
 #include "cafNotificationCenter.h"
 #include "cafPdmChildArrayField.h"
 #include "cafPdmDocument.h"
@@ -329,6 +329,15 @@ void RicDeleteItemExec::redo()
                 annotationColl->onAnnotationDeleted();
             }
         }
+
+        {
+            RimSurfaceCollection* surfCollection;
+            parentObj->firstAncestorOrThisOfType( surfCollection );
+            if ( surfCollection )
+            {
+                surfCollection->updateViews();
+            }
+        }
     }
 }
 

ApplicationCode/Commands/RicDeleteItemFeature.cpp

@@ -54,6 +54,7 @@
 #include "RimSummaryCurve.h"
 #include "RimSummaryCurveFilter.h"
 #include "RimSummaryPlot.h"
+#include "RimSurface.h"
 #include "RimTextAnnotation.h"
 #include "RimViewController.h"
 #include "RimWellAllocationPlot.h"
@@ -139,6 +140,7 @@ bool isDeletable( caf::PdmUiItem* uiItem )
     if ( dynamic_cast<RimReachCircleAnnotation*>( uiItem ) ) return true;
     if ( dynamic_cast<RimPolylinesAnnotation*>( uiItem ) ) return true;
     if ( dynamic_cast<RimIntersectionResultDefinition*>( uiItem ) ) return true;
+    if ( dynamic_cast<RimSurface*>( uiItem ) ) return true;
 
     if ( dynamic_cast<RimGridCrossPlot*>( uiItem ) )
     {

ApplicationCode/Commands/SurfaceCommands/RicImportSurfacesFeature.cpp

@@ -57,7 +57,7 @@ void RicImportSurfacesFeature::onActionTriggered( bool isChecked )
     // Remember the path to next time
     app->setLastUsedDialogDirectory( "BINARY_GRID", QFileInfo( fileNames.last() ).absolutePath() );
 
-    // Find or create the AnnotationsCollection
+    // Find or create the SurfaceCollection
 
     RimProject*           proj     = RiaApplication::instance()->project();
     RimSurfaceCollection* surfColl = proj->activeOilField()->surfaceCollection();
@@ -66,20 +66,17 @@ void RicImportSurfacesFeature::onActionTriggered( bool isChecked )
     {
         surfColl                                  = new RimSurfaceCollection();
         proj->activeOilField()->surfaceCollection = surfColl;
+        proj->updateConnectedEditors();
     }
 
     // For each file,
 
     RimSurface* lastCreatedOrUpdated = surfColl->importSurfacesFromFiles( fileNames );
 
-    proj->updateConnectedEditors();
-
     if ( lastCreatedOrUpdated )
     {
         Riu3DMainWindowTools::selectAsCurrentItem( lastCreatedOrUpdated );
     }
-
-    // surfColl->scheduleRedrawOfRelevantViews();
 }
 
 //--------------------------------------------------------------------------------------------------