From 0e50a0bac5676091956009bc4fede012d0ccfe41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20Hagen?= Date: Tue, 11 Aug 2015 13:55:31 +0200 Subject: [PATCH] Renamed some command classes --- ApplicationCode/Commands/CMakeLists_files.cmake | 8 ++++---- ...cpp => RicSaveEclipseResultAsInputProperty.cpp} | 14 +++++++------- ...ave.h => RicSaveEclipseResultAsInputProperty.h} | 2 +- ...=> RicSaveEclipseResultAsInputPropertyExec.cpp} | 12 ++++++------ ...h => RicSaveEclipseResultAsInputPropertyExec.h} | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) rename ApplicationCode/Commands/{RicEclipseCellResultSave.cpp => RicSaveEclipseResultAsInputProperty.cpp} (79%) rename ApplicationCode/Commands/{RicEclipseCellResultSave.h => RicSaveEclipseResultAsInputProperty.h} (95%) rename ApplicationCode/Commands/{RicEclipseCellResultSaveExec.cpp => RicSaveEclipseResultAsInputPropertyExec.cpp} (91%) rename ApplicationCode/Commands/{RicEclipseCellResultSaveExec.h => RicSaveEclipseResultAsInputPropertyExec.h} (85%) diff --git a/ApplicationCode/Commands/CMakeLists_files.cmake b/ApplicationCode/Commands/CMakeLists_files.cmake index d98ef6d1e6..627532c67c 100644 --- a/ApplicationCode/Commands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/CMakeLists_files.cmake @@ -11,8 +11,8 @@ ${CEE_CURRENT_LIST_DIR}RicEclipseCaseExecuteScript.h ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroup.h ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewView.h ${CEE_CURRENT_LIST_DIR}RicEclipseCasePaste.h -${CEE_CURRENT_LIST_DIR}RicEclipseCellResultSave.h -${CEE_CURRENT_LIST_DIR}RicEclipseCellResultSaveExec.h +${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputProperty.h +${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.h ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilter.h ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterDelete.h ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterDeleteExec.h @@ -45,8 +45,8 @@ ${CEE_CURRENT_LIST_DIR}RicEclipseCaseExecuteScript.cpp ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroup.cpp ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewView.cpp ${CEE_CURRENT_LIST_DIR}RicEclipseCasePaste.cpp -${CEE_CURRENT_LIST_DIR}RicEclipseCellResultSave.cpp -${CEE_CURRENT_LIST_DIR}RicEclipseCellResultSaveExec.cpp +${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputProperty.cpp +${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.cpp ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilter.cpp ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterDelete.cpp ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterDeleteExec.cpp diff --git a/ApplicationCode/Commands/RicEclipseCellResultSave.cpp b/ApplicationCode/Commands/RicSaveEclipseResultAsInputProperty.cpp similarity index 79% rename from ApplicationCode/Commands/RicEclipseCellResultSave.cpp rename to ApplicationCode/Commands/RicSaveEclipseResultAsInputProperty.cpp index 1088a234da..0dafa4c084 100644 --- a/ApplicationCode/Commands/RicEclipseCellResultSave.cpp +++ b/ApplicationCode/Commands/RicSaveEclipseResultAsInputProperty.cpp @@ -17,9 +17,9 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicEclipseCellResultSave.h" +#include "RicSaveEclipseResultAsInputProperty.h" -#include "RicEclipseCellResultSaveExec.h" +#include "RicSaveEclipseResultAsInputPropertyExec.h" #include "RimEclipseCellColors.h" #include "RimView.h" @@ -29,12 +29,12 @@ #include -CAF_CMD_SOURCE_INIT(RicEclipseCellResultSave, "RicEclipseCellResultSave"); +CAF_CMD_SOURCE_INIT(RicSaveEclipseResultAsInputProperty, "RicEclipseCellResultSave"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicEclipseCellResultSave::isCommandEnabled() +bool RicSaveEclipseResultAsInputProperty::isCommandEnabled() { std::vector selection; caf::SelectionManager::instance()->objectsByType(&selection); @@ -45,13 +45,13 @@ bool RicEclipseCellResultSave::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseCellResultSave::onActionTriggered(bool isChecked) +void RicSaveEclipseResultAsInputProperty::onActionTriggered(bool isChecked) { std::vector selection; caf::SelectionManager::instance()->objectsByType(&selection); if (selection.size() == 1) { - RicEclipseCellResultSaveExec* cellResultSaveExec = new RicEclipseCellResultSaveExec(selection[0]); + RicSaveEclipseResultAsInputPropertyExec* cellResultSaveExec = new RicSaveEclipseResultAsInputPropertyExec(selection[0]); caf::CmdExecCommandManager::instance()->processExecuteCommand(cellResultSaveExec); } } @@ -59,7 +59,7 @@ void RicEclipseCellResultSave::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseCellResultSave::setupActionLook(QAction* actionToSetup) +void RicSaveEclipseResultAsInputProperty::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Save Property To File"); } diff --git a/ApplicationCode/Commands/RicEclipseCellResultSave.h b/ApplicationCode/Commands/RicSaveEclipseResultAsInputProperty.h similarity index 95% rename from ApplicationCode/Commands/RicEclipseCellResultSave.h rename to ApplicationCode/Commands/RicSaveEclipseResultAsInputProperty.h index 8f91bf4e5a..3c8403f79b 100644 --- a/ApplicationCode/Commands/RicEclipseCellResultSave.h +++ b/ApplicationCode/Commands/RicSaveEclipseResultAsInputProperty.h @@ -25,7 +25,7 @@ //================================================================================================== /// //================================================================================================== -class RicEclipseCellResultSave : public caf::CmdFeature +class RicSaveEclipseResultAsInputProperty : public caf::CmdFeature { CAF_CMD_HEADER_INIT; diff --git a/ApplicationCode/Commands/RicEclipseCellResultSaveExec.cpp b/ApplicationCode/Commands/RicSaveEclipseResultAsInputPropertyExec.cpp similarity index 91% rename from ApplicationCode/Commands/RicEclipseCellResultSaveExec.cpp rename to ApplicationCode/Commands/RicSaveEclipseResultAsInputPropertyExec.cpp index d7815f306a..9e468d8097 100644 --- a/ApplicationCode/Commands/RicEclipseCellResultSaveExec.cpp +++ b/ApplicationCode/Commands/RicSaveEclipseResultAsInputPropertyExec.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicEclipseCellResultSaveExec.h" +#include "RicSaveEclipseResultAsInputPropertyExec.h" #include "RimEclipseCellColors.h" #include "RimBinaryExportSettings.h" @@ -41,7 +41,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicEclipseCellResultSaveExec::RicEclipseCellResultSaveExec(RimEclipseCellColors* cellColors) +RicSaveEclipseResultAsInputPropertyExec::RicSaveEclipseResultAsInputPropertyExec(RimEclipseCellColors* cellColors) : CmdExecuteCommand(NULL) { CVF_ASSERT(cellColors); @@ -51,14 +51,14 @@ RicEclipseCellResultSaveExec::RicEclipseCellResultSaveExec(RimEclipseCellColors* //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicEclipseCellResultSaveExec::~RicEclipseCellResultSaveExec() +RicSaveEclipseResultAsInputPropertyExec::~RicSaveEclipseResultAsInputPropertyExec() { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RicEclipseCellResultSaveExec::name() +QString RicSaveEclipseResultAsInputPropertyExec::name() { return "Save Property To File"; } @@ -66,7 +66,7 @@ QString RicEclipseCellResultSaveExec::name() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseCellResultSaveExec::redo() +void RicSaveEclipseResultAsInputPropertyExec::redo() { CVF_ASSERT(m_cellColors); @@ -113,7 +113,7 @@ void RicEclipseCellResultSaveExec::redo() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseCellResultSaveExec::undo() +void RicSaveEclipseResultAsInputPropertyExec::undo() { // TODO CVF_ASSERT(0); diff --git a/ApplicationCode/Commands/RicEclipseCellResultSaveExec.h b/ApplicationCode/Commands/RicSaveEclipseResultAsInputPropertyExec.h similarity index 85% rename from ApplicationCode/Commands/RicEclipseCellResultSaveExec.h rename to ApplicationCode/Commands/RicSaveEclipseResultAsInputPropertyExec.h index d052ca2de1..bfba44995b 100644 --- a/ApplicationCode/Commands/RicEclipseCellResultSaveExec.h +++ b/ApplicationCode/Commands/RicSaveEclipseResultAsInputPropertyExec.h @@ -27,11 +27,11 @@ class RimEclipseCellColors; //================================================================================================== /// //================================================================================================== -class RicEclipseCellResultSaveExec : public caf::CmdExecuteCommand +class RicSaveEclipseResultAsInputPropertyExec : public caf::CmdExecuteCommand { public: - RicEclipseCellResultSaveExec(RimEclipseCellColors* cellColors); - virtual ~RicEclipseCellResultSaveExec(); + RicSaveEclipseResultAsInputPropertyExec(RimEclipseCellColors* cellColors); + virtual ~RicSaveEclipseResultAsInputPropertyExec(); virtual QString name(); virtual void redo();