diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp index ecb25ebbfb..dc994bfd31 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp @@ -1804,6 +1804,8 @@ void RimEnsembleCurveSet::updateStatisticsCurves( const std::vectorsetSummaryAddressYAndApplyInterpolation( address ); curve->setLeftOrRightAxisY( axisY() ); + curve->setShowInLegend( m_statistics->showStatisticsCurveLegends() ); + curve->updateCurveVisibility(); curve->loadDataAndUpdate( false ); curve->updatePlotAxis(); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatistics.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatistics.cpp index e02207e049..4639da2649 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatistics.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatistics.cpp @@ -35,6 +35,7 @@ RimEnsembleStatistics::RimEnsembleStatistics( RimEnsembleCurveSetInterface* pare m_parentCurveSet = parentCurveSet; CAF_PDM_InitField( &m_active, "Active", true, "Show Statistics Curves" ); + CAF_PDM_InitField( &m_showStatisticsCurveLegends, "ShowStatisticsCurveLegends", false, "Show Statistics Curve Legends" ); CAF_PDM_InitField( &m_hideEnsembleCurves, "HideEnsembleCurves", false, "Hide Ensemble Curves" ); CAF_PDM_InitField( &m_basedOnFilteredCases, "BasedOnFilteredCases", false, "Based on Filtered Cases" ); CAF_PDM_InitField( &m_showP10Curve, "ShowP10Curve", true, "P10" ); @@ -108,7 +109,8 @@ void RimEnsembleStatistics::fieldChangedByUi( const caf::PdmFieldHandle* changed { if ( changedField == &m_active || changedField == &m_basedOnFilteredCases || changedField == &m_showP10Curve || changedField == &m_showP50Curve || changedField == &m_showP90Curve || changedField == &m_showMeanCurve || - changedField == &m_showCurveLabels || changedField == &m_color || changedField == &m_includeIncompleteCurves ) + changedField == &m_showCurveLabels || changedField == &m_color || changedField == &m_includeIncompleteCurves || + changedField == &m_showStatisticsCurveLegends ) { auto curveSet = m_parentCurveSet; if ( !curveSet ) return; @@ -135,6 +137,7 @@ void RimEnsembleStatistics::defineUiOrdering( QString uiConfigName, caf::PdmUiOr auto curveSet = m_parentCurveSet; uiOrdering.add( &m_active ); + if ( isActive() ) uiOrdering.add( &m_showStatisticsCurveLegends ); uiOrdering.add( &m_hideEnsembleCurves ); uiOrdering.add( &m_basedOnFilteredCases ); uiOrdering.add( &m_includeIncompleteCurves ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatistics.h b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatistics.h index 2fb8bed8c2..7cb19f7108 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatistics.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatistics.h @@ -36,6 +36,7 @@ public: bool isActive() const; void setShowStatisticsCurves( bool show ); + bool showStatisticsCurveLegends() const { return m_showStatisticsCurveLegends; } bool hideEnsembleCurves() const { return m_hideEnsembleCurves; } bool basedOnFilteredCases() const { return m_basedOnFilteredCases; } bool showP10Curve() const { return m_showP10Curve; } @@ -59,6 +60,7 @@ private: RimEnsembleCurveSetInterface* m_parentCurveSet; caf::PdmField m_active; + caf::PdmField m_showStatisticsCurveLegends; caf::PdmField m_hideEnsembleCurves; caf::PdmField m_basedOnFilteredCases; caf::PdmField m_showP10Curve; diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp index 174c867aef..63c7dbbb5d 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp @@ -945,6 +945,7 @@ void RimEnsembleWellLogCurveSet::updateStatisticsCurves( const std::vectorsetSymbolLabel( caf::AppEnum::uiText( statisticsType ) ); } curve->setLineStyle( RiuQwtPlotCurveDefines::LineStyleEnum::STYLE_SOLID ); + curve->setShowInLegend( m_statistics->showStatisticsCurveLegends() ); plotTrack->addCurve( curve );