From cea0e37d30a2ce49bb06904ca3461ae3106ecb0a Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Mon, 6 Jan 2014 13:14:25 +0100
Subject: [PATCH] Faults: Only one label per fault when property filter is
 active

---
 .../ProjectDataModel/RimReservoirView.cpp            | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
index 7c5b835c20..7ddc379eb1 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
@@ -756,18 +756,20 @@ void RimReservoirView::updateCurrentTimeStep()
 
         if (faultCollection()->showFaultsOutsideFilters)
         {
-            std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAdd = RivReservoirViewPartMgr::defaultVisibleFaultTypes();
+            std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAppend = RivReservoirViewPartMgr::defaultVisibleFaultTypes();
 
             if (this->showInactiveCells())
             {
-                faultGeometryTypesToAdd.push_back(RivReservoirViewPartMgr::INACTIVE);
+                faultGeometryTypesToAppend.push_back(RivReservoirViewPartMgr::INACTIVE);
             }
 
-            for (size_t i = 0; i < faultGeometryTypesToAdd.size(); i++)
+            for (size_t i = 0; i < faultGeometryTypesToAppend.size(); i++)
             {
-                m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), faultGeometryTypesToAdd[i]);
-                m_reservoirGridPartManager->appendFaultLabelsStaticGeometryPartsToModel(frameParts.p(), faultGeometryTypesToAdd[i]);
+                m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameParts.p(), faultGeometryTypesToAppend[i]);
             }
+
+            RivReservoirViewPartMgr::ReservoirGeometryCacheType faultLabelType = m_reservoirGridPartManager->geometryTypeForFaultLabels(faultGeometryTypesToAppend);
+            m_reservoirGridPartManager->appendFaultLabelsStaticGeometryPartsToModel(frameParts.p(), faultLabelType);
         }
         else
         {