From cd9f496ea9481de4499ca30ac940ab3b8501af5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rnar=20Grip=20Fj=C3=A6r?= Date: Thu, 27 Apr 2017 11:35:05 +0200 Subject: [PATCH] #1435 Move contribute to legend to curve name configuration --- ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp | 2 +- ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp | 2 +- .../ProjectDataModel/Summary/RimSummaryCurveFilter.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp b/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp index 247acb6d6f..e9ac2b3c6f 100644 --- a/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp @@ -481,13 +481,13 @@ void RimGridTimeHistoryCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiO } uiOrdering.add(&m_plotAxis); - uiOrdering.add(&m_showLegend); 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); } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index 3f25468a2f..ab60c6bbc7 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -446,13 +446,13 @@ void RimSummaryCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& curveVarSelectionGroup->add(&m_uiFilterResultSelection); uiOrdering.add(&m_plotAxis); - uiOrdering.add(&m_showLegend); 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); if (m_isUsingAutoName) diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp index 16e56ef630..47c0e082d9 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp @@ -198,7 +198,6 @@ void RimSummaryCurveFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd curveVarSelectionGroup->add(&m_uiFilterResultMultiSelection); uiOrdering.add(&m_plotAxis); - uiOrdering.add(&m_showLegend); caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroup("Appearance settings"); appearanceGroup->setCollapsedByDefault(true); @@ -219,6 +218,7 @@ void RimSummaryCurveFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd caf::PdmUiGroup* autoNameGroup = uiOrdering.addNewGroup("Curve Name Configuration"); autoNameGroup->setCollapsedByDefault(true); + autoNameGroup->add(&m_showLegend); m_curveNameConfig->uiOrdering(uiConfigName, *autoNameGroup); uiOrdering.add(&m_autoApplyChangesToPlot);