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

Rename RimSummaryCaseCollection to RimSummaryEnsemble.

Browse Source
This commit is contained in:
Kristian Bendiksen committed 2024-07-30 08:55:12 +02:00
1 parent 1d7b40fbdd
commit e9c46c5cec
147 files changed
+852 -862
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp
+8 -8
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() );
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.h
+3 -3
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;
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp
+1 -1
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"
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp
+1 -1
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"
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlotCollection.cpp
+12 -12
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 )
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlotCollection.h
+10 -10
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 );
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.cpp
+1 -1
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"
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationReportPlot.h
+1 -1
View File
@@ -30,7 +30,7 @@
class RimAnalysisPlotDataEntry;
class RimCorrelationMatrixPlot;
class RimParameterResultCrossPlot;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimCorrelationPlot;
class RiaSummaryCurveDefinition;
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp
+2 -2
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() )