From d4d79d3dec62f50d4100686b2f53ae0970b37004 Mon Sep 17 00:00:00 2001
From: Kristian Bendiksen <kristian.bendiksen@gmail.com>
Date: Wed, 23 Mar 2022 10:59:18 +0100
Subject: [PATCH] #8623 Contour Map: exclude surfaces from appearing

Fixes #8623.
---
 .../ProjectDataModel/RimEclipseContourMapView.cpp    |  9 +++++++++
 .../ProjectDataModel/RimEclipseContourMapView.h      |  2 ++
 .../ProjectDataModel/RimEclipseView.cpp              | 12 +++++++-----
 ApplicationLibCode/ProjectDataModel/RimGridView.h    |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.cpp
index 8050f79946..56c36a678f 100644
--- a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.cpp
@@ -560,3 +560,12 @@ void RimEclipseContourMapView::onLegendConfigChanged( const caf::SignalEmitter*
         m_contourMapProjection->clearGeometry();
     }
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RimSurfaceInViewCollection* RimEclipseContourMapView::surfaceInViewCollection() const
+{
+    // Surfaces should not be shown in contour map.
+    return nullptr;
+}
diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.h b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.h
index ad98914842..ed1d9f5709 100644
--- a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.h
+++ b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapView.h
@@ -40,6 +40,8 @@ public:
     void    setDefaultCustomName();
     void    updatePickPointAndRedraw();
 
+    RimSurfaceInViewCollection* surfaceInViewCollection() const override;
+
 protected:
     void initAfterRead() override;
     void onCreateDisplayModel() override;
diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp
index 1f4b3cf70e..4c2f766310 100644
--- a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp
@@ -597,9 +597,10 @@ void RimEclipseView::onCreateDisplayModel()
     // Surfaces
 
     m_surfaceVizModel->removeAllParts();
-    if ( m_surfaceCollection )
+    if ( surfaceInViewCollection() )
     {
-        m_surfaceCollection->appendPartsToModel( m_surfaceVizModel.p(), m_reservoirGridPartManager->scaleTransform() );
+        surfaceInViewCollection()->appendPartsToModel( m_surfaceVizModel.p(),
+                                                       m_reservoirGridPartManager->scaleTransform() );
         nativeOrOverrideViewer()->addStaticModelOnce( m_surfaceVizModel.p(), isUsingOverrideViewer() );
     }
 
@@ -912,7 +913,8 @@ void RimEclipseView::updateVisibleCellColors()
     bool hasGeneralCellResult = this->cellResult()->hasResult() || this->cellResult()->isTernarySaturationSelected();
 
     m_intersectionCollection->updateCellResultColor( hasGeneralCellResult, m_currentTimeStep );
-    if ( m_surfaceCollection ) m_surfaceCollection->updateCellResultColor( hasGeneralCellResult, m_currentTimeStep );
+    if ( surfaceInViewCollection() )
+        surfaceInViewCollection()->updateCellResultColor( hasGeneralCellResult, m_currentTimeStep );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -2291,9 +2293,9 @@ std::vector<RimLegendConfig*> RimEclipseView::legendConfigs() const
         absLegends.push_back( wellMeasurement->legendConfig() );
     }
 
-    if ( m_surfaceCollection )
+    if ( surfaceInViewCollection() )
     {
-        for ( auto legendConfig : m_surfaceCollection->legendConfigs() )
+        for ( auto legendConfig : surfaceInViewCollection()->legendConfigs() )
         {
             absLegends.push_back( legendConfig );
         }
diff --git a/ApplicationLibCode/ProjectDataModel/RimGridView.h b/ApplicationLibCode/ProjectDataModel/RimGridView.h
index 16128beb98..d5c4934c71 100644
--- a/ApplicationLibCode/ProjectDataModel/RimGridView.h
+++ b/ApplicationLibCode/ProjectDataModel/RimGridView.h
@@ -48,7 +48,7 @@ public:
     cvf::ref<cvf::UByteArray> currentTotalCellVisibility();
 
     RimIntersectionCollection*                  intersectionCollection() const;
-    RimSurfaceInViewCollection*                 surfaceInViewCollection() const;
+    virtual RimSurfaceInViewCollection*         surfaceInViewCollection() const;
     RimIntersectionResultsDefinitionCollection* separateIntersectionResultsCollection() const;
     RimIntersectionResultsDefinitionCollection* separateSurfaceResultsCollection() const;
     RimAnnotationInViewCollection*              annotationCollection() const;