OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-04 04:30:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

#8773 Source Stepping : Show data source stepping on summary multiplot

Browse Source
This commit is contained in:
Magne Sjaastad 2022-04-05 13:57:47 +02:00
parent 470d239a07
commit 9bbc709157
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp
View File

@ -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 );
}

17
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
View File

@ -161,7 +161,8 @@ void RimSummaryPlotSourceStepping::applyPrevOtherIdentifier()
//--------------------------------------------------------------------------------------------------
std::vector<caf::PdmFieldHandle*> RimSummaryPlotSourceStepping::fieldsToShowInToolbar()
{
return activeFieldsForDataSourceStepping();
bool fieldsForToolbar = true;
return activeFieldsForDataSourceStepping( fieldsForToolbar );
}
//--------------------------------------------------------------------------------------------------
@ -169,7 +170,8 @@ std::vector<caf::PdmFieldHandle*> 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<caf::PdmOptionItemInfo>
{
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<RimSummaryCase*> RimSummaryPlotSourceStepping::summaryCasesCurveCollect
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<caf::PdmFieldHandle*> RimSummaryPlotSourceStepping::activeFieldsForDataSourceStepping()
std::vector<caf::PdmFieldHandle*> RimSummaryPlotSourceStepping::activeFieldsForDataSourceStepping( bool toolbarFields )
{
std::vector<caf::PdmFieldHandle*> fields;
@ -757,7 +762,7 @@ std::vector<caf::PdmFieldHandle*> RimSummaryPlotSourceStepping::activeFieldsForD
m_summaryCase = *( sumCases.begin() );
fields.push_back( &m_summaryCase );
fields.push_back( &m_includeEnsembleCasesForCaseStepping );
if ( !toolbarFields ) fields.push_back( &m_includeEnsembleCasesForCaseStepping );
}
}

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h
View File

@ -78,7 +78,7 @@ private:
std::set<RifEclipseSummaryAddress> addressesForCurvesInPlot() const;
std::set<RimSummaryCase*> summaryCasesCurveCollection() const;
std::vector<caf::PdmFieldHandle*> activeFieldsForDataSourceStepping();
std::vector<caf::PdmFieldHandle*> activeFieldsForDataSourceStepping( bool toolbarFields );
std::set<RimSummaryCaseCollection*> ensembleCollection() const;
bool isXAxisStepping() const;