(#366) Renamed command classes and files

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}RicEclipseCaseCloseFeature.h
-${CEE_CURRENT_LIST_DIR}RicEclipseCaseExecuteScript.h
+${CEE_CURRENT_LIST_DIR}RicEclipseCaseExecuteScriptFeature.h
-${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroup.h
+${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.h
 ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.h
-${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewView.h
+${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewViewFeature.h
-${CEE_CURRENT_LIST_DIR}RicEclipseCasePaste.h
+${CEE_CURRENT_LIST_DIR}RicEclipseCasePasteFeature.h
-${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilter.h
+${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterImpl.h
-${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsert.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}RicEclipsePropertyFilterImpl.h
-${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsert.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}RicEclipseViewDeleteFeature.h
-${CEE_CURRENT_LIST_DIR}RicEclipseViewNew.h
+${CEE_CURRENT_LIST_DIR}RicEclipseViewNewFeature.h
-${CEE_CURRENT_LIST_DIR}RicEclipseViewPaste.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}RicRangeFilterInsertFeature.h
-${CEE_CURRENT_LIST_DIR}RicRangeFilterNew.h
+${CEE_CURRENT_LIST_DIR}RicRangeFilterNewFeature.h
-${CEE_CURRENT_LIST_DIR}RicRangeFilterHelper.h
+${CEE_CURRENT_LIST_DIR}RicRangeFilterImpl.h
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewExec.h
-${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceI.h
+${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceIFeature.h
-${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJ.h
+${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJFeature.h
-${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceK.h
+${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceKFeature.h
-${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputProperty.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}RicEclipseCaseCloseFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicEclipseCaseExecuteScript.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipseCaseExecuteScriptFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroup.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.cpp
-${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewView.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewViewFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicEclipseCasePaste.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipseCasePasteFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilter.cpp
+${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterImpl.cpp
-${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsert.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}RicEclipsePropertyFilterImpl.cpp
-${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsert.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}RicEclipseViewDeleteFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicEclipseViewNew.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipseViewNewFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicEclipseViewPaste.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}RicRangeFilterInsertFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicRangeFilterNew.cpp
+${CEE_CURRENT_LIST_DIR}RicRangeFilterNewFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicRangeFilterHelper.cpp
+${CEE_CURRENT_LIST_DIR}RicRangeFilterImpl.cpp
 ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewExec.cpp
-${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceI.cpp
+${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceIFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJ.cpp
+${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceK.cpp
+${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceKFeature.cpp
-${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputProperty.cpp
+${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.cpp
 
 ${CEE_CURRENT_LIST_DIR}RicWellPathsImportSsihubFeature.cpp

ApplicationCode/Commands/RicEclipseCaseCloseFeature.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicEclipseCaseClose.h"
+#include "RicEclipseCaseCloseFeature.h"
 
 #include "RimCase.h"
 
@@ -25,12 +25,12 @@
 
 #include <QAction>
 
-CAF_CMD_SOURCE_INIT(RicEclipseCaseClose, "RicEclipseCaseClose");
+CAF_CMD_SOURCE_INIT(RicEclipseCaseCloseFeature, "RicEclipseCaseClose");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicEclipseCaseClose::isCommandEnabled()
+bool RicEclipseCaseCloseFeature::isCommandEnabled()
 {
     std::vector<RimCase*> 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");
 }

ApplicationCode/Commands/RicEclipseCaseCloseFeature.h

@@ -25,7 +25,7 @@
 //==================================================================================================
 /// 
 //==================================================================================================
-class RicEclipseCaseNewGroup : public caf::CmdFeature
+class RicEclipseCaseCloseFeature : public caf::CmdFeature
 {
     CAF_CMD_HEADER_INIT;
 

ApplicationCode/Commands/RicEclipseCaseExecuteScriptFeature.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicEclipseCaseExecuteScript.h"
+#include "RicEclipseCaseExecuteScriptFeature.h"
 
 #include "RimCase.h"
 
@@ -25,12 +25,12 @@
 
 #include <QAction>
 
-CAF_CMD_SOURCE_INIT(RicEclipseCaseExecuteScript, "RicEclipseCaseExecuteScript");
+CAF_CMD_SOURCE_INIT(RicEclipseCaseExecuteScriptFeature, "RicEclipseCaseExecuteScript");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicEclipseCaseExecuteScript::isCommandEnabled()
+bool RicEclipseCaseExecuteScriptFeature::isCommandEnabled()
 {
     std::vector<RimCase*> 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");
 }

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 <http://www.gnu.org/licenses/gpl.html> 
+//  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 );
+};
+
+

ApplicationCode/Commands/RicEclipseCaseNewGroupFeature.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicEclipseCaseNewGroup.h"
+#include "RicEclipseCaseNewGroupFeature.h"
 
 #include "RicEclipseCaseNewGroupExec.h"
 
@@ -28,12 +28,12 @@
 
 #include <QAction>
 
-CAF_CMD_SOURCE_INIT(RicEclipseCaseNewGroup, "RicEclipseCaseNewGroup");
+CAF_CMD_SOURCE_INIT(RicEclipseCaseNewGroupFeature, "RicEclipseCaseNewGroup");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicEclipseCaseNewGroup::isCommandEnabled()
+bool RicEclipseCaseNewGroupFeature::isCommandEnabled()
 {
     std::vector<RimCase*> 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");
 }

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 <http://www.gnu.org/licenses/gpl.html> 
+//  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 );
+};
+
+

ApplicationCode/Commands/RicEclipseCaseNewViewFeature.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicEclipseCaseNewView.h"
+#include "RicEclipseCaseNewViewFeature.h"
 
 #include "RimCase.h"
 
@@ -25,12 +25,12 @@
 
 #include <QAction>
 
-CAF_CMD_SOURCE_INIT(RicEclipseCaseNewView, "RicEclipseCaseNewView");
+CAF_CMD_SOURCE_INIT(RicEclipseCaseNewViewFeature, "RicEclipseCaseNewView");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicEclipseCaseNewView::isCommandEnabled()
+bool RicEclipseCaseNewViewFeature::isCommandEnabled()
 {
     std::vector<RimCase*> 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");
 }

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 <http://www.gnu.org/licenses/gpl.html> 
+//  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 );
+};
+
+

ApplicationCode/Commands/RicEclipseCasePasteFeature.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicEclipseCasePaste.h"
+#include "RicEclipseCasePasteFeature.h"
 
 #include "RimCase.h"
 
@@ -25,12 +25,12 @@
 
 #include <QAction>
 
-CAF_CMD_SOURCE_INIT(RicEclipseCasePaste, "RicEclipseCasePaste");
+CAF_CMD_SOURCE_INIT(RicEclipseCasePasteFeature, "RicEclipseCasePaste");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicEclipseCasePaste::isCommandEnabled()
+bool RicEclipseCasePasteFeature::isCommandEnabled()
 {
     std::vector<RimCase*> 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");
 }

ApplicationCode/Commands/RicEclipseCasePasteFeature.h

@@ -25,7 +25,7 @@
 //==================================================================================================
 /// 
 //==================================================================================================
-class RicEclipseCasePaste : public caf::CmdFeature
+class RicEclipseCasePasteFeature : public caf::CmdFeature
 {
     CAF_CMD_HEADER_INIT;
 

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<RimEclipsePropertyFilter*> RicEclipsePropertyFilter::selectedPropertyFilters()
+std::vector<RimEclipsePropertyFilter*> RicEclipsePropertyFilterImpl::selectedPropertyFilters()
 {
     std::vector<RimEclipsePropertyFilter*> propertyFilters;
     caf::SelectionManager::instance()->objectsByType(&propertyFilters);
@@ -44,7 +44,7 @@ std::vector<RimEclipsePropertyFilter*> RicEclipsePropertyFilter::selectedPropert
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::vector<RimEclipsePropertyFilterCollection*> RicEclipsePropertyFilter::selectedPropertyFilterCollections()
+std::vector<RimEclipsePropertyFilterCollection*> RicEclipsePropertyFilterImpl::selectedPropertyFilterCollections()
 {
     std::vector<RimEclipsePropertyFilterCollection*> propertyFilterCollections;
     caf::SelectionManager::instance()->objectsByType(&propertyFilterCollections);
@@ -55,7 +55,7 @@ std::vector<RimEclipsePropertyFilterCollection*> 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);
 

ApplicationCode/Commands/RicEclipsePropertyFilterImpl.h

@@ -27,7 +27,7 @@ class RimEclipsePropertyFilterCollection;
 //==================================================================================================
 /// 
 //==================================================================================================
-class RicEclipsePropertyFilter
+class RicEclipsePropertyFilterImpl
 {
 public:
     static std::vector<RimEclipsePropertyFilter*>              selectedPropertyFilters();

ApplicationCode/Commands/RicEclipsePropertyFilterInsert.h

@@ -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 <http://www.gnu.org/licenses/gpl.html> 
-//  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 );
-};
-
-

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);
 }
 
 //--------------------------------------------------------------------------------------------------

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 <vector>
 
-CAF_CMD_SOURCE_INIT(RicEclipsePropertyFilterInsert, "RicEclipsePropertyFilterInsert");
+CAF_CMD_SOURCE_INIT(RicEclipsePropertyFilterInsertFeature, "RicEclipsePropertyFilterInsert");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicEclipsePropertyFilterInsert::isCommandEnabled()
+bool RicEclipsePropertyFilterInsertFeature::isCommandEnabled()
 {
-    std::vector<RimEclipsePropertyFilter*> propertyFilters = RicEclipsePropertyFilter::selectedPropertyFilters();
+    std::vector<RimEclipsePropertyFilter*> propertyFilters = RicEclipsePropertyFilterImpl::selectedPropertyFilters();
     return propertyFilters.size() == 1;
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicEclipsePropertyFilterInsert::onActionTriggered(bool isChecked)
+void RicEclipsePropertyFilterInsertFeature::onActionTriggered(bool isChecked)
 {
-    std::vector<RimEclipsePropertyFilter*> propertyFilters = RicEclipsePropertyFilter::selectedPropertyFilters();
+    std::vector<RimEclipsePropertyFilter*> 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");
 }

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 <http://www.gnu.org/licenses/gpl.html> 
+//  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 );
+};
+
+

ApplicationCode/Commands/RicEclipsePropertyFilterNew.h

@@ -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 <http://www.gnu.org/licenses/gpl.html> 
-//  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 );
-};
-
-

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);
 }
 
 //--------------------------------------------------------------------------------------------------

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 <QAction>
 
-CAF_CMD_SOURCE_INIT(RicEclipsePropertyFilterNew, "RicEclipsePropertyFilterNew");
+CAF_CMD_SOURCE_INIT(RicEclipsePropertyFilterNewFeature, "RicEclipsePropertyFilterNew");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicEclipsePropertyFilterNew::isCommandEnabled()
+bool RicEclipsePropertyFilterNewFeature::isCommandEnabled()
 {
-    std::vector<RimEclipsePropertyFilterCollection*> filterCollections = RicEclipsePropertyFilter::selectedPropertyFilterCollections();
+    std::vector<RimEclipsePropertyFilterCollection*> filterCollections = RicEclipsePropertyFilterImpl::selectedPropertyFilterCollections();
     return filterCollections.size() == 1;
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicEclipsePropertyFilterNew::onActionTriggered(bool isChecked)
+void RicEclipsePropertyFilterNewFeature::onActionTriggered(bool isChecked)
 {
-    std::vector<RimEclipsePropertyFilterCollection*> filterCollections = RicEclipsePropertyFilter::selectedPropertyFilterCollections();
+    std::vector<RimEclipsePropertyFilterCollection*> 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");

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 <http://www.gnu.org/licenses/gpl.html> 
+//  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 );
+};
+
+

ApplicationCode/Commands/RicEclipseViewDelete.cpp

@@ -25,12 +25,12 @@
 
 #include <QAction>
 
-CAF_CMD_SOURCE_INIT(RicEclipseViewDelete, "RicEclipseViewDelete");
+CAF_CMD_SOURCE_INIT(RicEclipseViewDeleteFeature, "RicEclipseViewDelete");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicEclipseViewDelete::isCommandEnabled()
+bool RicEclipseViewDeleteFeature::isCommandEnabled()
 {
     std::vector<RimEclipseView*> 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");
 }

ApplicationCode/Commands/RicEclipseViewDelete.h

@@ -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 <http://www.gnu.org/licenses/gpl.html> 
-//  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 );
-};
-
-

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 <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RicEclipseViewDeleteFeature.h"
+
+#include "RimEclipseView.h"
+
+#include "cafSelectionManager.h"
+
+#include <QAction>
+
+CAF_CMD_SOURCE_INIT(RicEclipseViewDeleteFeature, "RicEclipseViewDelete");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicEclipseViewDeleteFeature::isCommandEnabled()
+{
+    std::vector<RimEclipseView*> 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");
+}

ApplicationCode/Commands/RicEclipseViewDeleteFeature.h

@@ -25,7 +25,7 @@
 //==================================================================================================
 /// 
 //==================================================================================================
-class RicEclipseCaseExecuteScript : public caf::CmdFeature
+class RicEclipseViewDeleteFeature : public caf::CmdFeature
 {
     CAF_CMD_HEADER_INIT;
 

ApplicationCode/Commands/RicEclipseViewNew.h

@@ -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 <http://www.gnu.org/licenses/gpl.html> 
-//  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 );
-};
-
-

ApplicationCode/Commands/RicEclipseViewNewFeature.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicEclipseViewNew.h"
+#include "RicEclipseViewNewFeature.h"
 
 #include "RimEclipseView.h"
 
@@ -25,12 +25,12 @@
 
 #include <QAction>
 
-CAF_CMD_SOURCE_INIT(RicEclipseViewNew, "RicEclipseViewNew");
+CAF_CMD_SOURCE_INIT(RicEclipseViewNewFeature, "RicEclipseViewNew");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicEclipseViewNew::isCommandEnabled()
+bool RicEclipseViewNewFeature::isCommandEnabled()
 {
     std::vector<RimEclipseView*> 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");
 }

ApplicationCode/Commands/RicEclipseViewNewFeature.h

@@ -25,7 +25,7 @@
 //==================================================================================================
 /// 
 //==================================================================================================
-class RicEclipseCaseNewView : public caf::CmdFeature
+class RicEclipseViewNewFeature : public caf::CmdFeature
 {
     CAF_CMD_HEADER_INIT;
 

ApplicationCode/Commands/RicEclipseViewPaste.h

@@ -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 <http://www.gnu.org/licenses/gpl.html> 
-//  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 );
-};
-
-

ApplicationCode/Commands/RicEclipseViewPasteFeature.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicEclipseViewPaste.h"
+#include "RicEclipseViewPasteFeature.h"
 
 #include "RimEclipseView.h"
 
@@ -25,12 +25,12 @@
 
 #include <QAction>
 
-CAF_CMD_SOURCE_INIT(RicEclipseViewPaste, "RicEclipseViewPaste");
+CAF_CMD_SOURCE_INIT(RicEclipseViewPasteFeature, "RicEclipseViewPaste");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicEclipseViewPaste::isCommandEnabled()
+bool RicEclipseViewPasteFeature::isCommandEnabled()
 {
     std::vector<RimEclipseView*> 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");
 }

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 <http://www.gnu.org/licenses/gpl.html> 
+//  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 );
+};
+
+

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<RimGeoMechPropertyFilter*> RicGeoMechPropertyFilter::selectedPropertyFilters()
+std::vector<RimGeoMechPropertyFilter*> RicGeoMechPropertyFilterImpl::selectedPropertyFilters()
 {
     std::vector<RimGeoMechPropertyFilter*> propertyFilters;
     caf::SelectionManager::instance()->objectsByType(&propertyFilters);
@@ -44,7 +44,7 @@ std::vector<RimGeoMechPropertyFilter*> RicGeoMechPropertyFilter::selectedPropert
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::vector<RimGeoMechPropertyFilterCollection*> RicGeoMechPropertyFilter::selectedPropertyFilterCollections()
+std::vector<RimGeoMechPropertyFilterCollection*> RicGeoMechPropertyFilterImpl::selectedPropertyFilterCollections()
 {
     std::vector<RimGeoMechPropertyFilterCollection*> propertyFilterCollections;
     caf::SelectionManager::instance()->objectsByType(&propertyFilterCollections);
@@ -55,7 +55,7 @@ std::vector<RimGeoMechPropertyFilterCollection*> 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);
 

ApplicationCode/Commands/RicGeoMechPropertyFilterImpl.h

@@ -27,7 +27,7 @@ class RimGeoMechPropertyFilterCollection;
 //==================================================================================================
 /// 
 //==================================================================================================
-class RicGeoMechPropertyFilter
+class RicGeoMechPropertyFilterImpl
 {
 public:
     static std::vector<RimGeoMechPropertyFilter*>              selectedPropertyFilters();

ApplicationCode/Commands/RicGeoMechPropertyFilterInsert.h

@@ -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 <http://www.gnu.org/licenses/gpl.html> 
-//  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 );
-};
-
-

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);
 }
 
 //--------------------------------------------------------------------------------------------------

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 <vector>
 
-CAF_CMD_SOURCE_INIT(RicGeoMechPropertyFilterInsert, "RicGeoMechPropertyFilterInsert");
+CAF_CMD_SOURCE_INIT(RicGeoMechPropertyFilterInsertFeature, "RicGeoMechPropertyFilterInsert");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicGeoMechPropertyFilterInsert::isCommandEnabled()
+bool RicGeoMechPropertyFilterInsertFeature::isCommandEnabled()
 {
-    std::vector<RimGeoMechPropertyFilter*> propertyFilters = RicGeoMechPropertyFilter::selectedPropertyFilters();
+    std::vector<RimGeoMechPropertyFilter*> propertyFilters = RicGeoMechPropertyFilterImpl::selectedPropertyFilters();
     return propertyFilters.size() == 1;
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicGeoMechPropertyFilterInsert::onActionTriggered(bool isChecked)
+void RicGeoMechPropertyFilterInsertFeature::onActionTriggered(bool isChecked)
 {
-    std::vector<RimGeoMechPropertyFilter*> propertyFilters = RicGeoMechPropertyFilter::selectedPropertyFilters();
+    std::vector<RimGeoMechPropertyFilter*> 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");
 }

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 <http://www.gnu.org/licenses/gpl.html> 
+//  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 );
+};
+
+

ApplicationCode/Commands/RicGeoMechPropertyFilterNew.h

@@ -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 <http://www.gnu.org/licenses/gpl.html> 
-//  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 );
-};
-
-

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);
 }
 
 //--------------------------------------------------------------------------------------------------

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 <QAction>
 
-CAF_CMD_SOURCE_INIT(RicGeoMechPropertyFilterNew, "RicGeoMechPropertyFilterNew");
+CAF_CMD_SOURCE_INIT(RicGeoMechPropertyFilterNewFeature, "RicGeoMechPropertyFilterNew");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicGeoMechPropertyFilterNew::isCommandEnabled()
+bool RicGeoMechPropertyFilterNewFeature::isCommandEnabled()
 {
-    std::vector<RimGeoMechPropertyFilterCollection*> filterCollections = RicGeoMechPropertyFilter::selectedPropertyFilterCollections();
+    std::vector<RimGeoMechPropertyFilterCollection*> filterCollections = RicGeoMechPropertyFilterImpl::selectedPropertyFilterCollections();
     return filterCollections.size() == 1;
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RicGeoMechPropertyFilterNew::onActionTriggered(bool isChecked)
+void RicGeoMechPropertyFilterNewFeature::onActionTriggered(bool isChecked)
 {
-    std::vector<RimGeoMechPropertyFilterCollection*> filterCollections = RicGeoMechPropertyFilter::selectedPropertyFilterCollections();
+    std::vector<RimGeoMechPropertyFilterCollection*> 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");

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 <http://www.gnu.org/licenses/gpl.html> 
+//  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 );
+};
+
+

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;
     

ApplicationCode/Commands/RicRangeFilterImpl.h

@@ -25,7 +25,7 @@ class RimCellRangeFilterCollection;
 //==================================================================================================
 /// 
 //==================================================================================================
-class RicRangeFilterHelper
+class RicRangeFilterImpl
 {
 public:
     static bool isRangeFilterCommandAvailable();

ApplicationCode/Commands/RicRangeFilterInsert.h

@@ -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 <http://www.gnu.org/licenses/gpl.html> 
-//  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 );
-};
-
-

ApplicationCode/Commands/RicRangeFilterInsertFeature.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicRangeFilterInsert.h"
+#include "RicRangeFilterInsertFeature.h"
 
 #include "RimCellRangeFilter.h"
 
@@ -28,12 +28,12 @@
 
 #include <QAction>
 
-CAF_CMD_SOURCE_INIT(RicRangeFilterInsert, "RicRangeFilterInsert");
+CAF_CMD_SOURCE_INIT(RicRangeFilterInsertFeature, "RicRangeFilterInsert");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicRangeFilterInsert::isCommandEnabled()
+bool RicRangeFilterInsertFeature::isCommandEnabled()
 {
     std::vector<RimCellRangeFilter*> 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");
 }

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 <http://www.gnu.org/licenses/gpl.html> 
+//  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 );
+};
+
+

ApplicationCode/Commands/RicRangeFilterNew.h

@@ -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 <http://www.gnu.org/licenses/gpl.html> 
-//  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 );
-};
-
-

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 <QAction>
 
 
-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");

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;
 

ApplicationCode/Commands/RicRangeFilterNewSliceI.h

@@ -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 <http://www.gnu.org/licenses/gpl.html> 
-//  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 );
-};
-
-

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 <QAction>
 
 
-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");
 }

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 <http://www.gnu.org/licenses/gpl.html> 
+//  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 );
+};
+
+

ApplicationCode/Commands/RicRangeFilterNewSliceJ.h

@@ -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 <http://www.gnu.org/licenses/gpl.html> 
-//  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 );
-};
-
-

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 <QAction>
 
-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");
 }

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 <http://www.gnu.org/licenses/gpl.html> 
+//  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 );
+};
+
+

ApplicationCode/Commands/RicRangeFilterNewSliceK.h

@@ -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 <http://www.gnu.org/licenses/gpl.html> 
-//  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 );
-};
-
-

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 <QAction>
 
