(#605) Fixed delete of well path to avoid reuse of old data

ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake

@@ -5,12 +5,14 @@ if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
 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
 )
 
 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

ApplicationCode/Commands/WellPathCommands/RicWellPathDeleteFeature.cpp

@@ -0,0 +1,81 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2015-     Statoil ASA
+//  Copyright (C) 2015-     Ceetron Solutions AS
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RicWellPathDeleteFeature.h"
+
+#include "RimWellPathCollection.h"
+
+#include "cafSelectionManager.h"
+
+#include <QAction>
+#include "RimWellPath.h"
+
+namespace caf
+{
+
+CAF_CMD_SOURCE_INIT(RicWellPathDeleteFeature, "RicWellPathDeleteFeature");
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicWellPathDeleteFeature::isCommandEnabled()
+{
+    std::vector<RimWellPath*> objects;
+    caf::SelectionManager::instance()->objectsByType(&objects);
+
+    if (objects.size() == 1)
+    {
+        return true;
+    }
+
+    return false;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicWellPathDeleteFeature::onActionTriggered(bool isChecked)
+{
+    std::vector<RimWellPath*> objects;
+    caf::SelectionManager::instance()->objectsByType(&objects);
+
+    if (objects.size() == 0) return;
+
+    RimWellPath* wellPath = objects[0];
+
+    RimWellPathCollection* wellPathCollection = NULL;
+    wellPath->firstAnchestorOrThisOfType(wellPathCollection);
+
+    wellPathCollection->removeWellPath(wellPath);;
+    delete wellPath;
+
+    wellPathCollection->uiCapability()->updateConnectedEditors();
+    wellPathCollection->scheduleGeometryRegenAndRedrawViews();
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicWellPathDeleteFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setText("Delete Well Path");
+}
+
+} // end namespace caf

ApplicationCode/Commands/WellPathCommands/RicWellPathDeleteFeature.h

@@ -0,0 +1,43 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2015-     Statoil ASA
+//  Copyright (C) 2015-     Ceetron Solutions AS
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "cafCmdFeature.h"
+
+namespace caf 
+{
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicWellPathDeleteFeature : public CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+protected:
+
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+};
+
+
+
+} // end namespace caf

ApplicationCode/Commands/WellPathCommands/RicWellPathsDeleteAllFeature.cpp

@@ -57,7 +57,7 @@ void RicWellPathsDeleteAllFeature::onActionTriggered(bool isChecked)
 
     RimWellPathCollection* wellPathCollection = objects[0];
 
-    wellPathCollection->wellPaths.deleteAllChildObjects();
+    wellPathCollection->deleteAllWellPaths();
 
     wellPathCollection->uiCapability()->updateConnectedEditors();
     wellPathCollection->scheduleGeometryRegenAndRedrawViews();