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

#865 Short name -> Display Name, Auto off, Use Case Name as default display name.

Browse Source
This commit is contained in:
Jacob Støren 2016-10-05 14:15:55 +02:00
parent b2728b070b
commit c7a1bdd88a
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/RimSummaryCase.cpp
View File

@ -36,8 +36,8 @@ RimSummaryCase::RimSummaryCase()
{ {
CAF_PDM_InitObject("Summary Case",":/Cases16x16.png","",""); CAF_PDM_InitObject("Summary Case",":/Cases16x16.png","","");
CAF_PDM_InitField(&m_shortName, "ShortName", QString("Short Name"), "Short Name", "", "", ""); CAF_PDM_InitField(&m_shortName, "ShortName", QString("Display Name"), "Display Name", "", "", "");
CAF_PDM_InitField(&m_useAutoShortName, "AutoShortyName", true, "Use Auto Short Name", "", "", ""); CAF_PDM_InitField(&m_useAutoShortName, "AutoShortyName", false, "Use Auto Display Name", "", "", "");
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -95,7 +95,10 @@ void RimSummaryCase::updateOptionSensitivity()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryCase::updateTreeItemName() void RimSummaryCase::updateTreeItemName()
{ {
this->setUiName(caseName() + " (" + shortName() +")"); if (caseName() != shortName())
this->setUiName(caseName() + " (" + shortName() +")");
else
this->setUiName(caseName());
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -130,4 +133,9 @@ void RimSummaryCase::updateAutoShortName()
m_shortName = summaryCaseCollection->uniqueShortNameForCase(this); m_shortName = summaryCaseCollection->uniqueShortNameForCase(this);
updateTreeItemName(); updateTreeItemName();
} }
else if (m_shortName() == QString("Display Name"))
{
m_shortName = caseName();
updateTreeItemName();
}
} }