OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 06:55:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2816 Summary Curves : Replace empty auto name with plot title

Browse Source 
Also add a fallback if everything else ends up with an empty name
This commit is contained in:
Magne Sjaastad 2018-04-27 07:38:32 +02:00
parent 6ed6a55c4e
commit 478955d0f6
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@ -356,9 +356,18 @@ QString RimSummaryCurve::createCurveAutoName()
firstAncestorOrThisOfTypeAsserted(plot); firstAncestorOrThisOfTypeAsserted(plot);
QString curveName = m_curveNameConfig->curveNameY(m_yValuesCurveVariable->address(), plot->activePlotTitleHelper()); QString curveName = m_curveNameConfig->curveNameY(m_yValuesCurveVariable->address(), plot->activePlotTitleHelper());
if (curveName.isEmpty())
{
curveName = m_curveNameConfig->curveNameY(m_yValuesCurveVariable->address(), nullptr);
}
if (isCrossPlotCurve()) if (isCrossPlotCurve())
{ {
QString curveNameX = m_curveNameConfig->curveNameX(m_xValuesCurveVariable->address(), plot->activePlotTitleHelper()); QString curveNameX = m_curveNameConfig->curveNameX(m_xValuesCurveVariable->address(), plot->activePlotTitleHelper());
if (curveNameX.isEmpty())
{
curveNameX = m_curveNameConfig->curveNameX(m_xValuesCurveVariable->address(), nullptr);
}
if (!curveName.isEmpty() || !curveNameX.isEmpty()) if (!curveName.isEmpty() || !curveNameX.isEmpty())
{ {
@ -366,6 +375,11 @@ QString RimSummaryCurve::createCurveAutoName()
} }
} }
if (curveName.isEmpty())
{
curveName = "Curve Name Placeholder";
}
return curveName; return curveName;
} }