From a1e094625aa09aac81598db0be48c904a6591260 Mon Sep 17 00:00:00 2001
From: Gaute Lindkvist <lindkvis@gmail.com>
Date: Thu, 15 Nov 2018 14:58:22 +0100
Subject: [PATCH] #3701 Add axis line option to 2d intersection view as well.

---
 .../ProjectDataModel/Rim2dIntersectionView.cpp  | 17 +++++++++++++++--
 .../ProjectDataModel/Rim2dIntersectionView.h    |  1 +
 ApplicationCode/ProjectDataModel/Rim3dView.cpp  |  3 ++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp
index 8efb20c78d..dee625562f 100644
--- a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp
@@ -79,6 +79,7 @@ Rim2dIntersectionView::Rim2dIntersectionView(void)
     m_ternaryLegendConfig = new RimTernaryLegendConfig();
 
     CAF_PDM_InitField(&m_showDefiningPoints, "ShowDefiningPoints", true, "Show Points", "", "", "");
+    CAF_PDM_InitField(&m_showAxisLines, "ShowAxisLines", false, "Show Axis Lines", "", "", "");
 
     m_showWindow = false;
     m_scaleTransform = new cvf::Transform();
@@ -663,7 +664,7 @@ void Rim2dIntersectionView::resetLegendsInViewer()
     m_viewer->showAnimationProgress(true);
     m_viewer->showHistogram(false);
     m_viewer->showInfoText(false);
-    m_viewer->showEdgeTickMarksXZ(true);
+    m_viewer->showEdgeTickMarksXZ(true, m_showAxisLines());
 
     m_viewer->setMainScene(new cvf::Scene());
     m_viewer->enableNavigationRotation(false);
@@ -743,6 +744,12 @@ void Rim2dIntersectionView::fieldChangedByUi(const caf::PdmFieldHandle* changedF
     {
         this->loadDataAndUpdate();
     }
+    else if (changedField == &m_showAxisLines)
+    {
+        m_viewer->showEdgeTickMarksXZ(true, m_showAxisLines());
+        this->loadDataAndUpdate();
+    }
+
 }
 
 
@@ -752,8 +759,14 @@ void Rim2dIntersectionView::fieldChangedByUi(const caf::PdmFieldHandle* changedF
 void Rim2dIntersectionView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
     Rim3dView::defineUiOrdering(uiConfigName, uiOrdering);
-    uiOrdering.skipRemainingFields(true);
+    caf::PdmUiGroup* viewGroup = uiOrdering.findGroup("ViewGroup");
+    if (viewGroup)
+    {
+        viewGroup->add(&m_showAxisLines);
+    }
 
+    uiOrdering.skipRemainingFields(true);
+    
     if (m_intersection->hasDefiningPoints())
     {
         caf::PdmUiGroup* plGroup = uiOrdering.addNewGroup("Defining Points");
diff --git a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.h b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.h
index 1a4315e8ec..517fdc4ac2 100644
--- a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.h
+++ b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.h
@@ -111,6 +111,7 @@ protected:
     cvf::ref<cvf::Transform>           m_scaleTransform;
 
     caf::PdmField<bool>                m_showDefiningPoints;
+    caf::PdmField<bool>                m_showAxisLines;
 
     caf::PdmPointer<caf::PdmObject>    m_legendObjectToSelect;
 };
diff --git a/ApplicationCode/ProjectDataModel/Rim3dView.cpp b/ApplicationCode/ProjectDataModel/Rim3dView.cpp
index 2e7310a7f1..e88a0d9013 100644
--- a/ApplicationCode/ProjectDataModel/Rim3dView.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim3dView.cpp
@@ -253,7 +253,8 @@ void Rim3dView::deleteViewWidget()
 //--------------------------------------------------------------------------------------------------
 void Rim3dView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
-    caf::PdmUiGroup* viewGroup = uiOrdering.addNewGroup("Viewer");
+    caf::PdmUiGroup* viewGroup = uiOrdering.addNewGroupWithKeyword("Viewer", "ViewGroup");
+    
     viewGroup->add(&m_name);
     viewGroup->add(&m_backgroundColor);
     viewGroup->add(&m_showGridBox);