From 6a4f15368cd685c94f15a5979426743af879492d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetron.com>
Date: Wed, 24 Oct 2012 11:23:40 +0200
Subject: [PATCH] Mesh/Surface style is now made independent so it is possible
 to show the mesh lines without the surface geometry. A new mesh style "Faults
 only" is also added making it possible to show the mesh lines on the faults
 only p4#: 19289

---
 .../ProjectDataModel/RimReservoirView.cpp     | 33 ++++++++-----------
 .../ProjectDataModel/RimReservoirView.h       |  1 +
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
index 4d79599ed8..3828b7404e 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
@@ -49,8 +49,9 @@ namespace caf {
 template<>
 void caf::AppEnum< RimReservoirView::MeshModeType >::setUp()
 {
-    addItem(RimReservoirView::FULL_MESH,       "FULL_MESH",       "All");
-    addItem(RimReservoirView::NO_MESH,         "NO_MESH",         "None");
+    addItem(RimReservoirView::FULL_MESH,      "FULL_MESH",       "All");
+    addItem(RimReservoirView::FAULTS_MESH,    "FAULTS_MESH",      "Faults only");
+    addItem(RimReservoirView::NO_MESH,        "NO_MESH",        "None");
     setDefault(RimReservoirView::FULL_MESH);
 }
 
@@ -58,7 +59,7 @@ template<>
 void caf::AppEnum< RimReservoirView::SurfaceModeType >::setUp()
 {
     addItem(RimReservoirView::SURFACE,              "SURFACE",             "All");
-    addItem(RimReservoirView::FAULTS,               "FAULTS",              "Faults");
+    addItem(RimReservoirView::FAULTS,               "FAULTS",              "Faults only");
     addItem(RimReservoirView::NO_SURFACE,           "NO_SURFACE",          "None");
     setDefault(RimReservoirView::SURFACE);
 }
@@ -881,35 +882,27 @@ void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex,
 void RimReservoirView::updateDisplayModelVisibility()
 {
     if (m_viewer.isNull()) return;
-
-    bool surfaceVisible = false;
-    bool faultVisible = false;
+ 
+    unsigned int mask = 0;
 
     if (surfaceMode == SURFACE)
     {
-        surfaceVisible = true;
-        faultVisible = true;
+         mask |= surfaceBit;
+         mask |= faultBit;
     }
     else if (surfaceMode == FAULTS)
     {
-        faultVisible = true;
+        mask |= faultBit;
     }
 
-    unsigned int mask = 0;
     if (meshMode == FULL_MESH)
     {
-        if (surfaceVisible) mask |= meshSurfaceBit;
-        if (faultVisible) mask |= meshFaultBit;
+        mask |= meshSurfaceBit;
+        mask |= meshFaultBit;
     }
-
-    if (surfaceVisible)
+    else if (meshMode == FAULTS_MESH)
     {
-        mask |= surfaceBit;
-    }
-    
-    if (faultVisible)
-    {
-        mask |= faultBit;
+        mask |= meshFaultBit;
     }
 
     m_viewer->setEnableMask(mask);
diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.h b/ApplicationCode/ProjectDataModel/RimReservoirView.h
index 918536910b..5446d15d30 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirView.h
+++ b/ApplicationCode/ProjectDataModel/RimReservoirView.h
@@ -73,6 +73,7 @@ public:
     enum MeshModeType
     {
         FULL_MESH,
+        FAULTS_MESH,
         NO_MESH
     };