#1306 Use general delete sub items for well path collection

OPM · Mar 8, 2017 · 84f76e5 · 84f76e5
1 parent d547079
commit 84f76e5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 124 deletions.
diff --git a/ApplicationCode/Commands/RicDeleteSubItemsFeature.cpp b/ApplicationCode/Commands/RicDeleteSubItemsFeature.cpp
@@ -18,11 +18,14 @@
 
 #include "RicDeleteSubItemsFeature.h"
 
-#include <QAction>
 #include "RimSummaryPlotCollection.h"
+#include "RimWellPathCollection.h"
+
+#include "cafAssert.h"
 #include "cafPdmUiItem.h"
 #include "cafSelectionManager.h"
-#include "cafAssert.h"
+
+#include <QAction>
 
 
 CAF_CMD_SOURCE_INIT(RicDeleteSubItemsFeature, "RicDeleteSubItemsFeature");
@@ -68,6 +71,15 @@ void RicDeleteSubItemsFeature::onActionTriggered(bool isChecked)
 
             summaryPlotColl->updateConnectedEditors();
         }
+
+        RimWellPathCollection* wellPathColl = dynamic_cast<RimWellPathCollection*>(item);
+        if (wellPathColl)
+        {
+            wellPathColl->deleteAllWellPaths();
+
+            wellPathColl->updateConnectedEditors();
+            wellPathColl->scheduleGeometryRegenAndRedrawViews();
+        }
     }
 }
 
@@ -91,6 +103,11 @@ bool RicDeleteSubItemsFeature::hasDeletableSubItems(caf::PdmUiItem* uiItem)
         return true;
     }
 
+    RimWellPathCollection* wellPathColl = dynamic_cast<RimWellPathCollection*>(uiItem);
+    if (wellPathColl && wellPathColl->wellPaths().size() > 0)
+    {
+        return true;
+    }
 
     return false;
 }
diff --git a/ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake
@@ -6,15 +6,13 @@ endif()
 
 set (SOURCE_GROUP_HEADER_FILES
 ${CEE_CURRENT_LIST_DIR}RicWellPathDeleteFeature.h
-${CEE_CURRENT_LIST_DIR}RicWellPathsDeleteAllFeature.h
 ${CEE_CURRENT_LIST_DIR}RicWellPathsImportFileFeature.h
 ${CEE_CURRENT_LIST_DIR}RicWellPathsImportSsihubFeature.h
 ${CEE_CURRENT_LIST_DIR}RicWellPathViewerEventHandler.h 
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
 ${CEE_CURRENT_LIST_DIR}RicWellPathDeleteFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicWellPathsDeleteAllFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicWellPathsImportFileFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicWellPathsImportSsihubFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicWellPathViewerEventHandler.cpp

diff --git a/ApplicationCode/Commands/WellPathCommands/RicWellPathsDeleteAllFeature.cpp b/ApplicationCode/Commands/WellPathCommands/RicWellPathsDeleteAllFeature.cpp
diff --git a/ApplicationCode/Commands/WellPathCommands/RicWellPathsDeleteAllFeature.h b/ApplicationCode/Commands/WellPathCommands/RicWellPathsDeleteAllFeature.h
diff --git a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
@@ -205,8 +205,6 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
             commandIds << "RicWellPathsImportFileFeature";
             commandIds << "RicWellPathsImportSsihubFeature";
             commandIds << "RicWellLogsImportFileFeature";
-            commandIds << "Separator";
-            commandIds << "RicWellPathsDeleteAllFeature";
         }
         else if (dynamic_cast<RimWellPath*>(uiItem))
         {