#1018 Snapshot - Added support for multiple result variables

ApplicationCode/ProjectDataModel/RimEclipseCase.cpp

@@ -156,19 +156,44 @@ void RimEclipseCase::initAfterRead()
 //--------------------------------------------------------------------------------------------------
 RimEclipseView* RimEclipseCase::createAndAddReservoirView()
 {
-    RimEclipseView* riv = new RimEclipseView();
-    riv->setEclipseCase(this);
-    riv->cellEdgeResult()->setResultVariable("MULT");
-    riv->cellEdgeResult()->enableCellEdgeColors = false;
+    RimEclipseView* rimEclipseView = new RimEclipseView();
+    rimEclipseView->setEclipseCase(this);
+    rimEclipseView->cellEdgeResult()->setResultVariable("MULT");
+    rimEclipseView->cellEdgeResult()->enableCellEdgeColors = false;
 
-    caf::PdmDocument::updateUiIconStateRecursively(riv);
+    caf::PdmDocument::updateUiIconStateRecursively(rimEclipseView);
 
     size_t i = reservoirViews().size();
-    riv->name = QString("View %1").arg(i + 1);
+    rimEclipseView->name = QString("View %1").arg(i + 1);
 
-    reservoirViews().push_back(riv);
+    reservoirViews().push_back(rimEclipseView);
 
-    return riv;
+    return rimEclipseView;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimEclipseView* RimEclipseCase::createCopyAndAddView(const RimEclipseView* sourceView)
+{
+    CVF_ASSERT(sourceView);
+
+    RimEclipseView* rimEclipseView = dynamic_cast<RimEclipseView*>(sourceView->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
+    CVF_ASSERT(rimEclipseView);
+
+    rimEclipseView->setEclipseCase(this);
+   
+    caf::PdmDocument::updateUiIconStateRecursively(rimEclipseView);
+
+    reservoirViews().push_back(rimEclipseView);
+
+    // Resolve references after reservoir view has been inserted into Rim structures
+    // Intersections referencing a well path/ simulation well requires this
+    // TODO: initAfterReadRecursively can probably be removed
+    rimEclipseView->initAfterReadRecursively();
+    rimEclipseView->resolveReferencesRecursively();
+
+    return rimEclipseView;
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimEclipseCase.h

@@ -74,6 +74,7 @@ public:
     RimReservoirCellResultsStorage*             results(RifReaderInterface::PorosityModelResultType porosityModel);
                                                       
     RimEclipseView*                             createAndAddReservoirView();
+    RimEclipseView*                             createCopyAndAddView(const RimEclipseView* sourceView);
 
     void                                        removeResult(const QString& resultName);
 

ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp

@@ -21,10 +21,13 @@
 #include "RiaApplication.h"
 
 #include "RigActiveCellInfo.h"
+#include "RigCaseCellResultsData.h"
 
 #include "RimCase.h"
 #include "RimCellRangeFilterCollection.h"
+#include "RimEclipseView.h"
 #include "RimProject.h"
+#include "RimReservoirCellResultsStorage.h"
 #include "RimView.h"
 
 #include "cafPdmPointer.h"
@@ -54,6 +57,10 @@ RimMultiSnapshotDefinition::RimMultiSnapshotDefinition()
     CAF_PDM_InitObject("MultiSnapshotDefinition", "", "", "");
 
     CAF_PDM_InitFieldNoDefault(&viewObject,     "View",                 "View", "", "", "");
+
+    CAF_PDM_InitFieldNoDefault(&eclipseResultType,      "EclipseResultType",        "Eclipse Result Type", "", "", "");
+    CAF_PDM_InitFieldNoDefault(&selectedEclipseResults, "SelectedEclipseResults",   "Eclipse Result", "", "", "");
+
     CAF_PDM_InitField(&timeStepStart,           "TimeStepStart", 0,     "Timestep Start", "", "", "");
     CAF_PDM_InitField(&timeStepEnd,             "TimeStepEnd", 0,       "Timestep End", "", "", "");
 
@@ -104,6 +111,23 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(
         }
         options.push_back(caf::PdmOptionItemInfo("-- All views --", nullptr));
     }
+    else if (fieldNeedingOptions == &eclipseResultType)
+    {
+        options.push_back(caf::PdmOptionItemInfo(caf::AppEnum<RimDefines::ResultCatType>(RimDefines::DYNAMIC_NATIVE).uiText(), RimDefines::DYNAMIC_NATIVE));
+        options.push_back(caf::PdmOptionItemInfo(caf::AppEnum<RimDefines::ResultCatType>(RimDefines::STATIC_NATIVE).uiText(), RimDefines::STATIC_NATIVE));
+    }
+    else if (fieldNeedingOptions == &selectedEclipseResults)
+    {
+        RimView* rimView = viewObject();
+        if (dynamic_cast<RimEclipseView*>(rimView))
+        {
+            RimEclipseView* rimEclipseView = dynamic_cast<RimEclipseView*>(rimView);
+            QStringList varList;
+            varList = rimEclipseView->currentGridCellResults()->cellResults()->resultNames(eclipseResultType());
+
+            options = toOptionList(varList);
+        }
+    }
     else if (fieldNeedingOptions == &timeStepEnd)
     {
         getTimeStepStrings(options);
@@ -123,9 +147,10 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(
             options.push_back(caf::PdmOptionItemInfo(rimCase->caseUserDescription(), rimCase));
         }
 
-        if (useOptionsOnly) *useOptionsOnly = true;
     }
 
+    if (useOptionsOnly) *useOptionsOnly = true;
+
     return options;
 }
 
@@ -149,8 +174,11 @@ void RimMultiSnapshotDefinition::getTimeStepStrings(QList<caf::PdmOptionItemInfo
 //--------------------------------------------------------------------------------------------------
 void RimMultiSnapshotDefinition::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
-
-    if (changedField == &sliceDirection)
+    if (changedField == &eclipseResultType)
+    {
+        selectedEclipseResults.v().clear();
+    }
+    else if (changedField == &sliceDirection)
     {
         const cvf::StructGridInterface* mainGrid = nullptr;
         RigActiveCellInfo* actCellInfo = nullptr;
@@ -203,3 +231,16 @@ void RimMultiSnapshotDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::toOptionList(const QStringList& varList)
+{
+    QList<caf::PdmOptionItemInfo> optionList;
+    int i;
+    for (i = 0; i < varList.size(); ++i)
+    {
+        optionList.push_back(caf::PdmOptionItemInfo(varList[i], varList[i]));
+    }
+    return optionList;
+}

ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.h

@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "RimDefines.h"
+
 #include "cafAppEnum.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
@@ -40,6 +42,9 @@ public:
 
     caf::PdmPtrField<RimView*>  viewObject;
 
+    caf::PdmField< caf::AppEnum< RimDefines::ResultCatType > >  eclipseResultType;
+    caf::PdmField< std::vector<QString> >                       selectedEclipseResults;
+
     caf::PdmField<int>       timeStepStart;
     caf::PdmField<int>       timeStepEnd;
 
@@ -57,10 +62,12 @@ public:
 
     caf::PdmPtrArrayField<RimCase*>  additionalCases;
 
-
+private:
     virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
 
     void getTimeStepStrings(QList<caf::PdmOptionItemInfo> &options);
     
     virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
+
+    QList<caf::PdmOptionItemInfo> toOptionList(const QStringList& varList);
 };