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

#3370 Ensemble curves. Fix crash and duplicate grouped curves issue

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-09-18 11:29:45 +02:00
parent feacfcf0a6
commit 5dc4eae4de
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -361,8 +361,8 @@ void RicSummaryCurveCreator::syncPreviewCurvesFromUiSelection()
for (const auto& curve : currentCurvesInPreviewPlot)
{
RimSummaryCase* sumCase = curve->summaryCaseY();
if (sumCase && sumCase->ensemble()) continue;
if (sumCase->ensemble()) continue;
RiaSummaryCurveDefinition curveDef = RiaSummaryCurveDefinition(sumCase, curve->summaryAddressY());
if (deleteCurveDefs.count(curveDef) > 0) curvesToDelete.insert(curve);
}

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

@ -115,7 +115,7 @@ RimSummaryCaseCollection* RimSummaryCase::ensemble() const
{
RimSummaryCaseCollection* e;
firstAncestorOrThisOfType(e);
return e;
return e && e->isEnsemble() ? e : nullptr;
}
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@ -743,7 +743,8 @@ void RimSummaryCurve::forceUpdateCurveAppearanceFromCaseType()
//--------------------------------------------------------------------------------------------------
void RimSummaryCurve::markCachedDataForPurge()
{
valuesSummaryReaderY()->markForCachePurge(m_yValuesCurveVariable->address());
auto reader = valuesSummaryReaderY();
if(reader) reader->markForCachePurge(m_yValuesCurveVariable->address());
}
//--------------------------------------------------------------------------------------------------