From b85e2549831fcad6df0fa84897f21f95eb56bda8 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Mon, 21 Sep 2015 11:21:48 +0200
Subject: [PATCH] (#457) Show time step string instead of index in UI

---
 .../RimWellLogExtractionCurve.cpp             | 40 +++++++++++++++++--
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
index 9816288e92..b3b278f48c 100644
--- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
@@ -264,9 +264,7 @@ QList<caf::PdmOptionItemInfo> RimWellLogExtractionCurve::calculateValueOptions(c
             }
         }
     }
-
-    
-    if (fieldNeedingOptions == &m_case)
+    else if (fieldNeedingOptions == &m_case)
     {
         RimProject* proj = RiaApplication::instance()->project();
         std::vector<RimCase*> cases;
@@ -283,6 +281,20 @@ QList<caf::PdmOptionItemInfo> RimWellLogExtractionCurve::calculateValueOptions(c
             optionList.push_front(caf::PdmOptionItemInfo("None", QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(NULL))));
         }
     }
+    else if (fieldNeedingOptions == &m_timeStep)
+    {
+        QStringList timeStepNames;
+
+        if (m_case)
+        {
+            timeStepNames = m_case->timeStepStrings();
+        }
+
+        for (int i = 0; i < timeStepNames.size(); i++)
+        {
+            optionList.push_back(caf::PdmOptionItemInfo(timeStepNames[i], i));
+        }
+    }
 
     return optionList;
 }
@@ -319,11 +331,22 @@ void RimWellLogExtractionCurve::defineUiOrdering(QString uiConfigName, caf::PdmU
         group1->add(&(m_eclipseResultDefinition->m_resultTypeUiField));
         group1->add(&(m_eclipseResultDefinition->m_porosityModelUiField));
         group1->add(&(m_eclipseResultDefinition->m_resultVariableUiField));
+
+        if (m_eclipseResultDefinition->hasDynamicResult())
+        {
+            m_timeStep.uiCapability()->setUiHidden(false);
+        }
+        else
+        {
+            m_timeStep.uiCapability()->setUiHidden(true);
+        }
     }
     if (geomCase)
     {
         group1->add(&(m_geomResultDefinition->m_resultPositionTypeUiField));
         group1->add(&(m_geomResultDefinition->m_resultVariableUiField));
+
+        m_timeStep.uiCapability()->setUiHidden(false);
     }
 }
 
@@ -498,18 +521,27 @@ QString RimWellLogExtractionCurve::createCurveName()
         }
 
         size_t maxTimeStep = 0;
+        
+        QStringList timeStepNames;
 
         if (eclipseCase)
         {
             RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(m_eclipseResultDefinition->porosityModel());
             maxTimeStep = eclipseCase->reservoirData()->results(porosityModel)->maxTimeStepCount();
+
+            timeStepNames = eclipseCase->timeStepStrings();
         }
         else if (geomCase)
         {
             maxTimeStep = geomCase->geoMechData()->femPartResults()->frameCount();
-        }
 
+            timeStepNames = geomCase->timeStepStrings();
+        }
 
+        if (m_timeStep < timeStepNames.size())
+        {
+            generatedCurveName += timeStepNames[m_timeStep];
+        }
         generatedCurveName += QString("[%1/%2]").arg(m_timeStep()).arg(maxTimeStep);
     }