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

#7031 Delta Summary Case: Fix crash when updating case name

Browse Source
This commit is contained in:
Magne Sjaastad
2020-11-23 12:45:19 +01:00
parent 2ab1efa56f
commit efd1ddca54
4 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.cpp
View File

@@ -205,14 +205,22 @@ void RimDerivedEnsembleCaseCollection::createDerivedEnsembleCases()
//--------------------------------------------------------------------------------------------------
bool RimDerivedEnsembleCaseCollection::hasCaseReference( const RimSummaryCase* sumCase ) const
{
for ( auto currCase : m_ensemble1->allSummaryCases() )
if ( m_ensemble1 )
{
if ( currCase == sumCase ) return true;
for ( auto currCase : m_ensemble1->allSummaryCases() )
{
if ( currCase == sumCase ) return true;
}
}
for ( auto currCase : m_ensemble2->allSummaryCases() )
if ( m_ensemble2 )
{
if ( currCase == sumCase ) return true;
for ( auto currCase : m_ensemble2->allSummaryCases() )
{
if ( currCase == sumCase ) return true;
}
}
return false;
}

4
ApplicationCode/ProjectDataModel/Summary/RimDerivedSummaryCase.cpp
View File

@@ -111,7 +111,6 @@ bool RimDerivedSummaryCase::isInUse() const
//--------------------------------------------------------------------------------------------------
void RimDerivedSummaryCase::setSummaryCases( RimSummaryCase* sumCase1, RimSummaryCase* sumCase2 )
{
if ( !sumCase1 || !sumCase2 ) return;
m_summaryCase1 = sumCase1;
m_summaryCase2 = sumCase2;
}
@@ -421,7 +420,8 @@ void RimDerivedSummaryCase::updateDisplayNameFromCases()
operatorText = "Sum";
QString name;
if ( case1Name == case2Name && m_summaryCase1->ensemble() && m_summaryCase2->ensemble() )
if ( case1Name == case2Name && m_summaryCase1 && m_summaryCase2 && m_summaryCase1->ensemble() &&
m_summaryCase2->ensemble() )
{
QString ensembleName1 = m_summaryCase1->ensemble()->name();
QString ensembleName2 = m_summaryCase2->ensemble()->name();