From 78fef85f8b61b4436de74bc85a4138e89cb158a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetronSolutions.com>
Date: Fri, 7 Apr 2017 10:54:03 +0200
Subject: [PATCH] #1399 QA of Summary Axis objects

---
 .../Summary/RimSummaryTimeAxisProperties.cpp  | 12 +++++++-----
 .../Summary/RimSummaryYAxisProperties.cpp     | 19 +++++++++++++++++++
 .../Summary/RimSummaryYAxisProperties.h       |  1 +
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp
index 3152c15c2d..d42b3ef8ec 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp
@@ -283,11 +283,13 @@ double RimSummaryTimeAxisProperties::fromTimeTToDisplayUnitScale()
 //--------------------------------------------------------------------------------------------------
 void RimSummaryTimeAxisProperties::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
-    uiOrdering.add(&showTitle);
-    uiOrdering.add(&title);
-    uiOrdering.add(&titlePositionEnum);
-    uiOrdering.add(&fontSize);
-    caf::PdmUiGroup* timeGroup =  uiOrdering.addNewGroup("Time");
+    caf::PdmUiGroup& titleGroup = *(uiOrdering.addNewGroup("Axis Title"));
+    titleGroup.add(&showTitle);
+    titleGroup.add(&title);
+    titleGroup.add(&titlePositionEnum);
+    titleGroup.add(&fontSize);
+
+    caf::PdmUiGroup* timeGroup =  uiOrdering.addNewGroup("Time Values");
     timeGroup->add(&m_timeMode);
     if (m_timeMode() == DATE)
     {
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp
index c3c3ce7999..c24f34832f 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp
@@ -113,6 +113,25 @@ QList<caf::PdmOptionItemInfo> RimSummaryYAxisProperties::calculateValueOptions(c
     return options;
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimSummaryYAxisProperties::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+{
+    caf::PdmUiGroup& titleGroup = *(uiOrdering.addNewGroup("Axis Title"));
+    titleGroup.add(&isAutoTitle);
+    titleGroup.add(&customTitle);
+    titleGroup.add(&titlePositionEnum);
+    titleGroup.add(&fontSize);
+
+    caf::PdmUiGroup& scaleGroup =  *(uiOrdering.addNewGroup("Axis Values"));
+    scaleGroup.add(&isLogarithmicScaleEnabled);
+    scaleGroup.add(&numberFormat);
+    scaleGroup.add(&visibleRangeMin);
+    scaleGroup.add(&visibleRangeMax);
+
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.h
index 37afeb5369..bf9cae4d42 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.h
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.h
@@ -81,6 +81,7 @@ protected:
     virtual caf::PdmFieldHandle*            objectToggleField() override;
     virtual void                            fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
     virtual QList<caf::PdmOptionItemInfo>   calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
+    virtual void                            defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
 
 private:
     void                                    updateOptionSensitivity();