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

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

@@ -159,7 +159,7 @@ RimRegularLegendConfig* RimWellRftEnsembleCurveSet::legendConfig()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
EnsembleParameter::Type RimWellRftEnsembleCurveSet::currentEnsembleParameterType() const
RigEnsembleParameter::Type RimWellRftEnsembleCurveSet::currentEnsembleParameterType() const
{
if ( m_ensembleColorMode() == ColorMode::BY_ENSEMBLE_PARAM )
{
@@ -172,7 +172,7 @@ EnsembleParameter::Type RimWellRftEnsembleCurveSet::currentEnsembleParameterType
return eParam.type;
}
}
return EnsembleParameter::TYPE_NONE;
return RigEnsembleParameter::TYPE_NONE;
}
//--------------------------------------------------------------------------------------------------

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

@@ -21,6 +21,8 @@
#include "RimEnsembleCurveSetColorManager.h"
#include "RimSummaryCaseCollection.h"
#include "RigEnsembleParameter.h"
#include "cafPdmChildField.h"
#include "cafPdmObject.h"
#include "cafPdmProxyValueField.h"
@@ -51,9 +53,9 @@ public:
cvf::Color3f caseColor( const RimSummaryCase* summaryCase ) const;
QString currentEnsembleParameter() const;
void setEnsembleParameter( const QString& parameterName );
RimRegularLegendConfig* legendConfig();
EnsembleParameter::Type currentEnsembleParameterType() const;
void setEnsembleParameter( const QString& parameterName );
RimRegularLegendConfig* legendConfig();
RigEnsembleParameter::Type currentEnsembleParameterType() const;
protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;