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

Rename RimSummaryCaseCollection to RimSummaryEnsemble.

Browse Source
This commit is contained in:
Kristian Bendiksen
2024-07-29 15:38:17 +02:00
parent 1d7b40fbdd
commit e9c46c5cec
147 changed files with 852 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,11 +30,11 @@
#include "RimProject.h"
#include "RimSummaryAddressModifier.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveCollection.h"
#include "RimSummaryDataSourceStepping.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryPlot.h"
#include "RimSummaryPlotControls.h"
@@ -208,9 +208,9 @@ QList<caf::PdmOptionItemInfo> RimSummaryPlotSourceStepping::calculateValueOption
if ( !dataSourceSteppingObject()->curveSets().empty() )
{
auto first = dataSourceSteppingObject()->curveSets().front();
if ( first->summaryCaseCollection() )
if ( first->summaryEnsemble() )
{
analyzer = first->summaryCaseCollection()->addressAnalyzer();
analyzer = first->summaryEnsemble()->addressAnalyzer();
}
}
@@ -419,13 +419,13 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi( const caf::PdmFieldHandle*
if ( m_ensemble() && dataSourceSteppingObject() )
{
caf::PdmPointer<caf::PdmObjectHandle> variantHandle = oldValue.value<caf::PdmPointer<caf::PdmObjectHandle>>();
RimSummaryCaseCollection* previousCollection = dynamic_cast<RimSummaryCaseCollection*>( variantHandle.p() );
RimSummaryEnsemble* previousCollection = dynamic_cast<RimSummaryEnsemble*>( variantHandle.p() );
for ( auto curveSet : dataSourceSteppingObject()->curveSets() )
{
if ( curveSet->summaryCaseCollection() == previousCollection )
if ( curveSet->summaryEnsemble() == previousCollection )
{
curveSet->setSummaryCaseCollection( m_ensemble );
curveSet->setSummaryEnsemble( m_ensemble );
}
}
@@ -607,9 +607,9 @@ std::set<RifEclipseSummaryAddress> RimSummaryPlotSourceStepping::adressesForSour
{
for ( auto curveSet : dataSourceSteppingObject()->curveSets() )
{
if ( curveSet && curveSet->summaryCaseCollection() )
if ( curveSet && curveSet->summaryEnsemble() )
{
auto addresses = curveSet->summaryCaseCollection()->ensembleSummaryAddresses();
auto addresses = curveSet->summaryEnsemble()->ensembleSummaryAddresses();
addressSet.insert( addresses.begin(), addresses.end() );
}
}
@@ -875,17 +875,17 @@ std::vector<caf::PdmFieldHandle*> RimSummaryPlotSourceStepping::activeFieldsForD
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<RimSummaryCaseCollection*> RimSummaryPlotSourceStepping::ensembleCollection() const
std::set<RimSummaryEnsemble*> RimSummaryPlotSourceStepping::ensembleCollection() const
{
std::set<RimSummaryCaseCollection*> summaryCaseCollections;
std::set<RimSummaryEnsemble*> summaryCaseCollections;
if ( dataSourceSteppingObject() )
{
for ( auto curveSet : dataSourceSteppingObject()->curveSets() )
{
if ( curveSet && curveSet->summaryCaseCollection() )
if ( curveSet && curveSet->summaryEnsemble() )
{
summaryCaseCollections.insert( curveSet->summaryCaseCollection() );
summaryCaseCollections.insert( curveSet->summaryEnsemble() );
}
}
}
@@ -914,7 +914,7 @@ std::vector<RimSummaryCase*> RimSummaryPlotSourceStepping::summaryCasesForSource
{
if ( sumCase->isObservedData() ) continue;
auto sumCaseColl = sumCase->firstAncestorOrThisOfType<RimSummaryCaseCollection>();
auto sumCaseColl = sumCase->firstAncestorOrThisOfType<RimSummaryEnsemble>();
if ( sumCaseColl && sumCaseColl->isEnsemble() )
{
if ( m_includeEnsembleCasesForCaseStepping() )
@@ -1352,9 +1352,9 @@ RimSummaryCase* RimSummaryPlotSourceStepping::stepCase( int direction )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection* RimSummaryPlotSourceStepping::stepEnsemble( int direction )
RimSummaryEnsemble* RimSummaryPlotSourceStepping::stepEnsemble( int direction )
{
std::vector<RimSummaryCaseCollection*> ensembles;
std::vector<RimSummaryEnsemble*> ensembles;
RimProject* proj = RimProject::current();
for ( auto ensemble : proj->summaryGroups() )