OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-26 23:20:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename to summaryEnsembles()

Browse Source
This commit is contained in:
Magne Sjaastad committed 2025-05-12 13:04:10 +02:00
1 parent 76b3b3009d
commit 5126face72
13 files changed
+47 -49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/Application/Tools/Summary/RiaSummaryTools.cpp
+1 -1
View File
@@ -291,7 +291,7 @@ RimSummaryCase* RiaSummaryTools::summaryCaseById( int caseId )
//--------------------------------------------------------------------------------------------------
RimSummaryEnsemble* RiaSummaryTools::ensembleById( int ensembleId )
{
auto ensembles = RimProject::current()->summaryGroups();
auto ensembles = RimProject::current()->summaryEnsembles();
for ( auto ensemble : ensembles )
{
ApplicationLibCode/Commands/PlotBuilderCommands/RicNewSummaryMultiPlotFeature.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ void RicNewSummaryMultiPlotFeature::onActionTriggered( bool isChecked )
RimSummaryMultiPlotCollection* coll = selectedCollection( selectedItems );
if ( coll )
{
auto ensembles = RimProject::current()->summaryGroups();
auto ensembles = RimProject::current()->summaryEnsembles();
if ( !ensembles.empty() )
selectedEnsembles.push_back( ensembles.front() );
else
ApplicationLibCode/Commands/PlotTemplateCommands/RicSelectCaseOrEnsembleUi.cpp
+8 -8
View File
@@ -52,13 +52,13 @@ void RicSelectCaseOrEnsembleUi::setEnsembleSelectionMode( bool ensembleMode )
if ( ensembleMode )
{
std::vector<RimSummaryEnsemble*> groups = proj->summaryGroups();
std::vector<RimSummaryEnsemble*> ensembles = proj->summaryEnsembles();
for ( RimSummaryEnsemble* group : groups )
for ( RimSummaryEnsemble* ensemble : ensembles )
{
if ( group->isEnsemble() )
if ( ensemble->isEnsemble() )
{
m_selectedEnsemble = group;
m_selectedEnsemble = ensemble;
break;
}
}
@@ -83,12 +83,12 @@ QList<caf::PdmOptionItemInfo> RicSelectCaseOrEnsembleUi::calculateValueOptions(
}
else if ( fieldNeedingOptions == &m_selectedEnsemble )
{
RimProject* proj = RimProject::current();
std::vector<RimSummaryEnsemble*> groups = proj->summaryGroups();
RimProject* proj = RimProject::current();
std::vector<RimSummaryEnsemble*> ensembles = proj->summaryEnsembles();
for ( RimSummaryEnsemble* group : groups )
for ( RimSummaryEnsemble* ensemble : ensembles )
{
if ( group->isEnsemble() ) options.push_back( caf::PdmOptionItemInfo( group->name(), group ) );
if ( ensemble->isEnsemble() ) options.push_back( caf::PdmOptionItemInfo( ensemble->name(), ensemble ) );
}
}
ApplicationLibCode/Commands/RicImportEnsembleFeature.cpp
+3 -3
View File
@@ -189,9 +189,9 @@ void RicImportEnsembleFeature::setupActionLook( QAction* actionToSetup )
QString RicImportEnsembleFeature::askForEnsembleName( const QString& suggestion )
{
RimProject* project = RimProject::current();
std::vector<RimSummaryEnsemble*> groups = project->summaryGroups();
int ensemblesStartingWithRoot = std::count_if( groups.begin(),
groups.end(),
std::vector<RimSummaryEnsemble*> ensembles = project->summaryEnsembles();
int ensemblesStartingWithRoot = std::count_if( ensembles.begin(),
ensembles.end(),
[suggestion]( RimSummaryEnsemble* group )
{ return group->isEnsemble() && group->name().startsWith( suggestion ); } );
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp
+3 -3
View File
@@ -159,7 +159,7 @@ bool RicNewSummaryEnsembleCurveSetFeature::isCommandEnabled() const
{
RimProject* project = RimProject::current();
CVF_ASSERT( project );
if ( !project->summaryGroups().empty() )
if ( !project->summaryEnsembles().empty() )
{
return true;
}
@@ -178,8 +178,8 @@ void RicNewSummaryEnsembleCurveSetFeature::onActionTriggered( bool isChecked )
RimSummaryPlot* plot = selectedSummaryPlot();
if ( plot )
{
CVF_ASSERT( !project->summaryGroups().empty() );
auto ensemble = project->summaryGroups().back();
CVF_ASSERT( !project->summaryEnsembles().empty() );
auto ensemble = project->summaryEnsembles().back();
RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
ApplicationLibCode/Commands/SummaryPlotCommands/RicOpenSummaryPlotEditorFeature.cpp
+3 -3
View File
@@ -103,10 +103,10 @@ void RicOpenSummaryPlotEditorFeature::onActionTriggered( bool isChecked )
if ( sourcesToSelect.empty() && selectedGroups.empty() )
{
const auto allSingleCases = project->firstSummaryCaseMainCollection()->topLevelSummaryCases();
const auto allGroups = project->summaryGroups();
const auto ensembles = project->summaryEnsembles();
std::vector<RimSummaryEnsemble*> allEnsembles;
for ( const auto group : allGroups )
if ( group->isEnsemble() ) allEnsembles.push_back( group );
for ( const auto ensemble : ensembles )
if ( ensemble->isEnsemble() ) allEnsembles.push_back( ensemble );
if ( !allSingleCases.empty() )
{
ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.cpp
+8 -10
View File
@@ -455,16 +455,15 @@ std::vector<RimSummaryEnsemble*> rftEnsemblesForWell( const QString& simWellName
{
const RimProject* project = RimProject::current();
std::vector<RimSummaryEnsemble*> allSummaryCaseCollections = project->summaryGroups();
std::vector<RimSummaryEnsemble*> ensembles = project->summaryEnsembles();
std::vector<RimSummaryEnsemble*> rftEnsembles;
for ( RimSummaryEnsemble* summaryCaseColl : allSummaryCaseCollections )
for ( RimSummaryEnsemble* ensemble : ensembles )
{
if ( summaryCaseColl && summaryCaseColl->isEnsemble() &&
!rftTimeStepsForWell( summaryCaseColl->allSummaryCases(), simWellName ).empty() )
if ( ensemble && ensemble->isEnsemble() && !rftTimeStepsForWell( ensemble->allSummaryCases(), simWellName ).empty() )
{
rftEnsembles.push_back( summaryCaseColl );
rftEnsembles.push_back( ensemble );
}
}
return rftEnsembles;
@@ -477,16 +476,15 @@ std::vector<RimSummaryEnsemble*> rftEnsembles()
{
const RimProject* project = RimProject::current();
std::vector<RimSummaryEnsemble*> allSummaryCaseCollections = project->summaryGroups();
std::vector<RimSummaryEnsemble*> ensembles = project->summaryEnsembles();
std::vector<RimSummaryEnsemble*> rftEnsembles;
for ( RimSummaryEnsemble* summaryCaseColl : allSummaryCaseCollections )
for ( RimSummaryEnsemble* ensemble : ensembles )
{
if ( summaryCaseColl && summaryCaseColl->isEnsemble() &&
!RimSummaryEnsembleTools::wellsWithRftData( summaryCaseColl->allSummaryCases() ).empty() )
if ( ensemble && ensemble->isEnsemble() && !RimSummaryEnsembleTools::wellsWithRftData( ensemble->allSummaryCases() ).empty() )
{
rftEnsembles.push_back( summaryCaseColl );
rftEnsembles.push_back( ensemble );
}
}
return rftEnsembles;
ApplicationLibCode/ProjectDataModel/RimProject.cpp
+3 -3
View File
@@ -563,9 +563,9 @@ void RimProject::assignIdToEnsemble( RimSummaryEnsemble* summaryCaseCollection )
{
if ( summaryCaseCollection )
{
for ( RimSummaryEnsemble* s : RimProject::summaryGroups() )
for ( RimSummaryEnsemble* ensemble : summaryEnsembles() )
{
m_nextValidEnsembleId = std::max( m_nextValidEnsembleId, s->ensembleId() + 1 );
m_nextValidEnsembleId = std::max( m_nextValidEnsembleId, ensemble->ensembleId() + 1 );
}
summaryCaseCollection->setEnsembleId( m_nextValidEnsembleId );
@@ -751,7 +751,7 @@ std::vector<RimSummaryCase*> RimProject::allSummaryCases() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryEnsemble*> RimProject::summaryGroups() const
std::vector<RimSummaryEnsemble*> RimProject::summaryEnsembles() const
{
std::vector<RimSummaryEnsemble*> ensembles;
ApplicationLibCode/ProjectDataModel/RimProject.h
+1 -1
View File
@@ -133,7 +133,7 @@ public:
[[nodiscard]] std::vector<RimCase*> allGridCases() const;
std::vector<RimSummaryCase*> allSummaryCases() const;
std::vector<RimSummaryEnsemble*> summaryGroups() const;
std::vector<RimSummaryEnsemble*> summaryEnsembles() const;
RimSummaryCaseMainCollection* firstSummaryCaseMainCollection() const;
[[nodiscard]] std::vector<Rim3dView*> allViews() const;
ApplicationLibCode/ProjectDataModel/Summary/RimDeltaSummaryEnsemble.cpp
+5 -5
View File
@@ -594,16 +594,16 @@ std::vector<RimSummaryEnsemble*> RimDeltaSummaryEnsemble::allEnsembles() const
auto project = RimProject::current();
for ( auto group : project->summaryGroups() )
for ( auto ensemble : project->summaryEnsembles() )
{
if ( group == this ) continue;
if ( ensemble == this ) continue;
if ( !group->isEnsemble() ) continue;
if ( !ensemble->isEnsemble() ) continue;
auto derivedEnsemble = dynamic_cast<const RimDeltaSummaryEnsemble*>( group );
auto derivedEnsemble = dynamic_cast<const RimDeltaSummaryEnsemble*>( ensemble );
if ( derivedEnsemble && !derivedEnsemble->isValid() ) continue;
ensembles.push_back( group );
ensembles.push_back( ensemble );
}
return ensembles;
}
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
+4 -4
View File
@@ -1613,12 +1613,12 @@ QList<caf::PdmOptionItemInfo> RimEnsembleCurveSet::calculateValueOptions( const
if ( fieldNeedingOptions == &m_yValuesSummaryEnsemble )
{
RimProject* proj = RimProject::current();
std::vector<RimSummaryEnsemble*> groups = proj->summaryGroups();
RimProject* proj = RimProject::current();
std::vector<RimSummaryEnsemble*> ensembles = proj->summaryEnsembles();
for ( RimSummaryEnsemble* group : groups )
for ( RimSummaryEnsemble* ensemble : ensembles )
{
if ( group->isEnsemble() ) options.push_back( caf::PdmOptionItemInfo( group->name(), group ) );
if ( ensemble->isEnsemble() ) options.push_back( caf::PdmOptionItemInfo( ensemble->name(), ensemble ) );
}
options.push_front( caf::PdmOptionItemInfo( "None", nullptr ) );
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressSelector.cpp
+4 -4
View File
@@ -255,12 +255,12 @@ auto createOptionsForEnsemble = []() -> QList<caf::PdmOptionItemInfo>
{
QList<caf::PdmOptionItemInfo> options;
RimProject* proj = RimProject::current();
std::vector<RimSummaryEnsemble*> groups = proj->summaryGroups();
RimProject* proj = RimProject::current();
std::vector<RimSummaryEnsemble*> ensembles = proj->summaryEnsembles();
for ( RimSummaryEnsemble* group : groups )
for ( RimSummaryEnsemble* ensemble : ensembles )
{
if ( group->isEnsemble() ) options.push_back( caf::PdmOptionItemInfo( group->name(), group ) );
if ( ensemble->isEnsemble() ) options.push_back( caf::PdmOptionItemInfo( ensemble->name(), ensemble ) );
}
options.push_front( caf::PdmOptionItemInfo( "None", nullptr ) );
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
+3 -3
View File
@@ -196,7 +196,7 @@ QList<caf::PdmOptionItemInfo> RimSummaryPlotSourceStepping::calculateValueOption
if ( fieldNeedingOptions == &m_ensemble )
{
RimProject* proj = RimProject::current();
for ( auto ensemble : proj->summaryGroups() )
for ( auto ensemble : proj->summaryEnsembles() )
{
if ( ensemble->isEnsemble() )
{
@@ -769,7 +769,7 @@ std::vector<caf::PdmFieldHandle*> RimSummaryPlotSourceStepping::activeFieldsForD
auto ensembleColl = ensembleCollection();
if ( ensembleColl.size() == 1 )
{
if ( proj->summaryGroups().size() > 1 )
if ( proj->summaryEnsembles().size() > 1 )
{
m_ensemble = *( ensembleColl.begin() );
@@ -1408,7 +1408,7 @@ RimSummaryEnsemble* RimSummaryPlotSourceStepping::stepEnsemble( int direction )
std::vector<RimSummaryEnsemble*> ensembles;
RimProject* proj = RimProject::current();
for ( auto ensemble : proj->summaryGroups() )
for ( auto ensemble : proj->summaryEnsembles() )
{
if ( ensemble->isEnsemble() )
{