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

Merge pull request #5099 from OPM/improve-ensemble-statistics

Browse Source 
Improve ensemble statistics
This commit is contained in:
Magne Sjaastad
2019-11-27 09:57:17 +01:00
parent e4a4b40a3c
commit 4f4c48635b
5 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/ProjectDataModel/Summary/RimEnsembleStatistics.cpp
View File

@@ -43,6 +43,8 @@ RimEnsembleStatistics::RimEnsembleStatistics()
CAF_PDM_InitField( &m_showP90Curve, "ShowP90Curve", true, "P10", "", "", "" ); // Yes, P10
CAF_PDM_InitField( &m_showMeanCurve, "ShowMeanCurve", true, "Mean", "", "", "" );
CAF_PDM_InitField( &m_showCurveLabels, "ShowCurveLabels", true, "Show Curve Labels", "", "", "" );
CAF_PDM_InitField( &m_includeIncompleteCurves, "IncludeIncompleteCurves", false, "Include Incomplete Curves", "", "", "" );
CAF_PDM_InitField( &m_warningLabel, "WarningLabel", QString( "Warning: Ensemble time range mismatch" ), "", "", "", "" );
CAF_PDM_InitField( &m_color, "Color", cvf::Color3f( cvf::Color3::BLACK ), "Color", "", "", "" );
@@ -100,7 +102,7 @@ void RimEnsembleStatistics::fieldChangedByUi( const caf::PdmFieldHandle* changed
{
if ( changedField == &m_active || changedField == &m_basedOnFilteredCases || changedField == &m_showP10Curve ||
changedField == &m_showP50Curve || changedField == &m_showP90Curve || changedField == &m_showMeanCurve ||
changedField == &m_showCurveLabels || changedField == &m_color )
changedField == &m_showCurveLabels || changedField == &m_color || changedField == &m_includeIncompleteCurves )
{
auto curveSet = parentCurveSet();
if ( !curveSet ) return;
@@ -129,6 +131,7 @@ void RimEnsembleStatistics::defineUiOrdering( QString uiConfigName, caf::PdmUiOr
uiOrdering.add( &m_active );
uiOrdering.add( &m_hideEnsembleCurves );
uiOrdering.add( &m_basedOnFilteredCases );
uiOrdering.add( &m_includeIncompleteCurves );
uiOrdering.add( &m_showCurveLabels );
uiOrdering.add( &m_color );