From 01249ace3afc589d3429edbd13afe3ce216886d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= <bjorn.erik.jensen@acando.no>
Date: Thu, 13 Dec 2018 13:20:49 +0100
Subject: [PATCH] #3860 Z scale label. Do not show in contour map

---
 ApplicationCode/ProjectDataModel/Rim3dView.h      |  4 ++--
 .../ProjectDataModel/RimContourMapView.cpp        | 15 +++++++++++++++
 .../ProjectDataModel/RimContourMapView.h          |  2 ++
 ApplicationCode/UserInterface/RiuViewer.cpp       |  9 +++++++++
 ApplicationCode/UserInterface/RiuViewer.h         |  2 ++
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Rim3dView.h b/ApplicationCode/ProjectDataModel/Rim3dView.h
index 375d738dac..bc05144e84 100644
--- a/ApplicationCode/ProjectDataModel/Rim3dView.h
+++ b/ApplicationCode/ProjectDataModel/Rim3dView.h
@@ -218,11 +218,11 @@ protected:
     void                            fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
     void                            defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
     virtual void                    updateViewWidgetAfterCreation() override; 
-    
+    QWidget*                        createViewWidget(QWidget* mainWindowParent) override;
+
 private:
     // Overridden ViewWindow methods:
 
-    QWidget*                        createViewWidget(QWidget* mainWindowParent) override; 
     void                            updateMdiWindowTitle() override;
     void                            deleteViewWidget() override;
     QWidget*                        viewWidget() override;
diff --git a/ApplicationCode/ProjectDataModel/RimContourMapView.cpp b/ApplicationCode/ProjectDataModel/RimContourMapView.cpp
index 6ba9e4a0b0..4b6157112e 100644
--- a/ApplicationCode/ProjectDataModel/RimContourMapView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimContourMapView.cpp
@@ -388,3 +388,18 @@ std::set<RivCellSetEnum> RimContourMapView::allVisibleFaultGeometryTypes() const
     }
     return faultGeoTypes;
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QWidget* RimContourMapView::createViewWidget(QWidget* mainWindowParent)
+{
+    auto widget = Rim3dView::createViewWidget(mainWindowParent);
+
+    if (viewer())
+    {
+        viewer()->showZScaleLabel(false);
+        viewer()->hideZScaleCheckbox(true);
+    }
+    return widget;
+}
diff --git a/ApplicationCode/ProjectDataModel/RimContourMapView.h b/ApplicationCode/ProjectDataModel/RimContourMapView.h
index 0d29303d3f..b0503135d7 100644
--- a/ApplicationCode/ProjectDataModel/RimContourMapView.h
+++ b/ApplicationCode/ProjectDataModel/RimContourMapView.h
@@ -54,6 +54,8 @@ protected:
 
     virtual std::set<RivCellSetEnum> allVisibleFaultGeometryTypes() const override;
     
+    QWidget* createViewWidget(QWidget* mainWindowParent) override;
+
 private:
     cvf::ref<RivContourMapProjectionPartMgr>     m_contourMapProjectionPartMgr;
     caf::PdmChildField<RimContourMapProjection*> m_contourMapProjection;
diff --git a/ApplicationCode/UserInterface/RiuViewer.cpp b/ApplicationCode/UserInterface/RiuViewer.cpp
index 1544452968..7eba98a4b6 100644
--- a/ApplicationCode/UserInterface/RiuViewer.cpp
+++ b/ApplicationCode/UserInterface/RiuViewer.cpp
@@ -152,6 +152,7 @@ RiuViewer::RiuViewer(const QGLFormat& format, QWidget* parent)
     m_zScaleLabel->setAlignment(Qt::AlignLeft);
     m_zScaleLabel->setText(QString("Z: "));
     m_showZScaleLabel = true;
+    m_hideZScaleCheckbox = false;
 
     QPalette versionInfoPalette = p;
     QColor versionInfoLabelColor = p.color(QPalette::Window);
@@ -487,6 +488,14 @@ void RiuViewer::setInfoText(QString text)
     m_infoLabel->setText(text);
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RiuViewer::hideZScaleCheckbox(bool hide)
+{
+    m_hideZScaleCheckbox = hide;
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/UserInterface/RiuViewer.h b/ApplicationCode/UserInterface/RiuViewer.h
index 5d2ca0d66f..ccb5ea1c6f 100644
--- a/ApplicationCode/UserInterface/RiuViewer.h
+++ b/ApplicationCode/UserInterface/RiuViewer.h
@@ -83,6 +83,7 @@ public:
     void            showInfoText(bool enable);
     void            setInfoText(QString text);
 
+    void            hideZScaleCheckbox(bool hide);
     void            showZScaleLabel(bool enable);
     void            setZScale(int scale);
 
@@ -158,6 +159,7 @@ private:
 
     QLabel*         m_zScaleLabel;
     bool            m_showZScaleLabel;
+    bool            m_hideZScaleCheckbox;
 
     QProgressBar*   m_animationProgress;
     bool            m_showAnimProgress;