diff --git a/ApplicationCode/Commands/CMakeLists_files.cmake b/ApplicationCode/Commands/CMakeLists_files.cmake index 58a1c7ff19..74f03c4242 100644 --- a/ApplicationCode/Commands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/CMakeLists_files.cmake @@ -40,9 +40,9 @@ ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceK.h ${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputProperty.h ${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.h -${CEE_CURRENT_LIST_DIR}RicImportWellPathsSsihubFeature.h -${CEE_CURRENT_LIST_DIR}RicImportWellPathsFileFeature.h -${CEE_CURRENT_LIST_DIR}RicImportWellPathsDeleteAllFeature.h +${CEE_CURRENT_LIST_DIR}RicWellPathsImportSsihubFeature.h +${CEE_CURRENT_LIST_DIR}RicWellPathsImportFileFeature.h +${CEE_CURRENT_LIST_DIR}RicWellPathsDeleteAllFeature.h # General delete of any object in a child array field ${CEE_CURRENT_LIST_DIR}RicDeleteItemExec.h @@ -85,9 +85,9 @@ ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceK.cpp ${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputProperty.cpp ${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.cpp -${CEE_CURRENT_LIST_DIR}RicImportWellPathsSsihubFeature.cpp -${CEE_CURRENT_LIST_DIR}RicImportWellPathsFileFeature.cpp -${CEE_CURRENT_LIST_DIR}RicImportWellPathsDeleteAllFeature.cpp +${CEE_CURRENT_LIST_DIR}RicWellPathsImportSsihubFeature.cpp +${CEE_CURRENT_LIST_DIR}RicWellPathsImportFileFeature.cpp +${CEE_CURRENT_LIST_DIR}RicWellPathsDeleteAllFeature.cpp # General delete of any object in a child array field ${CEE_CURRENT_LIST_DIR}RicDeleteItemExec.cpp diff --git a/ApplicationCode/Commands/RicImportWellPathsDeleteAllFeature.cpp b/ApplicationCode/Commands/RicWellPathsDeleteAllFeature.cpp similarity index 98% rename from ApplicationCode/Commands/RicImportWellPathsDeleteAllFeature.cpp rename to ApplicationCode/Commands/RicWellPathsDeleteAllFeature.cpp index abf0f482ac..93844c66a2 100644 --- a/ApplicationCode/Commands/RicImportWellPathsDeleteAllFeature.cpp +++ b/ApplicationCode/Commands/RicWellPathsDeleteAllFeature.cpp @@ -34,7 +34,7 @@ // //################################################################################################## -#include "RicImportWellPathsDeleteAllFeature.h" +#include "RicWellPathsDeleteAllFeature.h" #include "RimWellPathCollection.h" diff --git a/ApplicationCode/Commands/RicImportWellPathsDeleteAllFeature.h b/ApplicationCode/Commands/RicWellPathsDeleteAllFeature.h similarity index 100% rename from ApplicationCode/Commands/RicImportWellPathsDeleteAllFeature.h rename to ApplicationCode/Commands/RicWellPathsDeleteAllFeature.h diff --git a/ApplicationCode/Commands/RicImportWellPathsFileFeature.cpp b/ApplicationCode/Commands/RicWellPathsImportFileFeature.cpp similarity index 91% rename from ApplicationCode/Commands/RicImportWellPathsFileFeature.cpp rename to ApplicationCode/Commands/RicWellPathsImportFileFeature.cpp index 7ae9e6a81c..740a39f6fc 100644 --- a/ApplicationCode/Commands/RicImportWellPathsFileFeature.cpp +++ b/ApplicationCode/Commands/RicWellPathsImportFileFeature.cpp @@ -34,7 +34,7 @@ // //################################################################################################## -#include "RicImportWellPathsFileFeature.h" +#include "RicWellPathsImportFileFeature.h" #include "RiaApplication.h" #include "RimProject.h" @@ -45,13 +45,13 @@ namespace caf { - CAF_CMD_SOURCE_INIT(RicImportWellPathsFileFeature, "RicImportWellPathsFileFeature"); + CAF_CMD_SOURCE_INIT(RicWellPathsImportFileFeature, "RicWellPathsImportFileFeature"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicImportWellPathsFileFeature::isCommandEnabled() +bool RicWellPathsImportFileFeature::isCommandEnabled() { return true; } @@ -59,7 +59,7 @@ bool RicImportWellPathsFileFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicImportWellPathsFileFeature::onActionTriggered(bool isChecked) +void RicWellPathsImportFileFeature::onActionTriggered(bool isChecked) { // Open dialog box to select well path files RiaApplication* app = RiaApplication::instance(); @@ -81,7 +81,7 @@ void RicImportWellPathsFileFeature::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicImportWellPathsFileFeature::setupActionLook(QAction* actionToSetup) +void RicWellPathsImportFileFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Import &Well Paths from File"); actionToSetup->setIcon(QIcon(":/Well.png")); diff --git a/ApplicationCode/Commands/RicImportWellPathsFileFeature.h b/ApplicationCode/Commands/RicWellPathsImportFileFeature.h similarity index 97% rename from ApplicationCode/Commands/RicImportWellPathsFileFeature.h rename to ApplicationCode/Commands/RicWellPathsImportFileFeature.h index f7c18fa917..999261a757 100644 --- a/ApplicationCode/Commands/RicImportWellPathsFileFeature.h +++ b/ApplicationCode/Commands/RicWellPathsImportFileFeature.h @@ -45,7 +45,7 @@ namespace caf //================================================================================================== /// //================================================================================================== -class RicImportWellPathsFileFeature : public CmdFeature +class RicWellPathsImportFileFeature : public CmdFeature { CAF_CMD_HEADER_INIT; protected: diff --git a/ApplicationCode/Commands/RicImportWellPathsSsihubFeature.cpp b/ApplicationCode/Commands/RicWellPathsImportSsihubFeature.cpp similarity index 93% rename from ApplicationCode/Commands/RicImportWellPathsSsihubFeature.cpp rename to ApplicationCode/Commands/RicWellPathsImportSsihubFeature.cpp index b21af8ea6a..6b64ff72fa 100644 --- a/ApplicationCode/Commands/RicImportWellPathsSsihubFeature.cpp +++ b/ApplicationCode/Commands/RicWellPathsImportSsihubFeature.cpp @@ -34,7 +34,7 @@ // //################################################################################################## -#include "RicImportWellPathsSsihubFeature.h" +#include "RicWellPathsImportSsihubFeature.h" #include "RiaApplication.h" #include "RiaPreferences.h" @@ -50,13 +50,13 @@ namespace caf { - CAF_CMD_SOURCE_INIT(RicImportWellPathsSsihubFeature, "RicImportWellPathsSsihubFeature"); + CAF_CMD_SOURCE_INIT(RicWellPathsImportSsihubFeature, "RicWellPathsImportSsihubFeature"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicImportWellPathsSsihubFeature::isCommandEnabled() +bool RicWellPathsImportSsihubFeature::isCommandEnabled() { RiaApplication* app = RiaApplication::instance(); if (!app->project()) @@ -75,7 +75,7 @@ bool RicImportWellPathsSsihubFeature::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicImportWellPathsSsihubFeature::onActionTriggered(bool isChecked) +void RicWellPathsImportSsihubFeature::onActionTriggered(bool isChecked) { RiaApplication* app = RiaApplication::instance(); if (!app->project()) @@ -137,7 +137,7 @@ void RicImportWellPathsSsihubFeature::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicImportWellPathsSsihubFeature::setupActionLook(QAction* actionToSetup) +void RicWellPathsImportSsihubFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Import Well Paths from &SSI-hub"); actionToSetup->setIcon(QIcon(":/WellCollection.png")); diff --git a/ApplicationCode/Commands/RicImportWellPathsSsihubFeature.h b/ApplicationCode/Commands/RicWellPathsImportSsihubFeature.h similarity index 97% rename from ApplicationCode/Commands/RicImportWellPathsSsihubFeature.h rename to ApplicationCode/Commands/RicWellPathsImportSsihubFeature.h index 9b01a19619..829afec16b 100644 --- a/ApplicationCode/Commands/RicImportWellPathsSsihubFeature.h +++ b/ApplicationCode/Commands/RicWellPathsImportSsihubFeature.h @@ -45,7 +45,7 @@ namespace caf //================================================================================================== /// //================================================================================================== -class RicImportWellPathsSsihubFeature : public CmdFeature +class RicWellPathsImportSsihubFeature : public CmdFeature { CAF_CMD_HEADER_INIT; protected: diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index 8a67082846..28c943c8b3 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -602,8 +602,8 @@ void RimProject::actionsBasedOnSelection(std::vector& actions) } else if (dynamic_cast(uiItem)) { - actions.push_back(commandManager->action("RicImportWellPathsSsihubFeature")); - actions.push_back(commandManager->action("RicImportWellPathsFileFeature")); + actions.push_back(commandManager->action("RicWellPathsImportSsihubFeature")); + actions.push_back(commandManager->action("RicWellPathsImportFileFeature")); actions.push_back(commandManager->action("RicWellPathsDeleteAllFeature")); } else if (dynamic_cast(uiItem)) diff --git a/ApplicationCode/UserInterface/RiuMainWindow.cpp b/ApplicationCode/UserInterface/RiuMainWindow.cpp index d2d970fbaa..e79879469e 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.cpp +++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp @@ -1002,7 +1002,7 @@ void RiuMainWindow::slotImportWellPathsFromFile() { caf::CmdFeatureManager* commandManager = caf::CmdFeatureManager::instance(); - commandManager->action("RicImportWellPathsFileFeature")->trigger(); + commandManager->action("RicWellPathsImportFileFeature")->trigger(); } //-------------------------------------------------------------------------------------------------- @@ -1958,7 +1958,7 @@ void RiuMainWindow::slotImportWellPathsFromSSIHub() { caf::CmdFeatureManager* commandManager = caf::CmdFeatureManager::instance(); - commandManager->action("RicImportWellPathsSsihubFeature")->trigger(); + commandManager->action("RicWellPathsImportSsihubFeature")->trigger(); } //--------------------------------------------------------------------------------------------------