#4571 WIP: Multiplot grid cell plotting

Basics working. Missing single plot and normalizing

ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp

@@ -19,6 +19,8 @@
 #include "RimEclipseGeometrySelectionItem.h"
 
 #include "RigTimeHistoryResultAccessor.h"
+#include "RigEclipseCaseData.h"
+#include "RigGridBase.h"
 
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
@@ -61,6 +63,24 @@ void RimEclipseGeometrySelectionItem::setFromSelectionItem(const RiuEclipseSelec
     m_eclipseCase = selectionItem->m_view->eclipseCase();
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimEclipseGeometrySelectionItem::setFromCaseGridAndIJK(RimEclipseCase* eclipseCase,
+                                                            size_t gridIndex,
+                                                            size_t i,
+                                                            size_t j,
+                                                            size_t k)
+{
+    m_eclipseCase = eclipseCase;
+    m_gridIndex = gridIndex;
+
+    size_t lgrCellIndex = eclipseCase->eclipseCaseData()->grid(gridIndex)->cellIndexFromIJK(i, j, k);
+    size_t reservoirCellIndex = eclipseCase->eclipseCaseData()->grid(gridIndex)->reservoirCellIndex(lgrCellIndex);
+    m_cellIndex = reservoirCellIndex;
+
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.h

@@ -39,7 +39,11 @@ public:
     ~RimEclipseGeometrySelectionItem() override;
 
     void            setFromSelectionItem(const RiuEclipseSelectionItem* selectionItem);
-
+    void            setFromCaseGridAndIJK(RimEclipseCase* eclipseCase,
+                                          size_t gridIndex,
+                                          size_t i,
+                                          size_t j,
+                                          size_t k);
     QString geometrySelectionText() const override;
 
     RimEclipseCase* eclipseCase() const;

ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp

@@ -31,6 +31,7 @@
 #include "RigEclipseCaseData.h"
 #include "RigFlowDiagResultAddress.h"
 #include "RigFlowDiagResults.h"
+#include "RigEclipseResultInfo.h"
 
 #include "Rim3dView.h"
 #include "Rim3dWellLogCurve.h"
@@ -763,21 +764,31 @@ RigEclipseResultAddress RimEclipseResultDefinition::eclipseResultAddress() const
 //--------------------------------------------------------------------------------------------------
 void RimEclipseResultDefinition::setFromEclipseResultAddress(const RigEclipseResultAddress& address)
 {
-    m_resultType            = address.m_resultCatType;
-    m_resultVariable        = address.m_resultName;
-    m_timeLapseBaseTimestep = address.m_timeLapseBaseFrameIdx;
+    RigEclipseResultAddress canonizedAddress = address;
 
-    if (address.hasDifferenceCase())
+    const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults();
+    if (gridCellResults)
+    {
+        canonizedAddress = gridCellResults->resultInfo(address)->eclipseResultAddress();    
+    }
+
+    m_resultType            = canonizedAddress.m_resultCatType;
+    m_resultVariable        = canonizedAddress.m_resultName;
+    m_timeLapseBaseTimestep = canonizedAddress.m_timeLapseBaseFrameIdx;
+
+    if (canonizedAddress.hasDifferenceCase())
     {
         auto eclipseCases = RiaApplication::instance()->project()->eclipseCases();
         for (RimEclipseCase* c : eclipseCases)
         {
-            if (c && c->caseId() == address.m_differenceCaseId)
+            if (c && c->caseId() == canonizedAddress.m_differenceCaseId)
             {
                 m_differenceCase = c;
             }
         }
     }
+
+    this->updateUiFieldsFromActiveResult();
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp

@@ -135,6 +135,30 @@ void RimGridTimeHistoryCurve::setFromSelectionItem(const RiuSelectionItem* selec
     updateResultDefinitionFromCase();
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimGridTimeHistoryCurve::setFromEclipseCellAndResult(RimEclipseCase* eclCase,
+                                                          size_t gridIdx,
+                                                          size_t i,
+                                                          size_t j,
+                                                          size_t k,
+                                                          const RigEclipseResultAddress& resAddr)
+{
+    delete m_geometrySelectionItem();
+    delete m_eclipseResultDefinition();
+    delete m_geoMechResultDefinition();
+
+    m_eclipseResultDefinition = new RimEclipseResultDefinition;
+    m_eclipseResultDefinition->setEclipseCase(eclCase);
+    m_eclipseResultDefinition->setFromEclipseResultAddress(resAddr);
+
+    RimEclipseGeometrySelectionItem* geomSelectionItem = new RimEclipseGeometrySelectionItem;
+    m_geometrySelectionItem = geomSelectionItem;
+    geomSelectionItem->setFromCaseGridAndIJK(eclCase, gridIdx, i, j, k);
+
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.h

@@ -36,6 +36,7 @@ class RimGeoMechGeometrySelectionItem;
 class RimGeometrySelectionItem;
 class RiuFemTimeHistoryResultAccessor;
 class RiuSelectionItem;
+class RigEclipseResultAddress;
 
 //==================================================================================================
 ///  
@@ -51,6 +52,12 @@ public:
     ~RimGridTimeHistoryCurve() override;
 
     void                    setFromSelectionItem(const RiuSelectionItem* selectionItem);
+    void                    setFromEclipseCellAndResult(RimEclipseCase* eclCase,
+                                                        size_t gridIdx,
+                                                        size_t i,
+                                                        size_t j,
+                                                        size_t k,
+                                                        const RigEclipseResultAddress& resAddr);
     RiaDefines::PlotAxis    yAxis() const;
     void                    setYAxis(RiaDefines::PlotAxis plotAxis);