diff --git a/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake index 1ca86b0f08..3aacc3daf3 100644 --- a/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake @@ -5,14 +5,14 @@ if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") endif() set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicAppendCrossSectionFeature.h +${CEE_CURRENT_LIST_DIR}RicAppendIntersectionFeature.h ${CEE_CURRENT_LIST_DIR}RicNewSimWellCrossSectionFeature.h ${CEE_CURRENT_LIST_DIR}RicNewWellPathCrossSectionFeature.h ${CEE_CURRENT_LIST_DIR}RicNewPolylineCrossSectionFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicAppendCrossSectionFeature.cpp +${CEE_CURRENT_LIST_DIR}RicAppendIntersectionFeature.cpp ${CEE_CURRENT_LIST_DIR}RicNewSimWellCrossSectionFeature.cpp ${CEE_CURRENT_LIST_DIR}RicNewWellPathCrossSectionFeature.cpp ${CEE_CURRENT_LIST_DIR}RicNewPolylineCrossSectionFeature.cpp diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicAppendCrossSectionFeature.cpp b/ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.cpp similarity index 85% rename from ApplicationCode/Commands/CrossSectionCommands/RicAppendCrossSectionFeature.cpp rename to ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.cpp index 7ae114aa5f..f8cba9c58e 100644 --- a/ApplicationCode/Commands/CrossSectionCommands/RicAppendCrossSectionFeature.cpp +++ b/ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicAppendCrossSectionFeature.h" +#include "RicAppendIntersectionFeature.h" #include "RimIntersection.h" #include "RimIntersectionCollection.h" @@ -29,12 +29,12 @@ #include -CAF_CMD_SOURCE_INIT(RicAppendCrossSectionFeature, "RicAppendCrossSectionFeature"); +CAF_CMD_SOURCE_INIT(RicAppendIntersectionFeature, "RicAppendIntersectionFeature"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicAppendCrossSectionFeature::isCommandEnabled() +bool RicAppendIntersectionFeature::isCommandEnabled() { return true; } @@ -42,7 +42,7 @@ bool RicAppendCrossSectionFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicAppendCrossSectionFeature::onActionTriggered(bool isChecked) +void RicAppendIntersectionFeature::onActionTriggered(bool isChecked) { std::vector collection; caf::SelectionManager::instance()->objectsByType(&collection); @@ -53,14 +53,14 @@ void RicAppendCrossSectionFeature::onActionTriggered(bool isChecked) CVF_ASSERT(crossSectionCollection); - RicAppendCrossSectionFeatureCmd* cmd = new RicAppendCrossSectionFeatureCmd(crossSectionCollection); + RicAppendIntersectionFeatureCmd* cmd = new RicAppendIntersectionFeatureCmd(crossSectionCollection); caf::CmdExecCommandManager::instance()->processExecuteCommand(cmd); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicAppendCrossSectionFeature::setupActionLook(QAction* actionToSetup) +void RicAppendIntersectionFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setIcon(QIcon(":/CrossSection16x16.png")); actionToSetup->setText("New Intersection"); @@ -69,7 +69,7 @@ void RicAppendCrossSectionFeature::setupActionLook(QAction* actionToSetup) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicAppendCrossSectionFeatureCmd::RicAppendCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection) +RicAppendIntersectionFeatureCmd::RicAppendIntersectionFeatureCmd(RimIntersectionCollection* crossSectionCollection) : CmdExecuteCommand(NULL), m_crossSectionCollection(crossSectionCollection) { @@ -78,14 +78,14 @@ RicAppendCrossSectionFeatureCmd::RicAppendCrossSectionFeatureCmd(RimIntersection //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicAppendCrossSectionFeatureCmd::~RicAppendCrossSectionFeatureCmd() +RicAppendIntersectionFeatureCmd::~RicAppendIntersectionFeatureCmd() { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RicAppendCrossSectionFeatureCmd::name() +QString RicAppendIntersectionFeatureCmd::name() { return "New Intersection"; } @@ -93,7 +93,7 @@ QString RicAppendCrossSectionFeatureCmd::name() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicAppendCrossSectionFeatureCmd::redo() +void RicAppendIntersectionFeatureCmd::redo() { CVF_ASSERT(m_crossSectionCollection); @@ -105,6 +105,6 @@ void RicAppendCrossSectionFeatureCmd::redo() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicAppendCrossSectionFeatureCmd::undo() +void RicAppendIntersectionFeatureCmd::undo() { } diff --git a/ApplicationCode/Commands/CrossSectionCommands/RicAppendCrossSectionFeature.h b/ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.h similarity index 88% rename from ApplicationCode/Commands/CrossSectionCommands/RicAppendCrossSectionFeature.h rename to ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.h index 3b0a818843..a227c6aa70 100644 --- a/ApplicationCode/Commands/CrossSectionCommands/RicAppendCrossSectionFeature.h +++ b/ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.h @@ -29,11 +29,11 @@ class RimIntersectionCollection; //================================================================================================== /// //================================================================================================== -class RicAppendCrossSectionFeatureCmd : public caf::CmdExecuteCommand +class RicAppendIntersectionFeatureCmd : public caf::CmdExecuteCommand { public: - RicAppendCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection); - virtual ~RicAppendCrossSectionFeatureCmd(); + RicAppendIntersectionFeatureCmd(RimIntersectionCollection* crossSectionCollection); + virtual ~RicAppendIntersectionFeatureCmd(); virtual QString name(); virtual void redo(); @@ -48,7 +48,7 @@ private: //================================================================================================== /// //================================================================================================== -class RicAppendCrossSectionFeature : public caf::CmdFeature +class RicAppendIntersectionFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; diff --git a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp index fda3b582c7..dcdc33415b 100644 --- a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp @@ -301,11 +301,11 @@ QStringList RimContextCommandBuilder::commandsFromSelection() } else if (dynamic_cast(uiItem)) { - commandIds << "RicAppendCrossSectionFeature"; + commandIds << "RicAppendIntersectionFeature"; } else if (dynamic_cast(uiItem)) { - commandIds << "RicAppendCrossSectionFeature"; + commandIds << "RicAppendIntersectionFeature"; commandIds << "Separator"; commandIds << "RicDeleteItemFeature"; }