From 2817e0d34d2130d9f2d681cb9c25ea0050fd9548 Mon Sep 17 00:00:00 2001 From: astridkbjorke Date: Wed, 11 Jan 2017 09:39:30 +0100 Subject: [PATCH] #1092 - pre-proto - Renaming RicExportFractureWellCompletionFeature to RicExportSimWellFractureWellCompletionFeature --- ApplicationCode/Commands/CMakeLists_files.cmake | 4 ++-- ... RicExportSimWellFractureWellCompletionFeature.cpp} | 10 +++++----- ...=> RicExportSimWellFractureWellCompletionFeature.h} | 2 +- .../ProjectDataModel/RimContextCommandBuilder.cpp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename ApplicationCode/Commands/{RicExportFractureWellCompletionFeature.cpp => RicExportSimWellFractureWellCompletionFeature.cpp} (88%) rename ApplicationCode/Commands/{RicExportFractureWellCompletionFeature.h => RicExportSimWellFractureWellCompletionFeature.h} (94%) diff --git a/ApplicationCode/Commands/CMakeLists_files.cmake b/ApplicationCode/Commands/CMakeLists_files.cmake index 54916acd9f..2effe5478e 100644 --- a/ApplicationCode/Commands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/CMakeLists_files.cmake @@ -46,7 +46,7 @@ ${CEE_CURRENT_LIST_DIR}RicFractureDefinitionsDeleteAllFeature.h ${CEE_CURRENT_LIST_DIR}RicFracturesDeleteAllFeature.h ${CEE_CURRENT_LIST_DIR}RicWellPathFracturesDeleteAllFeature.h ${CEE_CURRENT_LIST_DIR}RicSimWellFracturesDeleteAllFeature.h -${CEE_CURRENT_LIST_DIR}RicExportFractureWellCompletionFeature.h +${CEE_CURRENT_LIST_DIR}RicExportSimWellFractureWellCompletionFeature.h ${CEE_CURRENT_LIST_DIR}RicExportWellPathFractureWellCompletionFeature.h @@ -97,7 +97,7 @@ ${CEE_CURRENT_LIST_DIR}RicNewWellPathFractureAtPosFeature.cpp ${CEE_CURRENT_LIST_DIR}RicFractureDefinitionsDeleteAllFeature.cpp ${CEE_CURRENT_LIST_DIR}RicWellPathFracturesDeleteAllFeature.cpp ${CEE_CURRENT_LIST_DIR}RicSimWellFracturesDeleteAllFeature.cpp -${CEE_CURRENT_LIST_DIR}RicExportFractureWellCompletionFeature.cpp +${CEE_CURRENT_LIST_DIR}RicExportSimWellFractureWellCompletionFeature.cpp ${CEE_CURRENT_LIST_DIR}RicExportWellPathFractureWellCompletionFeature.cpp diff --git a/ApplicationCode/Commands/RicExportFractureWellCompletionFeature.cpp b/ApplicationCode/Commands/RicExportSimWellFractureWellCompletionFeature.cpp similarity index 88% rename from ApplicationCode/Commands/RicExportFractureWellCompletionFeature.cpp rename to ApplicationCode/Commands/RicExportSimWellFractureWellCompletionFeature.cpp index 762458ecac..6a80cbf7d3 100644 --- a/ApplicationCode/Commands/RicExportFractureWellCompletionFeature.cpp +++ b/ApplicationCode/Commands/RicExportSimWellFractureWellCompletionFeature.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicExportFractureWellCompletionFeature.h" +#include "RicExportSimWellFractureWellCompletionFeature.h" #include "RiaApplication.h" @@ -42,12 +42,12 @@ #include #include -CAF_CMD_SOURCE_INIT(RicExportFractureWellCompletionFeature, "RicExportFractureWellCompletionFeature"); +CAF_CMD_SOURCE_INIT(RicExportSimWellFractureWellCompletionFeature, "RicExportSimWellFractureWellCompletionFeature"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicExportFractureWellCompletionFeature::onActionTriggered(bool isChecked) +void RicExportSimWellFractureWellCompletionFeature::onActionTriggered(bool isChecked) { caf::PdmUiItem* pdmUiItem = caf::SelectionManager::instance()->selectedItem(); @@ -91,7 +91,7 @@ void RicExportFractureWellCompletionFeature::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicExportFractureWellCompletionFeature::setupActionLook(QAction* actionToSetup) +void RicExportSimWellFractureWellCompletionFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setIcon(QIcon(":/FractureTemplate16x16.png")); actionToSetup->setText("Export Fracture Well Completion Data"); @@ -100,7 +100,7 @@ void RicExportFractureWellCompletionFeature::setupActionLook(QAction* actionToSe //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicExportFractureWellCompletionFeature::isCommandEnabled() +bool RicExportSimWellFractureWellCompletionFeature::isCommandEnabled() { return true; } diff --git a/ApplicationCode/Commands/RicExportFractureWellCompletionFeature.h b/ApplicationCode/Commands/RicExportSimWellFractureWellCompletionFeature.h similarity index 94% rename from ApplicationCode/Commands/RicExportFractureWellCompletionFeature.h rename to ApplicationCode/Commands/RicExportSimWellFractureWellCompletionFeature.h index d87996c40a..5488f3e994 100644 --- a/ApplicationCode/Commands/RicExportFractureWellCompletionFeature.h +++ b/ApplicationCode/Commands/RicExportSimWellFractureWellCompletionFeature.h @@ -26,7 +26,7 @@ //================================================================================================== /// //================================================================================================== -class RicExportFractureWellCompletionFeature : public caf::CmdFeature +class RicExportSimWellFractureWellCompletionFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; protected: diff --git a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp index 7ef25651bb..68c2959b36 100644 --- a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp @@ -346,7 +346,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection() } else if (dynamic_cast(uiItem)) { - commandIds << "RicExportFractureWellCompletionFeature"; + commandIds << "RicExportSimWellFractureWellCompletionFeature"; } else if(dynamic_cast(uiItem)) {