OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 15:36:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2659 Ensemble statistics. Do not show statistic curves in curve creator

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-06-15 10:54:30 +02:00
parent 1abea45d45
commit 9cf4938651
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
View File

@ -433,6 +433,7 @@ void RicSummaryCurveCreator::updatePreviewCurvesFromCurveDefinitions(
if (!curveSet)
{
curveSet = new RimEnsembleCurveSet();
curveSet->disableStatisticCurves();
curveSet->setSummaryCaseCollection(curveDef.ensemble());
curveSet->setSummaryAddress(curveDef.summaryAddress());
m_previewPlot->ensembleCurveSetCollection()->addCurveSet(curveSet);
@ -593,6 +594,7 @@ void RicSummaryCurveCreator::populateCurveCreator(const RimSummaryPlot& sourceSu
for (const auto& curveSet : sourceSummaryPlot.ensembleCurveSetCollection()->curveSets())
{
RimEnsembleCurveSet* newCurveSet = curveSet->clone();
newCurveSet->disableStatisticCurves();
previewCurveSetColl->addCurveSet(newCurveSet);
RimSummaryCaseCollection* ensemble = curveSet->summaryCaseCollection();

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

@ -166,6 +166,8 @@ RimEnsembleCurveSet::RimEnsembleCurveSet()
m_ensembleStatCase.reset(new RimEnsembleStatisticsCase(this));
m_ensembleStatCase->createSummaryReaderInterface();
m_disableStatisticCurves = false;
}
//--------------------------------------------------------------------------------------------------
@ -604,6 +606,7 @@ void RimEnsembleCurveSet::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrd
{
uiTreeOrdering.add(m_curveFilters);
}
uiTreeOrdering.skipRemainingChildren(true);
}
@ -938,7 +941,7 @@ void RimEnsembleCurveSet::updateStatisticsCurves(bool calculate = true)
{
using SAddr = RifEclipseSummaryAddress;
if (m_yValuesCurveVariable->address().category() == RifEclipseSummaryAddress::SUMMARY_INVALID) return;
if (m_disableStatisticCurves || m_yValuesCurveVariable->address().category() == RifEclipseSummaryAddress::SUMMARY_INVALID) return;
if (calculate)
{
@ -1066,6 +1069,14 @@ std::vector<RimSummaryCase*> RimEnsembleCurveSet::filterEnsembleCases(const RimS
return sumCases;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSet::disableStatisticCurves()
{
m_disableStatisticCurves = true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
View File

@ -105,6 +105,7 @@ public:
std::vector<QString> ensembleParameterNames() const;
std::vector<RimSummaryCase*> filterEnsembleCases(const RimSummaryCaseCollection* ensemble);
void disableStatisticCurves();
private:
caf::PdmFieldHandle* userDescriptionField() override;
@ -165,5 +166,7 @@ private:
QwtPlotCurve* m_qwtPlotCurveForLegendText;
std::unique_ptr<RimEnsembleStatisticsCase> m_ensembleStatCase;
bool m_disableStatisticCurves;
};

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

@ -41,7 +41,7 @@ RimEnsembleStatistics::RimEnsembleStatistics()
CAF_PDM_InitFieldNoDefault(&m_showP10Curve, "ShowP10Curve", "P10", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_showP50Curve, "ShowP50Curve", "P50", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_showP90Curve, "ShowP90Curve", "P90", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_showMeanCurve, "ShowPMeanCurve", "Mean", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_showMeanCurve, "ShowMeanCurve", "Mean", "", "", "");
CAF_PDM_InitField(&m_color, "Color", cvf::Color3f(cvf::Color3::BLACK), "Color", "", "", "");
}