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

Fixed crash due to missing LegendConfig

Browse Source
This commit is contained in:
Jacob Støren
2015-08-07 11:09:05 +02:00
parent 6669e6f005
commit 78323e2299
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
View File

@@ -58,7 +58,10 @@ RimEclipseCellColors::RimEclipseCellColors()
//--------------------------------------------------------------------------------------------------
RimEclipseCellColors::~RimEclipseCellColors()
{
delete obsoleteField_legendConfig();
CVF_ASSERT(obsoleteField_legendConfig() == NULL);
m_legendConfigData.deleteAllChildObjects();
delete ternaryLegendConfig();
}
@@ -113,11 +116,6 @@ void RimEclipseCellColors::changeLegendConfig(QString resultVarNameOfNewLegend)
{
legendResultVariable = this->m_legendConfigPtrField()->resultVariableName();
}
else if (obsoleteField_legendConfig)
{
// Use resultVariableName from obsolete legend config if present
legendResultVariable = obsoleteField_legendConfig->resultVariableName();
}
if (!this->m_legendConfigPtrField() || legendResultVariable != resultVarNameOfNewLegend)
{
@@ -164,6 +162,8 @@ void RimEclipseCellColors::initAfterRead()
{
// The current legend config is NOT stored in <ResultVarLegendDefinitionList> in ResInsight up to v 1.3.7-dev
m_legendConfigData.push_back(obsoleteField_legendConfig);
m_legendConfigPtrField = obsoleteField_legendConfig;
obsoleteField_legendConfig = NULL;
}
changeLegendConfig(this->resultVariable());