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

#2659 Ensemble statistics. Small fixes

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-06-13 13:35:33 +02:00
parent ca17037209
commit 2eee3f770b
5 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,7 +213,6 @@ void RimEnsembleCurveSet::loadDataAndUpdate(bool updateParentPlot)
m_yValuesUiFilterResultSelection = m_yValuesCurveVariable->address();
updateAllCurves();
updateStatisticsCurves(true);
if (updateParentPlot)
{
@@ -404,6 +403,15 @@ EnsembleParameter::Type RimEnsembleCurveSet::currentEnsembleParameterType() cons
return EnsembleParameter::TYPE_NONE;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSet::updateAllCurves()
{
updateEnsembleCurves();
updateStatisticsCurves(true);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -432,7 +440,6 @@ void RimEnsembleCurveSet::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
m_yValuesCurveVariable->setAddress(m_yValuesUiFilterResultSelection());
updateAllCurves();
updateStatisticsCurves(true);
updateTextInPlot = true;
}
@@ -441,7 +448,6 @@ void RimEnsembleCurveSet::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
// Empty address cache
m_allAddressesCache.clear();
updateAllCurves();
updateStatisticsCurves(true);
updateTextInPlot = true;
}
@@ -873,7 +879,7 @@ void RimEnsembleCurveSet::updateQwtPlotAxis()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSet::updateAllCurves()
void RimEnsembleCurveSet::updateEnsembleCurves()
{
RimSummaryPlot* plot = nullptr;
firstAncestorOrThisOfType(plot);
@@ -881,6 +887,7 @@ void RimEnsembleCurveSet::updateAllCurves()
deleteEnsembleCurves();
m_qwtPlotCurveForLegendText->detach();
deleteStatisticsCurves();
RimSummaryCaseCollection* group = m_yValuesSummaryGroup();
RimSummaryAddress* addr = m_yValuesCurveVariable();
@@ -930,6 +937,8 @@ void RimEnsembleCurveSet::updateStatisticsCurves(bool calculate = true)
{
using SAddr = RifEclipseSummaryAddress;
if (m_yValuesCurveVariable->address().category() == RifEclipseSummaryAddress::SUMMARY_INVALID) return;
if (calculate)
{
// Calculate