-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");
 }

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 <http://www.gnu.org/licenses/gpl.html> 
+//  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 );
+};
+
+

ApplicationCode/Commands/RicSaveEclipseResultAsInputProperty.h

@@ -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 <http://www.gnu.org/licenses/gpl.html> 
-//  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 );
-};
-
-

ApplicationCode/Commands/RicSaveEclipseResultAsInputPropertyFeature.cpp

@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicSaveEclipseResultAsInputProperty.h"
+#include "RicSaveEclipseResultAsInputPropertyFeature.h"
 
 #include "RicSaveEclipseResultAsInputPropertyExec.h"
 
@@ -29,12 +29,12 @@
 
 #include <QAction>
 
-CAF_CMD_SOURCE_INIT(RicSaveEclipseResultAsInputProperty, "RicSaveEclipseResultAsInputProperty");
+CAF_CMD_SOURCE_INIT(RicSaveEclipseResultAsInputPropertyFeature, "RicSaveEclipseResultAsInputProperty");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RicSaveEclipseResultAsInputProperty::isCommandEnabled()
+bool RicSaveEclipseResultAsInputPropertyFeature::isCommandEnabled()
 {
     std::vector<RimEclipseCellColors*> 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<RimEclipseCellColors*> 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");
 }

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 <http://www.gnu.org/licenses/gpl.html> 
+//  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 );
+};
+
+