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

#2888 Auto Title : Crash when single summary case is nullptr

Browse Source
This commit is contained in:
Magne Sjaastad 2018-05-09 16:01:59 +02:00
parent c959db73a1
commit 9560e23b66
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotNameHelper.cpp
View File

@ -59,9 +59,9 @@ void RimSummaryPlotNameHelper::appendSummaryCases(const std::vector<RimSummaryCa
{ {
m_summaryCases.clear(); m_summaryCases.clear();
for (auto c : summaryCases) for (auto summaryCase : summaryCases)
{ {
m_summaryCases.insert(c); if (summaryCase) m_summaryCases.insert(summaryCase);
} }
extractPlotTitleSubStrings(); extractPlotTitleSubStrings();
@ -74,9 +74,9 @@ void RimSummaryPlotNameHelper::appendEnsembleCases(const std::vector<RimSummaryC
{ {
m_ensembleCases.clear(); m_ensembleCases.clear();
for (auto c : ensembleCases) for (auto ensembleCase : ensembleCases)
{ {
if(c) m_ensembleCases.insert(c); if (ensembleCase) m_ensembleCases.insert(ensembleCase);
} }
extractPlotTitleSubStrings(); extractPlotTitleSubStrings();
@ -212,17 +212,20 @@ void RimSummaryPlotNameHelper::extractPlotTitleSubStrings()
m_titleRegion = std::to_string(*(regions.begin())); m_titleRegion = std::to_string(*(regions.begin()));
} }
if (m_summaryCases.size() == 1 && m_ensembleCases.empty())
{ {
if (m_summaryCases.size() == 1 && m_ensembleCases.empty()) auto summaryCase = *(m_summaryCases.begin());
{
auto summaryCase = *(m_summaryCases.begin());
if (summaryCase)
{
m_titleCaseName = summaryCase->caseName(); m_titleCaseName = summaryCase->caseName();
} }
else if (m_ensembleCases.size() == 1 && m_summaryCases.empty()) }
else if (m_ensembleCases.size() == 1 && m_summaryCases.empty())
{
auto ensembleCase = *(m_ensembleCases.begin());
if (ensembleCase)
{ {
auto ensembleCase = *(m_ensembleCases.begin());
m_titleCaseName = ensembleCase->name(); m_titleCaseName = ensembleCase->name();
} }
} }