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

#987 Summary Plot : Do not show default unit text if empty calculation unit text

Browse Source
This commit is contained in:
Magne Sjaastad 2017-12-11 14:54:54 +01:00
parent ffbd4cda82
commit bc6a367635
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp
View File

@ -73,7 +73,8 @@ std::string RifCalculatedSummaryCurveReader::unitName(const RifEclipseSummaryAdd
{ {
return calculation->unitName().toStdString(); return calculation->unitName().toStdString();
} }
return "Calculated Curve Unit";
return "";
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
View File

@ -63,7 +63,7 @@ QString RimSummaryCurveAutoName::curveName(const RifEclipseSummaryAddress& summa
{ {
text += summaryAddress.quantityName(); text += summaryAddress.quantityName();
if (m_unit && summaryCurve) if (m_unit && summaryCurve && !summaryCurve->unitNameY().empty())
{ {
text += "[" + summaryCurve->unitNameY() + "]"; text += "[" + summaryCurve->unitNameY() + "]";
} }

6
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp
View File

@ -251,7 +251,11 @@ QString RimSummaryPlotYAxisFormatter::autoAxisTitle() const
{ {
assembledYAxisText += QString::fromStdString(quantIt) + " "; assembledYAxisText += QString::fromStdString(quantIt) + " ";
} }
assembledYAxisText += "[" + QString::fromStdString(unitIt.first) + scaleFactorText + "] ";
if (!unitIt.first.empty())
{
assembledYAxisText += "[" + QString::fromStdString(unitIt.first) + scaleFactorText + "] ";
}
} }
if (m_timeHistoryCurveQuantities.size() > 0) if (m_timeHistoryCurveQuantities.size() > 0)