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/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 );