From 68c0d906fbf1cf630453e756abb08fddc31dd1b3 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Sat, 16 Jul 2016 16:09:03 +0200
Subject: [PATCH] #590 Fault labels are not shown outside filters when faults
 are

---
 .../RivReservoirViewPartMgr.cpp                 | 17 ++++++++++-------
 .../RivReservoirViewPartMgr.h                   |  2 +-
 .../ProjectDataModel/RimEclipseView.cpp         |  4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
index 56209c427e..7f90acc7cb 100644
--- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
@@ -952,19 +952,22 @@ void RivReservoirViewPartMgr::appendFaultsDynamicGeometryPartsToModel(cvf::Model
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RivCellSetEnum RivReservoirViewPartMgr::geometryTypeForFaultLabels(const std::vector<RivCellSetEnum>& geometryTypes) const
+RivCellSetEnum RivReservoirViewPartMgr::geometryTypeForFaultLabels(const std::vector<RivCellSetEnum>& geometryTypes, bool showFaultsOutsideFilters) const
 {
     bool hasInactive = false;
     for (size_t i = 0; i < geometryTypes.size(); i++)
     {
-        if (geometryTypes[i] == PROPERTY_FILTERED)
+        if (!showFaultsOutsideFilters)
         {
-            return PROPERTY_FILTERED;
-        }
+            if (geometryTypes[i] == PROPERTY_FILTERED)
+            {
+                return PROPERTY_FILTERED;
+            }
 
-        if (geometryTypes[i] == RANGE_FILTERED)
-        {
-            return RANGE_FILTERED;
+            if (geometryTypes[i] == RANGE_FILTERED)
+            {
+                return RANGE_FILTERED;
+            }
         }
 
         if (geometryTypes[i] == INACTIVE)
diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
index 87e0e82672..07d807bec2 100644
--- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
@@ -64,7 +64,7 @@ public:
                                                             RimCellEdgeColors* cellEdgeResultColors);
 
     // Fault labels
-    RivCellSetEnum  geometryTypeForFaultLabels(const std::vector<RivCellSetEnum>& geometryTypes) const;
+    RivCellSetEnum              geometryTypeForFaultLabels(const std::vector<RivCellSetEnum>& geometryTypes, bool showFaultsOutsideFilters) const;
     void                        appendFaultLabelsStaticGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType);
     void                        appendFaultLabelsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType, size_t frameIndex);
 
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
index c3cd15b896..51cac8287d 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
@@ -407,7 +407,7 @@ void RimEclipseView::createDisplayModel()
 
         std::vector<RivCellSetEnum> faultGeometryTypesToAppend = visibleFaultGeometryTypes();
 
-        RivCellSetEnum faultLabelType = m_reservoirGridPartManager->geometryTypeForFaultLabels(faultGeometryTypesToAppend);
+        RivCellSetEnum faultLabelType = m_reservoirGridPartManager->geometryTypeForFaultLabels(faultGeometryTypesToAppend, faultCollection()->showFaultsOutsideFilters());
 
         for (size_t frameIdx = 0; frameIdx < frameModels.size(); ++frameIdx)
         {
@@ -535,7 +535,7 @@ void RimEclipseView::updateCurrentTimeStep()
                 m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), faultGeometryTypesToAppend[i]);
             }
 
-            RivCellSetEnum faultLabelType = m_reservoirGridPartManager->geometryTypeForFaultLabels(faultGeometryTypesToAppend);
+            RivCellSetEnum faultLabelType = m_reservoirGridPartManager->geometryTypeForFaultLabels(faultGeometryTypesToAppend, faultCollection()->showFaultsOutsideFilters());
             m_reservoirGridPartManager->appendFaultLabelsStaticGeometryPartsToModel(frameParts.p(), faultLabelType);
         }
         else