From ca7bd5b2b04e5c4b454d3545b70b01710396d8f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetronSolutions.com>
Date: Wed, 2 Nov 2016 17:03:59 +0100
Subject: [PATCH] #950 Some guarding and data update on changing the active
 formation names reference in case. More to do.

---
 .../ProjectDataModel/RimEclipsePropertyFilter.cpp    |  2 +-
 ApplicationCode/ReservoirDataModel/RigCaseData.cpp   | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
index c5b1abbfec..7f1d704dea 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
@@ -369,7 +369,7 @@ void RimEclipsePropertyFilter::updateFilterName()
         {
             newFiltername += " (";
 
-            if (m_selectedCategoryValues().size() == m_categoryValues.size())
+            if ( m_selectedCategoryValues().size() && m_selectedCategoryValues().size() == m_categoryValues.size() )
             {
                 newFiltername += QString::number(m_selectedCategoryValues()[0]);
                 newFiltername += "..";
diff --git a/ApplicationCode/ReservoirDataModel/RigCaseData.cpp b/ApplicationCode/ReservoirDataModel/RigCaseData.cpp
index 641f42e67e..04ca8067e8 100644
--- a/ApplicationCode/ReservoirDataModel/RigCaseData.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigCaseData.cpp
@@ -503,7 +503,6 @@ void RigCaseData::computeActiveCellsGeometryBoundingBox()
 void RigCaseData::setActiveFormationNames(RigFormationNames* activeFormationNames)
 {
     m_activeFormationNamesData  = activeFormationNames;
-    if (!activeFormationNames) return;
 
     size_t totalGlobCellCount = m_mainGrid->globalCellArray().size();
     size_t resIndex = m_matrixModelResults->addStaticScalarResult(RimDefines::FORMATION_NAMES, 
@@ -512,6 +511,17 @@ void RigCaseData::setActiveFormationNames(RigFormationNames* activeFormationName
                                                                   totalGlobCellCount);
 
     std::vector<double>& fnData =  m_matrixModelResults->cellScalarResults(resIndex,0);
+
+    if (m_activeFormationNamesData.isNull())
+    {
+        for ( size_t cIdx = 0; cIdx < totalGlobCellCount; ++cIdx )
+        {
+            fnData[cIdx] = HUGE_VAL;
+        }
+
+        return;
+    }
+
     size_t localCellCount = m_mainGrid->cellCount();
     for (size_t cIdx = 0; cIdx < localCellCount; ++cIdx)
     {