From fc959c94ae887bbb3f0d76084f884ab20de15c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20Hagen?= Date: Mon, 17 Aug 2015 13:32:50 +0200 Subject: [PATCH] (#366) Renamed command classes and files --- .../Commands/CMakeLists_files.cmake | 84 +++++++++---------- ...ose.cpp => RicEclipseCaseCloseFeature.cpp} | 10 +-- ...ewGroup.h => RicEclipseCaseCloseFeature.h} | 2 +- ...=> RicEclipseCaseExecuteScriptFeature.cpp} | 10 +-- .../RicEclipseCaseExecuteScriptFeature.h | 39 +++++++++ ....cpp => RicEclipseCaseNewGroupFeature.cpp} | 10 +-- .../Commands/RicEclipseCaseNewGroupFeature.h | 39 +++++++++ ...w.cpp => RicEclipseCaseNewViewFeature.cpp} | 10 +-- .../Commands/RicEclipseCaseNewViewFeature.h | 39 +++++++++ ...ste.cpp => RicEclipseCasePasteFeature.cpp} | 10 +-- ...sePaste.h => RicEclipseCasePasteFeature.h} | 2 +- ...r.cpp => RicEclipsePropertyFilterImpl.cpp} | 12 +-- ...ilter.h => RicEclipsePropertyFilterImpl.h} | 2 +- .../Commands/RicEclipsePropertyFilterInsert.h | 39 --------- .../RicEclipsePropertyFilterInsertExec.cpp | 4 +- ...RicEclipsePropertyFilterInsertFeature.cpp} | 16 ++-- .../RicEclipsePropertyFilterInsertFeature.h | 39 +++++++++ .../Commands/RicEclipsePropertyFilterNew.h | 39 --------- .../RicEclipsePropertyFilterNewExec.cpp | 4 +- ...=> RicEclipsePropertyFilterNewFeature.cpp} | 16 ++-- .../RicEclipsePropertyFilterNewFeature.h | 39 +++++++++ .../Commands/RicEclipseViewDelete.cpp | 8 +- .../Commands/RicEclipseViewDelete.h | 39 --------- .../Commands/RicEclipseViewDeleteFeature.cpp | 62 ++++++++++++++ ...Script.h => RicEclipseViewDeleteFeature.h} | 2 +- ApplicationCode/Commands/RicEclipseViewNew.h | 39 --------- ...ewNew.cpp => RicEclipseViewNewFeature.cpp} | 10 +-- ...seNewView.h => RicEclipseViewNewFeature.h} | 2 +- .../Commands/RicEclipseViewPaste.h | 39 --------- ...ste.cpp => RicEclipseViewPasteFeature.cpp} | 10 +-- .../Commands/RicEclipseViewPasteFeature.h | 39 +++++++++ ...r.cpp => RicGeoMechPropertyFilterImpl.cpp} | 14 ++-- ...ilter.h => RicGeoMechPropertyFilterImpl.h} | 2 +- .../Commands/RicGeoMechPropertyFilterInsert.h | 39 --------- .../RicGeoMechPropertyFilterInsertExec.cpp | 4 +- ...RicGeoMechPropertyFilterInsertFeature.cpp} | 16 ++-- .../RicGeoMechPropertyFilterInsertFeature.h | 39 +++++++++ .../Commands/RicGeoMechPropertyFilterNew.h | 39 --------- .../RicGeoMechPropertyFilterNewExec.cpp | 4 +- ...=> RicGeoMechPropertyFilterNewFeature.cpp} | 16 ++-- .../RicGeoMechPropertyFilterNewFeature.h | 39 +++++++++ ...ilterHelper.cpp => RicRangeFilterImpl.cpp} | 8 +- ...ngeFilterHelper.h => RicRangeFilterImpl.h} | 2 +- .../Commands/RicRangeFilterInsert.h | 39 --------- ...rt.cpp => RicRangeFilterInsertFeature.cpp} | 10 +-- .../Commands/RicRangeFilterInsertFeature.h | 39 +++++++++ ApplicationCode/Commands/RicRangeFilterNew.h | 38 --------- ...erNew.cpp => RicRangeFilterNewFeature.cpp} | 16 ++-- ...CaseClose.h => RicRangeFilterNewFeature.h} | 3 +- .../Commands/RicRangeFilterNewSliceI.h | 39 --------- ...cpp => RicRangeFilterNewSliceIFeature.cpp} | 16 ++-- .../Commands/RicRangeFilterNewSliceIFeature.h | 39 +++++++++ .../Commands/RicRangeFilterNewSliceJ.h | 39 --------- ...cpp => RicRangeFilterNewSliceJFeature.cpp} | 16 ++-- .../Commands/RicRangeFilterNewSliceJFeature.h | 39 +++++++++ .../Commands/RicRangeFilterNewSliceK.h | 39 --------- ...cpp => RicRangeFilterNewSliceKFeature.cpp} | 16 ++-- .../Commands/RicRangeFilterNewSliceKFeature.h | 39 +++++++++ .../RicSaveEclipseResultAsInputProperty.h | 39 --------- ...veEclipseResultAsInputPropertyFeature.cpp} | 10 +-- ...cSaveEclipseResultAsInputPropertyFeature.h | 39 +++++++++ 61 files changed, 757 insertions(+), 695 deletions(-) rename ApplicationCode/Commands/{RicEclipseCaseClose.cpp => RicEclipseCaseCloseFeature.cpp} (85%) rename ApplicationCode/Commands/{RicEclipseCaseNewGroup.h => RicEclipseCaseCloseFeature.h} (95%) rename ApplicationCode/Commands/{RicEclipseCaseExecuteScript.cpp => RicEclipseCaseExecuteScriptFeature.cpp} (83%) create mode 100644 ApplicationCode/Commands/RicEclipseCaseExecuteScriptFeature.h rename ApplicationCode/Commands/{RicEclipseCaseNewGroup.cpp => RicEclipseCaseNewGroupFeature.cpp} (86%) create mode 100644 ApplicationCode/Commands/RicEclipseCaseNewGroupFeature.h rename ApplicationCode/Commands/{RicEclipseCaseNewView.cpp => RicEclipseCaseNewViewFeature.cpp} (84%) create mode 100644 ApplicationCode/Commands/RicEclipseCaseNewViewFeature.h rename ApplicationCode/Commands/{RicEclipseCasePaste.cpp => RicEclipseCasePasteFeature.cpp} (85%) rename ApplicationCode/Commands/{RicEclipseCasePaste.h => RicEclipseCasePasteFeature.h} (95%) rename ApplicationCode/Commands/{RicEclipsePropertyFilter.cpp => RicEclipsePropertyFilterImpl.cpp} (88%) rename ApplicationCode/Commands/{RicEclipsePropertyFilter.h => RicEclipsePropertyFilterImpl.h} (97%) delete mode 100644 ApplicationCode/Commands/RicEclipsePropertyFilterInsert.h rename ApplicationCode/Commands/{RicEclipsePropertyFilterInsert.cpp => RicEclipsePropertyFilterInsertFeature.cpp} (80%) create mode 100644 ApplicationCode/Commands/RicEclipsePropertyFilterInsertFeature.h delete mode 100644 ApplicationCode/Commands/RicEclipsePropertyFilterNew.h rename ApplicationCode/Commands/{RicEclipsePropertyFilterNew.cpp => RicEclipsePropertyFilterNewFeature.cpp} (79%) create mode 100644 ApplicationCode/Commands/RicEclipsePropertyFilterNewFeature.h delete mode 100644 ApplicationCode/Commands/RicEclipseViewDelete.h create mode 100644 ApplicationCode/Commands/RicEclipseViewDeleteFeature.cpp rename ApplicationCode/Commands/{RicEclipseCaseExecuteScript.h => RicEclipseViewDeleteFeature.h} (95%) delete mode 100644 ApplicationCode/Commands/RicEclipseViewNew.h rename ApplicationCode/Commands/{RicEclipseViewNew.cpp => RicEclipseViewNewFeature.cpp} (86%) rename ApplicationCode/Commands/{RicEclipseCaseNewView.h => RicEclipseViewNewFeature.h} (95%) delete mode 100644 ApplicationCode/Commands/RicEclipseViewPaste.h rename ApplicationCode/Commands/{RicEclipseViewPaste.cpp => RicEclipseViewPasteFeature.cpp} (85%) create mode 100644 ApplicationCode/Commands/RicEclipseViewPasteFeature.h rename ApplicationCode/Commands/{RicGeoMechPropertyFilter.cpp => RicGeoMechPropertyFilterImpl.cpp} (87%) rename ApplicationCode/Commands/{RicGeoMechPropertyFilter.h => RicGeoMechPropertyFilterImpl.h} (98%) delete mode 100644 ApplicationCode/Commands/RicGeoMechPropertyFilterInsert.h rename ApplicationCode/Commands/{RicGeoMechPropertyFilterInsert.cpp => RicGeoMechPropertyFilterInsertFeature.cpp} (80%) create mode 100644 ApplicationCode/Commands/RicGeoMechPropertyFilterInsertFeature.h delete mode 100644 ApplicationCode/Commands/RicGeoMechPropertyFilterNew.h rename ApplicationCode/Commands/{RicGeoMechPropertyFilterNew.cpp => RicGeoMechPropertyFilterNewFeature.cpp} (79%) create mode 100644 ApplicationCode/Commands/RicGeoMechPropertyFilterNewFeature.h rename ApplicationCode/Commands/{RicRangeFilterHelper.cpp => RicRangeFilterImpl.cpp} (91%) rename ApplicationCode/Commands/{RicRangeFilterHelper.h => RicRangeFilterImpl.h} (97%) delete mode 100644 ApplicationCode/Commands/RicRangeFilterInsert.h rename ApplicationCode/Commands/{RicRangeFilterInsert.cpp => RicRangeFilterInsertFeature.cpp} (86%) create mode 100644 ApplicationCode/Commands/RicRangeFilterInsertFeature.h delete mode 100644 ApplicationCode/Commands/RicRangeFilterNew.h rename ApplicationCode/Commands/{RicRangeFilterNew.cpp => RicRangeFilterNewFeature.cpp} (79%) rename ApplicationCode/Commands/{RicEclipseCaseClose.h => RicRangeFilterNewFeature.h} (95%) delete mode 100644 ApplicationCode/Commands/RicRangeFilterNewSliceI.h rename ApplicationCode/Commands/{RicRangeFilterNewSliceI.cpp => RicRangeFilterNewSliceIFeature.cpp} (77%) create mode 100644 ApplicationCode/Commands/RicRangeFilterNewSliceIFeature.h delete mode 100644 ApplicationCode/Commands/RicRangeFilterNewSliceJ.h rename ApplicationCode/Commands/{RicRangeFilterNewSliceJ.cpp => RicRangeFilterNewSliceJFeature.cpp} (77%) create mode 100644 ApplicationCode/Commands/RicRangeFilterNewSliceJFeature.h delete mode 100644 ApplicationCode/Commands/RicRangeFilterNewSliceK.h rename ApplicationCode/Commands/{RicRangeFilterNewSliceK.cpp => RicRangeFilterNewSliceKFeature.cpp} (77%) create mode 100644 ApplicationCode/Commands/RicRangeFilterNewSliceKFeature.h delete mode 100644 ApplicationCode/Commands/RicSaveEclipseResultAsInputProperty.h rename ApplicationCode/Commands/{RicSaveEclipseResultAsInputProperty.cpp => RicSaveEclipseResultAsInputPropertyFeature.cpp} (84%) create mode 100644 ApplicationCode/Commands/RicSaveEclipseResultAsInputPropertyFeature.h diff --git a/ApplicationCode/Commands/CMakeLists_files.cmake b/ApplicationCode/Commands/CMakeLists_files.cmake index d5485f872b..b62c919d69 100644 --- a/ApplicationCode/Commands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/CMakeLists_files.cmake @@ -5,37 +5,37 @@ if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") endif() set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicEclipseCaseClose.h -${CEE_CURRENT_LIST_DIR}RicEclipseCaseExecuteScript.h -${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroup.h +${CEE_CURRENT_LIST_DIR}RicEclipseCaseCloseFeature.h +${CEE_CURRENT_LIST_DIR}RicEclipseCaseExecuteScriptFeature.h +${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.h ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.h -${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewView.h -${CEE_CURRENT_LIST_DIR}RicEclipseCasePaste.h -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilter.h -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsert.h +${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewViewFeature.h +${CEE_CURRENT_LIST_DIR}RicEclipseCasePasteFeature.h +${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterImpl.h +${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertFeature.h ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertExec.h -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNew.h +${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewFeature.h ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewExec.h -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilter.h -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsert.h +${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterImpl.h +${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertFeature.h ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertExec.h -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNew.h +${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewFeature.h ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewExec.h -${CEE_CURRENT_LIST_DIR}RicEclipseViewDelete.h -${CEE_CURRENT_LIST_DIR}RicEclipseViewNew.h -${CEE_CURRENT_LIST_DIR}RicEclipseViewPaste.h +${CEE_CURRENT_LIST_DIR}RicEclipseViewDeleteFeature.h +${CEE_CURRENT_LIST_DIR}RicEclipseViewNewFeature.h +${CEE_CURRENT_LIST_DIR}RicEclipseViewPasteFeature.h #${CEE_CURRENT_LIST_DIR}RicGridModelsCreateCaseGroupFromFiles.h #${CEE_CURRENT_LIST_DIR}RicGridModelsImport.h #${CEE_CURRENT_LIST_DIR}RicGridModelsImportInput.h ${CEE_CURRENT_LIST_DIR}RicPropertyFilterNewExec.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterInsert.h -${CEE_CURRENT_LIST_DIR}RicRangeFilterNew.h -${CEE_CURRENT_LIST_DIR}RicRangeFilterHelper.h +${CEE_CURRENT_LIST_DIR}RicRangeFilterInsertFeature.h +${CEE_CURRENT_LIST_DIR}RicRangeFilterNewFeature.h +${CEE_CURRENT_LIST_DIR}RicRangeFilterImpl.h ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewExec.h -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceI.h -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJ.h -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceK.h -${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputProperty.h +${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceIFeature.h +${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJFeature.h +${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceKFeature.h +${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyFeature.h ${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.h ${CEE_CURRENT_LIST_DIR}RicWellPathsImportSsihubFeature.h @@ -49,36 +49,36 @@ ${CEE_CURRENT_LIST_DIR}RicDeleteItemFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicEclipseCaseClose.cpp -${CEE_CURRENT_LIST_DIR}RicEclipseCaseExecuteScript.cpp -${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroup.cpp +${CEE_CURRENT_LIST_DIR}RicEclipseCaseCloseFeature.cpp +${CEE_CURRENT_LIST_DIR}RicEclipseCaseExecuteScriptFeature.cpp +${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.cpp ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.cpp -${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewView.cpp -${CEE_CURRENT_LIST_DIR}RicEclipseCasePaste.cpp -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilter.cpp -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsert.cpp +${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewViewFeature.cpp +${CEE_CURRENT_LIST_DIR}RicEclipseCasePasteFeature.cpp +${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterImpl.cpp +${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertFeature.cpp ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertExec.cpp -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNew.cpp +${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewFeature.cpp ${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewExec.cpp -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilter.cpp -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsert.cpp +${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterImpl.cpp +${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertFeature.cpp ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertExec.cpp -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNew.cpp +${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewFeature.cpp ${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewExec.cpp -${CEE_CURRENT_LIST_DIR}RicEclipseViewDelete.cpp -${CEE_CURRENT_LIST_DIR}RicEclipseViewNew.cpp -${CEE_CURRENT_LIST_DIR}RicEclipseViewPaste.cpp +${CEE_CURRENT_LIST_DIR}RicEclipseViewDeleteFeature.cpp +${CEE_CURRENT_LIST_DIR}RicEclipseViewNewFeature.cpp +${CEE_CURRENT_LIST_DIR}RicEclipseViewPasteFeature.cpp #${CEE_CURRENT_LIST_DIR}RicGridModelsCreateCaseGroupFromFiles.cpp #${CEE_CURRENT_LIST_DIR}RicGridModelsImport.cpp #${CEE_CURRENT_LIST_DIR}RicGridModelsImportInput.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterInsert.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterNew.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterHelper.cpp +${CEE_CURRENT_LIST_DIR}RicRangeFilterInsertFeature.cpp +${CEE_CURRENT_LIST_DIR}RicRangeFilterNewFeature.cpp +${CEE_CURRENT_LIST_DIR}RicRangeFilterImpl.cpp ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewExec.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceI.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJ.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceK.cpp -${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputProperty.cpp +${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceIFeature.cpp +${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJFeature.cpp +${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceKFeature.cpp +${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyFeature.cpp ${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.cpp ${CEE_CURRENT_LIST_DIR}RicWellPathsImportSsihubFeature.cpp diff --git a/ApplicationCode/Commands/RicEclipseCaseClose.cpp b/ApplicationCode/Commands/RicEclipseCaseCloseFeature.cpp similarity index 85% rename from ApplicationCode/Commands/RicEclipseCaseClose.cpp rename to ApplicationCode/Commands/RicEclipseCaseCloseFeature.cpp index 8f536d57bd..16b3de53be 100644 --- a/ApplicationCode/Commands/RicEclipseCaseClose.cpp +++ b/ApplicationCode/Commands/RicEclipseCaseCloseFeature.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicEclipseCaseClose.h" +#include "RicEclipseCaseCloseFeature.h" #include "RimCase.h" @@ -25,12 +25,12 @@ #include -CAF_CMD_SOURCE_INIT(RicEclipseCaseClose, "RicEclipseCaseClose"); +CAF_CMD_SOURCE_INIT(RicEclipseCaseCloseFeature, "RicEclipseCaseClose"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicEclipseCaseClose::isCommandEnabled() +bool RicEclipseCaseCloseFeature::isCommandEnabled() { std::vector selection; caf::SelectionManager::instance()->objectsByType(&selection); @@ -48,7 +48,7 @@ bool RicEclipseCaseClose::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseCaseClose::onActionTriggered(bool isChecked) +void RicEclipseCaseCloseFeature::onActionTriggered(bool isChecked) { // TODO assert(false); @@ -57,7 +57,7 @@ void RicEclipseCaseClose::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseCaseClose::setupActionLook(QAction* actionToSetup) +void RicEclipseCaseCloseFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Close"); } diff --git a/ApplicationCode/Commands/RicEclipseCaseNewGroup.h b/ApplicationCode/Commands/RicEclipseCaseCloseFeature.h similarity index 95% rename from ApplicationCode/Commands/RicEclipseCaseNewGroup.h rename to ApplicationCode/Commands/RicEclipseCaseCloseFeature.h index 8c0e242af2..7603259c94 100644 --- a/ApplicationCode/Commands/RicEclipseCaseNewGroup.h +++ b/ApplicationCode/Commands/RicEclipseCaseCloseFeature.h @@ -25,7 +25,7 @@ //================================================================================================== /// //================================================================================================== -class RicEclipseCaseNewGroup : public caf::CmdFeature +class RicEclipseCaseCloseFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; diff --git a/ApplicationCode/Commands/RicEclipseCaseExecuteScript.cpp b/ApplicationCode/Commands/RicEclipseCaseExecuteScriptFeature.cpp similarity index 83% rename from ApplicationCode/Commands/RicEclipseCaseExecuteScript.cpp rename to ApplicationCode/Commands/RicEclipseCaseExecuteScriptFeature.cpp index ef1fc6688b..3c1b884fc3 100644 --- a/ApplicationCode/Commands/RicEclipseCaseExecuteScript.cpp +++ b/ApplicationCode/Commands/RicEclipseCaseExecuteScriptFeature.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicEclipseCaseExecuteScript.h" +#include "RicEclipseCaseExecuteScriptFeature.h" #include "RimCase.h" @@ -25,12 +25,12 @@ #include -CAF_CMD_SOURCE_INIT(RicEclipseCaseExecuteScript, "RicEclipseCaseExecuteScript"); +CAF_CMD_SOURCE_INIT(RicEclipseCaseExecuteScriptFeature, "RicEclipseCaseExecuteScript"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicEclipseCaseExecuteScript::isCommandEnabled() +bool RicEclipseCaseExecuteScriptFeature::isCommandEnabled() { std::vector selection; caf::SelectionManager::instance()->objectsByType(&selection); @@ -48,14 +48,14 @@ bool RicEclipseCaseExecuteScript::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseCaseExecuteScript::onActionTriggered(bool isChecked) +void RicEclipseCaseExecuteScriptFeature::onActionTriggered(bool isChecked) { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseCaseExecuteScript::setupActionLook(QAction* actionToSetup) +void RicEclipseCaseExecuteScriptFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Execute Script"); } diff --git a/ApplicationCode/Commands/RicEclipseCaseExecuteScriptFeature.h b/ApplicationCode/Commands/RicEclipseCaseExecuteScriptFeature.h new file mode 100644 index 0000000000..28ddb6637a --- /dev/null +++ b/ApplicationCode/Commands/RicEclipseCaseExecuteScriptFeature.h @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2015- Statoil ASA +// Copyright (C) 2015- Ceetron Solutions AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + + +//================================================================================================== +/// +//================================================================================================== +class RicEclipseCaseExecuteScriptFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + // Overrides + virtual bool isCommandEnabled(); + virtual void onActionTriggered( bool isChecked ); + virtual void setupActionLook( QAction* actionToSetup ); +}; + + diff --git a/ApplicationCode/Commands/RicEclipseCaseNewGroup.cpp b/ApplicationCode/Commands/RicEclipseCaseNewGroupFeature.cpp similarity index 86% rename from ApplicationCode/Commands/RicEclipseCaseNewGroup.cpp rename to ApplicationCode/Commands/RicEclipseCaseNewGroupFeature.cpp index d0b5e3e397..843553c0cf 100644 --- a/ApplicationCode/Commands/RicEclipseCaseNewGroup.cpp +++ b/ApplicationCode/Commands/RicEclipseCaseNewGroupFeature.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicEclipseCaseNewGroup.h" +#include "RicEclipseCaseNewGroupFeature.h" #include "RicEclipseCaseNewGroupExec.h" @@ -28,12 +28,12 @@ #include -CAF_CMD_SOURCE_INIT(RicEclipseCaseNewGroup, "RicEclipseCaseNewGroup"); +CAF_CMD_SOURCE_INIT(RicEclipseCaseNewGroupFeature, "RicEclipseCaseNewGroup"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicEclipseCaseNewGroup::isCommandEnabled() +bool RicEclipseCaseNewGroupFeature::isCommandEnabled() { std::vector selection; caf::SelectionManager::instance()->objectsByType(&selection); @@ -51,7 +51,7 @@ bool RicEclipseCaseNewGroup::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseCaseNewGroup::onActionTriggered(bool isChecked) +void RicEclipseCaseNewGroupFeature::onActionTriggered(bool isChecked) { RicEclipseCaseNewGroupExec* cmdExec = new RicEclipseCaseNewGroupExec(); caf::CmdExecCommandManager::instance()->processExecuteCommand(cmdExec); @@ -60,7 +60,7 @@ void RicEclipseCaseNewGroup::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseCaseNewGroup::setupActionLook(QAction* actionToSetup) +void RicEclipseCaseNewGroupFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("New Grid Case Group"); } diff --git a/ApplicationCode/Commands/RicEclipseCaseNewGroupFeature.h b/ApplicationCode/Commands/RicEclipseCaseNewGroupFeature.h new file mode 100644 index 0000000000..669c92ef5d --- /dev/null +++ b/ApplicationCode/Commands/RicEclipseCaseNewGroupFeature.h @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2015- Statoil ASA +// Copyright (C) 2015- Ceetron Solutions AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + + +//================================================================================================== +/// +//================================================================================================== +class RicEclipseCaseNewGroupFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + // Overrides + virtual bool isCommandEnabled(); + virtual void onActionTriggered( bool isChecked ); + virtual void setupActionLook( QAction* actionToSetup ); +}; + + diff --git a/ApplicationCode/Commands/RicEclipseCaseNewView.cpp b/ApplicationCode/Commands/RicEclipseCaseNewViewFeature.cpp similarity index 84% rename from ApplicationCode/Commands/RicEclipseCaseNewView.cpp rename to ApplicationCode/Commands/RicEclipseCaseNewViewFeature.cpp index 3d6a0684b6..1199c76189 100644 --- a/ApplicationCode/Commands/RicEclipseCaseNewView.cpp +++ b/ApplicationCode/Commands/RicEclipseCaseNewViewFeature.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicEclipseCaseNewView.h" +#include "RicEclipseCaseNewViewFeature.h" #include "RimCase.h" @@ -25,12 +25,12 @@ #include -CAF_CMD_SOURCE_INIT(RicEclipseCaseNewView, "RicEclipseCaseNewView"); +CAF_CMD_SOURCE_INIT(RicEclipseCaseNewViewFeature, "RicEclipseCaseNewView"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicEclipseCaseNewView::isCommandEnabled() +bool RicEclipseCaseNewViewFeature::isCommandEnabled() { std::vector selection; caf::SelectionManager::instance()->objectsByType(&selection); @@ -48,14 +48,14 @@ bool RicEclipseCaseNewView::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseCaseNewView::onActionTriggered(bool isChecked) +void RicEclipseCaseNewViewFeature::onActionTriggered(bool isChecked) { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseCaseNewView::setupActionLook(QAction* actionToSetup) +void RicEclipseCaseNewViewFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("New View"); } diff --git a/ApplicationCode/Commands/RicEclipseCaseNewViewFeature.h b/ApplicationCode/Commands/RicEclipseCaseNewViewFeature.h new file mode 100644 index 0000000000..8623e5345f --- /dev/null +++ b/ApplicationCode/Commands/RicEclipseCaseNewViewFeature.h @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2015- Statoil ASA +// Copyright (C) 2015- Ceetron Solutions AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + + +//================================================================================================== +/// +//================================================================================================== +class RicEclipseCaseNewViewFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + // Overrides + virtual bool isCommandEnabled(); + virtual void onActionTriggered( bool isChecked ); + virtual void setupActionLook( QAction* actionToSetup ); +}; + + diff --git a/ApplicationCode/Commands/RicEclipseCasePaste.cpp b/ApplicationCode/Commands/RicEclipseCasePasteFeature.cpp similarity index 85% rename from ApplicationCode/Commands/RicEclipseCasePaste.cpp rename to ApplicationCode/Commands/RicEclipseCasePasteFeature.cpp index dad4b5e71c..cf2008fade 100644 --- a/ApplicationCode/Commands/RicEclipseCasePaste.cpp +++ b/ApplicationCode/Commands/RicEclipseCasePasteFeature.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicEclipseCasePaste.h" +#include "RicEclipseCasePasteFeature.h" #include "RimCase.h" @@ -25,12 +25,12 @@ #include -CAF_CMD_SOURCE_INIT(RicEclipseCasePaste, "RicEclipseCasePaste"); +CAF_CMD_SOURCE_INIT(RicEclipseCasePasteFeature, "RicEclipseCasePaste"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicEclipseCasePaste::isCommandEnabled() +bool RicEclipseCasePasteFeature::isCommandEnabled() { std::vector selection; caf::SelectionManager::instance()->objectsByType(&selection); @@ -48,14 +48,14 @@ bool RicEclipseCasePaste::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseCasePaste::onActionTriggered(bool isChecked) +void RicEclipseCasePasteFeature::onActionTriggered(bool isChecked) { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseCasePaste::setupActionLook(QAction* actionToSetup) +void RicEclipseCasePasteFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Paste"); } diff --git a/ApplicationCode/Commands/RicEclipseCasePaste.h b/ApplicationCode/Commands/RicEclipseCasePasteFeature.h similarity index 95% rename from ApplicationCode/Commands/RicEclipseCasePaste.h rename to ApplicationCode/Commands/RicEclipseCasePasteFeature.h index 0483ccc762..7ab091da65 100644 --- a/ApplicationCode/Commands/RicEclipseCasePaste.h +++ b/ApplicationCode/Commands/RicEclipseCasePasteFeature.h @@ -25,7 +25,7 @@ //================================================================================================== /// //================================================================================================== -class RicEclipseCasePaste : public caf::CmdFeature +class RicEclipseCasePasteFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilter.cpp b/ApplicationCode/Commands/RicEclipsePropertyFilterImpl.cpp similarity index 88% rename from ApplicationCode/Commands/RicEclipsePropertyFilter.cpp rename to ApplicationCode/Commands/RicEclipsePropertyFilterImpl.cpp index 3cb94b1be2..5d59ab2f0f 100644 --- a/ApplicationCode/Commands/RicEclipsePropertyFilter.cpp +++ b/ApplicationCode/Commands/RicEclipsePropertyFilterImpl.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicEclipsePropertyFilter.h" +#include "RicEclipsePropertyFilterImpl.h" #include "RimEclipsePropertyFilter.h" #include "RimEclipsePropertyFilterCollection.h" @@ -33,7 +33,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RicEclipsePropertyFilter::selectedPropertyFilters() +std::vector RicEclipsePropertyFilterImpl::selectedPropertyFilters() { std::vector propertyFilters; caf::SelectionManager::instance()->objectsByType(&propertyFilters); @@ -44,7 +44,7 @@ std::vector RicEclipsePropertyFilter::selectedPropert //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RicEclipsePropertyFilter::selectedPropertyFilterCollections() +std::vector RicEclipsePropertyFilterImpl::selectedPropertyFilterCollections() { std::vector propertyFilterCollections; caf::SelectionManager::instance()->objectsByType(&propertyFilterCollections); @@ -55,7 +55,7 @@ std::vector RicEclipsePropertyFilter::selec //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipsePropertyFilter::addPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection) +void RicEclipsePropertyFilterImpl::addPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection) { RimEclipsePropertyFilter* propertyFilter = new RimEclipsePropertyFilter(); propertyFilterCollection->propertyFilters.push_back(propertyFilter); @@ -71,7 +71,7 @@ void RicEclipsePropertyFilter::addPropertyFilter(RimEclipsePropertyFilterCollect //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipsePropertyFilter::insertPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection, size_t index) +void RicEclipsePropertyFilterImpl::insertPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection, size_t index) { RimEclipsePropertyFilter* propertyFilter = new RimEclipsePropertyFilter(); propertyFilterCollection->propertyFilters.insertAt(index, propertyFilter); @@ -86,7 +86,7 @@ void RicEclipsePropertyFilter::insertPropertyFilter(RimEclipsePropertyFilterColl //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipsePropertyFilter::setDefaults(RimEclipsePropertyFilter* propertyFilter) +void RicEclipsePropertyFilterImpl::setDefaults(RimEclipsePropertyFilter* propertyFilter) { CVF_ASSERT(propertyFilter); diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilter.h b/ApplicationCode/Commands/RicEclipsePropertyFilterImpl.h similarity index 97% rename from ApplicationCode/Commands/RicEclipsePropertyFilter.h rename to ApplicationCode/Commands/RicEclipsePropertyFilterImpl.h index a7b386edda..2a0790b8b5 100644 --- a/ApplicationCode/Commands/RicEclipsePropertyFilter.h +++ b/ApplicationCode/Commands/RicEclipsePropertyFilterImpl.h @@ -27,7 +27,7 @@ class RimEclipsePropertyFilterCollection; //================================================================================================== /// //================================================================================================== -class RicEclipsePropertyFilter +class RicEclipsePropertyFilterImpl { public: static std::vector selectedPropertyFilters(); diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterInsert.h b/ApplicationCode/Commands/RicEclipsePropertyFilterInsert.h deleted file mode 100644 index 09638b38b1..0000000000 --- a/ApplicationCode/Commands/RicEclipsePropertyFilterInsert.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2015- Statoil ASA -// Copyright (C) 2015- Ceetron Solutions AS -// -// ResInsight is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "cafCmdFeature.h" - - -//================================================================================================== -/// -//================================================================================================== -class RicEclipsePropertyFilterInsert : public caf::CmdFeature -{ - CAF_CMD_HEADER_INIT; - -protected: - // Overrides - virtual bool isCommandEnabled(); - virtual void onActionTriggered( bool isChecked ); - virtual void setupActionLook( QAction* actionToSetup ); -}; - - diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterInsertExec.cpp b/ApplicationCode/Commands/RicEclipsePropertyFilterInsertExec.cpp index dd26e48210..7d0f983500 100644 --- a/ApplicationCode/Commands/RicEclipsePropertyFilterInsertExec.cpp +++ b/ApplicationCode/Commands/RicEclipsePropertyFilterInsertExec.cpp @@ -20,7 +20,7 @@ #include "RicEclipsePropertyFilterInsertExec.h" -#include "RicEclipsePropertyFilter.h" +#include "RicEclipsePropertyFilterImpl.h" #include "RimEclipsePropertyFilter.h" #include "RimEclipsePropertyFilterCollection.h" @@ -63,7 +63,7 @@ void RicEclipsePropertyFilterInsertExec::redo() size_t index = propertyFilterCollection->propertyFilters.index(m_propertyFilter); CVF_ASSERT(index < propertyFilterCollection->propertyFilters.size()); - RicEclipsePropertyFilter::insertPropertyFilter(propertyFilterCollection, index); + RicEclipsePropertyFilterImpl::insertPropertyFilter(propertyFilterCollection, index); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterInsert.cpp b/ApplicationCode/Commands/RicEclipsePropertyFilterInsertFeature.cpp similarity index 80% rename from ApplicationCode/Commands/RicEclipsePropertyFilterInsert.cpp rename to ApplicationCode/Commands/RicEclipsePropertyFilterInsertFeature.cpp index fb7b079afa..6b5978d93e 100644 --- a/ApplicationCode/Commands/RicEclipsePropertyFilterInsert.cpp +++ b/ApplicationCode/Commands/RicEclipsePropertyFilterInsertFeature.cpp @@ -17,10 +17,10 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicEclipsePropertyFilterInsert.h" +#include "RicEclipsePropertyFilterInsertFeature.h" #include "RicEclipsePropertyFilterInsertExec.h" -#include "RicEclipsePropertyFilter.h" +#include "RicEclipsePropertyFilterImpl.h" #include "RimEclipsePropertyFilter.h" @@ -30,23 +30,23 @@ #include -CAF_CMD_SOURCE_INIT(RicEclipsePropertyFilterInsert, "RicEclipsePropertyFilterInsert"); +CAF_CMD_SOURCE_INIT(RicEclipsePropertyFilterInsertFeature, "RicEclipsePropertyFilterInsert"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicEclipsePropertyFilterInsert::isCommandEnabled() +bool RicEclipsePropertyFilterInsertFeature::isCommandEnabled() { - std::vector propertyFilters = RicEclipsePropertyFilter::selectedPropertyFilters(); + std::vector propertyFilters = RicEclipsePropertyFilterImpl::selectedPropertyFilters(); return propertyFilters.size() == 1; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipsePropertyFilterInsert::onActionTriggered(bool isChecked) +void RicEclipsePropertyFilterInsertFeature::onActionTriggered(bool isChecked) { - std::vector propertyFilters = RicEclipsePropertyFilter::selectedPropertyFilters(); + std::vector propertyFilters = RicEclipsePropertyFilterImpl::selectedPropertyFilters(); if (propertyFilters.size() == 1) { RicEclipsePropertyFilterInsertExec* filterExec = new RicEclipsePropertyFilterInsertExec(propertyFilters[0]); @@ -57,7 +57,7 @@ void RicEclipsePropertyFilterInsert::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipsePropertyFilterInsert::setupActionLook(QAction* actionToSetup) +void RicEclipsePropertyFilterInsertFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Insert Property Filter"); } diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterInsertFeature.h b/ApplicationCode/Commands/RicEclipsePropertyFilterInsertFeature.h new file mode 100644 index 0000000000..965ea705b2 --- /dev/null +++ b/ApplicationCode/Commands/RicEclipsePropertyFilterInsertFeature.h @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2015- Statoil ASA +// Copyright (C) 2015- Ceetron Solutions AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + + +//================================================================================================== +/// +//================================================================================================== +class RicEclipsePropertyFilterInsertFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + // Overrides + virtual bool isCommandEnabled(); + virtual void onActionTriggered( bool isChecked ); + virtual void setupActionLook( QAction* actionToSetup ); +}; + + diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterNew.h b/ApplicationCode/Commands/RicEclipsePropertyFilterNew.h deleted file mode 100644 index 3b1d4a8b7f..0000000000 --- a/ApplicationCode/Commands/RicEclipsePropertyFilterNew.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2015- Statoil ASA -// Copyright (C) 2015- Ceetron Solutions AS -// -// ResInsight is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "cafCmdFeature.h" - - -//================================================================================================== -/// -//================================================================================================== -class RicEclipsePropertyFilterNew : public caf::CmdFeature -{ - CAF_CMD_HEADER_INIT; - -protected: - // Overrides - virtual bool isCommandEnabled(); - virtual void onActionTriggered( bool isChecked ); - virtual void setupActionLook( QAction* actionToSetup ); -}; - - diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterNewExec.cpp b/ApplicationCode/Commands/RicEclipsePropertyFilterNewExec.cpp index 429fdf50ec..d8ef401c03 100644 --- a/ApplicationCode/Commands/RicEclipsePropertyFilterNewExec.cpp +++ b/ApplicationCode/Commands/RicEclipsePropertyFilterNewExec.cpp @@ -19,7 +19,7 @@ #include "RicEclipsePropertyFilterNewExec.h" -#include "RicEclipsePropertyFilter.h" +#include "RicEclipsePropertyFilterImpl.h" #include "RimEclipsePropertyFilter.h" #include "RimEclipsePropertyFilterCollection.h" @@ -55,7 +55,7 @@ QString RicEclipsePropertyFilterNewExec::name() //-------------------------------------------------------------------------------------------------- void RicEclipsePropertyFilterNewExec::redo() { - RicEclipsePropertyFilter::addPropertyFilter(m_propertyFilterCollection); + RicEclipsePropertyFilterImpl::addPropertyFilter(m_propertyFilterCollection); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterNew.cpp b/ApplicationCode/Commands/RicEclipsePropertyFilterNewFeature.cpp similarity index 79% rename from ApplicationCode/Commands/RicEclipsePropertyFilterNew.cpp rename to ApplicationCode/Commands/RicEclipsePropertyFilterNewFeature.cpp index 64f6b24aec..a8c3b812cd 100644 --- a/ApplicationCode/Commands/RicEclipsePropertyFilterNew.cpp +++ b/ApplicationCode/Commands/RicEclipsePropertyFilterNewFeature.cpp @@ -17,10 +17,10 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicEclipsePropertyFilterNew.h" +#include "RicEclipsePropertyFilterNewFeature.h" #include "RicEclipsePropertyFilterNewExec.h" -#include "RicEclipsePropertyFilter.h" +#include "RicEclipsePropertyFilterImpl.h" #include "RimEclipsePropertyFilter.h" #include "RimEclipsePropertyFilterCollection.h" @@ -29,23 +29,23 @@ #include -CAF_CMD_SOURCE_INIT(RicEclipsePropertyFilterNew, "RicEclipsePropertyFilterNew"); +CAF_CMD_SOURCE_INIT(RicEclipsePropertyFilterNewFeature, "RicEclipsePropertyFilterNew"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicEclipsePropertyFilterNew::isCommandEnabled() +bool RicEclipsePropertyFilterNewFeature::isCommandEnabled() { - std::vector filterCollections = RicEclipsePropertyFilter::selectedPropertyFilterCollections(); + std::vector filterCollections = RicEclipsePropertyFilterImpl::selectedPropertyFilterCollections(); return filterCollections.size() == 1; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipsePropertyFilterNew::onActionTriggered(bool isChecked) +void RicEclipsePropertyFilterNewFeature::onActionTriggered(bool isChecked) { - std::vector filterCollections = RicEclipsePropertyFilter::selectedPropertyFilterCollections(); + std::vector filterCollections = RicEclipsePropertyFilterImpl::selectedPropertyFilterCollections(); if (filterCollections.size() == 1) { RicEclipsePropertyFilterNewExec* filterExec = new RicEclipsePropertyFilterNewExec(filterCollections[0]); @@ -56,7 +56,7 @@ void RicEclipsePropertyFilterNew::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipsePropertyFilterNew::setupActionLook(QAction* actionToSetup) +void RicEclipsePropertyFilterNewFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setIcon(QIcon(":/CellFilter_Values.png")); actionToSetup->setText("New Property Filter"); diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterNewFeature.h b/ApplicationCode/Commands/RicEclipsePropertyFilterNewFeature.h new file mode 100644 index 0000000000..da3ac841c7 --- /dev/null +++ b/ApplicationCode/Commands/RicEclipsePropertyFilterNewFeature.h @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2015- Statoil ASA +// Copyright (C) 2015- Ceetron Solutions AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + + +//================================================================================================== +/// +//================================================================================================== +class RicEclipsePropertyFilterNewFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + // Overrides + virtual bool isCommandEnabled(); + virtual void onActionTriggered( bool isChecked ); + virtual void setupActionLook( QAction* actionToSetup ); +}; + + diff --git a/ApplicationCode/Commands/RicEclipseViewDelete.cpp b/ApplicationCode/Commands/RicEclipseViewDelete.cpp index 1bfd020bb4..e4c36e7f21 100644 --- a/ApplicationCode/Commands/RicEclipseViewDelete.cpp +++ b/ApplicationCode/Commands/RicEclipseViewDelete.cpp @@ -25,12 +25,12 @@ #include -CAF_CMD_SOURCE_INIT(RicEclipseViewDelete, "RicEclipseViewDelete"); +CAF_CMD_SOURCE_INIT(RicEclipseViewDeleteFeature, "RicEclipseViewDelete"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicEclipseViewDelete::isCommandEnabled() +bool RicEclipseViewDeleteFeature::isCommandEnabled() { std::vector selection; caf::SelectionManager::instance()->objectsByType(&selection); @@ -48,7 +48,7 @@ bool RicEclipseViewDelete::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseViewDelete::onActionTriggered(bool isChecked) +void RicEclipseViewDeleteFeature::onActionTriggered(bool isChecked) { // MODTODO } @@ -56,7 +56,7 @@ void RicEclipseViewDelete::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseViewDelete::setupActionLook(QAction* actionToSetup) +void RicEclipseViewDeleteFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Delete"); } diff --git a/ApplicationCode/Commands/RicEclipseViewDelete.h b/ApplicationCode/Commands/RicEclipseViewDelete.h deleted file mode 100644 index 5e4c1baf23..0000000000 --- a/ApplicationCode/Commands/RicEclipseViewDelete.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2015- Statoil ASA -// Copyright (C) 2015- Ceetron Solutions AS -// -// ResInsight is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "cafCmdFeature.h" - - -//================================================================================================== -/// -//================================================================================================== -class RicEclipseViewDelete : public caf::CmdFeature -{ - CAF_CMD_HEADER_INIT; - -protected: - // Overrides - virtual bool isCommandEnabled(); - virtual void onActionTriggered( bool isChecked ); - virtual void setupActionLook( QAction* actionToSetup ); -}; - - diff --git a/ApplicationCode/Commands/RicEclipseViewDeleteFeature.cpp b/ApplicationCode/Commands/RicEclipseViewDeleteFeature.cpp new file mode 100644 index 0000000000..79143cdce5 --- /dev/null +++ b/ApplicationCode/Commands/RicEclipseViewDeleteFeature.cpp @@ -0,0 +1,62 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2015- Statoil ASA +// Copyright (C) 2015- Ceetron Solutions AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#include "RicEclipseViewDeleteFeature.h" + +#include "RimEclipseView.h" + +#include "cafSelectionManager.h" + +#include + +CAF_CMD_SOURCE_INIT(RicEclipseViewDeleteFeature, "RicEclipseViewDelete"); + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool RicEclipseViewDeleteFeature::isCommandEnabled() +{ + std::vector selection; + caf::SelectionManager::instance()->objectsByType(&selection); + + if (selection.size() > 0) + { + return true; + } + else + { + return false; + } +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RicEclipseViewDeleteFeature::onActionTriggered(bool isChecked) +{ + // MODTODO +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RicEclipseViewDeleteFeature::setupActionLook(QAction* actionToSetup) +{ + actionToSetup->setText("Delete"); +} diff --git a/ApplicationCode/Commands/RicEclipseCaseExecuteScript.h b/ApplicationCode/Commands/RicEclipseViewDeleteFeature.h similarity index 95% rename from ApplicationCode/Commands/RicEclipseCaseExecuteScript.h rename to ApplicationCode/Commands/RicEclipseViewDeleteFeature.h index 0dbd5d6ee2..668f9a16b8 100644 --- a/ApplicationCode/Commands/RicEclipseCaseExecuteScript.h +++ b/ApplicationCode/Commands/RicEclipseViewDeleteFeature.h @@ -25,7 +25,7 @@ //================================================================================================== /// //================================================================================================== -class RicEclipseCaseExecuteScript : public caf::CmdFeature +class RicEclipseViewDeleteFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; diff --git a/ApplicationCode/Commands/RicEclipseViewNew.h b/ApplicationCode/Commands/RicEclipseViewNew.h deleted file mode 100644 index ef879bed33..0000000000 --- a/ApplicationCode/Commands/RicEclipseViewNew.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2015- Statoil ASA -// Copyright (C) 2015- Ceetron Solutions AS -// -// ResInsight is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "cafCmdFeature.h" - - -//================================================================================================== -/// -//================================================================================================== -class RicEclipseViewNew : public caf::CmdFeature -{ - CAF_CMD_HEADER_INIT; - -protected: - // Overrides - virtual bool isCommandEnabled(); - virtual void onActionTriggered( bool isChecked ); - virtual void setupActionLook( QAction* actionToSetup ); -}; - - diff --git a/ApplicationCode/Commands/RicEclipseViewNew.cpp b/ApplicationCode/Commands/RicEclipseViewNewFeature.cpp similarity index 86% rename from ApplicationCode/Commands/RicEclipseViewNew.cpp rename to ApplicationCode/Commands/RicEclipseViewNewFeature.cpp index 5fe2d9badc..1cdb9da5de 100644 --- a/ApplicationCode/Commands/RicEclipseViewNew.cpp +++ b/ApplicationCode/Commands/RicEclipseViewNewFeature.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicEclipseViewNew.h" +#include "RicEclipseViewNewFeature.h" #include "RimEclipseView.h" @@ -25,12 +25,12 @@ #include -CAF_CMD_SOURCE_INIT(RicEclipseViewNew, "RicEclipseViewNew"); +CAF_CMD_SOURCE_INIT(RicEclipseViewNewFeature, "RicEclipseViewNew"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicEclipseViewNew::isCommandEnabled() +bool RicEclipseViewNewFeature::isCommandEnabled() { std::vector selection; caf::SelectionManager::instance()->objectsByType(&selection); @@ -48,7 +48,7 @@ bool RicEclipseViewNew::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseViewNew::onActionTriggered(bool isChecked) +void RicEclipseViewNewFeature::onActionTriggered(bool isChecked) { // MODTODO } @@ -56,7 +56,7 @@ void RicEclipseViewNew::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseViewNew::setupActionLook(QAction* actionToSetup) +void RicEclipseViewNewFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("New View"); } diff --git a/ApplicationCode/Commands/RicEclipseCaseNewView.h b/ApplicationCode/Commands/RicEclipseViewNewFeature.h similarity index 95% rename from ApplicationCode/Commands/RicEclipseCaseNewView.h rename to ApplicationCode/Commands/RicEclipseViewNewFeature.h index 78824ec3f9..6af0f21006 100644 --- a/ApplicationCode/Commands/RicEclipseCaseNewView.h +++ b/ApplicationCode/Commands/RicEclipseViewNewFeature.h @@ -25,7 +25,7 @@ //================================================================================================== /// //================================================================================================== -class RicEclipseCaseNewView : public caf::CmdFeature +class RicEclipseViewNewFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; diff --git a/ApplicationCode/Commands/RicEclipseViewPaste.h b/ApplicationCode/Commands/RicEclipseViewPaste.h deleted file mode 100644 index 098ce8bd25..0000000000 --- a/ApplicationCode/Commands/RicEclipseViewPaste.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2015- Statoil ASA -// Copyright (C) 2015- Ceetron Solutions AS -// -// ResInsight is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "cafCmdFeature.h" - - -//================================================================================================== -/// -//================================================================================================== -class RicEclipseViewPaste : public caf::CmdFeature -{ - CAF_CMD_HEADER_INIT; - -protected: - // Overrides - virtual bool isCommandEnabled(); - virtual void onActionTriggered( bool isChecked ); - virtual void setupActionLook( QAction* actionToSetup ); -}; - - diff --git a/ApplicationCode/Commands/RicEclipseViewPaste.cpp b/ApplicationCode/Commands/RicEclipseViewPasteFeature.cpp similarity index 85% rename from ApplicationCode/Commands/RicEclipseViewPaste.cpp rename to ApplicationCode/Commands/RicEclipseViewPasteFeature.cpp index ca17e17ca4..f850906716 100644 --- a/ApplicationCode/Commands/RicEclipseViewPaste.cpp +++ b/ApplicationCode/Commands/RicEclipseViewPasteFeature.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicEclipseViewPaste.h" +#include "RicEclipseViewPasteFeature.h" #include "RimEclipseView.h" @@ -25,12 +25,12 @@ #include -CAF_CMD_SOURCE_INIT(RicEclipseViewPaste, "RicEclipseViewPaste"); +CAF_CMD_SOURCE_INIT(RicEclipseViewPasteFeature, "RicEclipseViewPaste"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicEclipseViewPaste::isCommandEnabled() +bool RicEclipseViewPasteFeature::isCommandEnabled() { std::vector selection; caf::SelectionManager::instance()->objectsByType(&selection); @@ -48,7 +48,7 @@ bool RicEclipseViewPaste::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseViewPaste::onActionTriggered(bool isChecked) +void RicEclipseViewPasteFeature::onActionTriggered(bool isChecked) { // MODTODO } @@ -56,7 +56,7 @@ void RicEclipseViewPaste::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEclipseViewPaste::setupActionLook(QAction* actionToSetup) +void RicEclipseViewPasteFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Paste"); } diff --git a/ApplicationCode/Commands/RicEclipseViewPasteFeature.h b/ApplicationCode/Commands/RicEclipseViewPasteFeature.h new file mode 100644 index 0000000000..9271e79835 --- /dev/null +++ b/ApplicationCode/Commands/RicEclipseViewPasteFeature.h @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2015- Statoil ASA +// Copyright (C) 2015- Ceetron Solutions AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + + +//================================================================================================== +/// +//================================================================================================== +class RicEclipseViewPasteFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + // Overrides + virtual bool isCommandEnabled(); + virtual void onActionTriggered( bool isChecked ); + virtual void setupActionLook( QAction* actionToSetup ); +}; + + diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilter.cpp b/ApplicationCode/Commands/RicGeoMechPropertyFilterImpl.cpp similarity index 87% rename from ApplicationCode/Commands/RicGeoMechPropertyFilter.cpp rename to ApplicationCode/Commands/RicGeoMechPropertyFilterImpl.cpp index a4349c53f0..c1ba944af7 100644 --- a/ApplicationCode/Commands/RicGeoMechPropertyFilter.cpp +++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterImpl.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicGeoMechPropertyFilter.h" +#include "RicGeoMechPropertyFilterImpl.h" #include "RimGeoMechPropertyFilter.h" #include "RimGeoMechPropertyFilterCollection.h" @@ -33,7 +33,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RicGeoMechPropertyFilter::selectedPropertyFilters() +std::vector RicGeoMechPropertyFilterImpl::selectedPropertyFilters() { std::vector propertyFilters; caf::SelectionManager::instance()->objectsByType(&propertyFilters); @@ -44,7 +44,7 @@ std::vector RicGeoMechPropertyFilter::selectedPropert //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RicGeoMechPropertyFilter::selectedPropertyFilterCollections() +std::vector RicGeoMechPropertyFilterImpl::selectedPropertyFilterCollections() { std::vector propertyFilterCollections; caf::SelectionManager::instance()->objectsByType(&propertyFilterCollections); @@ -55,7 +55,7 @@ std::vector RicGeoMechPropertyFilter::selec //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicGeoMechPropertyFilter::addPropertyFilter(RimGeoMechPropertyFilterCollection* propertyFilterCollection) +void RicGeoMechPropertyFilterImpl::addPropertyFilter(RimGeoMechPropertyFilterCollection* propertyFilterCollection) { RimGeoMechPropertyFilter* propertyFilter = createPropertyFilter(propertyFilterCollection); CVF_ASSERT(propertyFilter); @@ -71,7 +71,7 @@ void RicGeoMechPropertyFilter::addPropertyFilter(RimGeoMechPropertyFilterCollect //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicGeoMechPropertyFilter::insertPropertyFilter(RimGeoMechPropertyFilterCollection* propertyFilterCollection, size_t index) +void RicGeoMechPropertyFilterImpl::insertPropertyFilter(RimGeoMechPropertyFilterCollection* propertyFilterCollection, size_t index) { RimGeoMechPropertyFilter* propertyFilter = createPropertyFilter(propertyFilterCollection); CVF_ASSERT(propertyFilter); @@ -87,7 +87,7 @@ void RicGeoMechPropertyFilter::insertPropertyFilter(RimGeoMechPropertyFilterColl //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimGeoMechPropertyFilter* RicGeoMechPropertyFilter::createPropertyFilter(RimGeoMechPropertyFilterCollection* propertyFilterCollection) +RimGeoMechPropertyFilter* RicGeoMechPropertyFilterImpl::createPropertyFilter(RimGeoMechPropertyFilterCollection* propertyFilterCollection) { CVF_ASSERT(propertyFilterCollection); @@ -102,7 +102,7 @@ RimGeoMechPropertyFilter* RicGeoMechPropertyFilter::createPropertyFilter(RimGeoM //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicGeoMechPropertyFilter::setDefaults(RimGeoMechPropertyFilter* propertyFilter) +void RicGeoMechPropertyFilterImpl::setDefaults(RimGeoMechPropertyFilter* propertyFilter) { CVF_ASSERT(propertyFilter); diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilter.h b/ApplicationCode/Commands/RicGeoMechPropertyFilterImpl.h similarity index 98% rename from ApplicationCode/Commands/RicGeoMechPropertyFilter.h rename to ApplicationCode/Commands/RicGeoMechPropertyFilterImpl.h index 683d22803f..c4c29ea76e 100644 --- a/ApplicationCode/Commands/RicGeoMechPropertyFilter.h +++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterImpl.h @@ -27,7 +27,7 @@ class RimGeoMechPropertyFilterCollection; //================================================================================================== /// //================================================================================================== -class RicGeoMechPropertyFilter +class RicGeoMechPropertyFilterImpl { public: static std::vector selectedPropertyFilters(); diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterInsert.h b/ApplicationCode/Commands/RicGeoMechPropertyFilterInsert.h deleted file mode 100644 index 9897b88927..0000000000 --- a/ApplicationCode/Commands/RicGeoMechPropertyFilterInsert.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2015- Statoil ASA -// Copyright (C) 2015- Ceetron Solutions AS -// -// ResInsight is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "cafCmdFeature.h" - - -//================================================================================================== -/// -//================================================================================================== -class RicGeoMechPropertyFilterInsert : public caf::CmdFeature -{ - CAF_CMD_HEADER_INIT; - -protected: - // Overrides - virtual bool isCommandEnabled(); - virtual void onActionTriggered( bool isChecked ); - virtual void setupActionLook( QAction* actionToSetup ); -}; - - diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertExec.cpp b/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertExec.cpp index 80e1e3eec3..5990cc8030 100644 --- a/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertExec.cpp +++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertExec.cpp @@ -20,7 +20,7 @@ #include "RicGeoMechPropertyFilterInsertExec.h" -#include "RicGeoMechPropertyFilter.h" +#include "RicGeoMechPropertyFilterImpl.h" #include "RimGeoMechPropertyFilter.h" #include "RimGeoMechPropertyFilterCollection.h" @@ -63,7 +63,7 @@ void RicGeoMechPropertyFilterInsertExec::redo() size_t index = propertyFilterCollection->propertyFilters.index(m_propertyFilter); CVF_ASSERT(index < propertyFilterCollection->propertyFilters.size()); - RicGeoMechPropertyFilter::insertPropertyFilter(propertyFilterCollection, index); + RicGeoMechPropertyFilterImpl::insertPropertyFilter(propertyFilterCollection, index); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterInsert.cpp b/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertFeature.cpp similarity index 80% rename from ApplicationCode/Commands/RicGeoMechPropertyFilterInsert.cpp rename to ApplicationCode/Commands/RicGeoMechPropertyFilterInsertFeature.cpp index 74376a7bf6..f232685d67 100644 --- a/ApplicationCode/Commands/RicGeoMechPropertyFilterInsert.cpp +++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertFeature.cpp @@ -17,10 +17,10 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicGeoMechPropertyFilterInsert.h" +#include "RicGeoMechPropertyFilterInsertFeature.h" #include "RicGeoMechPropertyFilterInsertExec.h" -#include "RicGeoMechPropertyFilter.h" +#include "RicGeoMechPropertyFilterImpl.h" #include "RimGeoMechPropertyFilter.h" @@ -30,23 +30,23 @@ #include -CAF_CMD_SOURCE_INIT(RicGeoMechPropertyFilterInsert, "RicGeoMechPropertyFilterInsert"); +CAF_CMD_SOURCE_INIT(RicGeoMechPropertyFilterInsertFeature, "RicGeoMechPropertyFilterInsert"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicGeoMechPropertyFilterInsert::isCommandEnabled() +bool RicGeoMechPropertyFilterInsertFeature::isCommandEnabled() { - std::vector propertyFilters = RicGeoMechPropertyFilter::selectedPropertyFilters(); + std::vector propertyFilters = RicGeoMechPropertyFilterImpl::selectedPropertyFilters(); return propertyFilters.size() == 1; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicGeoMechPropertyFilterInsert::onActionTriggered(bool isChecked) +void RicGeoMechPropertyFilterInsertFeature::onActionTriggered(bool isChecked) { - std::vector propertyFilters = RicGeoMechPropertyFilter::selectedPropertyFilters(); + std::vector propertyFilters = RicGeoMechPropertyFilterImpl::selectedPropertyFilters(); if (propertyFilters.size() == 1) { RicGeoMechPropertyFilterInsertExec* filterExec = new RicGeoMechPropertyFilterInsertExec(propertyFilters[0]); @@ -57,7 +57,7 @@ void RicGeoMechPropertyFilterInsert::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicGeoMechPropertyFilterInsert::setupActionLook(QAction* actionToSetup) +void RicGeoMechPropertyFilterInsertFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Insert Property Filter"); } diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertFeature.h b/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertFeature.h new file mode 100644 index 0000000000..fa4730b9cc --- /dev/null +++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterInsertFeature.h @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2015- Statoil ASA +// Copyright (C) 2015- Ceetron Solutions AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + + +//================================================================================================== +/// +//================================================================================================== +class RicGeoMechPropertyFilterInsertFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + // Overrides + virtual bool isCommandEnabled(); + virtual void onActionTriggered( bool isChecked ); + virtual void setupActionLook( QAction* actionToSetup ); +}; + + diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterNew.h b/ApplicationCode/Commands/RicGeoMechPropertyFilterNew.h deleted file mode 100644 index 1398dcb0c2..0000000000 --- a/ApplicationCode/Commands/RicGeoMechPropertyFilterNew.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2015- Statoil ASA -// Copyright (C) 2015- Ceetron Solutions AS -// -// ResInsight is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "cafCmdFeature.h" - - -//================================================================================================== -/// -//================================================================================================== -class RicGeoMechPropertyFilterNew : public caf::CmdFeature -{ - CAF_CMD_HEADER_INIT; - -protected: - // Overrides - virtual bool isCommandEnabled(); - virtual void onActionTriggered( bool isChecked ); - virtual void setupActionLook( QAction* actionToSetup ); -}; - - diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterNewExec.cpp b/ApplicationCode/Commands/RicGeoMechPropertyFilterNewExec.cpp index a93ce5e02f..4a505109e5 100644 --- a/ApplicationCode/Commands/RicGeoMechPropertyFilterNewExec.cpp +++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterNewExec.cpp @@ -19,7 +19,7 @@ #include "RicGeoMechPropertyFilterNewExec.h" -#include "RicGeoMechPropertyFilter.h" +#include "RicGeoMechPropertyFilterImpl.h" #include "RimGeoMechPropertyFilter.h" #include "RimGeoMechPropertyFilterCollection.h" @@ -55,7 +55,7 @@ QString RicGeoMechPropertyFilterNewExec::name() //-------------------------------------------------------------------------------------------------- void RicGeoMechPropertyFilterNewExec::redo() { - RicGeoMechPropertyFilter::addPropertyFilter(m_propertyFilterCollection); + RicGeoMechPropertyFilterImpl::addPropertyFilter(m_propertyFilterCollection); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterNew.cpp b/ApplicationCode/Commands/RicGeoMechPropertyFilterNewFeature.cpp similarity index 79% rename from ApplicationCode/Commands/RicGeoMechPropertyFilterNew.cpp rename to ApplicationCode/Commands/RicGeoMechPropertyFilterNewFeature.cpp index e9c9a89c39..e7624e9b12 100644 --- a/ApplicationCode/Commands/RicGeoMechPropertyFilterNew.cpp +++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterNewFeature.cpp @@ -17,10 +17,10 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicGeoMechPropertyFilterNew.h" +#include "RicGeoMechPropertyFilterNewFeature.h" #include "RicGeoMechPropertyFilterNewExec.h" -#include "RicGeoMechPropertyFilter.h" +#include "RicGeoMechPropertyFilterImpl.h" #include "RimGeoMechPropertyFilter.h" #include "RimGeoMechPropertyFilterCollection.h" @@ -29,23 +29,23 @@ #include -CAF_CMD_SOURCE_INIT(RicGeoMechPropertyFilterNew, "RicGeoMechPropertyFilterNew"); +CAF_CMD_SOURCE_INIT(RicGeoMechPropertyFilterNewFeature, "RicGeoMechPropertyFilterNew"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicGeoMechPropertyFilterNew::isCommandEnabled() +bool RicGeoMechPropertyFilterNewFeature::isCommandEnabled() { - std::vector filterCollections = RicGeoMechPropertyFilter::selectedPropertyFilterCollections(); + std::vector filterCollections = RicGeoMechPropertyFilterImpl::selectedPropertyFilterCollections(); return filterCollections.size() == 1; } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicGeoMechPropertyFilterNew::onActionTriggered(bool isChecked) +void RicGeoMechPropertyFilterNewFeature::onActionTriggered(bool isChecked) { - std::vector filterCollections = RicGeoMechPropertyFilter::selectedPropertyFilterCollections(); + std::vector filterCollections = RicGeoMechPropertyFilterImpl::selectedPropertyFilterCollections(); if (filterCollections.size() == 1) { RicGeoMechPropertyFilterNewExec* filterExec = new RicGeoMechPropertyFilterNewExec(filterCollections[0]); @@ -56,7 +56,7 @@ void RicGeoMechPropertyFilterNew::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicGeoMechPropertyFilterNew::setupActionLook(QAction* actionToSetup) +void RicGeoMechPropertyFilterNewFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setIcon(QIcon(":/CellFilter_Values.png")); actionToSetup->setText("New Property Filter"); diff --git a/ApplicationCode/Commands/RicGeoMechPropertyFilterNewFeature.h b/ApplicationCode/Commands/RicGeoMechPropertyFilterNewFeature.h new file mode 100644 index 0000000000..26114b98ec --- /dev/null +++ b/ApplicationCode/Commands/RicGeoMechPropertyFilterNewFeature.h @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2015- Statoil ASA +// Copyright (C) 2015- Ceetron Solutions AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + + +//================================================================================================== +/// +//================================================================================================== +class RicGeoMechPropertyFilterNewFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + // Overrides + virtual bool isCommandEnabled(); + virtual void onActionTriggered( bool isChecked ); + virtual void setupActionLook( QAction* actionToSetup ); +}; + + diff --git a/ApplicationCode/Commands/RicRangeFilterHelper.cpp b/ApplicationCode/Commands/RicRangeFilterImpl.cpp similarity index 91% rename from ApplicationCode/Commands/RicRangeFilterHelper.cpp rename to ApplicationCode/Commands/RicRangeFilterImpl.cpp index 44e4f10ebb..ee80ed426d 100644 --- a/ApplicationCode/Commands/RicRangeFilterHelper.cpp +++ b/ApplicationCode/Commands/RicRangeFilterImpl.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicRangeFilterHelper.h" +#include "RicRangeFilterImpl.h" #include "RicRangeFilterNewExec.h" #include "RimCellRangeFilter.h" @@ -30,7 +30,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicRangeFilterHelper::isRangeFilterCommandAvailable() +bool RicRangeFilterImpl::isRangeFilterCommandAvailable() { return findRangeFilterCollection() != NULL; } @@ -38,7 +38,7 @@ bool RicRangeFilterHelper::isRangeFilterCommandAvailable() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicRangeFilterNewExec* RicRangeFilterHelper::createRangeFilterExecCommand() +RicRangeFilterNewExec* RicRangeFilterImpl::createRangeFilterExecCommand() { RimCellRangeFilterCollection* rangeFilterCollection = findRangeFilterCollection(); @@ -50,7 +50,7 @@ RicRangeFilterNewExec* RicRangeFilterHelper::createRangeFilterExecCommand() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimCellRangeFilterCollection* RicRangeFilterHelper::findRangeFilterCollection() +RimCellRangeFilterCollection* RicRangeFilterImpl::findRangeFilterCollection() { RimCellRangeFilterCollection* rangeFilterCollection = NULL; diff --git a/ApplicationCode/Commands/RicRangeFilterHelper.h b/ApplicationCode/Commands/RicRangeFilterImpl.h similarity index 97% rename from ApplicationCode/Commands/RicRangeFilterHelper.h rename to ApplicationCode/Commands/RicRangeFilterImpl.h index ce022a52c1..eba6140539 100644 --- a/ApplicationCode/Commands/RicRangeFilterHelper.h +++ b/ApplicationCode/Commands/RicRangeFilterImpl.h @@ -25,7 +25,7 @@ class RimCellRangeFilterCollection; //================================================================================================== /// //================================================================================================== -class RicRangeFilterHelper +class RicRangeFilterImpl { public: static bool isRangeFilterCommandAvailable(); diff --git a/ApplicationCode/Commands/RicRangeFilterInsert.h b/ApplicationCode/Commands/RicRangeFilterInsert.h deleted file mode 100644 index 823c458bfe..0000000000 --- a/ApplicationCode/Commands/RicRangeFilterInsert.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2015- Statoil ASA -// Copyright (C) 2015- Ceetron Solutions AS -// -// ResInsight is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "cafCmdFeature.h" - - -//================================================================================================== -/// -//================================================================================================== -class RicRangeFilterInsert : public caf::CmdFeature -{ - CAF_CMD_HEADER_INIT; - -protected: - // Overrides - virtual bool isCommandEnabled(); - virtual void onActionTriggered( bool isChecked ); - virtual void setupActionLook( QAction* actionToSetup ); -}; - - diff --git a/ApplicationCode/Commands/RicRangeFilterInsert.cpp b/ApplicationCode/Commands/RicRangeFilterInsertFeature.cpp similarity index 86% rename from ApplicationCode/Commands/RicRangeFilterInsert.cpp rename to ApplicationCode/Commands/RicRangeFilterInsertFeature.cpp index 9defc5f58f..674cd2b188 100644 --- a/ApplicationCode/Commands/RicRangeFilterInsert.cpp +++ b/ApplicationCode/Commands/RicRangeFilterInsertFeature.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicRangeFilterInsert.h" +#include "RicRangeFilterInsertFeature.h" #include "RimCellRangeFilter.h" @@ -28,12 +28,12 @@ #include -CAF_CMD_SOURCE_INIT(RicRangeFilterInsert, "RicRangeFilterInsert"); +CAF_CMD_SOURCE_INIT(RicRangeFilterInsertFeature, "RicRangeFilterInsert"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicRangeFilterInsert::isCommandEnabled() +bool RicRangeFilterInsertFeature::isCommandEnabled() { std::vector selectedRangeFilter; caf::SelectionManager::instance()->objectsByType(&selectedRangeFilter); @@ -51,14 +51,14 @@ bool RicRangeFilterInsert::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicRangeFilterInsert::onActionTriggered(bool isChecked) +void RicRangeFilterInsertFeature::onActionTriggered(bool isChecked) { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicRangeFilterInsert::setupActionLook(QAction* actionToSetup) +void RicRangeFilterInsertFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Insert Range Filter"); } diff --git a/ApplicationCode/Commands/RicRangeFilterInsertFeature.h b/ApplicationCode/Commands/RicRangeFilterInsertFeature.h new file mode 100644 index 0000000000..5e46f0e4cf --- /dev/null +++ b/ApplicationCode/Commands/RicRangeFilterInsertFeature.h @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2015- Statoil ASA +// Copyright (C) 2015- Ceetron Solutions AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + + +//================================================================================================== +/// +//================================================================================================== +class RicRangeFilterInsertFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + // Overrides + virtual bool isCommandEnabled(); + virtual void onActionTriggered( bool isChecked ); + virtual void setupActionLook( QAction* actionToSetup ); +}; + + diff --git a/ApplicationCode/Commands/RicRangeFilterNew.h b/ApplicationCode/Commands/RicRangeFilterNew.h deleted file mode 100644 index f50a6008e1..0000000000 --- a/ApplicationCode/Commands/RicRangeFilterNew.h +++ /dev/null @@ -1,38 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2015- Statoil ASA -// Copyright (C) 2015- Ceetron Solutions AS -// -// ResInsight is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// -#pragma once - -#include "cafCmdFeature.h" - - -//================================================================================================== -/// -//================================================================================================== -class RicRangeFilterNew : public caf::CmdFeature -{ - CAF_CMD_HEADER_INIT; - -protected: - // Overrides - virtual bool isCommandEnabled(); - virtual void onActionTriggered( bool isChecked ); - virtual void setupActionLook( QAction* actionToSetup ); -}; - - diff --git a/ApplicationCode/Commands/RicRangeFilterNew.cpp b/ApplicationCode/Commands/RicRangeFilterNewFeature.cpp similarity index 79% rename from ApplicationCode/Commands/RicRangeFilterNew.cpp rename to ApplicationCode/Commands/RicRangeFilterNewFeature.cpp index fe086e9cb3..d2f51e78b5 100644 --- a/ApplicationCode/Commands/RicRangeFilterNew.cpp +++ b/ApplicationCode/Commands/RicRangeFilterNewFeature.cpp @@ -17,9 +17,9 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicRangeFilterNew.h" +#include "RicRangeFilterNewFeature.h" -#include "RicRangeFilterHelper.h" +#include "RicRangeFilterImpl.h" #include "RicRangeFilterNewExec.h" #include "RimCellRangeFilter.h" @@ -31,22 +31,22 @@ #include -CAF_CMD_SOURCE_INIT(RicRangeFilterNew, "RicRangeFilterNew"); +CAF_CMD_SOURCE_INIT(RicRangeFilterNewFeature, "RicRangeFilterNew"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicRangeFilterNew::isCommandEnabled() +bool RicRangeFilterNewFeature::isCommandEnabled() { - return RicRangeFilterHelper::isRangeFilterCommandAvailable(); + return RicRangeFilterImpl::isRangeFilterCommandAvailable(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicRangeFilterNew::onActionTriggered(bool isChecked) +void RicRangeFilterNewFeature::onActionTriggered(bool isChecked) { - RicRangeFilterNewExec* filterExec = RicRangeFilterHelper::createRangeFilterExecCommand(); + RicRangeFilterNewExec* filterExec = RicRangeFilterImpl::createRangeFilterExecCommand(); caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec); } @@ -54,7 +54,7 @@ void RicRangeFilterNew::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicRangeFilterNew::setupActionLook(QAction* actionToSetup) +void RicRangeFilterNewFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setIcon(QIcon(":/CellFilter_Range.png")); actionToSetup->setText("New Range Filter"); diff --git a/ApplicationCode/Commands/RicEclipseCaseClose.h b/ApplicationCode/Commands/RicRangeFilterNewFeature.h similarity index 95% rename from ApplicationCode/Commands/RicEclipseCaseClose.h rename to ApplicationCode/Commands/RicRangeFilterNewFeature.h index 5a543b3004..e1fb158788 100644 --- a/ApplicationCode/Commands/RicEclipseCaseClose.h +++ b/ApplicationCode/Commands/RicRangeFilterNewFeature.h @@ -16,7 +16,6 @@ // for more details. // ///////////////////////////////////////////////////////////////////////////////// - #pragma once #include "cafCmdFeature.h" @@ -25,7 +24,7 @@ //================================================================================================== /// //================================================================================================== -class RicEclipseCaseClose : public caf::CmdFeature +class RicRangeFilterNewFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; diff --git a/ApplicationCode/Commands/RicRangeFilterNewSliceI.h b/ApplicationCode/Commands/RicRangeFilterNewSliceI.h deleted file mode 100644 index aabe7d7329..0000000000 --- a/ApplicationCode/Commands/RicRangeFilterNewSliceI.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2015- Statoil ASA -// Copyright (C) 2015- Ceetron Solutions AS -// -// ResInsight is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "cafCmdFeature.h" - - -//================================================================================================== -/// -//================================================================================================== -class RicRangeFilterNewSliceI : public caf::CmdFeature -{ - CAF_CMD_HEADER_INIT; - -protected: - // Overrides - virtual bool isCommandEnabled(); - virtual void onActionTriggered( bool isChecked ); - virtual void setupActionLook( QAction* actionToSetup ); -}; - - diff --git a/ApplicationCode/Commands/RicRangeFilterNewSliceI.cpp b/ApplicationCode/Commands/RicRangeFilterNewSliceIFeature.cpp similarity index 77% rename from ApplicationCode/Commands/RicRangeFilterNewSliceI.cpp rename to ApplicationCode/Commands/RicRangeFilterNewSliceIFeature.cpp index 436120357c..608c9e63a0 100644 --- a/ApplicationCode/Commands/RicRangeFilterNewSliceI.cpp +++ b/ApplicationCode/Commands/RicRangeFilterNewSliceIFeature.cpp @@ -17,10 +17,10 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicRangeFilterNewSliceI.h" +#include "RicRangeFilterNewSliceIFeature.h" #include "RicRangeFilterNewExec.h" -#include "RicRangeFilterHelper.h" +#include "RicRangeFilterImpl.h" #include "RimCellRangeFilter.h" #include "RimCellRangeFilterCollection.h" @@ -30,22 +30,22 @@ #include -CAF_CMD_SOURCE_INIT(RicRangeFilterNewSliceI, "RicRangeFilterNewSliceI"); +CAF_CMD_SOURCE_INIT(RicRangeFilterNewSliceIFeature, "RicRangeFilterNewSliceI"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicRangeFilterNewSliceI::isCommandEnabled() +bool RicRangeFilterNewSliceIFeature::isCommandEnabled() { - return RicRangeFilterHelper::isRangeFilterCommandAvailable(); + return RicRangeFilterImpl::isRangeFilterCommandAvailable(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicRangeFilterNewSliceI::onActionTriggered(bool isChecked) +void RicRangeFilterNewSliceIFeature::onActionTriggered(bool isChecked) { - RicRangeFilterNewExec* filterExec = RicRangeFilterHelper::createRangeFilterExecCommand(); + RicRangeFilterNewExec* filterExec = RicRangeFilterImpl::createRangeFilterExecCommand(); filterExec->m_iSlice = true; caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec); @@ -54,7 +54,7 @@ void RicRangeFilterNewSliceI::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicRangeFilterNewSliceI::setupActionLook(QAction* actionToSetup) +void RicRangeFilterNewSliceIFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("New I-slice range filter"); } diff --git a/ApplicationCode/Commands/RicRangeFilterNewSliceIFeature.h b/ApplicationCode/Commands/RicRangeFilterNewSliceIFeature.h new file mode 100644 index 0000000000..3d74f5c4a6 --- /dev/null +++ b/ApplicationCode/Commands/RicRangeFilterNewSliceIFeature.h @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2015- Statoil ASA +// Copyright (C) 2015- Ceetron Solutions AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + + +//================================================================================================== +/// +//================================================================================================== +class RicRangeFilterNewSliceIFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + // Overrides + virtual bool isCommandEnabled(); + virtual void onActionTriggered( bool isChecked ); + virtual void setupActionLook( QAction* actionToSetup ); +}; + + diff --git a/ApplicationCode/Commands/RicRangeFilterNewSliceJ.h b/ApplicationCode/Commands/RicRangeFilterNewSliceJ.h deleted file mode 100644 index ed14ff8f8c..0000000000 --- a/ApplicationCode/Commands/RicRangeFilterNewSliceJ.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2015- Statoil ASA -// Copyright (C) 2015- Ceetron Solutions AS -// -// ResInsight is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "cafCmdFeature.h" - - -//================================================================================================== -/// -//================================================================================================== -class RicRangeFilterNewSliceJ : public caf::CmdFeature -{ - CAF_CMD_HEADER_INIT; - -protected: - // Overrides - virtual bool isCommandEnabled(); - virtual void onActionTriggered( bool isChecked ); - virtual void setupActionLook( QAction* actionToSetup ); -}; - - diff --git a/ApplicationCode/Commands/RicRangeFilterNewSliceJ.cpp b/ApplicationCode/Commands/RicRangeFilterNewSliceJFeature.cpp similarity index 77% rename from ApplicationCode/Commands/RicRangeFilterNewSliceJ.cpp rename to ApplicationCode/Commands/RicRangeFilterNewSliceJFeature.cpp index 024e304561..61bbf1bca2 100644 --- a/ApplicationCode/Commands/RicRangeFilterNewSliceJ.cpp +++ b/ApplicationCode/Commands/RicRangeFilterNewSliceJFeature.cpp @@ -17,10 +17,10 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicRangeFilterNewSliceJ.h" +#include "RicRangeFilterNewSliceJFeature.h" #include "RicRangeFilterNewExec.h" -#include "RicRangeFilterHelper.h" +#include "RicRangeFilterImpl.h" #include "RimCellRangeFilter.h" #include "RimCellRangeFilterCollection.h" @@ -29,22 +29,22 @@ #include -CAF_CMD_SOURCE_INIT(RicRangeFilterNewSliceJ, "RicRangeFilterNewSliceJ"); +CAF_CMD_SOURCE_INIT(RicRangeFilterNewSliceJFeature, "RicRangeFilterNewSliceJ"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicRangeFilterNewSliceJ::isCommandEnabled() +bool RicRangeFilterNewSliceJFeature::isCommandEnabled() { - return RicRangeFilterHelper::isRangeFilterCommandAvailable(); + return RicRangeFilterImpl::isRangeFilterCommandAvailable(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicRangeFilterNewSliceJ::onActionTriggered(bool isChecked) +void RicRangeFilterNewSliceJFeature::onActionTriggered(bool isChecked) { - RicRangeFilterNewExec* filterExec = RicRangeFilterHelper::createRangeFilterExecCommand(); + RicRangeFilterNewExec* filterExec = RicRangeFilterImpl::createRangeFilterExecCommand(); filterExec->m_jSlice = true; caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec); @@ -53,7 +53,7 @@ void RicRangeFilterNewSliceJ::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicRangeFilterNewSliceJ::setupActionLook(QAction* actionToSetup) +void RicRangeFilterNewSliceJFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("New J-slice range filter"); } diff --git a/ApplicationCode/Commands/RicRangeFilterNewSliceJFeature.h b/ApplicationCode/Commands/RicRangeFilterNewSliceJFeature.h new file mode 100644 index 0000000000..38c3190a7d --- /dev/null +++ b/ApplicationCode/Commands/RicRangeFilterNewSliceJFeature.h @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2015- Statoil ASA +// Copyright (C) 2015- Ceetron Solutions AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + + +//================================================================================================== +/// +//================================================================================================== +class RicRangeFilterNewSliceJFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + // Overrides + virtual bool isCommandEnabled(); + virtual void onActionTriggered( bool isChecked ); + virtual void setupActionLook( QAction* actionToSetup ); +}; + + diff --git a/ApplicationCode/Commands/RicRangeFilterNewSliceK.h b/ApplicationCode/Commands/RicRangeFilterNewSliceK.h deleted file mode 100644 index 2a57a78809..0000000000 --- a/ApplicationCode/Commands/RicRangeFilterNewSliceK.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2015- Statoil ASA -// Copyright (C) 2015- Ceetron Solutions AS -// -// ResInsight is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "cafCmdFeature.h" - - -//================================================================================================== -/// -//================================================================================================== -class RicRangeFilterNewSliceK : public caf::CmdFeature -{ - CAF_CMD_HEADER_INIT; - -protected: - // Overrides - virtual bool isCommandEnabled(); - virtual void onActionTriggered( bool isChecked ); - virtual void setupActionLook( QAction* actionToSetup ); -}; - - diff --git a/ApplicationCode/Commands/RicRangeFilterNewSliceK.cpp b/ApplicationCode/Commands/RicRangeFilterNewSliceKFeature.cpp similarity index 77% rename from ApplicationCode/Commands/RicRangeFilterNewSliceK.cpp rename to ApplicationCode/Commands/RicRangeFilterNewSliceKFeature.cpp index 1b168ffe53..55ff414a53 100644 --- a/ApplicationCode/Commands/RicRangeFilterNewSliceK.cpp +++ b/ApplicationCode/Commands/RicRangeFilterNewSliceKFeature.cpp @@ -17,9 +17,9 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicRangeFilterNewSliceK.h" +#include "RicRangeFilterNewSliceKFeature.h" -#include "RicRangeFilterHelper.h" +#include "RicRangeFilterImpl.h" #include "RicRangeFilterNewExec.h" #include "RimCellRangeFilter.h" @@ -30,22 +30,22 @@ #include -CAF_CMD_SOURCE_INIT(RicRangeFilterNewSliceK, "RicRangeFilterNewSliceK"); +CAF_CMD_SOURCE_INIT(RicRangeFilterNewSliceKFeature, "RicRangeFilterNewSliceK"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicRangeFilterNewSliceK::isCommandEnabled() +bool RicRangeFilterNewSliceKFeature::isCommandEnabled() { - return RicRangeFilterHelper::isRangeFilterCommandAvailable(); + return RicRangeFilterImpl::isRangeFilterCommandAvailable(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicRangeFilterNewSliceK::onActionTriggered(bool isChecked) +void RicRangeFilterNewSliceKFeature::onActionTriggered(bool isChecked) { - RicRangeFilterNewExec* filterExec = RicRangeFilterHelper::createRangeFilterExecCommand(); + RicRangeFilterNewExec* filterExec = RicRangeFilterImpl::createRangeFilterExecCommand(); filterExec->m_kSlice = true; caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec); @@ -54,7 +54,7 @@ void RicRangeFilterNewSliceK::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicRangeFilterNewSliceK::setupActionLook(QAction* actionToSetup) +void RicRangeFilterNewSliceKFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("New K-slice range filter"); } diff --git a/ApplicationCode/Commands/RicRangeFilterNewSliceKFeature.h b/ApplicationCode/Commands/RicRangeFilterNewSliceKFeature.h new file mode 100644 index 0000000000..4bcbc28ec2 --- /dev/null +++ b/ApplicationCode/Commands/RicRangeFilterNewSliceKFeature.h @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2015- Statoil ASA +// Copyright (C) 2015- Ceetron Solutions AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + + +//================================================================================================== +/// +//================================================================================================== +class RicRangeFilterNewSliceKFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + // Overrides + virtual bool isCommandEnabled(); + virtual void onActionTriggered( bool isChecked ); + virtual void setupActionLook( QAction* actionToSetup ); +}; + + diff --git a/ApplicationCode/Commands/RicSaveEclipseResultAsInputProperty.h b/ApplicationCode/Commands/RicSaveEclipseResultAsInputProperty.h deleted file mode 100644 index 3c8403f79b..0000000000 --- a/ApplicationCode/Commands/RicSaveEclipseResultAsInputProperty.h +++ /dev/null @@ -1,39 +0,0 @@ -///////////////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2015- Statoil ASA -// Copyright (C) 2015- Ceetron Solutions AS -// -// ResInsight is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at -// for more details. -// -///////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "cafCmdFeature.h" - - -//================================================================================================== -/// -//================================================================================================== -class RicSaveEclipseResultAsInputProperty : public caf::CmdFeature -{ - CAF_CMD_HEADER_INIT; - -protected: - // Overrides - virtual bool isCommandEnabled(); - virtual void onActionTriggered( bool isChecked ); - virtual void setupActionLook( QAction* actionToSetup ); -}; - - diff --git a/ApplicationCode/Commands/RicSaveEclipseResultAsInputProperty.cpp b/ApplicationCode/Commands/RicSaveEclipseResultAsInputPropertyFeature.cpp similarity index 84% rename from ApplicationCode/Commands/RicSaveEclipseResultAsInputProperty.cpp rename to ApplicationCode/Commands/RicSaveEclipseResultAsInputPropertyFeature.cpp index 71a4284474..4dadc0e378 100644 --- a/ApplicationCode/Commands/RicSaveEclipseResultAsInputProperty.cpp +++ b/ApplicationCode/Commands/RicSaveEclipseResultAsInputPropertyFeature.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicSaveEclipseResultAsInputProperty.h" +#include "RicSaveEclipseResultAsInputPropertyFeature.h" #include "RicSaveEclipseResultAsInputPropertyExec.h" @@ -29,12 +29,12 @@ #include -CAF_CMD_SOURCE_INIT(RicSaveEclipseResultAsInputProperty, "RicSaveEclipseResultAsInputProperty"); +CAF_CMD_SOURCE_INIT(RicSaveEclipseResultAsInputPropertyFeature, "RicSaveEclipseResultAsInputProperty"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicSaveEclipseResultAsInputProperty::isCommandEnabled() +bool RicSaveEclipseResultAsInputPropertyFeature::isCommandEnabled() { std::vector selection; caf::SelectionManager::instance()->objectsByType(&selection); @@ -45,7 +45,7 @@ bool RicSaveEclipseResultAsInputProperty::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicSaveEclipseResultAsInputProperty::onActionTriggered(bool isChecked) +void RicSaveEclipseResultAsInputPropertyFeature::onActionTriggered(bool isChecked) { std::vector selection; caf::SelectionManager::instance()->objectsByType(&selection); @@ -59,7 +59,7 @@ void RicSaveEclipseResultAsInputProperty::onActionTriggered(bool isChecked) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicSaveEclipseResultAsInputProperty::setupActionLook(QAction* actionToSetup) +void RicSaveEclipseResultAsInputPropertyFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("Save Property To File"); } diff --git a/ApplicationCode/Commands/RicSaveEclipseResultAsInputPropertyFeature.h b/ApplicationCode/Commands/RicSaveEclipseResultAsInputPropertyFeature.h new file mode 100644 index 0000000000..da7977fb04 --- /dev/null +++ b/ApplicationCode/Commands/RicSaveEclipseResultAsInputPropertyFeature.h @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2015- Statoil ASA +// Copyright (C) 2015- Ceetron Solutions AS +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + + +//================================================================================================== +/// +//================================================================================================== +class RicSaveEclipseResultAsInputPropertyFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + // Overrides + virtual bool isCommandEnabled(); + virtual void onActionTriggered( bool isChecked ); + virtual void setupActionLook( QAction* actionToSetup ); +}; + +