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

2
ApplicationLibCode/Application/RiaApplication.cpp
View File

@@ -79,8 +79,8 @@
#include "RimStimPlanModelCollection.h"
#include "RimSummaryCalculationCollection.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSurfaceCollection.h"
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"

6
ApplicationLibCode/Application/RiaCurveSetDefinition.cpp
View File

@@ -19,7 +19,7 @@
#include "RiaCurveSetDefinition.h"
#include "RifSummaryReaderInterface.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
//--------------------------------------------------------------------------------------------------
///
@@ -32,7 +32,7 @@ RiaCurveSetDefinition::RiaCurveSetDefinition()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaCurveSetDefinition::RiaCurveSetDefinition( RimSummaryCaseCollection* ensemble, const RifEclipseSummaryAddress& summaryAddress )
RiaCurveSetDefinition::RiaCurveSetDefinition( RimSummaryEnsemble* ensemble, const RifEclipseSummaryAddress& summaryAddress )
: m_ensemble( ensemble )
, m_summaryAddress( summaryAddress )
{
@@ -41,7 +41,7 @@ RiaCurveSetDefinition::RiaCurveSetDefinition( RimSummaryCaseCollection* ensemble
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection* RiaCurveSetDefinition::ensemble() const
RimSummaryEnsemble* RiaCurveSetDefinition::ensemble() const
{
return m_ensemble;
}

10
ApplicationLibCode/Application/RiaCurveSetDefinition.h
View File

@@ -25,7 +25,7 @@
#include <utility>
#include <vector>
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
//==================================================================================================
///
@@ -34,14 +34,14 @@ class RiaCurveSetDefinition
{
public:
RiaCurveSetDefinition();
explicit RiaCurveSetDefinition( RimSummaryCaseCollection* emsemble, const RifEclipseSummaryAddress& summaryAddress );
explicit RiaCurveSetDefinition( RimSummaryEnsemble* emsemble, const RifEclipseSummaryAddress& summaryAddress );
RimSummaryCaseCollection* ensemble() const;
RimSummaryEnsemble* ensemble() const;
const RifEclipseSummaryAddress& summaryAddress() const;
bool operator<( const RiaCurveSetDefinition& other ) const;
private:
RimSummaryCaseCollection* m_ensemble;
RifEclipseSummaryAddress m_summaryAddress;
RimSummaryEnsemble* m_ensemble;
RifEclipseSummaryAddress m_summaryAddress;
};

2
ApplicationLibCode/Application/RiaFontCache.h
View File

@@ -31,7 +31,7 @@ template <typename T>
class AppEnum;
}
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
//==================================================================================================
///

2
ApplicationLibCode/Application/RiaGuiApplication.cpp
View File

@@ -77,8 +77,8 @@
#include "RimSimWellInViewCollection.h"
#include "RimStimPlanColors.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryPlot.h"
#include "RimTextAnnotation.h"
#include "RimTextAnnotationInView.h"

4
ApplicationLibCode/Application/RiaRftPltCurveDefinition.cpp
View File

@@ -57,8 +57,8 @@ const QDateTime& RiaRftPltCurveDefinition::timeStep() const
//--------------------------------------------------------------------------------------------------
auto RiaRftPltCurveDefinition::operator<=>( const RiaRftPltCurveDefinition& other ) const -> std::strong_ordering
{
RimSummaryCaseCollection* thisEnsemble = m_curveAddress.ensemble();
RimSummaryCaseCollection* otherEnsemble = other.m_curveAddress.ensemble();
RimSummaryEnsemble* thisEnsemble = m_curveAddress.ensemble();
RimSummaryEnsemble* otherEnsemble = other.m_curveAddress.ensemble();
if ( ( thisEnsemble && !otherEnsemble ) || ( !thisEnsemble && otherEnsemble ) )
{

10
ApplicationLibCode/Application/RiaSummaryCurveDefinition.cpp
View File

@@ -23,7 +23,7 @@
#include "RifSummaryReaderInterface.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "cafAssert.h"
@@ -57,7 +57,7 @@ RiaSummaryCurveDefinition::RiaSummaryCurveDefinition( RimSummaryCase*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaSummaryCurveDefinition::RiaSummaryCurveDefinition( RimSummaryCaseCollection* ensemble, const RifEclipseSummaryAddress& summaryAddressY )
RiaSummaryCurveDefinition::RiaSummaryCurveDefinition( RimSummaryEnsemble* ensemble, const RifEclipseSummaryAddress& summaryAddressY )
: m_summaryCaseY( nullptr )
, m_summaryAddressY( summaryAddressY )
, m_summaryCaseX( nullptr )
@@ -70,7 +70,7 @@ RiaSummaryCurveDefinition::RiaSummaryCurveDefinition( RimSummaryCaseCollection*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaSummaryCurveDefinition::RiaSummaryCurveDefinition( RimSummaryCaseCollection* ensemble, const RiaSummaryCurveAddress& summaryCurveAddress )
RiaSummaryCurveDefinition::RiaSummaryCurveDefinition( RimSummaryEnsemble* ensemble, const RiaSummaryCurveAddress& summaryCurveAddress )
: m_summaryCaseY( nullptr )
, m_summaryAddressY( summaryCurveAddress.summaryAddressY() )
, m_summaryCaseX( nullptr )
@@ -91,7 +91,7 @@ RimSummaryCase* RiaSummaryCurveDefinition::summaryCaseY() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection* RiaSummaryCurveDefinition::ensemble() const
RimSummaryEnsemble* RiaSummaryCurveDefinition::ensemble() const
{
return m_ensemble;
}
@@ -99,7 +99,7 @@ RimSummaryCaseCollection* RiaSummaryCurveDefinition::ensemble() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaSummaryCurveDefinition::setEnsemble( RimSummaryCaseCollection* ensemble )
void RiaSummaryCurveDefinition::setEnsemble( RimSummaryEnsemble* ensemble )
{
m_ensemble = ensemble;
}

26
ApplicationLibCode/Application/RiaSummaryCurveDefinition.h
View File

@@ -29,7 +29,7 @@
#include <gsl/gsl>
class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RiaSummaryCurveAddress;
//==================================================================================================
@@ -40,12 +40,12 @@ class RiaSummaryCurveDefinition
public:
RiaSummaryCurveDefinition();
explicit RiaSummaryCurveDefinition( RimSummaryCase* summaryCaseY, const RifEclipseSummaryAddress& summaryAddressY, bool isEnsembleCurve );
explicit RiaSummaryCurveDefinition( RimSummaryCaseCollection* ensemble, const RifEclipseSummaryAddress& summaryAddressY );
explicit RiaSummaryCurveDefinition( RimSummaryCaseCollection* ensemble, const RiaSummaryCurveAddress& summaryCurveAddress );
explicit RiaSummaryCurveDefinition( RimSummaryEnsemble* ensemble, const RifEclipseSummaryAddress& summaryAddressY );
explicit RiaSummaryCurveDefinition( RimSummaryEnsemble* ensemble, const RiaSummaryCurveAddress& summaryCurveAddress );
// X and Y Axis
RimSummaryCaseCollection* ensemble() const;
void setEnsemble( RimSummaryCaseCollection* ensemble );
RimSummaryEnsemble* ensemble() const;
void setEnsemble( RimSummaryEnsemble* ensemble );
// Y Axis
RimSummaryCase* summaryCaseY() const;
@@ -74,12 +74,12 @@ public:
static QString curveDefinitionText( const QString& caseName, const RifEclipseSummaryAddress& summaryAddress );
private:
RimSummaryCase* m_summaryCaseY;
RifEclipseSummaryAddress m_summaryAddressY;
RimSummaryCase* m_summaryCaseX;
RifEclipseSummaryAddress m_summaryAddressX;
RimSummaryCaseCollection* m_ensemble;
bool m_isEnsembleCurve;
RimSummaryCase* m_summaryCaseY;
RifEclipseSummaryAddress m_summaryAddressY;
RimSummaryCase* m_summaryCaseX;
RifEclipseSummaryAddress m_summaryAddressX;
RimSummaryEnsemble* m_ensemble;
bool m_isEnsembleCurve;
};
class RiaSummaryCurveDefinitionAnalyser
@@ -88,8 +88,8 @@ public:
RiaSummaryCurveDefinitionAnalyser() = default;
void setCurveDefinitions( const std::vector<RiaSummaryCurveDefinition>& curveDefs );
std::set<RimSummaryCase*> m_singleSummaryCases; // All summary cases used
std::set<RimSummaryCaseCollection*> m_ensembles; // All the ensembles referenced by the summary cases
std::set<RimSummaryCase*> m_singleSummaryCases; // All summary cases used
std::set<RimSummaryEnsemble*> m_ensembles; // All the ensembles referenced by the summary cases
std::set<RifEclipseSummaryAddress> m_summaryAdresses;
std::set<std::string> m_vectorNames;

2
ApplicationLibCode/Application/Tools/RiaEnsembleNameTools.cpp
View File

@@ -25,7 +25,7 @@
#include "RimCaseDisplayNameTools.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "cafAppEnum.h"

6
ApplicationLibCode/Application/Tools/RiaImportEclipseCaseTools.cpp
View File

@@ -49,10 +49,10 @@
#include "RimProject.h"
#include "RimRoffCase.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryPlot.h"
#include "RimWellLogRftCurve.h"
@@ -121,11 +121,11 @@ bool RiaImportEclipseCaseTools::openEclipseCasesFromFile( const QStringList& fil
for ( RimSummaryCase* newSumCase : candidateCases )
{
RimSummaryCaseCollection* existingCollection = nullptr;
RimSummaryEnsemble* existingCollection = nullptr;
auto existingSummaryCase = sumCaseColl->findTopLevelSummaryCaseFromFileName( newSumCase->summaryHeaderFilename() );
if ( existingSummaryCase )
{
existingCollection = existingSummaryCase->firstAncestorOrThisOfType<RimSummaryCaseCollection>();
existingCollection = existingSummaryCase->firstAncestorOrThisOfType<RimSummaryEnsemble>();
// Replace file summary case pointers in Rft Curves
auto rftCurves = existingSummaryCase->objectsWithReferringPtrFieldsOfType<RimWellLogRftCurve>();

14
ApplicationLibCode/Application/Tools/RiaSummaryStringTools.cpp
View File

@@ -29,8 +29,8 @@
#include "RimMainPlotCollection.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "SummaryPlotCommands/RicSummaryPlotFeatureImpl.h"
@@ -142,7 +142,7 @@ void RiaSummaryStringTools::splitUsingDataSourceNames( const QStringList& filter
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::pair<std::vector<RimSummaryCase*>, std::vector<RimSummaryCaseCollection*>> RiaSummaryStringTools::allDataSourcesInProject()
std::pair<std::vector<RimSummaryCase*>, std::vector<RimSummaryEnsemble*>> RiaSummaryStringTools::allDataSourcesInProject()
{
auto sumCaseMainColl = RiaSummaryTools::summaryCaseMainCollection();
if ( !sumCaseMainColl ) return { {}, {} };
@@ -156,11 +156,11 @@ std::pair<std::vector<RimSummaryCase*>, std::vector<RimSummaryCaseCollection*>>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::pair<std::vector<RimSummaryCase*>, std::vector<RimSummaryCaseCollection*>>
std::pair<std::vector<RimSummaryCase*>, std::vector<RimSummaryEnsemble*>>
RiaSummaryStringTools::dataSourcesMatchingFilters( const QStringList& dataSourceFilters )
{
std::vector<RimSummaryCase*> matchingSummaryCases;
std::vector<RimSummaryCaseCollection*> matchingEnsembles;
std::vector<RimSummaryCase*> matchingSummaryCases;
std::vector<RimSummaryEnsemble*> matchingEnsembles;
auto [allSummaryCases, allEnsembles] = allDataSourcesInProject();
@@ -223,8 +223,8 @@ QStringList RiaSummaryStringTools::splitIntoWords( const QString& text )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QStringList RiaSummaryStringTools::dataSourceNames( const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryCaseCollection*>& ensembles )
QStringList RiaSummaryStringTools::dataSourceNames( const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles )
{
QStringList names;
for ( const auto& summaryCase : summaryCases )

9
ApplicationLibCode/Application/Tools/RiaSummaryStringTools.h
View File

@@ -25,7 +25,7 @@
class RimSummaryCase;
class RifEclipseSummaryAddress;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class QString;
@@ -42,14 +42,13 @@ public:
static std::pair<QStringList, QStringList> splitIntoAddressAndDataSourceFilters( const QString& filter );
static std::pair<std::vector<RimSummaryCase*>, std::vector<RimSummaryCaseCollection*>> allDataSourcesInProject();
static std::pair<std::vector<RimSummaryCase*>, std::vector<RimSummaryCaseCollection*>>
static std::pair<std::vector<RimSummaryCase*>, std::vector<RimSummaryEnsemble*>> allDataSourcesInProject();
static std::pair<std::vector<RimSummaryCase*>, std::vector<RimSummaryEnsemble*>>
dataSourcesMatchingFilters( const QStringList& dataSourceFilters );
static QStringList splitIntoWords( const QString& text );
static QStringList dataSourceNames( const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryCaseCollection*>& ensembles );
static QStringList dataSourceNames( const std::vector<RimSummaryCase*>& summaryCases, const std::vector<RimSummaryEnsemble*>& ensembles );
static std::set<RifEclipseSummaryAddress> computeFilteredAddresses( const QStringList& textFilters,
const std::set<RifEclipseSummaryAddress>& sourceAddresses,

6
ApplicationLibCode/Application/Tools/RiaSummaryTools.cpp
View File

@@ -32,9 +32,9 @@
#include "RimSummaryCalculationCollection.h"
#include "RimSummaryCalculationVariable.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryMultiPlotCollection.h"
#include "RimSummaryPlot.h"
@@ -268,7 +268,7 @@ RimSummaryCase* RiaSummaryTools::summaryCaseById( int caseId )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection* RiaSummaryTools::ensembleById( int ensembleId )
RimSummaryEnsemble* RiaSummaryTools::ensembleById( int ensembleId )
{
auto ensembles = RimProject::current()->summaryGroups();
@@ -397,7 +397,7 @@ void RiaSummaryTools::reloadSummaryCase( RimSummaryCase* summaryCase )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaSummaryTools::reloadSummaryEnsemble( RimSummaryCaseCollection* ensemble )
void RiaSummaryTools::reloadSummaryEnsemble( RimSummaryEnsemble* ensemble )
{
RimSummaryMultiPlotCollection* summaryPlotColl = RiaSummaryTools::summaryMultiPlotCollection();
for ( RimSummaryMultiPlot* multiPlot : summaryPlotColl->multiPlots() )

8
ApplicationLibCode/Application/Tools/RiaSummaryTools.h
View File

@@ -32,7 +32,7 @@ class RimSummaryMultiPlot;
class RimSummaryMultiPlotCollection;
class RimSummaryCaseMainCollection;
class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimSummaryTable;
class RimSummaryTableCollection;
class RimObservedDataCollection;
@@ -76,8 +76,8 @@ public:
const std::vector<double>& values,
RiaDefines::DateTimePeriod period );
static RimSummaryCase* summaryCaseById( int caseId );
static RimSummaryCaseCollection* ensembleById( int ensembleId );
static RimSummaryCase* summaryCaseById( int caseId );
static RimSummaryEnsemble* ensembleById( int ensembleId );
static QList<caf::PdmOptionItemInfo> optionsForAllSummaryCases();
static QList<caf::PdmOptionItemInfo> optionsForSummaryCases( const std::vector<RimSummaryCase*>& cases );
@@ -86,7 +86,7 @@ public:
static void copyCurveAxisData( RimSummaryCurve& curve, const RimSummaryCurve& otherCurve );
static void reloadSummaryCase( RimSummaryCase* summaryCase );
static void reloadSummaryEnsemble( RimSummaryCaseCollection* ensemble );
static void reloadSummaryEnsemble( RimSummaryEnsemble* ensemble );
private:
static void updateRequiredCalculatedCurves( RimSummaryCase* sourceSummaryCase );

8
ApplicationLibCode/Commands/AnalysisPlotCommands/RicNewAnalysisPlotFeature.cpp
View File

@@ -62,10 +62,10 @@ void RicNewAnalysisPlotFeature::onActionTriggered( bool isChecked )
CAF_ASSERT( !correlationPlotCollections.empty() );
analysisPlotColl = correlationPlotCollections.front();
EnsemblePlotParams params = userData.value<EnsemblePlotParams>();
RimSummaryCaseCollection* ensemble = params.ensemble;
QString quantityName = params.mainQuantityName;
std::time_t timeStep = params.timeStep;
EnsemblePlotParams params = userData.value<EnsemblePlotParams>();
RimSummaryEnsemble* ensemble = params.ensemble;
QString quantityName = params.mainQuantityName;
std::time_t timeStep = params.timeStep;
newPlot = analysisPlotColl->createAnalysisPlot( ensemble, quantityName, timeStep );
}

4
ApplicationLibCode/Commands/CorrelationPlotCommands/RicNewCorrelationMatrixPlotFeature.cpp
View File

@@ -67,8 +67,8 @@ void RicNewCorrelationMatrixPlotFeature::onActionTriggered( bool isChecked )
std::vector<QString> includedQuantityNames =
std::vector<QString>( params.includedQuantityNames.begin(), params.includedQuantityNames.end() );
RimSummaryCaseCollection* ensemble = params.ensemble;
std::time_t timeStep = params.timeStep;
RimSummaryEnsemble* ensemble = params.ensemble;
std::time_t timeStep = params.timeStep;
newPlot = correlationPlotColl->createCorrelationMatrixPlot( ensemble, includedQuantityNames, timeStep );
}

16
ApplicationLibCode/Commands/CorrelationPlotCommands/RicNewCorrelationPlotFeature.cpp
View File

@@ -60,10 +60,10 @@ void RicNewCorrelationPlotFeature::onActionTriggered( bool isChecked )
CAF_ASSERT( !correlationPlotCollections.empty() );
correlationPlotColl = correlationPlotCollections.front();
EnsemblePlotParams params = userData.value<EnsemblePlotParams>();
RimSummaryCaseCollection* ensemble = params.ensemble;
QString quantityName = params.mainQuantityName;
std::time_t timeStep = params.timeStep;
EnsemblePlotParams params = userData.value<EnsemblePlotParams>();
RimSummaryEnsemble* ensemble = params.ensemble;
QString quantityName = params.mainQuantityName;
std::time_t timeStep = params.timeStep;
newPlot = correlationPlotColl->createCorrelationPlot( ensemble, quantityName, timeStep );
}
@@ -104,10 +104,10 @@ EnsemblePlotParams::EnsemblePlotParams()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
EnsemblePlotParams::EnsemblePlotParams( RimSummaryCaseCollection* ensemble,
const QStringList& includedQuantityNames,
const QString& mainQuantityName,
const std::time_t& timeStep )
EnsemblePlotParams::EnsemblePlotParams( RimSummaryEnsemble* ensemble,
const QStringList& includedQuantityNames,
const QString& mainQuantityName,
const std::time_t& timeStep )
: ensemble( ensemble )
, includedQuantityNames( includedQuantityNames )
, mainQuantityName( mainQuantityName )

20
ApplicationLibCode/Commands/CorrelationPlotCommands/RicNewCorrelationPlotFeature.h
View File

@@ -22,24 +22,24 @@
#include <ctime>
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class EnsemblePlotParams
{
public:
RimSummaryCaseCollection* ensemble;
QStringList includedQuantityNames;
QString mainQuantityName;
QString ensembleParameter;
std::time_t timeStep;
RimSummaryEnsemble* ensemble;
QStringList includedQuantityNames;
QString mainQuantityName;
QString ensembleParameter;
std::time_t timeStep;
EnsemblePlotParams();
EnsemblePlotParams( const EnsemblePlotParams& rhs ) = default;
EnsemblePlotParams( RimSummaryCaseCollection* ensemble,
const QStringList& includedQuantityNames,
const QString& mainQuantityName,
const std::time_t& timeStep );
EnsemblePlotParams( RimSummaryEnsemble* ensemble,
const QStringList& includedQuantityNames,
const QString& mainQuantityName,
const std::time_t& timeStep );
~EnsemblePlotParams() = default;
};

6
ApplicationLibCode/Commands/CorrelationPlotCommands/RicNewCorrelationReportPlotFeature.cpp
View File

@@ -61,9 +61,9 @@ void RicNewCorrelationReportPlotFeature::onActionTriggered( bool isChecked )
CAF_ASSERT( !correlationPlotCollections.empty() );
correlationPlotColl = correlationPlotCollections.front();
EnsemblePlotParams params = userData.value<EnsemblePlotParams>();
RimSummaryCaseCollection* ensemble = params.ensemble;
std::vector<QString> includedQuantityNames =
EnsemblePlotParams params = userData.value<EnsemblePlotParams>();
RimSummaryEnsemble* ensemble = params.ensemble;
std::vector<QString> includedQuantityNames =
std::vector<QString>( params.includedQuantityNames.begin(), params.includedQuantityNames.end() );
QString mainQuantityName = params.mainQuantityName;

8
ApplicationLibCode/Commands/CorrelationPlotCommands/RicNewParameterResultCrossPlotFeature.cpp
View File

@@ -52,10 +52,10 @@ void RicNewParameterResultCrossPlotFeature::onActionTriggered( bool isChecked )
{
RimCorrelationPlotCollection* correlationPlotColl = caf::firstAncestorOfTypeFromSelectedObject<RimCorrelationPlotCollection>();
RimSummaryCaseCollection* ensemble = nullptr;
QString quantityName;
QString ensembleParameter;
std::time_t timeStep = 0;
RimSummaryEnsemble* ensemble = nullptr;
QString quantityName;
QString ensembleParameter;
std::time_t timeStep = 0;
RimParameterResultCrossPlot* newPlot = nullptr;
if ( !correlationPlotColl )

2
ApplicationLibCode/Commands/OperationsUsingObjReferences/RicCutReferencesToClipboardFeature.cpp
View File

@@ -20,8 +20,8 @@
#include "RimMimeData.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "cafPdmObject.h"
#include "cafPdmUiItem.h"

4
ApplicationLibCode/Commands/PlotBuilderCommands/RicAppendSummaryCurvesForSummaryCasesFeature.cpp
View File

@@ -24,7 +24,7 @@
#include "RimSummaryAddressCollection.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryPlot.h"
@@ -88,7 +88,7 @@ std::vector<caf::PdmObjectHandle*> RicAppendSummaryCurvesForSummaryCasesFeature:
generalObjects.insert( generalObjects.begin(), objects.begin(), objects.end() );
}
{
std::vector<RimSummaryCaseCollection*> objects;
std::vector<RimSummaryEnsemble*> objects;
caf::SelectionManager::instance()->objectsByType( &objects );
generalObjects.insert( generalObjects.begin(), objects.begin(), objects.end() );

16
ApplicationLibCode/Commands/PlotBuilderCommands/RicAppendSummaryPlotsForObjectsFeature.cpp
View File

@@ -30,8 +30,8 @@
#include "RimSummaryAddressCollection.h"
#include "RimSummaryAddressModifier.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryMultiPlotCollection.h"
#include "RimSummaryPlot.h"
@@ -94,7 +94,7 @@ void RicAppendSummaryPlotsForObjectsFeature::appendPlots( RimSummaryMultiPlot*
{
for ( auto c : duplicatedPlot->curveSets() )
{
c->setSummaryCaseCollection( ensemble );
c->setSummaryEnsemble( ensemble );
}
}
}
@@ -120,9 +120,9 @@ void RicAppendSummaryPlotsForObjectsFeature::appendPlots( RimSummaryMultiPlot*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicAppendSummaryPlotsForObjectsFeature::appendPlots( RimSummaryMultiPlot* summaryMultiPlot,
const std::vector<RimSummaryCase*>& cases,
const std::vector<RimSummaryCaseCollection*>& ensembles )
void RicAppendSummaryPlotsForObjectsFeature::appendPlots( RimSummaryMultiPlot* summaryMultiPlot,
const std::vector<RimSummaryCase*>& cases,
const std::vector<RimSummaryEnsemble*>& ensembles )
{
auto addressCollectionsToBeDeleted = RicAppendSummaryPlotsForObjectsFeature::createAddressCollections( cases, ensembles );
RicAppendSummaryPlotsForObjectsFeature::appendPlots( summaryMultiPlot, addressCollectionsToBeDeleted );
@@ -137,8 +137,8 @@ void RicAppendSummaryPlotsForObjectsFeature::appendPlots( RimSummaryMultiPlot*
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryAddressCollection*>
RicAppendSummaryPlotsForObjectsFeature::createAddressCollections( const std::vector<RimSummaryCase*>& cases,
const std::vector<RimSummaryCaseCollection*>& ensembles )
RicAppendSummaryPlotsForObjectsFeature::createAddressCollections( const std::vector<RimSummaryCase*>& cases,
const std::vector<RimSummaryEnsemble*>& ensembles )
{
std::vector<RimSummaryAddressCollection*> addresses;
@@ -351,7 +351,7 @@ std::vector<RimSummaryPlot*>
auto curveSets = sourcePlot->curveSets();
for ( auto c : curveSets )
{
if ( c->summaryCaseCollection()->ensembleId() == ensembleIdToMatch ) isMatching = true;
if ( c->summaryEnsemble()->ensembleId() == ensembleIdToMatch ) isMatching = true;
}
}
else

12
ApplicationLibCode/Commands/PlotBuilderCommands/RicAppendSummaryPlotsForObjectsFeature.h
View File

@@ -30,7 +30,7 @@ class RimSummaryMultiPlot;
class RifEclipseSummaryAddress;
class RimSummaryPlot;
class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
//==================================================================================================
///
@@ -50,9 +50,9 @@ public:
static void appendPlots( RimSummaryMultiPlot* summaryMultiPlot, const std::vector<RimSummaryAddressCollection*>& selection );
static void appendPlots( RimSummaryMultiPlot* summaryMultiPlot,
const std::vector<RimSummaryCase*>& cases,
const std::vector<RimSummaryCaseCollection*>& ensembles );
static void appendPlots( RimSummaryMultiPlot* summaryMultiPlot,
const std::vector<RimSummaryCase*>& cases,
const std::vector<RimSummaryEnsemble*>& ensembles );
protected:
bool isCommandEnabled() const override;
@@ -60,6 +60,6 @@ protected:
void setupActionLook( QAction* actionToSetup ) override;
private:
static std::vector<RimSummaryAddressCollection*> createAddressCollections( const std::vector<RimSummaryCase*>& cases,
const std::vector<RimSummaryCaseCollection*>& ensembles );
static std::vector<RimSummaryAddressCollection*> createAddressCollections( const std::vector<RimSummaryCase*>& cases,
const std::vector<RimSummaryEnsemble*>& ensembles );
};

6
ApplicationLibCode/Commands/PlotBuilderCommands/RicAppendSummaryPlotsForSummaryCasesFeature.cpp
View File

@@ -24,7 +24,7 @@
#include "RimSummaryAddressCollection.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "cafSelectionManager.h"
@@ -86,9 +86,9 @@ std::vector<RimSummaryCase*> RicAppendSummaryPlotsForSummaryCasesFeature::select
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCaseCollection*> RicAppendSummaryPlotsForSummaryCasesFeature::selectedEnsembles()
std::vector<RimSummaryEnsemble*> RicAppendSummaryPlotsForSummaryCasesFeature::selectedEnsembles()
{
std::vector<RimSummaryCaseCollection*> objects;
std::vector<RimSummaryEnsemble*> objects;
caf::SelectionManager::instance()->objectsByType( &objects );
return objects;

6
ApplicationLibCode/Commands/PlotBuilderCommands/RicAppendSummaryPlotsForSummaryCasesFeature.h
View File

@@ -24,7 +24,7 @@
class RimSummaryCase;
class RimSummaryMultiPlot;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
//==================================================================================================
///
@@ -39,6 +39,6 @@ protected:
void setupActionLook( QAction* actionToSetup ) override;
private:
static std::vector<RimSummaryCase*> selectedCases();
static std::vector<RimSummaryCaseCollection*> selectedEnsembles();
static std::vector<RimSummaryCase*> selectedCases();
static std::vector<RimSummaryEnsemble*> selectedEnsembles();
};

6
ApplicationLibCode/Commands/PlotBuilderCommands/RicNewEmptySummaryMultiPlotFeature.cpp
View File

@@ -22,7 +22,7 @@
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryMultiPlotCollection.h"
#include "RimSummaryPlot.h"
@@ -41,8 +41,8 @@ CAF_CMD_SOURCE_INIT( RicNewEmptySummaryMultiPlotFeature, "RicNewEmptySummaryMult
//--------------------------------------------------------------------------------------------------
void RicNewEmptySummaryMultiPlotFeature::onActionTriggered( bool isChecked )
{
std::vector<RimSummaryCase*> selectedIndividualSummaryCases;
std::vector<RimSummaryCaseCollection*> selectedEnsembles;
std::vector<RimSummaryCase*> selectedIndividualSummaryCases;
std::vector<RimSummaryEnsemble*> selectedEnsembles;
bool skipCreationOfPlotBasedOnPreferences = false;
RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPlot( selectedIndividualSummaryCases,

14
ApplicationLibCode/Commands/PlotBuilderCommands/RicNewSummaryMultiPlotFeature.cpp
View File

@@ -22,7 +22,7 @@
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryMultiPlotCollection.h"
#include "RimSummaryPlot.h"
@@ -46,8 +46,8 @@ bool RicNewSummaryMultiPlotFeature::isCommandEnabled() const
if ( selectedCollection( selectedUiItems ) ) return true;
std::vector<RimSummaryCase*> selectedIndividualSummaryCases;
std::vector<RimSummaryCaseCollection*> selectedEnsembles;
std::vector<RimSummaryCase*> selectedIndividualSummaryCases;
std::vector<RimSummaryEnsemble*> selectedEnsembles;
return selectedCases( &selectedIndividualSummaryCases, &selectedEnsembles );
}
@@ -59,8 +59,8 @@ void RicNewSummaryMultiPlotFeature::onActionTriggered( bool isChecked )
std::vector<caf::PdmUiItem*> selectedUiItems;
caf::SelectionManager::instance()->selectedItems( selectedUiItems );
std::vector<RimSummaryCase*> selectedIndividualSummaryCases;
std::vector<RimSummaryCaseCollection*> selectedEnsembles;
std::vector<RimSummaryCase*> selectedIndividualSummaryCases;
std::vector<RimSummaryEnsemble*> selectedEnsembles;
RimSummaryMultiPlotCollection* coll = selectedCollection( selectedUiItems );
if ( coll )
@@ -110,8 +110,8 @@ RimSummaryMultiPlotCollection* RicNewSummaryMultiPlotFeature::selectedCollection
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicNewSummaryMultiPlotFeature::selectedCases( std::vector<RimSummaryCase*>* selectedIndividualSummaryCases,
std::vector<RimSummaryCaseCollection*>* selectedEnsembles )
bool RicNewSummaryMultiPlotFeature::selectedCases( std::vector<RimSummaryCase*>* selectedIndividualSummaryCases,
std::vector<RimSummaryEnsemble*>* selectedEnsembles )
{
CAF_ASSERT( selectedIndividualSummaryCases && selectedEnsembles );

6
ApplicationLibCode/Commands/PlotBuilderCommands/RicNewSummaryMultiPlotFeature.h
View File

@@ -26,7 +26,7 @@
class RimSummaryMultiPlotCollection;
class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
//==================================================================================================
///
@@ -43,6 +43,6 @@ protected:
private:
static RimSummaryMultiPlotCollection* selectedCollection( std::vector<caf::PdmUiItem*>& items );
static bool selectedCases( std::vector<RimSummaryCase*>* selectedIndividualSummaryCases,
std::vector<RimSummaryCaseCollection*>* selectedEnsembles );
static bool selectedCases( std::vector<RimSummaryCase*>* selectedIndividualSummaryCases,
std::vector<RimSummaryEnsemble*>* selectedEnsembles );
};

14
ApplicationLibCode/Commands/PlotBuilderCommands/RicNewSummaryMultiPlotFromDataVectorFeature.cpp
View File

@@ -23,7 +23,7 @@
#include "RimSummaryAddress.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryPlot.h"
#include "RicSummaryPlotBuilder.h"
@@ -70,12 +70,12 @@ bool RicNewSummaryMultiPlotFromDataVectorFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicNewSummaryMultiPlotFromDataVectorFeature::onActionTriggered( bool isChecked )
{
std::vector<RimSummaryAddress*> selectedAddressItems = caf::selectedObjectsByType<RimSummaryAddress*>();
std::set<int> caseIds;
std::set<int> ensembleIds;
std::vector<RimSummaryCase*> selectedCases;
std::set<RifEclipseSummaryAddress> eclipseAddresses;
std::vector<RimSummaryCaseCollection*> selectedEnsembles;
std::vector<RimSummaryAddress*> selectedAddressItems = caf::selectedObjectsByType<RimSummaryAddress*>();
std::set<int> caseIds;
std::set<int> ensembleIds;
std::vector<RimSummaryCase*> selectedCases;
std::set<RifEclipseSummaryAddress> eclipseAddresses;
std::vector<RimSummaryEnsemble*> selectedEnsembles;
bool isEnsemble = false;

12
ApplicationLibCode/Commands/PlotBuilderCommands/RicNewSummaryPlotFromDataVectorFeature.cpp
View File

@@ -67,12 +67,12 @@ bool RicNewSummaryPlotFromDataVectorFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicNewSummaryPlotFromDataVectorFeature::onActionTriggered( bool isChecked )
{
std::vector<RimSummaryAddress*> selectedAddressItems = caf::selectedObjectsByType<RimSummaryAddress*>();
std::set<int> caseIds;
std::set<int> ensembleIds;
std::vector<RimSummaryCase*> selectedCases;
std::set<RifEclipseSummaryAddress> eclipseAddresses;
std::vector<RimSummaryCaseCollection*> selectedEnsembles;
std::vector<RimSummaryAddress*> selectedAddressItems = caf::selectedObjectsByType<RimSummaryAddress*>();
std::set<int> caseIds;
std::set<int> ensembleIds;
std::vector<RimSummaryCase*> selectedCases;
std::set<RifEclipseSummaryAddress> eclipseAddresses;
std::vector<RimSummaryEnsemble*> selectedEnsembles;
bool isEnsemble = false;

39
ApplicationLibCode/Commands/PlotBuilderCommands/RicSummaryPlotBuilder.cpp
View File

@@ -38,9 +38,9 @@
#include "RimPlot.h"
#include "RimSaturationPressurePlot.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveAppearanceCalculator.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryMultiPlotCollection.h"
#include "RimSummaryPlot.h"
@@ -59,8 +59,7 @@ RicSummaryPlotBuilder::RicSummaryPlotBuilder()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryPlotBuilder::setDataSources( const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryCaseCollection*>& ensembles )
void RicSummaryPlotBuilder::setDataSources( const std::vector<RimSummaryCase*>& summaryCases, const std::vector<RimSummaryEnsemble*>& ensembles )
{
m_summaryCases = summaryCases;
m_ensembles = ensembles;
@@ -224,7 +223,7 @@ std::vector<RimSummaryPlot*> RicSummaryPlotBuilder::createPlots() const
//--------------------------------------------------------------------------------------------------
std::set<RifEclipseSummaryAddress> RicSummaryPlotBuilder::addressesForSource( caf::PdmObject* summarySource )
{
auto ensemble = dynamic_cast<RimSummaryCaseCollection*>( summarySource );
auto ensemble = dynamic_cast<RimSummaryEnsemble*>( summarySource );
if ( ensemble )
{
return ensemble->ensembleSummaryAddresses();
@@ -246,11 +245,11 @@ std::set<RifEclipseSummaryAddress> RicSummaryPlotBuilder::addressesForSource( ca
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEnsembleCurveSet* RicSummaryPlotBuilder::createCurveSet( RimSummaryCaseCollection* ensemble, const RifEclipseSummaryAddress& addr )
RimEnsembleCurveSet* RicSummaryPlotBuilder::createCurveSet( RimSummaryEnsemble* ensemble, const RifEclipseSummaryAddress& addr )
{
auto curveSet = new RimEnsembleCurveSet();
curveSet->setSummaryCaseCollection( ensemble );
curveSet->setSummaryEnsemble( ensemble );
curveSet->setSummaryAddressYAndStatisticsFlag( addr );
return curveSet;
@@ -400,8 +399,8 @@ void RicSummaryPlotBuilder::appendPlotsToMultiPlot( RimMultiPlot* multiPlot, con
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryMultiPlot* RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPlot( const std::vector<RimSummaryCase*>& cases,
const std::vector<RimSummaryCaseCollection*>& ensembles,
RimSummaryMultiPlot* RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPlot( const std::vector<RimSummaryCase*>& cases,
const std::vector<RimSummaryEnsemble*>& ensembles,
bool skipCreationOfPlotBasedOnPreferences )
{
RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
@@ -604,9 +603,9 @@ RimSummaryPlot* RicSummaryPlotBuilder::createPlot( const std::vector<RimSummaryC
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryPlot* RicSummaryPlotBuilder::createPlot( const std::set<RifEclipseSummaryAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryCaseCollection*>& ensembles )
RimSummaryPlot* RicSummaryPlotBuilder::createPlot( const std::set<RifEclipseSummaryAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles )
{
auto* plot = new RimSummaryPlot();
plot->enableAutoPlotTitle( true );
@@ -621,9 +620,9 @@ RimSummaryPlot* RicSummaryPlotBuilder::createPlot( const std::set<RifEclipseSumm
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryPlot* RicSummaryPlotBuilder::createCrossPlot( const std::vector<RiaSummaryCurveAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryCaseCollection*>& ensembles )
RimSummaryPlot* RicSummaryPlotBuilder::createCrossPlot( const std::vector<RiaSummaryCurveAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles )
{
auto* summaryPlot = new RimSummaryPlot();
summaryPlot->enableAutoPlotTitle( true );
@@ -656,10 +655,10 @@ RimSummaryPlot* RicSummaryPlotBuilder::createCrossPlot( const std::vector<RiaSum
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryPlotBuilder::appendCurvesToPlot( RimSummaryPlot* summaryPlot,
const std::set<RifEclipseSummaryAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryCaseCollection*>& ensembles )
void RicSummaryPlotBuilder::appendCurvesToPlot( RimSummaryPlot* summaryPlot,
const std::set<RifEclipseSummaryAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles )
{
for ( const auto& addr : addresses )
{
@@ -683,11 +682,11 @@ void RicSummaryPlotBuilder::appendCurvesToPlot( RimSummaryPlot*
//--------------------------------------------------------------------------------------------------
RimEnsembleCurveSet* RicSummaryPlotBuilder::addNewEnsembleCurve( RimSummaryPlot* summaryPlot,
const RiaSummaryCurveAddress& curveAddress,
RimSummaryCaseCollection* ensemble )
RimSummaryEnsemble* ensemble )
{
auto* curveSet = new RimEnsembleCurveSet();
curveSet->setSummaryCaseCollection( ensemble );
curveSet->setSummaryEnsemble( ensemble );
curveSet->setCurveAddress( curveAddress );
cvf::Color3f curveColor =

38
ApplicationLibCode/Commands/PlotBuilderCommands/RicSummaryPlotBuilder.h
View File

@@ -22,7 +22,7 @@ class RimPlot;
class RimMultiPlot;
class RifEclipseSummaryAddress;
class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimSummaryPlot;
class RimEnsembleCurveSet;
class RimSummaryCurve;
@@ -54,7 +54,7 @@ public:
public:
RicSummaryPlotBuilder();
void setDataSources( const std::vector<RimSummaryCase*>& summaryCases, const std::vector<RimSummaryCaseCollection*>& ensembles );
void setDataSources( const std::vector<RimSummaryCase*>& summaryCases, const std::vector<RimSummaryEnsemble*>& ensembles );
void setAddresses( const std::set<RifEclipseSummaryAddress>& addresses );
@@ -66,7 +66,7 @@ public:
// Static helper functions
static std::set<RifEclipseSummaryAddress> addressesForSource( caf::PdmObject* summarySource );
static RimEnsembleCurveSet* createCurveSet( RimSummaryCaseCollection* ensemble, const RifEclipseSummaryAddress& addr );
static RimEnsembleCurveSet* createCurveSet( RimSummaryEnsemble* ensemble, const RifEclipseSummaryAddress& addr );
static RimSummaryCurve* createCurve( RimSummaryCase* summaryCase, const RifEclipseSummaryAddress& addr );
static std::vector<RimPlot*> duplicatePlots( const std::vector<RimPlot*>& plots );
@@ -75,8 +75,8 @@ public:
static RimMultiPlot* createAndAppendMultiPlot( const std::vector<RimPlot*>& plots );
static void appendPlotsToMultiPlot( RimMultiPlot* multiPlot, const std::vector<RimPlot*>& plots );
static RimSummaryMultiPlot* createAndAppendDefaultSummaryMultiPlot( const std::vector<RimSummaryCase*>& cases,
const std::vector<RimSummaryCaseCollection*>& ensembles,
static RimSummaryMultiPlot* createAndAppendDefaultSummaryMultiPlot( const std::vector<RimSummaryCase*>& cases,
const std::vector<RimSummaryEnsemble*>& ensembles,
bool skipCreationOfPlotBasedOnPreferences = true );
static RimSummaryMultiPlot* createAndAppendSingleSummaryMultiPlotNoAutoSettings( RimSummaryPlot* plot );
@@ -87,29 +87,29 @@ public:
static RimSummaryPlot* createPlot( const std::vector<RimSummaryCurve*>& summaryCurves );
static RimSummaryPlot* createPlot( const std::set<RifEclipseSummaryAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryCaseCollection*>& ensembles );
static RimSummaryPlot* createPlot( const std::set<RifEclipseSummaryAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles );
static RimSummaryPlot* createCrossPlot( const std::vector<RiaSummaryCurveAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryCaseCollection*>& ensembles );
static RimSummaryPlot* createCrossPlot( const std::vector<RiaSummaryCurveAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles );
static void appendCurvesToPlot( RimSummaryPlot* summaryPlot,
const std::set<RifEclipseSummaryAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryCaseCollection*>& ensembles );
static void appendCurvesToPlot( RimSummaryPlot* summaryPlot,
const std::set<RifEclipseSummaryAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles );
static RimEnsembleCurveSet*
addNewEnsembleCurve( RimSummaryPlot* summaryPlot, const RiaSummaryCurveAddress& curveAddress, RimSummaryCaseCollection* ensemble );
addNewEnsembleCurve( RimSummaryPlot* summaryPlot, const RiaSummaryCurveAddress& curveAddress, RimSummaryEnsemble* ensemble );
static RimSummaryCurve*
addNewSummaryCurve( RimSummaryPlot* summaryPlot, const RiaSummaryCurveAddress& curveAddress, RimSummaryCase* summaryCase );
private:
std::set<RifEclipseSummaryAddress> m_addresses;
std::vector<RimSummaryCase*> m_summaryCases;
std::vector<RimSummaryCaseCollection*> m_ensembles;
std::set<RifEclipseSummaryAddress> m_addresses;
std::vector<RimSummaryCase*> m_summaryCases;
std::vector<RimSummaryEnsemble*> m_ensembles;
bool m_individualPlotPerDataSource;

4
ApplicationLibCode/Commands/PlotTemplateCommands/RicCreateNewPlotFromTemplateFeature.cpp
View File

@@ -27,7 +27,7 @@
#include "RicSummaryPlotTemplateTools.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RiuPlotMainWindow.h"
@@ -126,7 +126,7 @@ RimSummaryCase* RicCreateNewPlotFromTemplateFeature::selectSummaryCase()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection* RicCreateNewPlotFromTemplateFeature::selectEnsemble()
RimSummaryEnsemble* RicCreateNewPlotFromTemplateFeature::selectEnsemble()
{
RiuPlotMainWindow* plotwindow = RiaGuiApplication::instance()->mainPlotWindow();
RicSelectCaseOrEnsembleUi ui;

6
ApplicationLibCode/Commands/PlotTemplateCommands/RicCreateNewPlotFromTemplateFeature.h
View File

@@ -21,7 +21,7 @@
#include "cafCmdFeature.h"
class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
//==================================================================================================
///
@@ -36,6 +36,6 @@ protected:
void setupActionLook( QAction* actionToSetup ) override;
private:
RimSummaryCase* selectSummaryCase();
RimSummaryCaseCollection* selectEnsemble();
RimSummaryCase* selectSummaryCase();
RimSummaryEnsemble* selectEnsemble();
};

4
ApplicationLibCode/Commands/PlotTemplateCommands/RicSaveMultiPlotTemplateFeature.cpp
View File

@@ -33,8 +33,8 @@
#include "RimProject.h"
#include "RimSummaryAddress.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryPlot.h"
@@ -214,7 +214,7 @@ QString RicSaveMultiPlotTemplateFeature::createTextFromObject( RimSummaryMultiPl
auto fieldHandle = curveSet->findField( summaryGroupFieldKeyword );
if ( fieldHandle )
{
auto reference = caf::PdmReferenceHelper::referenceFromFieldToObject( fieldHandle, curveSet->summaryCaseCollection() );
auto reference = caf::PdmReferenceHelper::referenceFromFieldToObject( fieldHandle, curveSet->summaryEnsemble() );
ensembleReferenceStrings.insert( reference );
}

14
ApplicationLibCode/Commands/PlotTemplateCommands/RicSelectCaseOrEnsembleUi.cpp
View File

@@ -22,7 +22,7 @@
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
CAF_PDM_SOURCE_INIT( RicSelectCaseOrEnsembleUi, "RicSelectCaseOrEnsembleUi" );
@@ -52,9 +52,9 @@ void RicSelectCaseOrEnsembleUi::setEnsembleSelectionMode( bool ensembleMode )
if ( ensembleMode )
{
std::vector<RimSummaryCaseCollection*> groups = proj->summaryGroups();
std::vector<RimSummaryEnsemble*> groups = proj->summaryGroups();
for ( RimSummaryCaseCollection* group : groups )
for ( RimSummaryEnsemble* group : groups )
{
if ( group->isEnsemble() )
{
@@ -83,10 +83,10 @@ QList<caf::PdmOptionItemInfo> RicSelectCaseOrEnsembleUi::calculateValueOptions(
}
else if ( fieldNeedingOptions == &m_selectedEnsemble )
{
RimProject* proj = RimProject::current();
std::vector<RimSummaryCaseCollection*> groups = proj->summaryGroups();
RimProject* proj = RimProject::current();
std::vector<RimSummaryEnsemble*> groups = proj->summaryGroups();
for ( RimSummaryCaseCollection* group : groups )
for ( RimSummaryEnsemble* group : groups )
{
if ( group->isEnsemble() ) options.push_back( caf::PdmOptionItemInfo( group->name(), group ) );
}
@@ -120,7 +120,7 @@ RimSummaryCase* RicSelectCaseOrEnsembleUi::selectedSummaryCase() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection* RicSelectCaseOrEnsembleUi::selectedEnsemble() const
RimSummaryEnsemble* RicSelectCaseOrEnsembleUi::selectedEnsemble() const
{
if ( !m_useEnsembleMode ) return nullptr;

10
ApplicationLibCode/Commands/PlotTemplateCommands/RicSelectCaseOrEnsembleUi.h
View File

@@ -26,7 +26,7 @@
#include <vector>
class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
//==================================================================================================
///
@@ -40,8 +40,8 @@ public:
void setEnsembleSelectionMode( bool selectEnsemble );
RimSummaryCase* selectedSummaryCase() const;
RimSummaryCaseCollection* selectedEnsemble() const;
RimSummaryCase* selectedSummaryCase() const;
RimSummaryEnsemble* selectedEnsemble() const;
protected:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
@@ -49,8 +49,8 @@ protected:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
private:
caf::PdmPtrField<RimSummaryCase*> m_selectedSummaryCase;
caf::PdmPtrField<RimSummaryCaseCollection*> m_selectedEnsemble;
caf::PdmPtrField<RimSummaryCase*> m_selectedSummaryCase;
caf::PdmPtrField<RimSummaryEnsemble*> m_selectedEnsemble;
bool m_useEnsembleMode;
};

60
ApplicationLibCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp
View File

@@ -36,8 +36,8 @@
#include "RimMainPlotCollection.h"
#include "RimSummaryAddressCollection.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryMultiPlotCollection.h"
#include "RimSummaryPlot.h"
@@ -77,16 +77,16 @@ RimSummaryMultiPlot* RicSummaryPlotTemplateTools::createMultiPlotFromTemplateFil
//--------------------------------------------------------------------------------------------------
RimSummaryMultiPlot* RicSummaryPlotTemplateTools::create( const QString& fileName )
{
auto sumCases = RicSummaryPlotTemplateTools::selectedSummaryCases();
auto sumCaseCollections = RicSummaryPlotTemplateTools::selectedSummaryCaseCollections();
auto sumCases = RicSummaryPlotTemplateTools::selectedSummaryCases();
auto sumEnsembles = RicSummaryPlotTemplateTools::selectedSummaryEnsembles();
auto summaryAddressCollections = RicSummaryPlotTemplateTools::selectedSummaryAddressCollections();
std::vector<QString> wellNames;
std::vector<QString> groupNames;
std::vector<QString> regions;
std::set<RimSummaryCase*> caseSet;
std::set<RimSummaryCaseCollection*> caseCollectionSet;
std::vector<QString> wellNames;
std::vector<QString> groupNames;
std::vector<QString> regions;
std::set<RimSummaryCase*> caseSet;
std::set<RimSummaryEnsemble*> caseCollectionSet;
if ( summaryAddressCollections.empty() )
{
@@ -98,9 +98,9 @@ RimSummaryMultiPlot* RicSummaryPlotTemplateTools::create( const QString& fileNam
analyzer.appendAddresses( firstCase->summaryReader()->allResultAddresses() );
}
else if ( !sumCaseCollections.empty() )
else if ( !sumEnsembles.empty() )
{
auto caseCollection = sumCaseCollections.front();
auto caseCollection = sumEnsembles.front();
auto firstCase = caseCollection->firstSummaryCase();
if ( firstCase != nullptr )
@@ -145,7 +145,7 @@ RimSummaryMultiPlot* RicSummaryPlotTemplateTools::create( const QString& fileNam
for ( auto sumCaseCollection : caseCollectionSet )
{
sumCaseCollections.push_back( sumCaseCollection );
sumEnsembles.push_back( sumCaseCollection );
}
auto collections = RimMainPlotCollection::current()->summaryMultiPlotCollection();
@@ -156,7 +156,7 @@ RimSummaryMultiPlot* RicSummaryPlotTemplateTools::create( const QString& fileNam
collections->addSummaryMultiPlot( newSummaryPlot );
newSummaryPlot->resolveReferencesRecursively();
RicSummaryPlotTemplateTools::setValuesForPlaceholders( newSummaryPlot, sumCases, sumCaseCollections, wellNames, groupNames, regions );
RicSummaryPlotTemplateTools::setValuesForPlaceholders( newSummaryPlot, sumCases, sumEnsembles, wellNames, groupNames, regions );
newSummaryPlot->initAfterReadRecursively();
newSummaryPlot->loadDataAndUpdate();
@@ -168,9 +168,9 @@ RimSummaryMultiPlot* RicSummaryPlotTemplateTools::create( const QString& fileNam
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryMultiPlot* RicSummaryPlotTemplateTools::create( const QString& fileName,
const std::vector<RimSummaryCase*>& sumCases,
const std::vector<RimSummaryCaseCollection*>& ensembles )
RimSummaryMultiPlot* RicSummaryPlotTemplateTools::create( const QString& fileName,
const std::vector<RimSummaryCase*>& sumCases,
const std::vector<RimSummaryEnsemble*>& ensembles )
{
std::vector<QString> wellNames;
std::vector<QString> groupNames;
@@ -218,12 +218,12 @@ RimSummaryMultiPlot* RicSummaryPlotTemplateTools::create( const QString&
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryPlotTemplateTools::setValuesForPlaceholders( RimSummaryMultiPlot* summaryMultiPlot,
const std::vector<RimSummaryCase*>& selectedSummaryCases,
const std::vector<RimSummaryCaseCollection*>& selectedEnsembles,
const std::vector<QString>& wellNames,
const std::vector<QString>& groupNames,
const std::vector<QString>& regions )
void RicSummaryPlotTemplateTools::setValuesForPlaceholders( RimSummaryMultiPlot* summaryMultiPlot,
const std::vector<RimSummaryCase*>& selectedSummaryCases,
const std::vector<RimSummaryEnsemble*>& selectedEnsembles,
const std::vector<QString>& wellNames,
const std::vector<QString>& groupNames,
const std::vector<QString>& regions )
{
auto plots = summaryMultiPlot->plots();
@@ -237,12 +237,12 @@ void RicSummaryPlotTemplateTools::setValuesForPlaceholders( RimSummaryMultiPlot*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryPlotTemplateTools::setValuesForPlaceholders( RimSummaryPlot* summaryPlot,
const std::vector<RimSummaryCase*>& selectedSummaryCases,
const std::vector<RimSummaryCaseCollection*>& selectedEnsembles,
const std::vector<QString>& wellNames,
const std::vector<QString>& groupNames,
const std::vector<QString>& regions )
void RicSummaryPlotTemplateTools::setValuesForPlaceholders( RimSummaryPlot* summaryPlot,
const std::vector<RimSummaryCase*>& selectedSummaryCases,
const std::vector<RimSummaryEnsemble*>& selectedEnsembles,
const std::vector<QString>& wellNames,
const std::vector<QString>& groupNames,
const std::vector<QString>& regions )
{
{
// Replace single summary curves data sources
@@ -315,7 +315,7 @@ void RicSummaryPlotTemplateTools::setValuesForPlaceholders( RimSummaryPlot*
if ( conversionOk && indexValue >= 0 && indexValue < static_cast<int>( selectedEnsembles.size() ) )
{
auto ensembleCase = selectedEnsembles[static_cast<int>( indexValue )];
curveSet->setSummaryCaseCollection( ensembleCase );
curveSet->setSummaryEnsemble( ensembleCase );
}
}
@@ -496,9 +496,9 @@ std::vector<RimSummaryCase*> RicSummaryPlotTemplateTools::selectedSummaryCases()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCaseCollection*> RicSummaryPlotTemplateTools::selectedSummaryCaseCollections()
std::vector<RimSummaryEnsemble*> RicSummaryPlotTemplateTools::selectedSummaryEnsembles()
{
std::vector<RimSummaryCaseCollection*> objects;
std::vector<RimSummaryEnsemble*> objects;
caf::SelectionManager::instance()->objectsByType( &objects );
return objects;

30
ApplicationLibCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.h
View File

@@ -30,7 +30,7 @@ class PdmObject;
class RimSummaryPlot;
class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RifEclipseSummaryAddress;
class RimSummaryMultiPlot;
class RimSummaryAddressCollection;
@@ -45,7 +45,7 @@ public:
static RimSummaryMultiPlot* create( const QString& fileName );
static RimSummaryMultiPlot*
create( const QString& fileName, const std::vector<RimSummaryCase*>& cases, const std::vector<RimSummaryCaseCollection*>& ensembles );
create( const QString& fileName, const std::vector<RimSummaryCase*>& cases, const std::vector<RimSummaryEnsemble*>& ensembles );
static QString selectPlotTemplatePath();
static std::vector<QString> selectDefaultPlotTemplates( std::vector<QString> currentSelection );
@@ -64,7 +64,7 @@ private:
static RimSummaryMultiPlot* createMultiPlotFromTemplateFile( const QString& fileName );
static std::vector<RimSummaryCase*> selectedSummaryCases();
static std::vector<RimSummaryCaseCollection*> selectedSummaryCaseCollections();
static std::vector<RimSummaryEnsemble*> selectedSummaryEnsembles();
static std::vector<RimSummaryAddressCollection*> selectedSummaryAddressCollections();
static QString htmlTextFromPlotAndSelection( const RimSummaryPlot* templatePlot,
@@ -74,19 +74,19 @@ private:
static QString htmlTextFromCount( const QString& itemText, size_t requiredItemCount, size_t selectionCount );
static void setValuesForPlaceholders( RimSummaryMultiPlot* summaryMultiPlot,
const std::vector<RimSummaryCase*>& selectedSummaryCases,
const std::vector<RimSummaryCaseCollection*>& selectedEnsembles,
const std::vector<QString>& wellNames,
const std::vector<QString>& groupNames,
const std::vector<QString>& regions );
static void setValuesForPlaceholders( RimSummaryMultiPlot* summaryMultiPlot,
const std::vector<RimSummaryCase*>& selectedSummaryCases,
const std::vector<RimSummaryEnsemble*>& selectedEnsembles,
const std::vector<QString>& wellNames,
const std::vector<QString>& groupNames,
const std::vector<QString>& regions );
static void setValuesForPlaceholders( RimSummaryPlot* summaryPlot,
const std::vector<RimSummaryCase*>& selectedSummaryCases,
const std::vector<RimSummaryCaseCollection*>& selectedEnsembles,
const std::vector<QString>& wellNames,
const std::vector<QString>& groupNames,
const std::vector<QString>& regions );
static void setValuesForPlaceholders( RimSummaryPlot* summaryPlot,
const std::vector<RimSummaryCase*>& selectedSummaryCases,
const std::vector<RimSummaryEnsemble*>& selectedEnsembles,
const std::vector<QString>& wellNames,
const std::vector<QString>& groupNames,
const std::vector<QString>& regions );
static RifEclipseSummaryAddress firstAddressByQuantity( const RifEclipseSummaryAddress& sourceAddress,
const std::set<RifEclipseSummaryAddress>& allAddresses );

10
ApplicationLibCode/Commands/RicCloseSummaryCaseInCollectionFeature.cpp
View File

@@ -26,8 +26,8 @@
#include "RimMainPlotCollection.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryPlot.h"
#include "RiuPlotMainWindow.h"
@@ -58,12 +58,12 @@ bool RicCloseSummaryCaseInCollectionFeature::isCommandEnabled() const
std::vector<RimSummaryCaseMainCollection*> summaryCaseMainCollections;
caf::SelectionManager::instance()->objectsByType( &summaryCaseMainCollections );
std::vector<RimSummaryCaseCollection*> summaryCaseCollections;
std::vector<RimSummaryEnsemble*> summaryCaseCollections;
caf::SelectionManager::instance()->objectsByType( &summaryCaseCollections );
summaryCaseCollections.erase( std::remove_if( summaryCaseCollections.begin(),
summaryCaseCollections.end(),
[]( RimSummaryCaseCollection* coll )
[]( RimSummaryEnsemble* coll )
{ return dynamic_cast<RimDerivedEnsembleCaseCollection*>( coll ) != nullptr; } ),
summaryCaseCollections.end() );
@@ -84,10 +84,10 @@ void RicCloseSummaryCaseInCollectionFeature::onActionTriggered( bool isChecked )
RicCloseSummaryCaseFeature::deleteSummaryCases( allSummaryCases );
}
std::vector<RimSummaryCaseCollection*> summaryCaseCollections;
std::vector<RimSummaryEnsemble*> summaryCaseCollections;
caf::SelectionManager::instance()->objectsByType( &summaryCaseCollections );
for ( RimSummaryCaseCollection* summaryCaseCollection : summaryCaseCollections )
for ( RimSummaryEnsemble* summaryCaseCollection : summaryCaseCollections )
{
std::vector<RimSummaryCase*> collectionSummaryCases = summaryCaseCollection->allSummaryCases();
RicCloseSummaryCaseFeature::deleteSummaryCases( collectionSummaryCases );

6
ApplicationLibCode/Commands/RicConvertGroupToEnsembleFeature.cpp
View File

@@ -29,8 +29,8 @@
#include "RimOilField.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RiuMainWindow.h"
#include "RiuPlotMainWindow.h"
@@ -47,7 +47,7 @@ CAF_CMD_SOURCE_INIT( RicConvertGroupToEnsembleFeature, "RicConvertGroupToEnsembl
//--------------------------------------------------------------------------------------------------
bool RicConvertGroupToEnsembleFeature::isCommandEnabled() const
{
const auto& selGroups = caf::selectedObjectsByTypeStrict<RimSummaryCaseCollection*>();
const auto& selGroups = caf::selectedObjectsByTypeStrict<RimSummaryEnsemble*>();
if ( selGroups.empty() ) return false;
for ( const auto& group : selGroups )
@@ -62,7 +62,7 @@ bool RicConvertGroupToEnsembleFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicConvertGroupToEnsembleFeature::onActionTriggered( bool isChecked )
{
const auto& selGroups = caf::selectedObjectsByTypeStrict<RimSummaryCaseCollection*>();
const auto& selGroups = caf::selectedObjectsByTypeStrict<RimSummaryEnsemble*>();
for ( const auto& group : selGroups )
{

6
ApplicationLibCode/Commands/RicCreateSummaryCaseCollectionFeature.cpp
View File

@@ -21,8 +21,8 @@
#include "RiaSummaryTools.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RiuPlotMainWindowTools.h"
@@ -36,13 +36,13 @@ CAF_CMD_SOURCE_INIT( RicCreateSummaryCaseCollectionFeature, "RicCreateSummaryCas
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection*
RimSummaryEnsemble*
RicCreateSummaryCaseCollectionFeature::groupSummaryCases( std::vector<RimSummaryCase*> cases, const QString& groupName, bool isEnsemble )
{
RimSummaryCaseMainCollection* summaryCaseMainCollection = RiaSummaryTools::summaryCaseMainCollection();
if ( !cases.empty() )
{
auto newGroup = summaryCaseMainCollection->addCaseCollection( cases, groupName, isEnsemble );
auto newGroup = summaryCaseMainCollection->addEnsemble( cases, groupName, isEnsemble );
summaryCaseMainCollection->updateConnectedEditors();
RiuPlotMainWindowTools::showPlotMainWindow();

4
ApplicationLibCode/Commands/RicCreateSummaryCaseCollectionFeature.h
View File

@@ -23,7 +23,7 @@
#include <vector>
class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
//==================================================================================================
///
@@ -32,7 +32,7 @@ class RicCreateSummaryCaseCollectionFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
static RimSummaryCaseCollection* groupSummaryCases( std::vector<RimSummaryCase*> cases, const QString& groupName, bool isEnsemble = false );
static RimSummaryEnsemble* groupSummaryCases( std::vector<RimSummaryCase*> cases, const QString& groupName, bool isEnsemble = false );
private:
bool isCommandEnabled() const override;

18
ApplicationLibCode/Commands/RicDeleteSummaryCaseCollectionFeature.cpp
View File

@@ -24,8 +24,8 @@
#include "RimMainPlotCollection.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryMultiPlotCollection.h"
#include "RimSummaryPlot.h"
@@ -43,7 +43,7 @@ CAF_CMD_SOURCE_INIT( RicDeleteSummaryCaseCollectionFeature, "RicDeleteSummaryCas
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicDeleteSummaryCaseCollectionFeature::deleteSummaryCaseCollection( RimSummaryCaseCollection* caseCollection )
void RicDeleteSummaryCaseCollectionFeature::deleteSummaryCaseCollection( RimSummaryEnsemble* caseCollection )
{
RimSummaryMultiPlotCollection* summaryPlotColl = RiaSummaryTools::summaryMultiPlotCollection();
@@ -65,12 +65,12 @@ void RicDeleteSummaryCaseCollectionFeature::deleteSummaryCaseCollection( RimSumm
//--------------------------------------------------------------------------------------------------
bool RicDeleteSummaryCaseCollectionFeature::isCommandEnabled() const
{
std::vector<RimSummaryCaseCollection*> selection;
std::vector<RimSummaryEnsemble*> selection;
caf::SelectionManager::instance()->objectsByType( &selection );
selection.erase( std::remove_if( selection.begin(),
selection.end(),
[]( RimSummaryCaseCollection* coll )
[]( RimSummaryEnsemble* coll )
{ return dynamic_cast<RimDerivedEnsembleCaseCollection*>( coll ) != nullptr; } ),
selection.end() );
return ( !selection.empty() );
@@ -81,7 +81,7 @@ bool RicDeleteSummaryCaseCollectionFeature::isCommandEnabled() const
//--------------------------------------------------------------------------------------------------
void RicDeleteSummaryCaseCollectionFeature::onActionTriggered( bool isChecked )
{
std::vector<RimSummaryCaseCollection*> selection;
std::vector<RimSummaryEnsemble*> selection;
caf::SelectionManager::instance()->objectsByType( &selection );
if ( selection.empty() ) return;
@@ -103,14 +103,14 @@ void RicDeleteSummaryCaseCollectionFeature::onActionTriggered( bool isChecked )
if ( ret == QMessageBox::Yes )
{
for ( RimSummaryCaseCollection* summaryCaseCollection : selection )
for ( RimSummaryEnsemble* summaryCaseCollection : selection )
{
RicDeleteSummaryCaseCollectionFeature::deleteSummaryCaseCollection( summaryCaseCollection );
}
}
else if ( ret == QMessageBox::No )
{
for ( RimSummaryCaseCollection* summaryCaseCollection : selection )
for ( RimSummaryEnsemble* summaryCaseCollection : selection )
{
RicDeleteSummaryCaseCollectionFeature::moveAllCasesToMainSummaryCollection( summaryCaseCollection );
}
@@ -118,7 +118,7 @@ void RicDeleteSummaryCaseCollectionFeature::onActionTriggered( bool isChecked )
RimSummaryCaseMainCollection* summaryCaseMainCollection = selection[0]->firstAncestorOrThisOfTypeAsserted<RimSummaryCaseMainCollection>();
for ( RimSummaryCaseCollection* caseCollection : selection )
for ( RimSummaryEnsemble* caseCollection : selection )
{
summaryCaseMainCollection->removeCaseCollection( caseCollection );
delete caseCollection;
@@ -140,7 +140,7 @@ void RicDeleteSummaryCaseCollectionFeature::setupActionLook( QAction* actionToSe
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicDeleteSummaryCaseCollectionFeature::moveAllCasesToMainSummaryCollection( RimSummaryCaseCollection* summaryCaseCollection )
void RicDeleteSummaryCaseCollectionFeature::moveAllCasesToMainSummaryCollection( RimSummaryEnsemble* summaryCaseCollection )
{
std::vector<RimSummaryCase*> summaryCases = summaryCaseCollection->allSummaryCases();
if ( summaryCases.empty() ) return;

6
ApplicationLibCode/Commands/RicDeleteSummaryCaseCollectionFeature.h
View File

@@ -22,7 +22,7 @@
#include <vector>
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
//==================================================================================================
///
@@ -36,6 +36,6 @@ private:
void onActionTriggered( bool isChecked ) override;
void setupActionLook( QAction* actionToSetup ) override;
static void deleteSummaryCaseCollection( RimSummaryCaseCollection* caseCollection );
static void moveAllCasesToMainSummaryCollection( RimSummaryCaseCollection* summaryCaseCollection );
static void deleteSummaryCaseCollection( RimSummaryEnsemble* caseCollection );
static void moveAllCasesToMainSummaryCollection( RimSummaryEnsemble* summaryCaseCollection );
};

12
ApplicationLibCode/Commands/RicImportEnsembleFeature.cpp
View File

@@ -36,8 +36,8 @@
#include "RimOilField.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryPlot.h"
#include "RiuMainWindow.h"
@@ -119,7 +119,7 @@ void RicImportEnsembleFeature::importSingleEnsemble( const QStringList&
if ( !isOk || cases.empty() ) return;
RimSummaryCaseCollection* ensemble = RicCreateSummaryCaseCollectionFeature::groupSummaryCases( cases, ensembleName, true );
RimSummaryEnsemble* ensemble = RicCreateSummaryCaseCollectionFeature::groupSummaryCases( cases, ensembleName, true );
if ( ensemble )
{
@@ -152,11 +152,11 @@ void RicImportEnsembleFeature::setupActionLook( QAction* actionToSetup )
//--------------------------------------------------------------------------------------------------
QString RicImportEnsembleFeature::askForEnsembleName( const QString& suggestion )
{
RimProject* project = RimProject::current();
std::vector<RimSummaryCaseCollection*> groups = project->summaryGroups();
int ensemblesStartingWithRoot = std::count_if( groups.begin(),
RimProject* project = RimProject::current();
std::vector<RimSummaryEnsemble*> groups = project->summaryGroups();
int ensemblesStartingWithRoot = std::count_if( groups.begin(),
groups.end(),
[suggestion]( RimSummaryCaseCollection* group )
[suggestion]( RimSummaryEnsemble* group )
{ return group->isEnsemble() && group->name().startsWith( suggestion ); } );
QInputDialog dialog;

2
ApplicationLibCode/Commands/RicImportRevealSummaryCaseFeature.cpp
View File

@@ -23,8 +23,8 @@
#include "RimCsvSummaryCase.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RiuFileDialogTools.h"

2
ApplicationLibCode/Commands/RicImportStimPlanSummaryCaseFeature.cpp
View File

@@ -23,8 +23,8 @@
#include "RimCsvSummaryCase.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RiuFileDialogTools.h"

6
ApplicationLibCode/Commands/RicImportSummaryCasesFeature.cpp
View File

@@ -34,8 +34,8 @@
#include "RimOilField.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryPlot.h"
@@ -240,11 +240,11 @@ void RicImportSummaryCasesFeature::addSummaryCases( const std::vector<RimSummary
//--------------------------------------------------------------------------------------------------
void RicImportSummaryCasesFeature::addCasesToGroupIfRelevant( const std::vector<RimSummaryCase*>& cases )
{
std::vector<RimSummaryCaseCollection*> selectedColl = caf::selectedObjectsByTypeStrict<RimSummaryCaseCollection*>();
std::vector<RimSummaryEnsemble*> selectedColl = caf::selectedObjectsByTypeStrict<RimSummaryEnsemble*>();
if ( selectedColl.size() == 1 )
{
RimSummaryCaseCollection* coll = selectedColl.front();
RimSummaryEnsemble* coll = selectedColl.front();
RimSummaryCaseMainCollection* mainColl = coll->firstAncestorOrThisOfType<RimSummaryCaseMainCollection>();
if ( mainColl )

4
ApplicationLibCode/Commands/RicReloadSummaryCaseFeature.cpp
View File

@@ -24,8 +24,8 @@
#include "RimObservedDataCollection.h"
#include "RimObservedSummaryData.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "cafPdmObject.h"
#include "cafSelectionManager.h"
@@ -84,7 +84,7 @@ std::vector<RimSummaryCase*> RicReloadSummaryCaseFeature::selectedSummaryCases()
caf::SelectionManager::instance()->objectsByType( &caseSelection );
{
std::vector<RimSummaryCaseCollection*> collectionSelection;
std::vector<RimSummaryEnsemble*> collectionSelection;
caf::SelectionManager::instance()->objectsByType( &collectionSelection );
for ( auto collection : collectionSelection )

4
ApplicationLibCode/Commands/SummaryPlotCommands/RicCreateCrossPlotFeature.cpp
View File

@@ -28,7 +28,7 @@
#include "RimSummaryAddress.h"
#include "RimSummaryAddressCollection.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "cafSelectionManagerTools.h"
@@ -110,7 +110,7 @@ void RicCreateCrossPlotFeature::onSubMenuActionTriggered( bool isChecked )
RiaSummaryCurveAddress curveAddress( adrX, adrY );
auto selectedCases = caf::firstAncestorOfTypeFromSelectedObject<RimSummaryCase>();
auto selectedEnsembles = caf::firstAncestorOfTypeFromSelectedObject<RimSummaryCaseCollection>();
auto selectedEnsembles = caf::firstAncestorOfTypeFromSelectedObject<RimSummaryEnsemble>();
auto newPlot = RicSummaryPlotBuilder::createCrossPlot( { curveAddress }, { selectedCases }, { selectedEnsembles } );

18
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewDefaultSummaryPlotFeature.cpp
View File

@@ -35,8 +35,8 @@
#include "RimProject.h"
#include "RimRegularLegendConfig.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryPlot.h"
@@ -50,8 +50,8 @@
CAF_CMD_SOURCE_INIT( RicNewDefaultSummaryPlotFeature, "RicNewDefaultSummaryPlotFeature" );
void extractPlotObjectsFromSelection( std::vector<RimSummaryCase*>* selectedIndividualSummaryCases,
std::vector<RimSummaryCaseCollection*>* selectedEnsembles )
void extractPlotObjectsFromSelection( std::vector<RimSummaryCase*>* selectedIndividualSummaryCases,
std::vector<RimSummaryEnsemble*>* selectedEnsembles )
{
CAF_ASSERT( selectedIndividualSummaryCases && selectedEnsembles );
@@ -101,8 +101,8 @@ bool RicNewDefaultSummaryPlotFeature::isCommandEnabled() const
return true;
}
std::vector<RimSummaryCase*> selectedIndividualSummaryCases;
std::vector<RimSummaryCaseCollection*> selectedEnsembles;
std::vector<RimSummaryCase*> selectedIndividualSummaryCases;
std::vector<RimSummaryEnsemble*> selectedEnsembles;
extractPlotObjectsFromSelection( &selectedIndividualSummaryCases, &selectedEnsembles );
@@ -135,8 +135,8 @@ void RicNewDefaultSummaryPlotFeature::onActionTriggered( bool isChecked )
return;
}
std::vector<RimSummaryCase*> selectedIndividualSummaryCases;
std::vector<RimSummaryCaseCollection*> selectedEnsembles;
std::vector<RimSummaryCase*> selectedIndividualSummaryCases;
std::vector<RimSummaryEnsemble*> selectedEnsembles;
extractPlotObjectsFromSelection( &selectedIndividualSummaryCases, &selectedEnsembles );
if ( !selectedIndividualSummaryCases.empty() )
@@ -155,8 +155,8 @@ void RicNewDefaultSummaryPlotFeature::onActionTriggered( bool isChecked )
//--------------------------------------------------------------------------------------------------
void RicNewDefaultSummaryPlotFeature::setupActionLook( QAction* actionToSetup )
{
std::vector<RimSummaryCase*> selectedIndividualSummaryCases;
std::vector<RimSummaryCaseCollection*> selectedEnsembles;
std::vector<RimSummaryCase*> selectedIndividualSummaryCases;
std::vector<RimSummaryEnsemble*> selectedEnsembles;
extractPlotObjectsFromSelection( &selectedIndividualSummaryCases, &selectedEnsembles );

6
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewDerivedEnsembleFeature.cpp
View File

@@ -63,7 +63,7 @@ bool RicNewDerivedEnsembleFeature::showWarningDialogWithQuestion()
bool RicNewDerivedEnsembleFeature::isCommandEnabled() const
{
std::vector<RimSummaryCaseMainCollection*> mainColls = caf::selectedObjectsByTypeStrict<RimSummaryCaseMainCollection*>();
std::vector<RimSummaryCaseCollection*> ensembles = caf::selectedObjectsByTypeStrict<RimSummaryCaseCollection*>();
std::vector<RimSummaryEnsemble*> ensembles = caf::selectedObjectsByTypeStrict<RimSummaryEnsemble*>();
return mainColls.size() == 1 || ensembles.size() == 1 || ensembles.size() == 2;
}
@@ -78,11 +78,11 @@ void RicNewDerivedEnsembleFeature::onActionTriggered( bool isChecked )
auto project = RimProject::current();
auto mainColl = project->firstSummaryCaseMainCollection();
auto newColl = mainColl->addCaseCollection( {}, "", true, []() { return new RimDerivedEnsembleCaseCollection(); } );
auto newColl = mainColl->addEnsemble( {}, "", true, []() { return new RimDerivedEnsembleCaseCollection(); } );
auto newEnsemble = dynamic_cast<RimDerivedEnsembleCaseCollection*>( newColl );
{
std::vector<RimSummaryCaseCollection*> ensembles = caf::selectedObjectsByType<RimSummaryCaseCollection*>();
std::vector<RimSummaryEnsemble*> ensembles = caf::selectedObjectsByType<RimSummaryEnsemble*>();
if ( !ensembles.empty() ) newEnsemble->setEnsemble1( ensembles[0] );
if ( ensembles.size() == 2 )

11
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp
View File

@@ -32,10 +32,10 @@
#include "RimMainPlotCollection.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveAppearanceCalculator.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryMultiPlotCollection.h"
#include "RimSummaryPlot.h"
@@ -56,8 +56,7 @@ CAF_CMD_SOURCE_INIT( RicNewSummaryEnsembleCurveSetFeature, "RicNewSummaryEnsembl
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimEnsembleCurveSet*> RicNewSummaryEnsembleCurveSetFeature::addDefaultCurveSets( RimSummaryPlot* plot,
RimSummaryCaseCollection* ensemble )
std::vector<RimEnsembleCurveSet*> RicNewSummaryEnsembleCurveSetFeature::addDefaultCurveSets( RimSummaryPlot* plot, RimSummaryEnsemble* ensemble )
{
CVF_ASSERT( plot && ensemble );
@@ -88,7 +87,7 @@ std::vector<RimEnsembleCurveSet*> RicNewSummaryEnsembleCurveSetFeature::addDefau
curveSet->legendConfig()->setColorLegend( RimRegularLegendConfig::mapToColorLegend(
RimEnsembleCurveSetColorManager::cycledEnsembleColorRange( static_cast<int>( colorIndex ) ) ) );
curveSet->setSummaryCaseCollection( ensemble );
curveSet->setSummaryEnsemble( ensemble );
curveSet->setSummaryAddressYAndStatisticsFlag( addr );
auto filter = curveSet->filterCollection()->addFilter();
filter->setActive( false );
@@ -105,7 +104,7 @@ std::vector<RimEnsembleCurveSet*> RicNewSummaryEnsembleCurveSetFeature::addDefau
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryPlot* RicNewSummaryEnsembleCurveSetFeature::createPlotForCurveSetsAndUpdate( std::vector<RimSummaryCaseCollection*> ensembles )
RimSummaryPlot* RicNewSummaryEnsembleCurveSetFeature::createPlotForCurveSetsAndUpdate( std::vector<RimSummaryEnsemble*> ensembles )
{
RiaGuiApplication* app = RiaGuiApplication::instance();
@@ -118,7 +117,7 @@ RimSummaryPlot* RicNewSummaryEnsembleCurveSetFeature::createPlotForCurveSetsAndU
RimSummaryMultiPlot* multiPlot = RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlot( plot );
RimEnsembleCurveSet* firstCurveSetCreated = nullptr;
for ( RimSummaryCaseCollection* ensemble : ensembles )
for ( RimSummaryEnsemble* ensemble : ensembles )
{
std::vector<RimEnsembleCurveSet*> curveSets = RicNewSummaryEnsembleCurveSetFeature::addDefaultCurveSets( plot, ensemble );
if ( !firstCurveSetCreated && !curveSets.empty() ) firstCurveSetCreated = curveSets.front();

6
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.h
View File

@@ -24,7 +24,7 @@
class RimSummaryPlot;
class RimEnsembleCurveSet;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
//==================================================================================================
///
@@ -34,8 +34,8 @@ class RicNewSummaryEnsembleCurveSetFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT;
public:
static RimSummaryPlot* createPlotForCurveSetsAndUpdate( std::vector<RimSummaryCaseCollection*> ensembles );
static std::vector<RimEnsembleCurveSet*> addDefaultCurveSets( RimSummaryPlot* plot, RimSummaryCaseCollection* ensemble );
static RimSummaryPlot* createPlotForCurveSetsAndUpdate( std::vector<RimSummaryEnsemble*> ensembles );
static std::vector<RimEnsembleCurveSet*> addDefaultCurveSets( RimSummaryPlot* plot, RimSummaryEnsemble* ensemble );
protected:
bool isCommandEnabled() const override;

16
ApplicationLibCode/Commands/SummaryPlotCommands/RicOpenSummaryPlotEditorFeature.cpp
View File

@@ -33,8 +33,8 @@
#include "RimProject.h"
#include "RimRegularLegendConfig.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryMultiPlotCollection.h"
#include "RimSummaryPlot.h"
@@ -59,7 +59,7 @@ bool RicOpenSummaryPlotEditorFeature::isCommandEnabled() const
std::vector<RimSummaryCase*> selectedCases = caf::selectedObjectsByType<RimSummaryCase*>();
if ( !selectedCases.empty() ) return true;
std::vector<RimSummaryCaseCollection*> selectedGroups = caf::selectedObjectsByType<RimSummaryCaseCollection*>();
std::vector<RimSummaryEnsemble*> selectedGroups = caf::selectedObjectsByType<RimSummaryEnsemble*>();
if ( !selectedGroups.empty() ) return true;
std::vector<RimSummaryMultiPlotCollection*> selectedPlotCollections = caf::selectedObjectsByType<RimSummaryMultiPlotCollection*>();
@@ -81,7 +81,7 @@ bool RicOpenSummaryPlotEditorFeature::isCommandEnabled() const
if ( multiPlot ) return true;
auto summaryCase = dynamic_cast<RimSummaryCase*>( selObj );
auto summaryCaseColl = dynamic_cast<RimSummaryCaseCollection*>( selObj );
auto summaryCaseColl = dynamic_cast<RimSummaryEnsemble*>( selObj );
auto obsColl = dynamic_cast<RimObservedDataCollection*>( selObj );
return summaryCase || summaryCaseColl || obsColl;
@@ -95,16 +95,16 @@ void RicOpenSummaryPlotEditorFeature::onActionTriggered( bool isChecked )
RimProject* project = RimProject::current();
CVF_ASSERT( project );
std::vector<RimSummaryCase*> selectedCases = caf::selectedObjectsByType<RimSummaryCase*>();
std::vector<RimSummaryCaseCollection*> selectedGroups = caf::selectedObjectsByType<RimSummaryCaseCollection*>();
std::vector<RimSummaryCase*> selectedCases = caf::selectedObjectsByType<RimSummaryCase*>();
std::vector<RimSummaryEnsemble*> selectedGroups = caf::selectedObjectsByType<RimSummaryEnsemble*>();
std::vector<caf::PdmObject*> sourcesToSelect( selectedCases.begin(), selectedCases.end() );
if ( sourcesToSelect.empty() && selectedGroups.empty() )
{
const auto allSingleCases = project->firstSummaryCaseMainCollection()->topLevelSummaryCases();
const auto allGroups = project->summaryGroups();
std::vector<RimSummaryCaseCollection*> allEnsembles;
const auto allSingleCases = project->firstSummaryCaseMainCollection()->topLevelSummaryCases();
const auto allGroups = project->summaryGroups();
std::vector<RimSummaryEnsemble*> allEnsembles;
for ( const auto group : allGroups )
if ( group->isEnsemble() ) allEnsembles.push_back( group );

8
ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteSummaryCaseFeature.cpp
View File

@@ -21,8 +21,8 @@
#include "OperationsUsingObjReferences/RicPasteFeatureImpl.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryPlot.h"
#include "cafPdmDefaultObjectFactory.h"
@@ -44,7 +44,7 @@ bool RicPasteSummaryCaseFeature::isCommandEnabled() const
caf::PdmObjectHandle* destinationObject = dynamic_cast<caf::PdmObjectHandle*>( caf::SelectionManager::instance()->selectedItem() );
if ( !destinationObject ) return false;
RimSummaryCaseCollection* summaryCaseCollection = destinationObject->firstAncestorOrThisOfType<RimSummaryCaseCollection>();
RimSummaryEnsemble* summaryCaseCollection = destinationObject->firstAncestorOrThisOfType<RimSummaryEnsemble>();
RimSummaryCaseMainCollection* summaryCaseMainCollection = destinationObject->firstAncestorOrThisOfType<RimSummaryCaseMainCollection>();
if ( !( summaryCaseCollection || summaryCaseMainCollection ) )
@@ -79,7 +79,7 @@ void RicPasteSummaryCaseFeature::onActionTriggered( bool isChecked )
std::vector<caf::PdmPointer<RimSummaryCase>> sourceObjects = RicPasteSummaryCaseFeature::summaryCases();
RimSummaryCaseCollection* summaryCaseCollection = destinationObject->firstAncestorOrThisOfType<RimSummaryCaseCollection>();
RimSummaryEnsemble* summaryCaseCollection = destinationObject->firstAncestorOrThisOfType<RimSummaryEnsemble>();
if ( summaryCaseCollection )
{
@@ -138,7 +138,7 @@ std::vector<caf::PdmPointer<RimSummaryCase>> RicPasteSummaryCaseFeature::summary
//--------------------------------------------------------------------------------------------------
void RicPasteSummaryCaseFeature::removeFromSourceCollection( RimSummaryCase* summaryCase )
{
RimSummaryCaseCollection* sourceSummaryCaseCollection = summaryCase->firstAncestorOrThisOfType<RimSummaryCaseCollection>();
RimSummaryEnsemble* sourceSummaryCaseCollection = summaryCase->firstAncestorOrThisOfType<RimSummaryEnsemble>();
if ( sourceSummaryCaseCollection )
{
sourceSummaryCaseCollection->removeCase( summaryCase );

20
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp
View File

@@ -36,11 +36,11 @@
#include "RimProject.h"
#include "RimSummaryCalculationCollection.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveAutoName.h"
#include "RimSummaryCurveCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryPlot.h"
@@ -400,7 +400,7 @@ void RicSummaryPlotEditorUi::syncPreviewCurvesFromUiSelection()
for ( const auto& curveSet : currentCurveSetsInPreviewPlot )
{
RimSummaryCaseCollection* ensemble = curveSet->summaryCaseCollection();
RimSummaryEnsemble* ensemble = curveSet->summaryEnsemble();
currentCurveSetDefs.insert( RiaCurveSetDefinition( ensemble, curveSet->summaryAddressY() ) );
}
@@ -416,8 +416,8 @@ void RicSummaryPlotEditorUi::syncPreviewCurvesFromUiSelection()
for ( const auto& curveSet : currentCurveSetsInPreviewPlot )
{
RimSummaryCaseCollection* ensemble = curveSet->summaryCaseCollection();
RiaCurveSetDefinition curveSetDef = RiaCurveSetDefinition( ensemble, curveSet->summaryAddressY() );
RimSummaryEnsemble* ensemble = curveSet->summaryEnsemble();
RiaCurveSetDefinition curveSetDef = RiaCurveSetDefinition( ensemble, curveSet->summaryAddressY() );
if ( deleteCurveSetDefs.count( curveSetDef ) > 0 ) curveSetsToDelete.insert( curveSet );
}
}
@@ -478,7 +478,7 @@ void RicSummaryPlotEditorUi::updatePreviewCurvesFromCurveDefinitions( const std:
RimEnsembleCurveSet* curveSet = nullptr;
for ( const auto& cs : m_previewPlot->ensembleCurveSetCollection()->curveSets() )
{
if ( cs->summaryCaseCollection() == curveDef.ensemble() && cs->summaryAddressY() == curveDef.summaryAddressY() )
if ( cs->summaryEnsemble() == curveDef.ensemble() && cs->summaryAddressY() == curveDef.summaryAddressY() )
{
curveSet = cs;
break;
@@ -488,7 +488,7 @@ void RicSummaryPlotEditorUi::updatePreviewCurvesFromCurveDefinitions( const std:
{
curveSet = new RimEnsembleCurveSet();
curveSet->disableStatisticCurves();
curveSet->setSummaryCaseCollection( curveDef.ensemble() );
curveSet->setSummaryEnsemble( curveDef.ensemble() );
// Do not call setSummaryAddressAndStatisticsFlag() here, as the call to m_statistics->updateAllRequiredEditors(); causes a
// crash in updateUiOrdering. The statistics curves will be created when the curve set is added to the plot.
@@ -632,7 +632,7 @@ void RicSummaryPlotEditorUi::populateCurveCreator( const RimSummaryPlot& sourceS
newCurveSet->disableStatisticCurves();
previewCurveSetColl->addCurveSet( newCurveSet );
RimSummaryCaseCollection* ensemble = curveSet->summaryCaseCollection();
RimSummaryEnsemble* ensemble = curveSet->summaryEnsemble();
curveDefs.emplace_back( ensemble, curveSet->summaryAddressY() );
}
@@ -921,15 +921,15 @@ void RicSummaryPlotEditorUi::setInitialCurveVisibility( const RimSummaryPlot* ta
}
}
std::set<std::pair<RimSummaryCaseCollection*, RifEclipseSummaryAddress>> sourceCurveSetDefs;
std::set<std::pair<RimSummaryEnsemble*, RifEclipseSummaryAddress>> sourceCurveSetDefs;
for ( const auto& curveSet : targetPlot->ensembleCurveSetCollection()->curveSets() )
{
sourceCurveSetDefs.insert( std::make_pair( curveSet->summaryCaseCollection(), curveSet->summaryAddressY() ) );
sourceCurveSetDefs.insert( std::make_pair( curveSet->summaryEnsemble(), curveSet->summaryAddressY() ) );
}
for ( const auto& curveSet : m_previewPlot->ensembleCurveSetCollection()->curveSets() )
{
auto curveDef = std::make_pair( curveSet->summaryCaseCollection(), curveSet->summaryAddressY() );
auto curveDef = std::make_pair( curveSet->summaryEnsemble(), curveSet->summaryAddressY() );
if ( sourceCurveSetDefs.count( curveDef ) == 0 )
{
curveSet->showCurves( false );

10
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp
View File

@@ -312,7 +312,7 @@ void RicSummaryPlotFeatureImpl::createSummaryPlotsFromArgumentLine( const QStrin
if ( !summaryAddressFilters.empty() )
{
RimSummaryCaseCollection* ensemble = nullptr;
RimSummaryEnsemble* ensemble = nullptr;
if ( isEnsembleMode )
{
@@ -510,7 +510,7 @@ void RicSummaryPlotFeatureImpl::createSummaryPlotsFromArgumentLine( const QStrin
}
RimSummaryPlot* RicSummaryPlotFeatureImpl::createSummaryPlotForEnsemble( const std::vector<RimSummaryCase*>& summaryCasesToUse,
RimSummaryCaseCollection* ensemble,
RimSummaryEnsemble* ensemble,
QStringList summaryAddressFilters,
bool addHistoryCurves,
EnsembleColoringType ensembleColoringStyle,
@@ -545,14 +545,14 @@ RimSummaryPlot* RicSummaryPlotFeatureImpl::createSummaryPlotForEnsemble( const s
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEnsembleCurveSet* RicSummaryPlotFeatureImpl::createCurveSet( RimSummaryCaseCollection* ensemble,
RimEnsembleCurveSet* RicSummaryPlotFeatureImpl::createCurveSet( RimSummaryEnsemble* ensemble,
const RifEclipseSummaryAddress& addr,
EnsembleColoringType ensembleColoringStyle,
QString ensembleColoringParameter )
{
auto curveSet = new RimEnsembleCurveSet();
curveSet->setSummaryCaseCollection( ensemble );
curveSet->setSummaryEnsemble( ensemble );
curveSet->setSummaryAddressYAndStatisticsFlag( addr );
if ( ensembleColoringStyle == EnsembleColoringType::PARAMETER || ensembleColoringStyle == EnsembleColoringType::LOG_PARAMETER )
@@ -594,7 +594,7 @@ RimSummaryPlot* RicSummaryPlotFeatureImpl::createSummaryPlotForCases( const std:
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryPlot*> RicSummaryPlotFeatureImpl::createMultipleSummaryPlotsFromAddresses(
const std::vector<RimSummaryCase*>& summaryCasesToUse,
RimSummaryCaseCollection* ensemble,
RimSummaryEnsemble* ensemble,
QStringList summaryAddressFilters,
bool addHistoryCurves,
EnsembleColoringType ensembleColoringStyle /*= EnsembleColoringType::NONE*/,

8
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.h
View File

@@ -33,7 +33,7 @@ class PdmObject;
class RimSummaryCurve;
class RimSummaryPlot;
class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimEnsembleCurveSet;
class RicSummaryPlotFeatureImpl
@@ -52,7 +52,7 @@ public:
static void createSummaryPlotsFromArgumentLine( const QStringList& arguments );
static RimSummaryPlot* createSummaryPlotForEnsemble( const std::vector<RimSummaryCase*>& summaryCasesToUse,
RimSummaryCaseCollection* ensemble,
RimSummaryEnsemble* ensemble,
QStringList summaryAddressFilters,
bool addHistoryCurves = false,
EnsembleColoringType ensembleColoringStyle = EnsembleColoringType::NONE,
@@ -64,7 +64,7 @@ public:
static std::vector<RimSummaryPlot*>
createMultipleSummaryPlotsFromAddresses( const std::vector<RimSummaryCase*>& summaryCasesToUse,
RimSummaryCaseCollection* ensemble,
RimSummaryEnsemble* ensemble,
QStringList summaryAddressFilters,
bool addHistoryCurves = false,
EnsembleColoringType ensembleColoringStyle = EnsembleColoringType::NONE,
@@ -78,7 +78,7 @@ public:
static QString summaryPlotCommandLineHelpText();
private:
static RimEnsembleCurveSet* createCurveSet( RimSummaryCaseCollection* ensemble,
static RimEnsembleCurveSet* createCurveSet( RimSummaryEnsemble* ensemble,
const RifEclipseSummaryAddress& addr,
EnsembleColoringType ensembleColoringStyle,
QString ensembleColoringParameter );

4
ApplicationLibCode/Commands/WellLogCommands/RicCreateRftPlotsFeature.cpp
View File

@@ -27,7 +27,7 @@
#include "RimMainPlotCollection.h"
#include "RimRftPlotCollection.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryEnsembleTools.h"
#include "RimWellLogPlotNameConfig.h"
#include "RimWellLogTrack.h"
@@ -56,7 +56,7 @@ void RicCreateRftPlotsFeature::onActionTriggered( bool isChecked )
std::set<QString> wellsWithRftData;
auto dataSource = sourcePlot->dataSource();
if ( auto summaryCollection = std::get_if<RimSummaryCaseCollection*>( &dataSource ) )
if ( auto summaryCollection = std::get_if<RimSummaryEnsemble*>( &dataSource ) )
{
wellsWithRftData = RimSummaryEnsembleTools::wellsWithRftData( ( *summaryCollection )->allSummaryCases() );
}

8
ApplicationLibCode/FileInterface/RifDataSourceForRftPlt.cpp
View File

@@ -25,7 +25,7 @@
#include "RimObservedFmuRftData.h"
#include "RimPressureDepthData.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimWellLogLasFile.h"
#include "cafAppEnum.h"
@@ -83,7 +83,7 @@ RifDataSourceForRftPlt::RifDataSourceForRftPlt( RimWellLogLasFile* wellLogFile )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifDataSourceForRftPlt::RifDataSourceForRftPlt( RimSummaryCaseCollection* ensemble )
RifDataSourceForRftPlt::RifDataSourceForRftPlt( RimSummaryEnsemble* ensemble )
{
m_sourceType = SourceType::ENSEMBLE_RFT;
m_ensemble = ensemble;
@@ -92,7 +92,7 @@ RifDataSourceForRftPlt::RifDataSourceForRftPlt( RimSummaryCaseCollection* ensemb
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifDataSourceForRftPlt::RifDataSourceForRftPlt( RimSummaryCase* summaryCase, RimSummaryCaseCollection* ensemble, RimEclipseCase* eclipseCase )
RifDataSourceForRftPlt::RifDataSourceForRftPlt( RimSummaryCase* summaryCase, RimSummaryEnsemble* ensemble, RimEclipseCase* eclipseCase )
{
m_sourceType = SourceType::SUMMARY_RFT;
m_summaryCase = summaryCase;
@@ -232,7 +232,7 @@ auto RifDataSourceForRftPlt::operator<=>( const RifDataSourceForRftPlt& addr2 )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection* RifDataSourceForRftPlt::ensemble() const
RimSummaryEnsemble* RifDataSourceForRftPlt::ensemble() const
{
return m_ensemble;
}

30
ApplicationLibCode/FileInterface/RifDataSourceForRftPlt.h
View File

@@ -32,7 +32,7 @@
class RimWellLogLasFile;
class RimEclipseCase;
class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimObservedFmuRftData;
class RimPressureDepthData;
@@ -57,20 +57,20 @@ public:
RifDataSourceForRftPlt();
RifDataSourceForRftPlt( SourceType sourceType, RimEclipseCase* eclCase );
RifDataSourceForRftPlt( RimSummaryCaseCollection* ensemble );
RifDataSourceForRftPlt( RimSummaryCase* summaryCase, RimSummaryCaseCollection* ensemble, RimEclipseCase* eclipseCase );
RifDataSourceForRftPlt( RimSummaryEnsemble* ensemble );
RifDataSourceForRftPlt( RimSummaryCase* summaryCase, RimSummaryEnsemble* ensemble, RimEclipseCase* eclipseCase );
RifDataSourceForRftPlt( RimWellLogLasFile* wellLogFile );
RifDataSourceForRftPlt( RimObservedFmuRftData* observedFmuRftData );
RifDataSourceForRftPlt( RimPressureDepthData* pressureDepthData );
SourceType sourceType() const;
RimEclipseCase* eclCase() const;
RimSummaryCase* summaryCase() const;
RimSummaryCaseCollection* ensemble() const;
RimWellLogLasFile* wellLogFile() const;
RimObservedFmuRftData* observedFmuRftData() const;
RimPressureDepthData* pressureDepthData() const;
RimEclipseCase* eclCase() const;
RimSummaryCase* summaryCase() const;
RimSummaryEnsemble* ensemble() const;
RimWellLogLasFile* wellLogFile() const;
RimObservedFmuRftData* observedFmuRftData() const;
RimPressureDepthData* pressureDepthData() const;
static QString sourceTypeUiText( SourceType sourceType );
@@ -85,12 +85,12 @@ public:
private:
SourceType m_sourceType;
caf::PdmPointer<RimEclipseCase> m_eclCase;
caf::PdmPointer<RimSummaryCase> m_summaryCase;
caf::PdmPointer<RimSummaryCaseCollection> m_ensemble;
caf::PdmPointer<RimWellLogLasFile> m_wellLogFile;
caf::PdmPointer<RimObservedFmuRftData> m_observedFmuRftData;
caf::PdmPointer<RimPressureDepthData> m_pressureDepthData;
caf::PdmPointer<RimEclipseCase> m_eclCase;
caf::PdmPointer<RimSummaryCase> m_summaryCase;
caf::PdmPointer<RimSummaryEnsemble> m_ensemble;
caf::PdmPointer<RimWellLogLasFile> m_wellLogFile;
caf::PdmPointer<RimObservedFmuRftData> m_observedFmuRftData;
caf::PdmPointer<RimPressureDepthData> m_pressureDepthData;
};
QTextStream& operator<<( QTextStream& str, const RifDataSourceForRftPlt& addr );

5
ApplicationLibCode/FileInterface/RifReaderEnsembleStatisticsRft.cpp
View File

@@ -25,7 +25,7 @@
#include "RigWellPath.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimTools.h"
#include "cafAssert.h"
@@ -33,8 +33,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifReaderEnsembleStatisticsRft::RifReaderEnsembleStatisticsRft( const RimSummaryCaseCollection* summaryCaseCollection,
RimEclipseCase* eclipseCase )
RifReaderEnsembleStatisticsRft::RifReaderEnsembleStatisticsRft( const RimSummaryEnsemble* summaryCaseCollection, RimEclipseCase* eclipseCase )
: m_summaryCaseCollection( summaryCaseCollection )
, m_eclipseCase( eclipseCase )
{

8
ApplicationLibCode/FileInterface/RifReaderEnsembleStatisticsRft.h
View File

@@ -25,14 +25,14 @@
#include "cvfObject.h"
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimEclipseCase;
class RigWellPath;
class RifReaderEnsembleStatisticsRft : public RifReaderRftInterface
{
public:
RifReaderEnsembleStatisticsRft( const RimSummaryCaseCollection* summaryCaseCollection, RimEclipseCase* eclipseCase );
RifReaderEnsembleStatisticsRft( const RimSummaryEnsemble* summaryCaseCollection, RimEclipseCase* eclipseCase );
std::set<RifEclipseRftAddress> eclipseRftAddresses() override;
void values( const RifEclipseRftAddress& rftAddress, std::vector<double>* values ) override;
@@ -58,8 +58,8 @@ private:
void clearCache( const QString& wellName, const QDateTime& timeStep );
private:
const RimSummaryCaseCollection* m_summaryCaseCollection;
RimEclipseCase* m_eclipseCase;
const RimSummaryEnsemble* m_summaryCaseCollection;
RimEclipseCase* m_eclipseCase;
std::map<RifEclipseRftAddress, std::vector<double>> m_cachedValues;
};

8
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
View File

@@ -34,7 +34,7 @@
#include "RimPlotDataFilterCollection.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryPlotAxisFormatter.h"
#include "RiuContextMenuLauncher.h"
@@ -259,7 +259,7 @@ std::set<RigEnsembleParameter> RimAnalysisPlot::ensembleParameters() const
RiaSummaryCurveDefinitionAnalyser* analyserOfSelectedCurveDefs = updateAndGetCurveAnalyzer();
std::set<RimSummaryCaseCollection*> ensembles;
std::set<RimSummaryEnsemble*> ensembles;
for ( RimSummaryCase* sumCase : analyserOfSelectedCurveDefs->m_singleSummaryCases )
{
@@ -269,7 +269,7 @@ std::set<RigEnsembleParameter> RimAnalysisPlot::ensembleParameters() const
}
}
for ( RimSummaryCaseCollection* ensemble : ensembles )
for ( RimSummaryEnsemble* ensemble : ensembles )
{
std::vector<RigEnsembleParameter> parameters = ensemble->variationSortedEnsembleParameters();
ensembleParms.insert( parameters.begin(), parameters.end() );
@@ -671,7 +671,7 @@ QList<caf::PdmOptionItemInfo> RimAnalysisPlot::calculateValueOptions( const caf:
for ( auto sumCase : allSummaryCases )
{
QString displayName = sumCase->displayCaseName();
auto caseColl = dynamic_cast<RimSummaryCaseCollection*>( sumCase->parentField()->ownerObject() );
auto caseColl = dynamic_cast<RimSummaryEnsemble*>( sumCase->parentField()->ownerObject() );
if ( caseColl )
{
displayName = caseColl->name() + "/" + displayName;

19
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp
View File

@@ -24,7 +24,7 @@
#include "RimPlotDataFilterCollection.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
CAF_PDM_SOURCE_INIT( RimAnalysisPlotCollection, "AnalysisPlotCollection" );
@@ -83,8 +83,7 @@ RimAnalysisPlot* RimAnalysisPlotCollection::createAnalysisPlot()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimAnalysisPlot*
RimAnalysisPlotCollection::createAnalysisPlot( RimSummaryCaseCollection* ensemble, const QString& quantityName, std::time_t timeStep )
RimAnalysisPlot* RimAnalysisPlotCollection::createAnalysisPlot( RimSummaryEnsemble* ensemble, const QString& quantityName, std::time_t timeStep )
{
RimAnalysisPlot* plot = new RimAnalysisPlot();
plot->setAsPlotMdiWindow();
@@ -181,9 +180,9 @@ void RimAnalysisPlotCollection::applyAllSummaryCasesAndFieldAddressesToPlot( Rim
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimAnalysisPlotCollection::applySummaryCaseCollectionAndFieldAddressToPlot( RimAnalysisPlot* plot,
RimSummaryCaseCollection* summaryCaseCollection,
const std::string& quantityName )
void RimAnalysisPlotCollection::applySummaryCaseCollectionAndFieldAddressToPlot( RimAnalysisPlot* plot,
RimSummaryEnsemble* summaryCaseCollection,
const std::string& quantityName )
{
if ( summaryCaseCollection )
{
@@ -219,9 +218,9 @@ void RimAnalysisPlotCollection::applySummaryCaseCollectionAndFieldAddressToPlot(
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection* RimAnalysisPlotCollection::firstEnsemble() const
RimSummaryEnsemble* RimAnalysisPlotCollection::firstEnsemble() const
{
std::vector<RimSummaryCaseCollection*> allSummaryCaseCollections = RimProject::current()->descendantsOfType<RimSummaryCaseCollection>();
std::vector<RimSummaryEnsemble*> allSummaryCaseCollections = RimProject::current()->descendantsOfType<RimSummaryEnsemble>();
for ( auto summaryCaseCollection : allSummaryCaseCollections )
{
if ( summaryCaseCollection->isEnsemble() ) return summaryCaseCollection;
@@ -232,9 +231,9 @@ RimSummaryCaseCollection* RimAnalysisPlotCollection::firstEnsemble() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection* RimAnalysisPlotCollection::firstSummaryCaseCollection() const
RimSummaryEnsemble* RimAnalysisPlotCollection::firstSummaryCaseCollection() const
{
std::vector<RimSummaryCaseCollection*> allSummaryCaseCollections = RimProject::current()->descendantsOfType<RimSummaryCaseCollection>();
std::vector<RimSummaryEnsemble*> allSummaryCaseCollections = RimProject::current()->descendantsOfType<RimSummaryEnsemble>();
if ( !allSummaryCaseCollections.empty() ) return allSummaryCaseCollections.front();

14
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.h
View File

@@ -26,7 +26,7 @@
#include <ctime>
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
//==================================================================================================
///
@@ -41,7 +41,7 @@ public:
~RimAnalysisPlotCollection() override;
RimAnalysisPlot* createAnalysisPlot();
RimAnalysisPlot* createAnalysisPlot( RimSummaryCaseCollection* ensemble, const QString& quantityName, std::time_t timeStep );
RimAnalysisPlot* createAnalysisPlot( RimSummaryEnsemble* ensemble, const QString& quantityName, std::time_t timeStep );
void updateSummaryNameHasChanged();
@@ -54,12 +54,12 @@ private:
void applyFirstEnsembleFieldAddressesToPlot( RimAnalysisPlot* plot, const std::string& quantityName = "" );
void applyFirstSummaryCaseCollectionAndFieldAddressesToPlot( RimAnalysisPlot* plot, const std::string& quantityName = "" );
void applyAllSummaryCasesAndFieldAddressesToPlot( RimAnalysisPlot* plot, const std::string& quantityName = "" );
void applySummaryCaseCollectionAndFieldAddressToPlot( RimAnalysisPlot* plot,
RimSummaryCaseCollection* summaryCaseCollection,
const std::string& quantityName );
void applySummaryCaseCollectionAndFieldAddressToPlot( RimAnalysisPlot* plot,
RimSummaryEnsemble* summaryCaseCollection,
const std::string& quantityName );
RimSummaryCaseCollection* firstEnsemble() const;
RimSummaryCaseCollection* firstSummaryCaseCollection() const;
RimSummaryEnsemble* firstEnsemble() const;
RimSummaryEnsemble* firstSummaryCaseCollection() const;
private:
caf::PdmChildArrayField<RimAnalysisPlot*> m_analysisPlots;

4
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotDataEntry.cpp
View File

@@ -21,7 +21,7 @@
#include "RiaSummaryCurveDefinition.h"
#include "RifEclipseSummaryAddress.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryAddress.h"
#include "RimSummaryCase.h"
@@ -98,7 +98,7 @@ RimSummaryCase* RimAnalysisPlotDataEntry::summaryCase() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection* RimAnalysisPlotDataEntry::ensemble() const
RimSummaryEnsemble* RimAnalysisPlotDataEntry::ensemble() const
{
return m_ensemble;
}

18
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotDataEntry.h
View File

@@ -25,7 +25,7 @@
class RimSummaryCase;
class RimSummaryAddress;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RiaSummaryCurveDefinition;
class RifEclipseSummaryAddress;
@@ -40,14 +40,14 @@ public:
void setFromCurveDefinition( const RiaSummaryCurveDefinition& curveDef );
RiaSummaryCurveDefinition curveDefinition() const;
RimSummaryCase* summaryCase() const;
RimSummaryCaseCollection* ensemble() const;
RifEclipseSummaryAddress summaryAddress() const;
bool isEnsembleCurve() const;
RimSummaryCase* summaryCase() const;
RimSummaryEnsemble* ensemble() const;
RifEclipseSummaryAddress summaryAddress() const;
bool isEnsembleCurve() const;
private:
caf::PdmPtrField<RimSummaryCase*> m_summaryCase;
caf::PdmPtrField<RimSummaryCaseCollection*> m_ensemble;
caf::PdmChildField<RimSummaryAddress*> m_summaryAddress;
caf::PdmField<bool> m_isEnsembleCurve;
caf::PdmPtrField<RimSummaryCase*> m_summaryCase;
caf::PdmPtrField<RimSummaryEnsemble*> m_ensemble;
caf::PdmChildField<RimSummaryAddress*> m_summaryAddress;
caf::PdmField<bool> m_isEnsembleCurve;
};

2
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.cpp
View File

@@ -25,7 +25,7 @@
#include "RimAnalysisPlot.h"
#include "RimSummaryAddress.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "cafPdmUiActionPushButtonEditor.h"
#include "cafPdmUiDoubleSliderEditor.h"

16
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp
View File

@@ -31,7 +31,7 @@
#include "RimProject.h"
#include "RimSummaryAddress.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryEnsembleTools.h"
#include "RiuContextMenuLauncher.h"
@@ -304,7 +304,7 @@ QList<caf::PdmOptionItemInfo> RimAbstractCorrelationPlot::calculateValueOptions(
}
else if ( fieldNeedingOptions == &m_curveSetForFiltering )
{
RimSummaryCaseCollection* ensemble = nullptr;
RimSummaryEnsemble* ensemble = nullptr;
for ( auto e : m_dataSources )
{
@@ -340,7 +340,7 @@ std::set<time_t> RimAbstractCorrelationPlot::allAvailableTimeSteps()
std::set<time_t> timeStepUnion;
RiaSummaryCurveDefinitionAnalyser* analyserOfSelectedCurveDefs = getOrCreateSelectedCurveDefAnalyser();
for ( RimSummaryCaseCollection* ensemble : analyserOfSelectedCurveDefs->m_ensembles )
for ( RimSummaryEnsemble* ensemble : analyserOfSelectedCurveDefs->m_ensembles )
{
const std::set<time_t>& timeSteps = ensemble->ensembleTimeSteps();
timeStepUnion.insert( timeSteps.begin(), timeSteps.end() );
@@ -390,7 +390,7 @@ std::set<RifEclipseSummaryAddress> RimAbstractCorrelationPlot::addresses() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<RimSummaryCaseCollection*> RimAbstractCorrelationPlot::ensembles() const
std::set<RimSummaryEnsemble*> RimAbstractCorrelationPlot::ensembles() const
{
RiaSummaryCurveDefinitionAnalyser* analyserOfSelectedCurveDefs = getOrCreateSelectedCurveDefAnalyser();
return analyserOfSelectedCurveDefs->m_ensembles;
@@ -399,7 +399,7 @@ std::set<RimSummaryCaseCollection*> RimAbstractCorrelationPlot::ensembles() cons
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<RimSummaryCase*> RimAbstractCorrelationPlot::filterEnsembleCases( RimSummaryCaseCollection* ensemble ) const
std::set<RimSummaryCase*> RimAbstractCorrelationPlot::filterEnsembleCases( RimSummaryEnsemble* ensemble ) const
{
std::set<RimSummaryCase*> setOfCases;
@@ -407,7 +407,7 @@ std::set<RimSummaryCase*> RimAbstractCorrelationPlot::filterEnsembleCases( RimSu
{
std::vector<RimSummaryCase*> summaryCasesVector;
if ( m_useCaseFilter() && m_curveSetForFiltering() && m_curveSetForFiltering->summaryCaseCollection() == ensemble )
if ( m_useCaseFilter() && m_curveSetForFiltering() && m_curveSetForFiltering->summaryEnsemble() == ensemble )
{
summaryCasesVector = m_curveSetForFiltering->filterEnsembleCases( ensemble->allSummaryCases() );
}
@@ -464,7 +464,7 @@ std::set<RigEnsembleParameter> RimAbstractCorrelationPlot::ensembleParameters()
RiaSummaryCurveDefinitionAnalyser* analyserOfSelectedCurveDefs = getOrCreateSelectedCurveDefAnalyser();
for ( RimSummaryCaseCollection* ensemble : analyserOfSelectedCurveDefs->m_ensembles )
for ( RimSummaryEnsemble* ensemble : analyserOfSelectedCurveDefs->m_ensembles )
{
std::vector<RigEnsembleParameter> parameters = RimSummaryEnsembleTools::alphabeticEnsembleParameters( ensemble->allSummaryCases() );
ensembleParms.insert( parameters.begin(), parameters.end() );
@@ -481,7 +481,7 @@ std::set<RigEnsembleParameter> RimAbstractCorrelationPlot::variationSortedEnsemb
RiaSummaryCurveDefinitionAnalyser* analyserOfSelectedCurveDefs = getOrCreateSelectedCurveDefAnalyser();
for ( RimSummaryCaseCollection* ensemble : analyserOfSelectedCurveDefs->m_ensembles )
for ( RimSummaryEnsemble* ensemble : analyserOfSelectedCurveDefs->m_ensembles )
{
std::vector<RigEnsembleParameter> parameters = ensemble->variationSortedEnsembleParameters();
ensembleParms.insert( parameters.begin(), parameters.end() );

6
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.h
View File

@@ -32,7 +32,7 @@ class RiaSummaryCurveDefinitionAnalyser;
class RimAnalysisPlotDataEntry;
class RimSummaryAddress;
class RimEnsembleCurveSet;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimSummaryCase;
class RigEnsembleParameter;
class RifEclipseSummaryAddress;
@@ -52,10 +52,10 @@ public:
std::vector<RiaSummaryCurveDefinition> curveDefinitions() const;
void setCurveDefinitions( const std::vector<RiaSummaryCurveDefinition>& curveDefinitions );
void setTimeStep( std::time_t timeStep );
std::set<RimSummaryCaseCollection*> ensembles() const;
std::set<RimSummaryEnsemble*> ensembles() const;
// Get summary cases filtered by attached ensemble parameter filter
std::set<RimSummaryCase*> filterEnsembleCases( RimSummaryCaseCollection* ensemble ) const;
std::set<RimSummaryCase*> filterEnsembleCases( RimSummaryEnsemble* ensemble ) const;
bool isCaseFilterEnabled() const;
void enableCaseFilter( bool enable );
RimEnsembleCurveSet* caseFilterDataSource() const;

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp
View File

@@ -37,7 +37,7 @@
#include "RimRegularLegendConfig.h"
#include "RimSummaryAddress.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryPlotAxisFormatter.h"
#include "RiuPlotMainWindowTools.h"

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp
View File

@@ -36,7 +36,7 @@
#include "RimPlotDataFilterCollection.h"
#include "RimSummaryAddress.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryPlotAxisFormatter.h"
#include "cafFontTools.h"

24
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlotCollection.cpp
View File

@@ -25,7 +25,7 @@
#include "RimCorrelationReportPlot.h"
#include "RimParameterResultCrossPlot.h"
#include "RimProject.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryEnsembleTools.h"
CAF_PDM_SOURCE_INIT( RimCorrelationPlotCollection, "CorrelationPlotCollection" );
@@ -68,7 +68,7 @@ RimCorrelationPlot* RimCorrelationPlotCollection::createCorrelationPlot( bool de
///
//--------------------------------------------------------------------------------------------------
RimCorrelationPlot*
RimCorrelationPlotCollection::createCorrelationPlot( RimSummaryCaseCollection* ensemble, const QString& quantityName, std::time_t timeStep )
RimCorrelationPlotCollection::createCorrelationPlot( RimSummaryEnsemble* ensemble, const QString& quantityName, std::time_t timeStep )
{
RimCorrelationPlot* plot = new RimCorrelationPlot();
plot->setAsPlotMdiWindow();
@@ -99,7 +99,7 @@ RimCorrelationMatrixPlot* RimCorrelationPlotCollection::createCorrelationMatrixP
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimCorrelationMatrixPlot* RimCorrelationPlotCollection::createCorrelationMatrixPlot( RimSummaryCaseCollection* ensemble,
RimCorrelationMatrixPlot* RimCorrelationPlotCollection::createCorrelationMatrixPlot( RimSummaryEnsemble* ensemble,
const std::vector<QString>& quantityNames,
std::time_t timeStep )
{
@@ -129,10 +129,10 @@ RimParameterResultCrossPlot* RimCorrelationPlotCollection::createParameterResult
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimParameterResultCrossPlot* RimCorrelationPlotCollection::createParameterResultCrossPlot( RimSummaryCaseCollection* ensemble,
const QString& paramName,
const QString& quantityName,
std::time_t timeStep )
RimParameterResultCrossPlot* RimCorrelationPlotCollection::createParameterResultCrossPlot( RimSummaryEnsemble* ensemble,
const QString& paramName,
const QString& quantityName,
std::time_t timeStep )
{
RimParameterResultCrossPlot* plot = new RimParameterResultCrossPlot;
plot->setAsPlotMdiWindow();
@@ -160,7 +160,7 @@ RimCorrelationReportPlot* RimCorrelationPlotCollection::createCorrelationReportP
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimCorrelationReportPlot* RimCorrelationPlotCollection::createCorrelationReportPlot( RimSummaryCaseCollection* ensemble,
RimCorrelationReportPlot* RimCorrelationPlotCollection::createCorrelationReportPlot( RimSummaryEnsemble* ensemble,
const std::vector<QString>& matrixQuantityNames,
const QString& tornadoAndCrossPlotQuantityName,
std::time_t timeStep )
@@ -230,7 +230,7 @@ void RimCorrelationPlotCollection::deleteAllPlots()
void RimCorrelationPlotCollection::applyFirstEnsembleFieldAddressesToPlot( RimAbstractCorrelationPlot* plot,
const std::vector<QString>& quantityNames /*= {} */ )
{
std::vector<RimSummaryCaseCollection*> ensembles = RimProject::current()->descendantsIncludingThisOfType<RimSummaryCaseCollection>();
std::vector<RimSummaryEnsemble*> ensembles = RimProject::current()->descendantsIncludingThisOfType<RimSummaryEnsemble>();
if ( !ensembles.empty() )
{
std::set<RifEclipseSummaryAddress> allAddresses = ensembles.front()->ensembleSummaryAddresses();
@@ -258,7 +258,7 @@ void RimCorrelationPlotCollection::applyFirstEnsembleFieldAddressesToPlot( RimAb
///
//--------------------------------------------------------------------------------------------------
void RimCorrelationPlotCollection::applyEnsembleFieldAndTimeStepToPlot( RimAbstractCorrelationPlot* plot,
RimSummaryCaseCollection* ensemble,
RimSummaryEnsemble* ensemble,
const std::vector<QString>& quantityNames,
std::time_t timeStep )
{
@@ -296,7 +296,7 @@ void RimCorrelationPlotCollection::applyFirstEnsembleFieldAddressesToReport( Rim
const std::vector<QString>& matrixQuantityNames,
const QString& tornadoAndCrossPlotQuantityName )
{
std::vector<RimSummaryCaseCollection*> ensembles = RimProject::current()->descendantsIncludingThisOfType<RimSummaryCaseCollection>();
std::vector<RimSummaryEnsemble*> ensembles = RimProject::current()->descendantsIncludingThisOfType<RimSummaryEnsemble>();
if ( !ensembles.empty() )
{
std::set<RifEclipseSummaryAddress> allAddresses = ensembles.front()->ensembleSummaryAddresses();
@@ -336,7 +336,7 @@ void RimCorrelationPlotCollection::applyFirstEnsembleFieldAddressesToReport( Rim
///
//--------------------------------------------------------------------------------------------------
void RimCorrelationPlotCollection::applyEnsembleFieldAndTimeStepToReport( RimCorrelationReportPlot* plot,
RimSummaryCaseCollection* ensemble,
RimSummaryEnsemble* ensemble,
const std::vector<QString>& matrixQuantityNames,
const QString& tornadoAndCrossPlotQuantityName,
std::time_t timeStep )

20
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlotCollection.h
View File

@@ -31,7 +31,7 @@ class RimCorrelationPlot;
class RimCorrelationMatrixPlot;
class RimCorrelationReportPlot;
class RimParameterResultCrossPlot;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
//==================================================================================================
///
@@ -46,20 +46,20 @@ public:
~RimCorrelationPlotCollection() override;
RimCorrelationPlot* createCorrelationPlot( bool defaultToFirstEnsembleFopt = true );
RimCorrelationPlot* createCorrelationPlot( RimSummaryCaseCollection* ensemble, const QString& quantityName, std::time_t timeStep );
RimCorrelationPlot* createCorrelationPlot( RimSummaryEnsemble* ensemble, const QString& quantityName, std::time_t timeStep );
RimCorrelationMatrixPlot* createCorrelationMatrixPlot( bool defaultToFirstEnsembleField = true );
RimCorrelationMatrixPlot*
createCorrelationMatrixPlot( RimSummaryCaseCollection* ensemble, const std::vector<QString>& quantityNames, std::time_t timeStep );
createCorrelationMatrixPlot( RimSummaryEnsemble* ensemble, const std::vector<QString>& quantityNames, std::time_t timeStep );
RimParameterResultCrossPlot* createParameterResultCrossPlot( bool defaultToFirstEnsembleFopt = true );
RimParameterResultCrossPlot* createParameterResultCrossPlot( RimSummaryCaseCollection* ensemble,
const QString& paramName,
const QString& quantityName,
std::time_t timeStep );
RimParameterResultCrossPlot* createParameterResultCrossPlot( RimSummaryEnsemble* ensemble,
const QString& paramName,
const QString& quantityName,
std::time_t timeStep );
RimCorrelationReportPlot* createCorrelationReportPlot( bool defaultToFirstEnsembleField = true );
RimCorrelationReportPlot* createCorrelationReportPlot( RimSummaryCaseCollection* ensemble,
RimCorrelationReportPlot* createCorrelationReportPlot( RimSummaryEnsemble* ensemble,
const std::vector<QString>& matrixQuantityNames,
const QString& tornadoAndCrossPlotQuantityName,
std::time_t timeStep );
@@ -78,14 +78,14 @@ public:
private:
void applyFirstEnsembleFieldAddressesToPlot( RimAbstractCorrelationPlot* plot, const std::vector<QString>& quantityNames = {} );
void applyEnsembleFieldAndTimeStepToPlot( RimAbstractCorrelationPlot* plot,
RimSummaryCaseCollection* ensemble,
RimSummaryEnsemble* ensemble,
const std::vector<QString>& quantityNames,
std::time_t timeStep );
void applyFirstEnsembleFieldAddressesToReport( RimCorrelationReportPlot* plot,
const std::vector<QString>& matrixQuantityNames,
const QString& tornadoAndCrossPlotQuantityName );
void applyEnsembleFieldAndTimeStepToReport( RimCorrelationReportPlot* plot,
RimSummaryCaseCollection* ensemble,
RimSummaryEnsemble* ensemble,
const std::vector<QString>& matrixQuantityNames,
const QString& tornadoAndCrossPlotQuantityName,
std::time_t timeStep );

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp
View File

@@ -26,7 +26,7 @@
#include "RimCorrelationPlotCollection.h"
#include "RimParameterResultCrossPlot.h"
#include "RimRegularLegendConfig.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RiuMultiPlotPage.h"
#include "RiuPlotWidget.h"

2
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.h
View File

@@ -30,7 +30,7 @@
class RimAnalysisPlotDataEntry;
class RimCorrelationMatrixPlot;
class RimParameterResultCrossPlot;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimCorrelationPlot;
class RiaSummaryCurveDefinition;

4
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp
View File

@@ -36,7 +36,7 @@
#include "RimProject.h"
#include "RimSummaryAddress.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryPlotAxisFormatter.h"
#include "RiuPlotCurve.h"
@@ -203,7 +203,7 @@ void RimParameterResultCrossPlot::updateAxes()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QStringList caseNamesOfValidEnsembleCases( const RimSummaryCaseCollection* ensemble )
QStringList caseNamesOfValidEnsembleCases( const RimSummaryEnsemble* ensemble )
{
QStringList caseNames;
for ( auto summaryCase : ensemble->allSummaryCases() )

2
ApplicationLibCode/ProjectDataModel/Flow/RimDataSourceForRftPlt.cpp
View File

@@ -21,7 +21,7 @@
#include "RimObservedFmuRftData.h"
#include "RimPressureDepthData.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimWellLogLasFile.h"
#include "cafAppEnum.h"

14
ApplicationLibCode/ProjectDataModel/Flow/RimDataSourceForRftPlt.h
View File

@@ -34,7 +34,7 @@
#include <QPointer>
class RimObservedFmuRftData;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimWellLogLasFile;
class RimEclipseCase;
@@ -59,10 +59,10 @@ private:
private:
caf::PdmField<caf::AppEnum<RifDataSourceForRftPlt::SourceType>> m_sourceType;
caf::PdmPtrField<RimEclipseCase*> m_eclCase;
caf::PdmPtrField<RimSummaryCase*> m_summaryCase;
caf::PdmPtrField<RimSummaryCaseCollection*> m_ensemble;
caf::PdmPtrField<RimWellLogLasFile*> m_wellLogFile;
caf::PdmPtrField<RimObservedFmuRftData*> m_observedFmuRftData;
caf::PdmPtrField<RimPressureDepthData*> m_pressureDepthData;
caf::PdmPtrField<RimEclipseCase*> m_eclCase;
caf::PdmPtrField<RimSummaryCase*> m_summaryCase;
caf::PdmPtrField<RimSummaryEnsemble*> m_ensemble;
caf::PdmPtrField<RimWellLogLasFile*> m_wellLogFile;
caf::PdmPtrField<RimObservedFmuRftData*> m_observedFmuRftData;
caf::PdmPtrField<RimPressureDepthData*> m_pressureDepthData;
};

30
ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.cpp
View File

@@ -33,7 +33,7 @@
#include "RimPressureDepthData.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryEnsembleTools.h"
#include "RimWellLogChannel.h"
#include "RimWellLogExtractionCurve.h"
@@ -449,15 +449,15 @@ std::set<QDateTime> rftTimeStepsForWell( const std::vector<RimSummaryCase*>& sum
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCaseCollection*> rftEnsemblesForWell( const QString& simWellName )
std::vector<RimSummaryEnsemble*> rftEnsemblesForWell( const QString& simWellName )
{
const RimProject* project = RimProject::current();
std::vector<RimSummaryCaseCollection*> allSummaryCaseCollections = project->summaryGroups();
std::vector<RimSummaryEnsemble*> allSummaryCaseCollections = project->summaryGroups();
std::vector<RimSummaryCaseCollection*> rftEnsembles;
std::vector<RimSummaryEnsemble*> rftEnsembles;
for ( RimSummaryCaseCollection* summaryCaseColl : allSummaryCaseCollections )
for ( RimSummaryEnsemble* summaryCaseColl : allSummaryCaseCollections )
{
if ( summaryCaseColl && summaryCaseColl->isEnsemble() &&
!rftTimeStepsForWell( summaryCaseColl->allSummaryCases(), simWellName ).empty() )
@@ -471,15 +471,15 @@ std::vector<RimSummaryCaseCollection*> rftEnsemblesForWell( const QString& simWe
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCaseCollection*> rftEnsembles()
std::vector<RimSummaryEnsemble*> rftEnsembles()
{
const RimProject* project = RimProject::current();
std::vector<RimSummaryCaseCollection*> allSummaryCaseCollections = project->summaryGroups();
std::vector<RimSummaryEnsemble*> allSummaryCaseCollections = project->summaryGroups();
std::vector<RimSummaryCaseCollection*> rftEnsembles;
std::vector<RimSummaryEnsemble*> rftEnsembles;
for ( RimSummaryCaseCollection* summaryCaseColl : allSummaryCaseCollections )
for ( RimSummaryEnsemble* summaryCaseColl : allSummaryCaseCollections )
{
if ( summaryCaseColl && summaryCaseColl->isEnsemble() &&
!RimSummaryEnsembleTools::wellsWithRftData( summaryCaseColl->allSummaryCases() ).empty() )
@@ -663,11 +663,11 @@ RiaRftPltCurveDefinition curveDefFromCurve( const RimWellLogCurve* curve )
if ( rftCurve != nullptr )
{
RimEclipseResultCase* rftCase = dynamic_cast<RimEclipseResultCase*>( rftCurve->eclipseCase() );
RimSummaryCase* rftSummaryCase = rftCurve->summaryCase();
RimSummaryCaseCollection* rftEnsemble = rftCurve->ensemble();
RimObservedFmuRftData* rftFmuData = rftCurve->observedFmuRftData();
RimPressureDepthData* pressureDepthData = rftCurve->pressureDepthData();
RimEclipseResultCase* rftCase = dynamic_cast<RimEclipseResultCase*>( rftCurve->eclipseCase() );
RimSummaryCase* rftSummaryCase = rftCurve->summaryCase();
RimSummaryEnsemble* rftEnsemble = rftCurve->ensemble();
RimObservedFmuRftData* rftFmuData = rftCurve->observedFmuRftData();
RimPressureDepthData* pressureDepthData = rftCurve->pressureDepthData();
const RifEclipseRftAddress rftAddress = rftCurve->rftAddress();
const QString& wellName = rftAddress.wellName();
@@ -678,7 +678,7 @@ RiaRftPltCurveDefinition curveDefFromCurve( const RimWellLogCurve* curve )
// Presens of rftSummaryCase must be tested before rftCase because a rftSummaryCase can have a rftCase
// The rftCase is used to extract TVD/MD from the grid model
RimSummaryCaseCollection* parentEnsemble = rftSummaryCase->firstAncestorOrThisOfType<RimSummaryCaseCollection>();
RimSummaryEnsemble* parentEnsemble = rftSummaryCase->firstAncestorOrThisOfType<RimSummaryEnsemble>();
return RiaRftPltCurveDefinition( RifDataSourceForRftPlt( rftSummaryCase, parentEnsemble, rftCase ), wellName, timeStep );
}
else if ( rftCase != nullptr )

16
ApplicationLibCode/ProjectDataModel/Flow/RimWellPlotTools.h
View File

@@ -31,7 +31,7 @@
class RimEclipseCase;
class RimEclipseResultCase;
class RimObservedFmuRftData;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimWellLogCurve;
class RimWellLogChannel;
class RimWellLogPlot;
@@ -80,13 +80,13 @@ RiaRftPltCurveDefinition curveDefFromCurve( const R
bool hasFlowData( const RimWellLog* wellLog );
bool hasAssociatedWellPath( const QString& wellName );
std::vector<RimEclipseResultCase*> gridCasesForWell( const QString& simWellName );
std::vector<RimEclipseResultCase*> rftCasesForWell( const QString& simWellName );
std::vector<RimSummaryCaseCollection*> rftEnsemblesForWell( const QString& simWellName );
std::vector<RimSummaryCaseCollection*> rftEnsembles();
std::vector<RimObservedFmuRftData*> observedFmuRftDataForWell( const QString& simWellName );
std::vector<RimObservedFmuRftData*> observedFmuRftData();
QString simWellName( const QString& wellPathNameOrSimWellName );
std::vector<RimEclipseResultCase*> gridCasesForWell( const QString& simWellName );
std::vector<RimEclipseResultCase*> rftCasesForWell( const QString& simWellName );
std::vector<RimSummaryEnsemble*> rftEnsemblesForWell( const QString& simWellName );
std::vector<RimSummaryEnsemble*> rftEnsembles();
std::vector<RimObservedFmuRftData*> observedFmuRftDataForWell( const QString& simWellName );
std::vector<RimObservedFmuRftData*> observedFmuRftData();
QString simWellName( const QString& wellPathNameOrSimWellName );
std::map<QDateTime, std::set<RifDataSourceForRftPlt>>
calculateRelevantTimeStepsFromCases( const QString& wellPathNameOrSimWellName,

14
ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.cpp
View File

@@ -24,7 +24,7 @@
#include "RimEnsembleCurveSetColorManager.h"
#include "RimRegularLegendConfig.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimTools.h"
#include "RimWellRftPlot.h"
@@ -77,7 +77,7 @@ RimWellRftEnsembleCurveSet::~RimWellRftEnsembleCurveSet()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection* RimWellRftEnsembleCurveSet::ensemble() const
RimSummaryEnsemble* RimWellRftEnsembleCurveSet::ensemble() const
{
return m_ensemble;
}
@@ -85,7 +85,7 @@ RimSummaryCaseCollection* RimWellRftEnsembleCurveSet::ensemble() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellRftEnsembleCurveSet::setEnsemble( RimSummaryCaseCollection* ensemble )
void RimWellRftEnsembleCurveSet::setEnsemble( RimSummaryEnsemble* ensemble )
{
m_ensemble = ensemble;
@@ -148,8 +148,8 @@ void RimWellRftEnsembleCurveSet::setEnsembleParameter( const QString& parameterN
//--------------------------------------------------------------------------------------------------
std::vector<QString> RimWellRftEnsembleCurveSet::parametersWithVariation() const
{
std::set<QString> paramSet;
RimSummaryCaseCollection* group = m_ensemble;
std::set<QString> paramSet;
RimSummaryEnsemble* group = m_ensemble;
if ( group )
{
auto parameters = group->variationSortedEnsembleParameters( true );
@@ -192,8 +192,8 @@ RigEnsembleParameter::Type RimWellRftEnsembleCurveSet::currentEnsembleParameterT
{
if ( m_ensembleColorMode() == ColorMode::BY_ENSEMBLE_PARAM )
{
RimSummaryCaseCollection* group = m_ensemble();
QString parameterName = m_ensembleParameter();
RimSummaryEnsemble* group = m_ensemble();
QString parameterName = m_ensembleParameter();
if ( group && !parameterName.isEmpty() )
{

18
ApplicationLibCode/ProjectDataModel/Flow/RimWellRftEnsembleCurveSet.h
View File

@@ -31,7 +31,7 @@
#include <QPointer>
class RiuCvfOverlayItemWidget;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimEclipseCase;
class RifReaderEnsembleStatisticsRft;
class RifReaderRftInterface;
@@ -48,13 +48,13 @@ public:
RimWellRftEnsembleCurveSet();
~RimWellRftEnsembleCurveSet() override;
RimSummaryCaseCollection* ensemble() const;
void setEnsemble( RimSummaryCaseCollection* ensemble );
ColorMode colorMode() const;
void setColorMode( ColorMode mode );
void initializeLegend();
cvf::Color3f caseColor( const RimSummaryCase* summaryCase ) const;
QString currentEnsembleParameter() const;
RimSummaryEnsemble* ensemble() const;
void setEnsemble( RimSummaryEnsemble* ensemble );
ColorMode colorMode() const;
void setColorMode( ColorMode mode );
void initializeLegend();
cvf::Color3f caseColor( const RimSummaryCase* summaryCase ) const;
QString currentEnsembleParameter() const;
void setEnsembleParameter( const QString& parameterName );
RimRegularLegendConfig* legendConfig();
@@ -81,7 +81,7 @@ private:
private:
caf::PdmPtrField<RimEclipseCase*> m_eclipseCase;
caf::PdmPtrField<RimSummaryCaseCollection*> m_ensemble;
caf::PdmPtrField<RimSummaryEnsemble*> m_ensemble;
caf::PdmProxyValueField<QString> m_ensembleName;
caf::PdmField<ColorModeEnum> m_ensembleColorMode;
caf::PdmField<QString> m_ensembleParameter;

44
ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
View File

@@ -38,7 +38,7 @@
#include "RimRegularLegendConfig.h"
#include "RimReloadCaseTools.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryEnsembleTools.h"
#include "RimTools.h"
#include "RimWellLogChannel.h"
@@ -233,7 +233,7 @@ QString RimWellRftPlot::associatedSimWellName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellRftPlot::applyInitialSelections( std::variant<RimSummaryCase*, RimSummaryCaseCollection*> dataSource )
void RimWellRftPlot::applyInitialSelections( std::variant<RimSummaryCase*, RimSummaryEnsemble*> dataSource )
{
std::map<QString, QStringList> wellSources = findWellSources();
if ( m_wellPathNameOrSimWellName() == "None" && !wellSources.empty() )
@@ -241,10 +241,10 @@ void RimWellRftPlot::applyInitialSelections( std::variant<RimSummaryCase*, RimSu
m_wellPathNameOrSimWellName = wellSources.begin()->first;
}
RimSummaryCaseCollection* ensemble = nullptr;
RimSummaryCase* summaryCase = nullptr;
RimSummaryEnsemble* ensemble = nullptr;
RimSummaryCase* summaryCase = nullptr;
if ( auto summaryCollection = std::get_if<RimSummaryCaseCollection*>( &dataSource ) )
if ( auto summaryCollection = std::get_if<RimSummaryEnsemble*>( &dataSource ) )
{
ensemble = *summaryCollection;
}
@@ -270,7 +270,7 @@ void RimWellRftPlot::applyInitialSelections( std::variant<RimSummaryCase*, RimSu
sourcesToSelect.push_back( RifDataSourceForRftPlt( RifDataSourceForRftPlt::SourceType::GRID_MODEL_CELL_DATA, gridCase ) );
}
for ( RimSummaryCaseCollection* const ensemble : RimWellPlotTools::rftEnsemblesForWell( simWellName ) )
for ( RimSummaryEnsemble* const ensemble : RimWellPlotTools::rftEnsemblesForWell( simWellName ) )
{
sourcesToSelect.push_back( RifDataSourceForRftPlt( ensemble ) );
}
@@ -509,7 +509,7 @@ void RimWellRftPlot::updateCurvesInPlot( const std::set<RiaRftPltCurveDefinition
defineCurveColorsAndSymbols( allCurveDefs );
std::set<RimSummaryCaseCollection*> ensemblesWithSummaryCurves;
std::set<RimSummaryEnsemble*> ensemblesWithSummaryCurves;
// Add new curves
for ( const RiaRftPltCurveDefinition& curveDefToAdd : allCurveDefs )
@@ -595,8 +595,8 @@ void RimWellRftPlot::updateCurvesInPlot( const std::set<RiaRftPltCurveDefinition
}
else if ( m_showStatisticsCurves && curveDefToAdd.address().sourceType() == RifDataSourceForRftPlt::SourceType::ENSEMBLE_RFT )
{
RimSummaryCaseCollection* ensemble = curveDefToAdd.address().ensemble();
auto curveSet = findEnsembleCurveSet( ensemble );
RimSummaryEnsemble* ensemble = curveDefToAdd.address().ensemble();
auto curveSet = findEnsembleCurveSet( ensemble );
std::set<RifEclipseRftAddress> rftAddresses =
curveSet->statisticsEclipseRftReader()->eclipseRftAddresses( m_wellPathNameOrSimWellName, curveDefToAdd.timeStep() );
@@ -867,14 +867,14 @@ QList<caf::PdmOptionItemInfo> RimWellRftPlot::calculateValueOptionsForSources()
}
}
const std::vector<RimSummaryCaseCollection*> rftEnsembles = RimWellPlotTools::rftEnsemblesForWell( m_wellPathNameOrSimWellName );
const std::vector<RimSummaryEnsemble*> rftEnsembles = RimWellPlotTools::rftEnsemblesForWell( m_wellPathNameOrSimWellName );
if ( !rftEnsembles.empty() )
{
options.push_back(
caf::PdmOptionItemInfo::createHeader( RifDataSourceForRftPlt::sourceTypeUiText( RifDataSourceForRftPlt::SourceType::ENSEMBLE_RFT ),
true ) );
for ( RimSummaryCaseCollection* rftEnsemble : rftEnsembles )
for ( RimSummaryEnsemble* rftEnsemble : rftEnsembles )
{
auto addr = RifDataSourceForRftPlt( rftEnsemble );
auto item = caf::PdmOptionItemInfo( rftEnsemble->name(), QVariant::fromValue( addr ) );
@@ -894,7 +894,7 @@ QList<caf::PdmOptionItemInfo> RimWellRftPlot::calculateValueOptionsForSources()
if ( summaryCase->rftReader() && summaryCase->rftReader()->wellNames().contains( m_wellPathNameOrSimWellName ) )
{
auto eclipeGridModel = RimReloadCaseTools::gridModelFromSummaryCase( summaryCase );
auto parentEnsemble = summaryCase->firstAncestorOrThisOfType<RimSummaryCaseCollection>();
auto parentEnsemble = summaryCase->firstAncestorOrThisOfType<RimSummaryEnsemble>();
auto addr = RifDataSourceForRftPlt( summaryCase, parentEnsemble, eclipeGridModel );
auto item = caf::PdmOptionItemInfo( summaryCase->displayCaseName(), QVariant::fromValue( addr ) );
@@ -1036,7 +1036,7 @@ void RimWellRftPlot::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
for ( RimWellRftEnsembleCurveSet* curveSet : m_ensembleCurveSets() )
{
bool isSelected = false;
for ( RimSummaryCaseCollection* selectedCurveSet : selectedEnsembles() )
for ( RimSummaryEnsemble* selectedCurveSet : selectedEnsembles() )
{
if ( curveSet->ensemble() == selectedCurveSet )
{
@@ -1149,10 +1149,10 @@ std::map<QString, QStringList> RimWellRftPlot::findWellSources()
}
}
const std::vector<RimSummaryCaseCollection*> rftEnsembles = RimWellPlotTools::rftEnsembles();
const std::vector<RimSummaryEnsemble*> rftEnsembles = RimWellPlotTools::rftEnsembles();
// Ensemble RFT wells
{
for ( RimSummaryCaseCollection* summaryCaseColl : rftEnsembles )
for ( RimSummaryEnsemble* summaryCaseColl : rftEnsembles )
{
std::set<QString> wellsWithRftData = RimSummaryEnsembleTools::wellsWithRftData( summaryCaseColl->allSummaryCases() );
for ( const QString& wellName : wellsWithRftData )
@@ -1412,7 +1412,7 @@ void RimWellRftPlot::defineCurveColorsAndSymbols( const std::set<RiaRftPltCurveD
CAF_ASSERT( curveSet );
auto ensemble_it = std::find_if( ensembles.begin(),
ensembles.end(),
[&curveSet]( const RimSummaryCaseCollection* ensemble ) { return curveSet->ensemble() == ensemble; } );
[&curveSet]( const RimSummaryEnsemble* ensemble ) { return curveSet->ensemble() == ensemble; } );
if ( ensemble_it != ensembles.end() )
{
curveSet->initializeLegend();
@@ -1475,9 +1475,9 @@ void RimWellRftPlot::defineCurveColorsAndSymbols( const std::set<RiaRftPltCurveD
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCaseCollection*> RimWellRftPlot::selectedEnsembles() const
std::vector<RimSummaryEnsemble*> RimWellRftPlot::selectedEnsembles() const
{
std::vector<RimSummaryCaseCollection*> ensembleSets;
std::vector<RimSummaryEnsemble*> ensembleSets;
for ( const RifDataSourceForRftPlt& dataSource : m_selectedSources() )
{
if ( dataSource.ensemble() != nullptr )
@@ -1493,7 +1493,7 @@ std::vector<RimSummaryCaseCollection*> RimWellRftPlot::selectedEnsembles() const
//--------------------------------------------------------------------------------------------------
void RimWellRftPlot::createEnsembleCurveSets()
{
const std::vector<RimSummaryCaseCollection*> rftEnsembles = RimWellPlotTools::rftEnsemblesForWell( m_wellPathNameOrSimWellName );
const std::vector<RimSummaryEnsemble*> rftEnsembles = RimWellPlotTools::rftEnsemblesForWell( m_wellPathNameOrSimWellName );
// First delete any curve sets not belonging to the given rftEnsembles
std::vector<RimWellRftEnsembleCurveSet*> curveSetsToDelete;
@@ -1512,7 +1512,7 @@ void RimWellRftPlot::createEnsembleCurveSets()
}
// Then add curve set for any ensembles we haven't already added
for ( RimSummaryCaseCollection* ensemble : rftEnsembles )
for ( RimSummaryEnsemble* ensemble : rftEnsembles )
{
auto it = std::find_if( m_ensembleCurveSets.begin(),
m_ensembleCurveSets.end(),
@@ -1529,7 +1529,7 @@ void RimWellRftPlot::createEnsembleCurveSets()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellRftEnsembleCurveSet* RimWellRftPlot::findEnsembleCurveSet( RimSummaryCaseCollection* ensemble ) const
RimWellRftEnsembleCurveSet* RimWellRftPlot::findEnsembleCurveSet( RimSummaryEnsemble* ensemble ) const
{
for ( RimWellRftEnsembleCurveSet* curveSet : m_ensembleCurveSets() )
{
@@ -1544,7 +1544,7 @@ RimWellRftEnsembleCurveSet* RimWellRftPlot::findEnsembleCurveSet( RimSummaryCase
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::variant<RimSummaryCase*, RimSummaryCaseCollection*> RimWellRftPlot::dataSource() const
std::variant<RimSummaryCase*, RimSummaryEnsemble*> RimWellRftPlot::dataSource() const
{
// Return the first selected ensemble, if any
// If no ensemble is selected, return the first selected summary case, if any

10
ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.h
View File

@@ -84,8 +84,8 @@ public:
int branchIndex() const;
std::variant<RimSummaryCase*, RimSummaryCaseCollection*> dataSource() const;
void applyInitialSelections( std::variant<RimSummaryCase*, RimSummaryCaseCollection*> dataSource );
std::variant<RimSummaryCase*, RimSummaryEnsemble*> dataSource() const;
void applyInitialSelections( std::variant<RimSummaryCase*, RimSummaryEnsemble*> dataSource );
static const char* plotNameFormatString();
@@ -94,7 +94,7 @@ public:
bool showErrorBarsForObservedData() const;
void onLegendDefinitionChanged();
RimWellRftEnsembleCurveSet* findEnsembleCurveSet( RimSummaryCaseCollection* ensemble ) const;
RimWellRftEnsembleCurveSet* findEnsembleCurveSet( RimSummaryEnsemble* ensemble ) const;
protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
@@ -140,8 +140,8 @@ private:
cvf::Color3f findCurveColor( RimWellLogCurve* curve );
void defineCurveColorsAndSymbols( const std::set<RiaRftPltCurveDefinition>& allCurveDefs );
std::vector<RimSummaryCaseCollection*> selectedEnsembles() const;
void createEnsembleCurveSets();
std::vector<RimSummaryEnsemble*> selectedEnsembles() const;
void createEnsembleCurveSets();
private:
friend class RimWellRftEnsembleCurveSet;

6
ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -135,10 +135,10 @@
#include "RimSummaryAddress.h"
#include "RimSummaryAddressCollection.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryMultiPlotCollection.h"
#include "RimSummaryPlot.h"
@@ -798,7 +798,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "Separator";
menuBuilder << "RicShowSummaryCurveCalculatorFeature";
}
else if ( dynamic_cast<RimSummaryCaseCollection*>( firstUiItem ) )
else if ( dynamic_cast<RimSummaryEnsemble*>( firstUiItem ) )
{
menuBuilder.subMenuStart( "Import" );
menuBuilder << "RicImportSummaryCaseFeature";
@@ -1204,7 +1204,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicDeleteWellPathFeature";
menuBuilder << "RicLinkWellPathFeature";
if ( dynamic_cast<RimSummaryCase*>( firstUiItem ) || dynamic_cast<RimSummaryCaseCollection*>( firstUiItem ) )
if ( dynamic_cast<RimSummaryCase*>( firstUiItem ) || dynamic_cast<RimSummaryEnsemble*>( firstUiItem ) )
{
menuBuilder << "RicAppendSummaryCurvesForSummaryCasesFeature";
menuBuilder << "RicAppendSummaryPlotsForSummaryCasesFeature";

4
ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunction.cpp
View File

@@ -20,7 +20,7 @@
#include "RimCustomObjectiveFunctionWeight.h"
#include "RimEnsembleCurveSet.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include <cafPdmUiLineEditor.h>
#include <cafPdmUiTreeOrdering.h>
@@ -90,7 +90,7 @@ std::vector<double> RimCustomObjectiveFunction::functionValueForAllCases() const
{
if ( m_weights.empty() ) return {};
RimSummaryCaseCollection* caseCollection = parentCurveSet()->summaryCaseCollection();
RimSummaryEnsemble* caseCollection = parentCurveSet()->summaryEnsemble();
if ( !caseCollection || caseCollection->allSummaryCases().empty() ) return {};
std::vector<double> values;

2
ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionWeight.cpp
View File

@@ -146,7 +146,7 @@ void RimCustomObjectiveFunctionWeight::fieldChangedByUi( const caf::PdmFieldHand
{
RiuSummaryVectorSelectionDialog dlg( nullptr );
RimObjectiveFunctionTools::configureDialogForObjectiveFunctions( &dlg );
RimSummaryCaseCollection* candidateEnsemble = parentCurveSet()->summaryCaseCollection();
RimSummaryEnsemble* candidateEnsemble = parentCurveSet()->summaryEnsemble();
std::vector<RifEclipseSummaryAddress> candidateAddresses;
for ( auto address : m_objectiveValuesSummaryAddresses().childrenByType() )

12
ApplicationLibCode/ProjectDataModel/RimProject.cpp
View File

@@ -84,8 +84,8 @@
#include "RimStimPlanModelPlotCollection.h"
#include "RimSummaryCalculation.h"
#include "RimSummaryCalculationCollection.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryMultiPlotCollection.h"
#include "RimSummaryTableCollection.h"
#include "RimSurfaceCollection.h"
@@ -538,11 +538,11 @@ void RimProject::assignCaseIdToSummaryCase( RimSummaryCase* summaryCase )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimProject::assignIdToEnsemble( RimSummaryCaseCollection* summaryCaseCollection )
void RimProject::assignIdToEnsemble( RimSummaryEnsemble* summaryCaseCollection )
{
if ( summaryCaseCollection )
{
for ( RimSummaryCaseCollection* s : RimProject::summaryGroups() )
for ( RimSummaryEnsemble* s : RimProject::summaryGroups() )
{
m_nextValidEnsembleId = std::max( m_nextValidEnsembleId, s->ensembleId() + 1 );
}
@@ -715,9 +715,9 @@ std::vector<RimSummaryCase*> RimProject::allSummaryCases() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCaseCollection*> RimProject::summaryGroups() const
std::vector<RimSummaryEnsemble*> RimProject::summaryGroups() const
{
std::vector<RimSummaryCaseCollection*> groups;
std::vector<RimSummaryEnsemble*> groups;
for ( RimOilField* oilField : oilFields )
{
@@ -725,7 +725,7 @@ std::vector<RimSummaryCaseCollection*> RimProject::summaryGroups() const
RimSummaryCaseMainCollection* sumCaseMainColl = oilField->summaryCaseMainCollection();
if ( sumCaseMainColl )
{
std::vector<RimSummaryCaseCollection*> g = sumCaseMainColl->summaryCaseCollections();
std::vector<RimSummaryEnsemble*> g = sumCaseMainColl->summaryCaseCollections();
groups.insert( groups.end(), g.begin(), g.end() );
}
}

10
ApplicationLibCode/ProjectDataModel/RimProject.h
View File

@@ -57,7 +57,7 @@ class RimOilField;
class RimColorLegendCollection;
class RimScriptCollection;
class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimSummaryCaseMainCollection;
class Rim3dView;
class RimGridView;
@@ -129,13 +129,13 @@ public:
void assignViewIdToView( Rim3dView* view );
void assignPlotIdToPlotWindow( RimPlotWindow* plotWindow );
void assignCaseIdToSummaryCase( RimSummaryCase* summaryCase );
void assignIdToEnsemble( RimSummaryCaseCollection* summaryCaseCollection );
void assignIdToEnsemble( RimSummaryEnsemble* summaryCaseCollection );
[[nodiscard]] std::vector<RimCase*> allGridCases() const;
std::vector<RimSummaryCase*> allSummaryCases() const;
std::vector<RimSummaryCaseCollection*> summaryGroups() const;
RimSummaryCaseMainCollection* firstSummaryCaseMainCollection() const;
std::vector<RimSummaryCase*> allSummaryCases() const;
std::vector<RimSummaryEnsemble*> summaryGroups() const;
RimSummaryCaseMainCollection* firstSummaryCaseMainCollection() const;
[[nodiscard]] std::vector<Rim3dView*> allViews() const;
[[nodiscard]] std::vector<Rim3dView*> allVisibleViews() const;

4
ApplicationLibCode/ProjectDataModel/RimSummaryCalculationCollection.cpp
View File

@@ -25,8 +25,8 @@
#include "RimObservedSummaryData.h"
#include "RimSummaryCalculation.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
CAF_PDM_SOURCE_INIT( RimSummaryCalculationCollection, "RimSummaryCalculationCollection" );
//--------------------------------------------------------------------------------------------------
@@ -83,7 +83,7 @@ void RimSummaryCalculationCollection::updateDataDependingOnCalculations()
}
auto summaryCaseCollections = summaryCaseCollection->summaryCaseCollections();
for ( RimSummaryCaseCollection* summaryCaseCollection : summaryCaseCollections )
for ( RimSummaryEnsemble* summaryCaseCollection : summaryCaseCollections )
{
summaryCaseCollection->onCalculationUpdated();
}

2
ApplicationLibCode/ProjectDataModel/RimSummaryCalculationVariable.cpp
View File

@@ -28,8 +28,8 @@
#include "RimSummaryAddress.h"
#include "RimSummaryCalculation.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryEnsemble.h"
#include "RiuDragDrop.h"
#include "RiuSummaryVectorSelectionDialog.h"

4
ApplicationLibCode/ProjectDataModel/Summary/CMakeLists_files.cmake
View File

@@ -4,7 +4,7 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCase.h
${CMAKE_CURRENT_LIST_DIR}/RimGridSummaryCase.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCaseMainCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCaseCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryEnsemble.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurve.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurvesData.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAppearanceCalculator.h
@@ -63,7 +63,7 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RimGridSummaryCase.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCase.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCaseMainCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCaseCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryEnsemble.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurve.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurvesData.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAppearanceCalculator.cpp

18
ApplicationLibCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.cpp
View File

@@ -23,8 +23,8 @@
#include "RimDerivedEnsembleCaseCollection.h"
#include "RimDerivedSummaryCase.h"
#include "RimProject.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RifSummaryReaderInterface.h"
@@ -96,7 +96,7 @@ RimDerivedEnsembleCaseCollection::~RimDerivedEnsembleCaseCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimDerivedEnsembleCaseCollection::setEnsemble1( RimSummaryCaseCollection* ensemble )
void RimDerivedEnsembleCaseCollection::setEnsemble1( RimSummaryEnsemble* ensemble )
{
m_ensemble1 = ensemble;
updateAutoName();
@@ -105,7 +105,7 @@ void RimDerivedEnsembleCaseCollection::setEnsemble1( RimSummaryCaseCollection* e
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimDerivedEnsembleCaseCollection::setEnsemble2( RimSummaryCaseCollection* ensemble )
void RimDerivedEnsembleCaseCollection::setEnsemble2( RimSummaryEnsemble* ensemble )
{
m_ensemble2 = ensemble;
updateAutoName();
@@ -253,7 +253,7 @@ QList<caf::PdmOptionItemInfo> RimDerivedEnsembleCaseCollection::calculateValueOp
if ( fieldNeedingOptions == &m_fixedTimeStepIndex )
{
RimSummaryCaseCollection* sourceEnsemble = nullptr;
RimSummaryEnsemble* sourceEnsemble = nullptr;
if ( m_useFixedTimeStep() == FixedTimeStepMode::FIXED_TIME_STEP_CASE_1 )
{
sourceEnsemble = m_ensemble1;
@@ -282,7 +282,7 @@ QList<caf::PdmOptionItemInfo> RimDerivedEnsembleCaseCollection::calculateValueOp
//--------------------------------------------------------------------------------------------------
void RimDerivedEnsembleCaseCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
RimSummaryCaseCollection::defineUiOrdering( uiConfigName, uiOrdering );
RimSummaryEnsemble::defineUiOrdering( uiConfigName, uiOrdering );
uiOrdering.add( &m_caseCount );
uiOrdering.add( &m_ensemble1 );
@@ -443,7 +443,7 @@ RimDerivedSummaryCase* RimDerivedEnsembleCaseCollection::firstCaseNotInUse()
std::vector<RimDerivedSummaryCase*> RimDerivedEnsembleCaseCollection::allDerivedCases( bool activeOnly ) const
{
std::vector<RimDerivedSummaryCase*> activeCases;
for ( auto sumCase : RimSummaryCaseCollection::allSummaryCases() )
for ( auto sumCase : RimSummaryEnsemble::allSummaryCases() )
{
auto derivedCase = dynamic_cast<RimDerivedSummaryCase*>( sumCase );
if ( derivedCase && ( !activeOnly || derivedCase->isInUse() ) )
@@ -461,7 +461,7 @@ void RimDerivedEnsembleCaseCollection::updateAutoName()
{
QString timeStepString;
{
RimSummaryCaseCollection* sourceEnsemble = nullptr;
RimSummaryEnsemble* sourceEnsemble = nullptr;
if ( m_useFixedTimeStep() == FixedTimeStepMode::FIXED_TIME_STEP_CASE_1 )
{
sourceEnsemble = m_ensemble1;
@@ -598,9 +598,9 @@ std::vector<RimDerivedEnsembleCaseCollection*> RimDerivedEnsembleCaseCollection:
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCaseCollection*> RimDerivedEnsembleCaseCollection::allEnsembles() const
std::vector<RimSummaryEnsemble*> RimDerivedEnsembleCaseCollection::allEnsembles() const
{
std::vector<RimSummaryCaseCollection*> ensembles;
std::vector<RimSummaryEnsemble*> ensembles;
auto project = RimProject::current();

22
ApplicationLibCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.h
View File

@@ -19,7 +19,7 @@
#pragma once
#include "RimDerivedSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "cafPdmChildArrayField.h"
#include "cafPdmField.h"
@@ -34,7 +34,7 @@ class RimSummaryCase;
//==================================================================================================
///
//==================================================================================================
class RimDerivedEnsembleCaseCollection : public RimSummaryCaseCollection
class RimDerivedEnsembleCaseCollection : public RimSummaryEnsemble
{
CAF_PDM_HEADER_INIT;
@@ -50,13 +50,13 @@ public:
RimDerivedEnsembleCaseCollection();
~RimDerivedEnsembleCaseCollection() override;
RimSummaryCaseCollection* ensemble1() const { return m_ensemble1; }
RimSummaryCaseCollection* ensemble2() const { return m_ensemble2; }
DerivedSummaryOperator op() const { return m_operator(); }
bool isValid() const { return m_ensemble1 != nullptr && m_ensemble2 != nullptr; }
RimSummaryEnsemble* ensemble1() const { return m_ensemble1; }
RimSummaryEnsemble* ensemble2() const { return m_ensemble2; }
DerivedSummaryOperator op() const { return m_operator(); }
bool isValid() const { return m_ensemble1 != nullptr && m_ensemble2 != nullptr; }
void setEnsemble1( RimSummaryCaseCollection* ensemble );
void setEnsemble2( RimSummaryCaseCollection* ensemble );
void setEnsemble1( RimSummaryEnsemble* ensemble );
void setEnsemble2( RimSummaryEnsemble* ensemble );
std::vector<RimSummaryCase*> allSummaryCases() const override;
std::set<RifEclipseSummaryAddress> ensembleSummaryAddresses() const override;
@@ -85,11 +85,11 @@ private:
std::vector<RimDerivedEnsembleCaseCollection*> findReferringEnsembles() const;
private:
std::vector<RimSummaryCaseCollection*> allEnsembles() const;
std::vector<RimSummaryEnsemble*> allEnsembles() const;
private:
caf::PdmPtrField<RimSummaryCaseCollection*> m_ensemble1;
caf::PdmPtrField<RimSummaryCaseCollection*> m_ensemble2;
caf::PdmPtrField<RimSummaryEnsemble*> m_ensemble1;
caf::PdmPtrField<RimSummaryEnsemble*> m_ensemble2;
caf::PdmField<caf::AppEnum<DerivedSummaryOperator>> m_operator;
caf::PdmField<bool> m_swapEnsemblesButton;
caf::PdmField<QString> m_caseCount;

2
ApplicationLibCode/ProjectDataModel/Summary/RimDerivedSummaryCase.cpp
View File

@@ -25,7 +25,7 @@
#include "RifDerivedEnsembleReader.h"
#include "RimProject.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryPlot.h"
#include "cafPdmUiTreeSelectionEditor.h"

Some files were not shown because too many files have changed in this diff Show More