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

Refactor: extract EnsembleParameter into separate file.

Browse Source
This commit is contained in:
Kristian Bendiksen
2021-05-31 11:00:23 +02:00
parent fb301ef3ab
commit f31aecf507
24 changed files with 331 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,9 +250,9 @@ std::set<RifEclipseSummaryAddress> RimAnalysisPlot::unfilteredAddresses()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<EnsembleParameter> RimAnalysisPlot::ensembleParameters()
std::set<RigEnsembleParameter> RimAnalysisPlot::ensembleParameters()
{
std::set<EnsembleParameter> ensembleParms;
std::set<RigEnsembleParameter> ensembleParms;
RiaSummaryCurveDefinitionAnalyser* analyserOfSelectedCurveDefs = getOrCreateSelectedCurveDefAnalyser();
@@ -268,7 +268,7 @@ std::set<EnsembleParameter> RimAnalysisPlot::ensembleParameters()
for ( RimSummaryCaseCollection* ensemble : ensembles )
{
std::vector<EnsembleParameter> parameters = ensemble->variationSortedEnsembleParameters();
std::vector<RigEnsembleParameter> parameters = ensemble->variationSortedEnsembleParameters();
ensembleParms.insert( parameters.begin(), parameters.end() );
}
@@ -278,15 +278,15 @@ std::set<EnsembleParameter> RimAnalysisPlot::ensembleParameters()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
EnsembleParameter RimAnalysisPlot::ensembleParameter( const QString& ensembleParameterName )
RigEnsembleParameter RimAnalysisPlot::ensembleParameter( const QString& ensembleParameterName )
{
std::set<EnsembleParameter> ensembleParms = ensembleParameters();
for ( const EnsembleParameter& eParam : ensembleParms )
std::set<RigEnsembleParameter> ensembleParms = ensembleParameters();
for ( const RigEnsembleParameter& eParam : ensembleParms )
{
if ( eParam.name == ensembleParameterName ) return eParam;
}
return EnsembleParameter();
return RigEnsembleParameter();
}
//--------------------------------------------------------------------------------------------------
@@ -1095,7 +1095,7 @@ void RimAnalysisPlot::applyFilter( const RimPlotDataFilterItem* filter,
{
sumItemsToKeep = ( *filteredSummaryItems ); // Not filtering items
EnsembleParameter eParam = this->ensembleParameter( filter->ensembleParameterName() );
RigEnsembleParameter eParam = this->ensembleParameter( filter->ensembleParameterName() );
for ( auto sumCase : ( *filteredSumCases ) )
{

6
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h
View File

@@ -23,6 +23,8 @@
#include "RimSummaryCaseCollection.h"
#include "RimTimeStepFilter.h"
#include "RigEnsembleParameter.h"
#include "cafPdmPtrField.h"
#include <QDateTime>
@@ -81,8 +83,8 @@ public:
void setTimeSteps( const std::vector<time_t>& timeSteps );
std::set<RifEclipseSummaryAddress> unfilteredAddresses();
std::set<EnsembleParameter> ensembleParameters();
EnsembleParameter ensembleParameter( const QString& ensembleParameterName );
std::set<RigEnsembleParameter> ensembleParameters();
RigEnsembleParameter ensembleParameter( const QString& ensembleParameterName );
void maxMinValueFromAddress( const RifEclipseSummaryAddress& address,
RimPlotDataFilterItem::TimeStepSourceType timeStepSourceType,

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

@@ -298,8 +298,8 @@ QList<caf::PdmOptionItemInfo>
{
if ( m_filterTarget() == ENSEMBLE_CASE )
{
std::set<EnsembleParameter> ensembleParams = parentPlot->ensembleParameters();
for ( const EnsembleParameter& ensParam : ensembleParams )
std::set<RigEnsembleParameter> ensembleParams = parentPlot->ensembleParameters();
for ( const RigEnsembleParameter& ensParam : ensembleParams )
{
options.push_back( caf::PdmOptionItemInfo( ensParam.uiName(), ensParam.name ) );
}
@@ -307,7 +307,7 @@ QList<caf::PdmOptionItemInfo>
}
else if ( fieldNeedingOptions == &m_ensembleParameterValueCategories )
{
EnsembleParameter eParm = selectedEnsembleParameter();
RigEnsembleParameter eParm = selectedEnsembleParameter();
if ( eParm.isText() )
{
for ( const auto& val : eParm.values )
@@ -359,7 +359,7 @@ void RimPlotDataFilterItem::defineUiOrdering( QString uiConfigName, caf::PdmUiOr
}
}
EnsembleParameter eParm;
RigEnsembleParameter eParm;
if ( m_filterTarget() == ENSEMBLE_CASE )
{
eParm = selectedEnsembleParameter();
@@ -430,14 +430,14 @@ void RimPlotDataFilterItem::updateMaxMinAndDefaultValues( bool forceDefault )
{
if ( !selectedEnsembleParameter().isValid() )
{
std::set<EnsembleParameter> ensembleParams = parentPlot->ensembleParameters();
std::set<RigEnsembleParameter> ensembleParams = parentPlot->ensembleParameters();
if ( !ensembleParams.empty() )
{
m_filterEnsembleParameter = ensembleParams.begin()->name;
}
}
EnsembleParameter eParam = selectedEnsembleParameter();
RigEnsembleParameter eParam = selectedEnsembleParameter();
if ( eParam.isValid() && eParam.isNumeric() )
{
if ( RiaCurveDataTools::isValidValue( eParam.minValue, false ) )
@@ -475,7 +475,7 @@ void RimPlotDataFilterItem::updateMaxMinAndDefaultValues( bool forceDefault )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
EnsembleParameter RimPlotDataFilterItem::selectedEnsembleParameter() const
RigEnsembleParameter RimPlotDataFilterItem::selectedEnsembleParameter() const
{
RimAnalysisPlot* parentPlot;
this->firstAncestorOrThisOfTypeAsserted( parentPlot );

4
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.h
View File

@@ -26,7 +26,7 @@
#include "RifEclipseSummaryAddress.h"
#include "RifEclipseSummaryAddressQMetaType.h"
#include "RimSummaryCaseCollection.h"
#include "RigEnsembleParameter.h"
#include <QDateTime>
@@ -116,7 +116,7 @@ private:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
EnsembleParameter selectedEnsembleParameter() const;
RigEnsembleParameter selectedEnsembleParameter() const;
caf::PdmField<bool> m_isActive;