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

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"