From cd3523d91d2df9afc98a411462aebb307505dd7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Fri, 15 Dec 2017 09:55:43 +0100 Subject: [PATCH] #2269 Ascii summary curve. Fix property editor layout --- .../Summary/RimAsciiDataCurve.cpp | 20 +++++++++++++++++++ .../Summary/RimAsciiDataCurve.h | 1 + 2 files changed, 21 insertions(+) diff --git a/ApplicationCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp b/ApplicationCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp index 57e4568586..1efd3a051c 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp @@ -178,6 +178,26 @@ void RimAsciiDataCurve::onLoadDataAndUpdate(bool updateParentPlot) updateQwtPlotAxis(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimAsciiDataCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) +{ + RimPlotCurve::updateOptionSensitivity(); + + uiOrdering.add(&m_plotAxis); + + caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroup("Appearance"); + RimPlotCurve::appearanceUiOrdering(*appearanceGroup); + + caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup("Curve Name"); + nameGroup->setCollapsedByDefault(true); + nameGroup->add(&m_showLegend); + RimPlotCurve::curveNameUiOrdering(*nameGroup); + + uiOrdering.skipRemainingFields(true); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Summary/RimAsciiDataCurve.h b/ApplicationCode/ProjectDataModel/Summary/RimAsciiDataCurve.h index 217432b4db..f078fac30e 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimAsciiDataCurve.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimAsciiDataCurve.h @@ -68,6 +68,7 @@ protected: virtual QString createCurveAutoName() override; virtual void updateZoomInParentPlot() override; virtual void onLoadDataAndUpdate(bool updateParentPlot) override; + virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; private: bool curveData(std::vector* timeSteps, std::vector* values) const;