Fix crashes related to name config and make name correct for old plots when loading

This commit is contained in:
Gaute Lindkvist
2019-09-06 10:59:04 +02:00
parent c0f7f4e056
commit 45103da354
24 changed files with 48 additions and 44 deletions

View File

@@ -31,8 +31,7 @@ CAF_PDM_SOURCE_INIT(RimNameConfig, "RimCurveNameConfig");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimNameConfig::RimNameConfig(const RimNameConfigHolderInterface* configHolder /*= nullptr*/)
: m_configHolder(configHolder)
RimNameConfig::RimNameConfig()
{
CAF_PDM_InitObject("Curve Name Generator", "", "", "");
@@ -106,7 +105,9 @@ void RimNameConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedField, co
//--------------------------------------------------------------------------------------------------
QString RimNameConfig::autoName() const
{
return m_configHolder->createAutoName();
RimNameConfigHolderInterface* plotHolder;
this->firstAncestorOrThisOfTypeAsserted(plotHolder);
return plotHolder->createAutoName();
}
//--------------------------------------------------------------------------------------------------