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

10
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp
View File

@@ -156,10 +156,10 @@ QList<caf::PdmOptionItemInfo> RimCorrelationPlot::calculateValueOptions( const c
if ( fieldNeedingOptions == &m_selectedParametersList )
{
std::set<EnsembleParameter> params = variationSortedEnsembleParameters();
std::set<RigEnsembleParameter> params = variationSortedEnsembleParameters();
for ( auto param : params )
{
if ( !m_excludeParametersWithoutVariation() || param.variationBin > EnsembleParameter::NO_VARIATION )
if ( !m_excludeParametersWithoutVariation() || param.variationBin > RigEnsembleParameter::NO_VARIATION )
{
options.push_back( caf::PdmOptionItemInfo( param.uiName(), param.name ) );
}
@@ -242,7 +242,7 @@ void RimCorrelationPlot::addDataToChartBuilder( RiuGroupedBarChartBuilder& chart
std::set<RimSummaryCase*> activeCases = filterEnsembleCases( ensemble );
std::vector<std::pair<EnsembleParameter, double>> correlations =
std::vector<std::pair<RigEnsembleParameter, double>> correlations =
ensemble->parameterCorrelations( address, selectedTimestep, m_selectedParametersList(), activeCases );
for ( auto parameterCorrPair : correlations )
@@ -332,10 +332,10 @@ void RimCorrelationPlot::setSortByAbsoluteValues( bool sortByAbsoluteValues )
void RimCorrelationPlot::selectAllParameters()
{
m_selectedParametersList.v().clear();
std::set<EnsembleParameter> params = variationSortedEnsembleParameters();
std::set<RigEnsembleParameter> params = variationSortedEnsembleParameters();
for ( auto param : params )
{
if ( !m_excludeParametersWithoutVariation() || param.variationBin > EnsembleParameter::NO_VARIATION )
if ( !m_excludeParametersWithoutVariation() || param.variationBin > RigEnsembleParameter::NO_VARIATION )
{
m_selectedParametersList.v().push_back( param.name );
}