From 3c107e6f9e3c9d6b85f57bba30433baf7015d56c Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Thu, 7 Sep 2017 09:16:51 +0200
Subject: [PATCH] #1868 CellRangeFilter : Show correct label text when range
 filter is created

---
 .../ProjectDataModel/RimCellRangeFilter.cpp   | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp b/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp
index cad868f4a8..bc1e27b9a8 100644
--- a/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp
@@ -203,11 +203,28 @@ void RimCellRangeFilter::defineEditorAttribute(const caf::PdmFieldHandle* field,
         myAttr->m_minimum = 1;
         myAttr->m_maximum = static_cast<int>(grid->cellCountK());
     }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimCellRangeFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+{
+    bool readOnlyState = isRangeFilterControlled();
+
+    std::vector<caf::PdmFieldHandle*> objFields;
+    this->fields(objFields);
+    for (size_t i = 0; i < objFields.size(); i ++)
+    {
+        objFields[i]->uiCapability()->setUiReadOnly(readOnlyState);
+    }
+
+    const cvf::StructGridInterface* grid = selectedGrid();
 
     RimCase* rimCase = nullptr;
     this->firstAncestorOrThisOfTypeAsserted(rimCase);
     const cvf::StructGridInterface* mainGrid = RigReservoirGridTools::mainGrid(rimCase);
-    
+
     RimView* rimView = nullptr;
     this->firstAncestorOrThisOfTypeAsserted(rimView);
     RigActiveCellInfo* actCellInfo = RigReservoirGridTools::activeCellInfo(rimView);
@@ -244,21 +261,6 @@ void RimCellRangeFilter::defineEditorAttribute(const caf::PdmFieldHandle* field,
     }
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-void RimCellRangeFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
-{
-    bool readOnlyState = isRangeFilterControlled();
-
-    std::vector<caf::PdmFieldHandle*> objFields;
-    this->fields(objFields);
-    for (size_t i = 0; i < objFields.size(); i ++)
-    {
-        objFields[i]->uiCapability()->setUiReadOnly(readOnlyState);
-    }
-}
-
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------