Rename to RimAdvancedSnapshotExportDefinition

ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

@@ -88,7 +88,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimContextCommandBuilder.h
 ${CMAKE_CURRENT_LIST_DIR}/RimGridCollection.h
 ${CMAKE_CURRENT_LIST_DIR}/RimPlotCurve.h
 ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionBox.h
-${CMAKE_CURRENT_LIST_DIR}/RimMultiSnapshotDefinition.h
+${CMAKE_CURRENT_LIST_DIR}/RimAdvancedSnapshotExportDefinition.h
 ${CMAKE_CURRENT_LIST_DIR}/RimMdiWindowController.h
 ${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilter.h
 ${CMAKE_CURRENT_LIST_DIR}/RimNamedObject.h
@@ -222,7 +222,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimContextCommandBuilder.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimGridCollection.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimPlotCurve.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimIntersectionBox.cpp
-${CMAKE_CURRENT_LIST_DIR}/RimMultiSnapshotDefinition.cpp
+${CMAKE_CURRENT_LIST_DIR}/RimAdvancedSnapshotExportDefinition.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimMdiWindowController.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilter.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RimNamedObject.cpp

ApplicationCode/ProjectDataModel/RimAdvancedSnapshotExportDefinition.cpp

@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimMultiSnapshotDefinition.h"
+#include "RimAdvancedSnapshotExportDefinition.h"
 
 #include "RiaApplication.h"
 #include "RiaOptionItemFactory.h"
@@ -39,23 +39,23 @@
 namespace caf
 {
     template<>
-    void caf::AppEnum< RimMultiSnapshotDefinition::SnapShotDirectionEnum >::setUp()
+    void caf::AppEnum< RimAdvancedSnapshotExportDefinition::SnapShotDirectionEnum >::setUp()
     {
-        addItem(RimMultiSnapshotDefinition::NO_RANGEFILTER, "None", "None");
-        addItem(RimMultiSnapshotDefinition::RANGEFILTER_I, "I", "I");
-        addItem(RimMultiSnapshotDefinition::RANGEFILTER_J, "J", "J");
-        addItem(RimMultiSnapshotDefinition::RANGEFILTER_K, "K", "K");
+        addItem(RimAdvancedSnapshotExportDefinition::NO_RANGEFILTER, "None", "None");
+        addItem(RimAdvancedSnapshotExportDefinition::RANGEFILTER_I, "I", "I");
+        addItem(RimAdvancedSnapshotExportDefinition::RANGEFILTER_J, "J", "J");
+        addItem(RimAdvancedSnapshotExportDefinition::RANGEFILTER_K, "K", "K");
 
-        setDefault(RimMultiSnapshotDefinition::RANGEFILTER_K);
+        setDefault(RimAdvancedSnapshotExportDefinition::RANGEFILTER_K);
     }
 }
 
-CAF_PDM_SOURCE_INIT(RimMultiSnapshotDefinition, "MultiSnapshotDefinition");
+CAF_PDM_SOURCE_INIT(RimAdvancedSnapshotExportDefinition, "MultiSnapshotDefinition");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimMultiSnapshotDefinition::RimMultiSnapshotDefinition()
+RimAdvancedSnapshotExportDefinition::RimAdvancedSnapshotExportDefinition()
 {
     //CAF_PDM_InitObject("MultiSnapshotDefinition", ":/Well.png", "", "");
     CAF_PDM_InitObject("MultiSnapshotDefinition", "", "", "");
@@ -82,12 +82,12 @@ RimMultiSnapshotDefinition::RimMultiSnapshotDefinition()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimMultiSnapshotDefinition::~RimMultiSnapshotDefinition() {}
+RimAdvancedSnapshotExportDefinition::~RimAdvancedSnapshotExportDefinition() {}
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
+QList<caf::PdmOptionItemInfo> RimAdvancedSnapshotExportDefinition::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
                                                                                 bool*                      useOptionsOnly)
 {
     QList<caf::PdmOptionItemInfo> options;
@@ -154,7 +154,7 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimMultiSnapshotDefinition::getTimeStepStrings(QList<caf::PdmOptionItemInfo>& options)
+void RimAdvancedSnapshotExportDefinition::getTimeStepStrings(QList<caf::PdmOptionItemInfo>& options)
 {
     if (!view()) return;
 
@@ -171,7 +171,7 @@ void RimMultiSnapshotDefinition::getTimeStepStrings(QList<caf::PdmOptionItemInfo
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimMultiSnapshotDefinition::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
+void RimAdvancedSnapshotExportDefinition::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
                                                   const QVariant&            oldValue,
                                                   const QVariant&            newValue)
 {
@@ -211,17 +211,17 @@ void RimMultiSnapshotDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
             int maxInt = 0;
             int minInt = 0;
 
-            if (newValue == RimMultiSnapshotDefinition::RANGEFILTER_I)
+            if (newValue == RimAdvancedSnapshotExportDefinition::RANGEFILTER_I)
             {
                 maxInt = static_cast<int>(max.x());
                 minInt = static_cast<int>(min.x());
             }
-            else if (newValue == RimMultiSnapshotDefinition::RANGEFILTER_J)
+            else if (newValue == RimAdvancedSnapshotExportDefinition::RANGEFILTER_J)
             {
                 maxInt = static_cast<int>(max.y());
                 minInt = static_cast<int>(min.y());
             }
-            else if (newValue == RimMultiSnapshotDefinition::RANGEFILTER_K)
+            else if (newValue == RimAdvancedSnapshotExportDefinition::RANGEFILTER_K)
             {
                 maxInt = static_cast<int>(max.z());
                 minInt = static_cast<int>(min.z());
@@ -238,7 +238,7 @@ void RimMultiSnapshotDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::toOptionList(const QStringList& varList)
+QList<caf::PdmOptionItemInfo> RimAdvancedSnapshotExportDefinition::toOptionList(const QStringList& varList)
 {
     QList<caf::PdmOptionItemInfo> optionList;
     int                           i;
@@ -252,7 +252,7 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::toOptionList(const QSt
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimMultiSnapshotDefinition::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+void RimAdvancedSnapshotExportDefinition::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
     if (!isActive())
     {

ApplicationCode/ProjectDataModel/RimAdvancedSnapshotExportDefinition.h

@@ -33,12 +33,12 @@ class Rim3dView;
 ///  
 ///  
 //==================================================================================================
-class RimMultiSnapshotDefinition : public caf::PdmObject
+class RimAdvancedSnapshotExportDefinition : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
 public:
-    RimMultiSnapshotDefinition();
-    ~RimMultiSnapshotDefinition() override;
+    RimAdvancedSnapshotExportDefinition();
+    ~RimAdvancedSnapshotExportDefinition() override;
 
     caf::PdmField<bool>      isActive;
 

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -58,7 +58,7 @@
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimMainPlotCollection.h"
 #include "RimMeasurement.h"
-#include "RimMultiSnapshotDefinition.h"
+#include "RimAdvancedSnapshotExportDefinition.h"
 #include "RimObservedDataCollection.h"
 #include "RimOilField.h"
 #include "RimPltPlotCollection.h"

ApplicationCode/ProjectDataModel/RimProject.h

@@ -48,7 +48,7 @@ class RimGeoMechCase;
 class RimIdenticalGridCaseGroup;
 class RimMainPlotCollection;
 class RimMeasurement;
-class RimMultiSnapshotDefinition; 
+class RimAdvancedSnapshotExportDefinition; 
 class RimObservedData;
 class RimOilField;
 class RimScriptCollection;
@@ -96,7 +96,7 @@ public:
     caf::PdmChildField<RimSummaryCalculationCollection*>       calculationCollection;
     caf::PdmChildArrayField<RimCommandObject*>          commandObjects;
     
-    caf::PdmChildArrayField<RimMultiSnapshotDefinition*> multiSnapshotDefinitions;
+    caf::PdmChildArrayField<RimAdvancedSnapshotExportDefinition*> multiSnapshotDefinitions;
 
     caf::PdmField<QString>                              mainWindowTreeViewState;
     caf::PdmField<QString>                              mainWindowCurrentModelIndexPath;