diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp index ac4cc355ad..0ab5bcaaf9 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp @@ -293,6 +293,11 @@ void RimSummaryMultiPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOrde caf::PdmUiGroup* axesGroup = uiOrdering.addNewGroup( "Axes" ); axesGroup->add( &m_syncSubPlotAxes ); + { + auto group = uiOrdering.addNewGroup( "Data Source" ); + m_sourceStepping()->uiOrdering( uiConfigName, *group ); + } + uiOrdering.skipRemainingFields( true ); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp index 7c604b2383..d43c81781a 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp @@ -161,7 +161,8 @@ void RimSummaryPlotSourceStepping::applyPrevOtherIdentifier() //-------------------------------------------------------------------------------------------------- std::vector RimSummaryPlotSourceStepping::fieldsToShowInToolbar() { - return activeFieldsForDataSourceStepping(); + bool fieldsForToolbar = true; + return activeFieldsForDataSourceStepping( fieldsForToolbar ); } //-------------------------------------------------------------------------------------------------- @@ -169,7 +170,8 @@ std::vector RimSummaryPlotSourceStepping::fieldsToShowInTo //-------------------------------------------------------------------------------------------------- void RimSummaryPlotSourceStepping::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) { - auto visible = activeFieldsForDataSourceStepping(); + bool fieldsForToolbar = false; + auto visible = activeFieldsForDataSourceStepping( fieldsForToolbar ); if ( visible.empty() ) { uiOrdering.add( &m_placeholderForLabel ); @@ -209,8 +211,11 @@ QList { if ( sumCase->ensemble() ) { - auto name = sumCase->ensemble()->name() + " : " + sumCase->displayCaseName(); - options.append( caf::PdmOptionItemInfo( name, sumCase ) ); + if ( m_includeEnsembleCasesForCaseStepping() ) + { + auto name = sumCase->ensemble()->name() + " : " + sumCase->displayCaseName(); + options.append( caf::PdmOptionItemInfo( name, sumCase ) ); + } } else { @@ -744,7 +749,7 @@ std::set RimSummaryPlotSourceStepping::summaryCasesCurveCollect //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RimSummaryPlotSourceStepping::activeFieldsForDataSourceStepping() +std::vector RimSummaryPlotSourceStepping::activeFieldsForDataSourceStepping( bool toolbarFields ) { std::vector fields; @@ -757,7 +762,7 @@ std::vector RimSummaryPlotSourceStepping::activeFieldsForD m_summaryCase = *( sumCases.begin() ); fields.push_back( &m_summaryCase ); - fields.push_back( &m_includeEnsembleCasesForCaseStepping ); + if ( !toolbarFields ) fields.push_back( &m_includeEnsembleCasesForCaseStepping ); } } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h index 22b36a16a5..8b22b2d80f 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h @@ -78,7 +78,7 @@ private: std::set addressesForCurvesInPlot() const; std::set summaryCasesCurveCollection() const; - std::vector activeFieldsForDataSourceStepping(); + std::vector activeFieldsForDataSourceStepping( bool toolbarFields ); std::set ensembleCollection() const; bool isXAxisStepping() const;