From a8f225a74915e50d9b9a20ea6814e52a978d9daa Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Tue, 14 Mar 2017 16:13:40 +0100
Subject: [PATCH] #1297 Added text label to display range type

---
 .../RimEclipsePropertyFilter.cpp              | 35 ++++++++++++++++---
 .../RimEclipsePropertyFilter.h                |  3 +-
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
index ee03da27af..60f9936ae1 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
@@ -22,12 +22,14 @@
 
 #include "RigCaseCellResultsData.h"
 #include "RigEclipseCaseData.h"
+#include "RigFlowDiagResults.h"
 #include "RigFormationNames.h"
 
 #include "RimEclipseCase.h"
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseResultDefinition.h"
 #include "RimEclipseView.h"
+#include "RimFlowDiagSolution.h"
 #include "RimReservoirCellResultsStorage.h"
 #include "RimViewController.h"
 
@@ -37,8 +39,6 @@
 
 #include "cvfAssert.h"
 #include "cvfMath.h"
-#include "RigFlowDiagResults.h"
-#include "RimFlowDiagSolution.h"
 
 
 namespace caf
@@ -74,6 +74,11 @@ RimEclipsePropertyFilter::RimEclipsePropertyFilter()
     resultDefinition.uiCapability()->setUiHidden(true);
     resultDefinition.uiCapability()->setUiTreeChildrenHidden(true);
 
+    CAF_PDM_InitField(&m_rangeLabelText, "Dummy_keyword", QString("Range Type"), "Range Type", "", "", "");
+    m_rangeLabelText.xmlCapability()->setIOReadable(false);
+    m_rangeLabelText.xmlCapability()->setIOWritable(false);
+    m_rangeLabelText.uiCapability()->setUiReadOnly(true);
+
     CAF_PDM_InitField(&m_lowerBound, "LowerBound", 0.0, "Min", "", "", "");
     m_lowerBound.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
 
@@ -180,6 +185,8 @@ void RimEclipsePropertyFilter::defineUiOrdering(QString uiConfigName, caf::PdmUi
     
     // Fields declared in RimCellFilter
     uiOrdering.add(&filterMode);
+    
+    uiOrdering.add(&m_rangeLabelText);
 
     if (resultDefinition->hasCategoryResult())
     {
@@ -199,6 +206,7 @@ void RimEclipsePropertyFilter::defineUiOrdering(QString uiConfigName, caf::PdmUi
     uiOrdering.setForgetRemainingFields(true);
 
     updateReadOnlyStateOfAllFields();
+    updateRangeLabel();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -226,9 +234,26 @@ void RimEclipsePropertyFilter::updateReadOnlyStateOfAllFields()
     objFields.push_back(&(resultDefinition->m_porosityModelUiField));
     objFields.push_back(&(resultDefinition->m_resultVariableUiField));
 
-    for (size_t i = 0; i < objFields.size(); i++)
+    for (auto f : objFields)
     {
-        objFields[i]->uiCapability()->setUiReadOnly(readOnlyState);
+        if (f == &m_rangeLabelText) continue;
+
+        f->uiCapability()->setUiReadOnly(readOnlyState);
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimEclipsePropertyFilter::updateRangeLabel()
+{
+    if (resultDefinition->resultType() == RimDefines::FLOW_DIAGNOSTICS)
+    {
+        m_rangeLabelText = "Current Timestep";
+    }
+    else
+    {
+        m_rangeLabelText = "All Timesteps";
     }
 }
 
@@ -237,7 +262,7 @@ void RimEclipsePropertyFilter::updateReadOnlyStateOfAllFields()
 //--------------------------------------------------------------------------------------------------
 bool RimEclipsePropertyFilter::isPropertyFilterControlled()
 {
-    RimView* rimView = NULL;
+    RimView* rimView = nullptr;
     firstAncestorOrThisOfType(rimView);
     CVF_ASSERT(rimView);
 
diff --git a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.h b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.h
index 639a004280..4878608612 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.h
@@ -57,7 +57,6 @@ public:
     virtual void                            fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
     virtual void                            initAfterRead();
 
-
 protected:
     virtual void                            defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
     virtual void                            defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName);
@@ -70,9 +69,11 @@ private:
 
     void                                    updateActiveState();
     void                                    updateReadOnlyStateOfAllFields();
+    void                                    updateRangeLabel();
     bool                                    isPropertyFilterControlled();
 
 private:
+    caf::PdmField<QString>                  m_rangeLabelText;
     caf::PdmField<double>                   m_lowerBound;
     caf::PdmField<double>                   m_upperBound;