From 3279f51364099289255e60c246b958e205e356c1 Mon Sep 17 00:00:00 2001
From: Gaute Lindkvist <lindkvis@gmail.com>
Date: Tue, 10 Sep 2019 09:18:40 +0200
Subject: [PATCH] #4668 Make contour time and case diff work

---
 .../RimEclipseContourMapProjection.cpp        |  5 ++++-
 .../RimEclipseResultDefinition.cpp            | 20 +++++++++++++++++++
 .../RimEclipseResultDefinition.h              |  3 +++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp b/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp
index 6b8dc4795f..1aae648557 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp
@@ -202,7 +202,10 @@ std::vector<double> RimEclipseContourMapProjection::generateResults( int timeSte
             else if ( !( cellColors->hasStaticResult() && timeStep > 0 ) )
             {
                 m_currentResultName = cellColors->resultVariable();
-                RigEclipseResultAddress resAddr( cellColors->resultType(), cellColors->resultVariable() );
+                RigEclipseResultAddress resAddr( cellColors->resultType(),
+                                                 cellColors->resultVariable(),
+                                                 cellColors->timeLapseBaseTimeStep(),
+                                                 cellColors->caseDiffIndex() );
                 if ( resAddr.isValid() && resultData->hasResultEntry( resAddr ) )
                 {
                     gridResultValues = resultData->cellScalarResults( resAddr, timeStep );
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
index a3c5cedc76..819c0eafcc 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
@@ -1009,6 +1009,26 @@ QString RimEclipseResultDefinition::diffResultUiShortNameHTML() const
     return diffResult.join( "<br>" );
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+int RimEclipseResultDefinition::timeLapseBaseTimeStep() const
+{
+    return m_timeLapseBaseTimestep;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+int RimEclipseResultDefinition::caseDiffIndex() const
+{
+    if ( m_differenceCase )
+    {
+        return m_differenceCase->caseId();
+    }
+    return -1;
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
index 634c13b3b0..c79944a2d0 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
@@ -106,6 +106,9 @@ public:
     QString diffResultUiShortName() const;
     QString diffResultUiShortNameHTML() const;
 
+    int timeLapseBaseTimeStep() const;
+    int caseDiffIndex() const;
+
     void                    loadResult();
     RigEclipseResultAddress eclipseResultAddress() const;
     void                    setFromEclipseResultAddress( const RigEclipseResultAddress& resultAddress );