#3077 Ensemble statistics. Option to base stat calc on filtered cases or all cases

This commit is contained in:
Bjørn Erik Jensen
2018-06-29 12:34:56 +02:00
parent 0c1c454cdc
commit bcf7938427
6 changed files with 58 additions and 44 deletions

View File

@@ -38,6 +38,7 @@ RimEnsembleStatistics::RimEnsembleStatistics()
CAF_PDM_InitObject("Ensemble Curve Filter", ":/EnsembleCurveSet16x16.png", "", "");
CAF_PDM_InitField(&m_active, "Active", true, "Show statistics curves", "", "", "");
CAF_PDM_InitField(&m_basedOnFilteredCases, "BasedOnFilteredCases", false, "Based on Filtered Cases", "", "", "");
CAF_PDM_InitField(&m_showP10Curve, "ShowP10Curve", true, "P90", "", "", ""); // Yes, P90
CAF_PDM_InitField(&m_showP50Curve, "ShowP50Curve", true, "P50", "", "", "");
CAF_PDM_InitField(&m_showP90Curve, "ShowP90Curve", true, "P10", "", "", ""); // Yes, P10
@@ -86,23 +87,13 @@ void RimEnsembleStatistics::disableMeanCurve(bool disable)
m_showMeanCurve.uiCapability()->setUiReadOnly(disable);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimEnsembleStatistics::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
{
QList<caf::PdmOptionItemInfo> options;
return options;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleStatistics::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (changedField == &m_active ||
changedField == &m_basedOnFilteredCases ||
changedField == &m_showP10Curve ||
changedField == &m_showP50Curve ||
changedField == &m_showP90Curve ||
@@ -113,7 +104,7 @@ void RimEnsembleStatistics::fieldChangedByUi(const caf::PdmFieldHandle* changedF
auto curveSet = parentCurveSet();
if (!curveSet) return;
curveSet->updateStatisticsCurves(false);
curveSet->updateStatisticsCurves();
if (changedField == &m_active) curveSet->updateConnectedEditors();
}
@@ -127,6 +118,7 @@ void RimEnsembleStatistics::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
auto curveSet = parentCurveSet();
uiOrdering.add(&m_active);
uiOrdering.add(&m_basedOnFilteredCases);
uiOrdering.add(&m_showCurveLabels);
uiOrdering.add(&m_color);