From d549f45ad0bd6555e29e58269743555d1d056b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Wed, 21 Sep 2016 11:38:37 +0200 Subject: [PATCH] #815 More renaming CrossSection -> Intersection --- .../CMakeLists_files.cmake | 4 ++-- ... => RicNewWellPathIntersectionFeature.cpp} | 24 +++++++++---------- ....h => RicNewWellPathIntersectionFeature.h} | 10 ++++---- .../RimContextCommandBuilder.cpp | 2 +- .../UserInterface/RiuViewerCommands.cpp | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) rename ApplicationCode/Commands/CrossSectionCommands/{RicNewWellPathCrossSectionFeature.cpp => RicNewWellPathIntersectionFeature.cpp} (83%) rename ApplicationCode/Commands/CrossSectionCommands/{RicNewWellPathCrossSectionFeature.h => RicNewWellPathIntersectionFeature.h} (86%) diff --git a/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake index 3aacc3daf3..7779820fcb 100644 --- a/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake @@ -7,14 +7,14 @@ endif() set (SOURCE_GROUP_HEADER_FILES ${CEE_CURRENT_LIST_DIR}RicAppendIntersectionFeature.h ${CEE_CURRENT_LIST_DIR}RicNewSimWellCrossSectionFeature.h -${CEE_CURRENT_LIST_DIR}RicNewWellPathCrossSectionFeature.h +${CEE_CURRENT_LIST_DIR}RicNewWellPathIntersectionFeature.h ${CEE_CURRENT_LIST_DIR}RicNewPolylineCrossSectionFeature.h ) set (SOURCE_GROUP_SOURCE_FILES ${CEE_CURRENT_LIST_DIR}RicAppendIntersectionFeature.cpp ${CEE_CURRENT_LIST_DIR}RicNewSimWellCrossSectionFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewWellPathCrossSectionFeature.cpp +${CEE_CURRENT_LIST_DIR}RicNewWellPathIntersectionFeature.cpp ${CEE_CURRENT_LIST_DIR}RicNewPolylineCrossSectionFeature.cpp ) diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathCrossSectionFeature.cpp b/ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp similarity index 83% rename from ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathCrossSectionFeature.cpp rename to ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp index c1bbf4c325..e4b0f6b5c4 100644 --- a/ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathCrossSectionFeature.cpp +++ b/ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicNewWellPathCrossSectionFeature.h" +#include "RicNewWellPathIntersectionFeature.h" #include "RiaApplication.h" @@ -33,12 +33,12 @@ #include -CAF_CMD_SOURCE_INIT(RicNewWellPathCrossSectionFeature, "RicNewWellPathCrossSectionFeature"); +CAF_CMD_SOURCE_INIT(RicNewWellPathIntersectionFeature, "RicNewWellPathIntersectionFeature"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicNewWellPathCrossSectionFeature::RicNewWellPathCrossSectionFeature() +RicNewWellPathIntersectionFeature::RicNewWellPathIntersectionFeature() { } @@ -46,7 +46,7 @@ RicNewWellPathCrossSectionFeature::RicNewWellPathCrossSectionFeature() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicNewWellPathCrossSectionFeature::isCommandEnabled() +bool RicNewWellPathIntersectionFeature::isCommandEnabled() { return true; } @@ -54,7 +54,7 @@ bool RicNewWellPathCrossSectionFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewWellPathCrossSectionFeature::onActionTriggered(bool isChecked) +void RicNewWellPathIntersectionFeature::onActionTriggered(bool isChecked) { RimView* activeView = RiaApplication::instance()->activeReservoirView(); if (!activeView) return; @@ -65,14 +65,14 @@ void RicNewWellPathCrossSectionFeature::onActionTriggered(bool isChecked) RimWellPath* wellPath = collection[0]; - RicNewWellPathCrossSectionFeatureCmd* cmd = new RicNewWellPathCrossSectionFeatureCmd(activeView->crossSectionCollection, wellPath); + RicNewWellPathIntersectionFeatureCmd* cmd = new RicNewWellPathIntersectionFeatureCmd(activeView->crossSectionCollection, wellPath); caf::CmdExecCommandManager::instance()->processExecuteCommand(cmd); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewWellPathCrossSectionFeature::setupActionLook(QAction* actionToSetup) +void RicNewWellPathIntersectionFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setIcon(QIcon(":/CrossSection16x16.png")); actionToSetup->setText("New Intersection"); @@ -81,7 +81,7 @@ void RicNewWellPathCrossSectionFeature::setupActionLook(QAction* actionToSetup) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicNewWellPathCrossSectionFeatureCmd::RicNewWellPathCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection, RimWellPath* wellPath) +RicNewWellPathIntersectionFeatureCmd::RicNewWellPathIntersectionFeatureCmd(RimIntersectionCollection* crossSectionCollection, RimWellPath* wellPath) : CmdExecuteCommand(NULL), m_crossSectionCollection(crossSectionCollection), m_wellPath(wellPath) @@ -91,14 +91,14 @@ RicNewWellPathCrossSectionFeatureCmd::RicNewWellPathCrossSectionFeatureCmd(RimIn //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicNewWellPathCrossSectionFeatureCmd::~RicNewWellPathCrossSectionFeatureCmd() +RicNewWellPathIntersectionFeatureCmd::~RicNewWellPathIntersectionFeatureCmd() { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RicNewWellPathCrossSectionFeatureCmd::name() +QString RicNewWellPathIntersectionFeatureCmd::name() { return "Create Intersection From Well Path"; } @@ -106,7 +106,7 @@ QString RicNewWellPathCrossSectionFeatureCmd::name() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewWellPathCrossSectionFeatureCmd::redo() +void RicNewWellPathIntersectionFeatureCmd::redo() { CVF_ASSERT(m_crossSectionCollection); CVF_ASSERT(m_wellPath); @@ -122,6 +122,6 @@ void RicNewWellPathCrossSectionFeatureCmd::redo() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicNewWellPathCrossSectionFeatureCmd::undo() +void RicNewWellPathIntersectionFeatureCmd::undo() { } diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathCrossSectionFeature.h b/ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.h similarity index 86% rename from ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathCrossSectionFeature.h rename to ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.h index b5990dfc47..aa156d35f5 100644 --- a/ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathCrossSectionFeature.h +++ b/ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.h @@ -30,11 +30,11 @@ class RimWellPath; //================================================================================================== /// //================================================================================================== -class RicNewWellPathCrossSectionFeatureCmd : public caf::CmdExecuteCommand +class RicNewWellPathIntersectionFeatureCmd : public caf::CmdExecuteCommand { public: - RicNewWellPathCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection, RimWellPath* wellPath); - virtual ~RicNewWellPathCrossSectionFeatureCmd(); + RicNewWellPathIntersectionFeatureCmd(RimIntersectionCollection* crossSectionCollection, RimWellPath* wellPath); + virtual ~RicNewWellPathIntersectionFeatureCmd(); virtual QString name(); virtual void redo(); @@ -50,12 +50,12 @@ private: //================================================================================================== /// //================================================================================================== -class RicNewWellPathCrossSectionFeature : public caf::CmdFeature +class RicNewWellPathIntersectionFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; public: - RicNewWellPathCrossSectionFeature(); + RicNewWellPathIntersectionFeature(); protected: // Overrides diff --git a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp index dcdc33415b..f6d487c9a6 100644 --- a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp @@ -213,7 +213,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection() { commandIds << "RicNewWellLogFileCurveFeature"; commandIds << "RicNewWellLogCurveExtractionFeature"; - commandIds << "RicNewWellPathCrossSectionFeature"; + commandIds << "RicNewWellPathIntersectionFeature"; commandIds << "RicWellPathDeleteFeature"; } else if (dynamic_cast(uiItem)) diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp index 0d2ec36962..ad9e19ae83 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp +++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp @@ -255,7 +255,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event) commandIds << "RicNewWellLogFileCurveFeature"; commandIds << "RicNewWellLogCurveExtractionFeature"; - commandIds << "RicNewWellPathCrossSectionFeature"; + commandIds << "RicNewWellPathIntersectionFeature"; } }