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

#3148 Ensemble curves. Option to hide ensemble curves (in order to show only stat curves)

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-07-09 11:18:42 +02:00
parent 19ce35432c
commit 15e1fcfdac
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@ -925,6 +925,8 @@ void RimEnsembleCurveSet::updateEnsembleCurves(const std::vector<RimSummaryCase*
m_qwtPlotCurveForLegendText->detach(); m_qwtPlotCurveForLegendText->detach();
deleteStatisticsCurves(); deleteStatisticsCurves();
if (m_statistics->hideEnsembleCurves()) return;
RimSummaryAddress* addr = m_yValuesCurveVariable(); RimSummaryAddress* addr = m_yValuesCurveVariable();
if (plot && addr->address().category() != RifEclipseSummaryAddress::SUMMARY_INVALID) if (plot && addr->address().category() != RifEclipseSummaryAddress::SUMMARY_INVALID)
{ {

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

@ -38,6 +38,7 @@ RimEnsembleStatistics::RimEnsembleStatistics()
CAF_PDM_InitObject("Ensemble Curve Filter", ":/EnsembleCurveSet16x16.png", "", ""); CAF_PDM_InitObject("Ensemble Curve Filter", ":/EnsembleCurveSet16x16.png", "", "");
CAF_PDM_InitField(&m_active, "Active", true, "Show statistics curves", "", "", ""); CAF_PDM_InitField(&m_active, "Active", true, "Show statistics curves", "", "", "");
CAF_PDM_InitField(&m_hideEnsembleCurves, "HideEnsembleCurves", false, "Hide Ensemble Curves", "", "", "");
CAF_PDM_InitField(&m_basedOnFilteredCases, "BasedOnFilteredCases", false, "Based on Filtered Cases", "", "", ""); 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_showP10Curve, "ShowP10Curve", true, "P90", "", "", ""); // Yes, P90
CAF_PDM_InitField(&m_showP50Curve, "ShowP50Curve", true, "P50", "", "", ""); CAF_PDM_InitField(&m_showP50Curve, "ShowP50Curve", true, "P50", "", "", "");
@ -108,6 +109,15 @@ void RimEnsembleStatistics::fieldChangedByUi(const caf::PdmFieldHandle* changedF
if (changedField == &m_active || changedField == &m_basedOnFilteredCases) curveSet->updateConnectedEditors(); if (changedField == &m_active || changedField == &m_basedOnFilteredCases) curveSet->updateConnectedEditors();
} }
if (changedField == &m_hideEnsembleCurves)
{
auto curveSet = parentCurveSet();
if (!curveSet) return;
curveSet->updateAllCurves();
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -118,6 +128,7 @@ void RimEnsembleStatistics::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
auto curveSet = parentCurveSet(); auto curveSet = parentCurveSet();
uiOrdering.add(&m_active); uiOrdering.add(&m_active);
uiOrdering.add(&m_hideEnsembleCurves);
uiOrdering.add(&m_basedOnFilteredCases); uiOrdering.add(&m_basedOnFilteredCases);
uiOrdering.add(&m_showCurveLabels); uiOrdering.add(&m_showCurveLabels);
uiOrdering.add(&m_color); uiOrdering.add(&m_color);

2
ApplicationCode/ProjectDataModel/Summary/RimEnsembleStatistics.h
View File

@ -41,6 +41,7 @@ public:
RimEnsembleStatistics(); RimEnsembleStatistics();
bool isActive() const; bool isActive() const;
bool hideEnsembleCurves() const { return m_hideEnsembleCurves; }
bool basedOnFilteredCases() const { return m_basedOnFilteredCases; } bool basedOnFilteredCases() const { return m_basedOnFilteredCases; }
bool showP10Curve() const { return m_showP10Curve; } bool showP10Curve() const { return m_showP10Curve; }
bool showP50Curve() const { return m_showP50Curve; } bool showP50Curve() const { return m_showP50Curve; }
@ -61,6 +62,7 @@ private:
RimEnsembleCurveSet* parentCurveSet() const; RimEnsembleCurveSet* parentCurveSet() const;
caf::PdmField<bool> m_active; caf::PdmField<bool> m_active;
caf::PdmField<bool> m_hideEnsembleCurves;
caf::PdmField<bool> m_basedOnFilteredCases; caf::PdmField<bool> m_basedOnFilteredCases;
caf::PdmField<bool> m_showP10Curve; caf::PdmField<bool> m_showP10Curve;
caf::PdmField<bool> m_showP50Curve; caf::PdmField<bool> m_showP50Curve;