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 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 calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override; + virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; private: void updateOptionSensitivity();