From 22d033669d25022c81c389c733645a913b34072d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetronSolutions.com>
Date: Mon, 21 Sep 2015 09:10:50 +0200
Subject: [PATCH] (#401) Result colors now updated on "Visible
 cells"-overridden Eclipse cases

---
 ApplicationCode/ProjectDataModel/RimEclipseView.cpp | 13 ++++++++++---
 ApplicationCode/ProjectDataModel/RimView.cpp        |  2 +-
 ApplicationCode/ProjectDataModel/RimView.h          |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
index b8dc0bf65e..4a0f3d0358 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
@@ -581,7 +581,11 @@ void RimEclipseView::updateCurrentTimeStep()
         geometriesToRecolor.push_back(RANGE_FILTERED);
         geometriesToRecolor.push_back(RANGE_FILTERED_WELL_CELLS);
     }
-    else 
+    else if (this->controllingViewLink() && this->controllingViewLink()->syncVisibleCells())
+    {
+        geometriesToRecolor.push_back(OVERRIDDEN_CELL_VISIBILITY);
+    }
+    else
     {
         geometriesToRecolor.push_back(ACTIVE);
         geometriesToRecolor.push_back(ALL_WELL_CELLS);
@@ -1310,8 +1314,11 @@ void RimEclipseView::updateFaultForcedVisibility()
 std::vector<RivCellSetEnum> RimEclipseView::visibleFaultGeometryTypes() const
 {
     std::vector<RivCellSetEnum> faultParts;
-
-    if (this->propertyFilterCollection()->hasActiveFilters() && !faultCollection()->showFaultsOutsideFilters())
+    if (this->controllingViewLink() && this->controllingViewLink()->syncVisibleCells())
+    {
+            faultParts.push_back(OVERRIDDEN_CELL_VISIBILITY);
+    }
+    else if (this->propertyFilterCollection()->hasActiveFilters() && !faultCollection()->showFaultsOutsideFilters())
     {
         faultParts.push_back(PROPERTY_FILTERED);
         faultParts.push_back(PROPERTY_FILTERED_WELL_CELLS);
diff --git a/ApplicationCode/ProjectDataModel/RimView.cpp b/ApplicationCode/ProjectDataModel/RimView.cpp
index 1d6e8c30ca..4b6e2dec7a 100644
--- a/ApplicationCode/ProjectDataModel/RimView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimView.cpp
@@ -743,7 +743,7 @@ RimViewLinker* RimView::viewLinkerWithMyDepViews()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimViewLink* RimView::controllingViewLink()
+RimViewLink* RimView::controllingViewLink() const
 {
     RimViewLink* viewLink = NULL;
     std::vector<caf::PdmObjectHandle*> reffingObjs;
diff --git a/ApplicationCode/ProjectDataModel/RimView.h b/ApplicationCode/ProjectDataModel/RimView.h
index ef14640bb4..da0b41ec40 100644
--- a/ApplicationCode/ProjectDataModel/RimView.h
+++ b/ApplicationCode/ProjectDataModel/RimView.h
@@ -127,7 +127,7 @@ public:
     void                                    scheduleCreateDisplayModelAndRedraw();
     void                                    createDisplayModelAndRedraw();
 
-    RimViewLink*                            controllingViewLink();
+    RimViewLink*                            controllingViewLink() const;
     cvf::ref<cvf::UByteArray>               currentTotalCellVisibility();
 
 public: