Summary Plot Curve Editor : Use () instead of [] around acronyms as [] are used for unit text

This commit is contained in:
Magne Sjaastad 2017-12-12 08:42:09 +01:00
parent ab53135f91
commit b7bdce1d9e
2 changed files with 13 additions and 8 deletions

View File

@ -242,10 +242,15 @@ QString RimSummaryPlotYAxisFormatter::autoAxisTitle() const
{ {
if (!quantityNameForDisplay.empty()) if (!quantityNameForDisplay.empty())
{ {
quantityNameForDisplay += " "; quantityNameForDisplay += " (";
quantityNameForDisplay += quantityName;
quantityNameForDisplay += ")";
}
else
{
quantityNameForDisplay += quantityName;
} }
quantityNameForDisplay += quantityName;
} }
} }

View File

@ -534,22 +534,22 @@ QList<caf::PdmOptionItemInfo> RiuSummaryCurveDefSelection::calculateValueOptions
} }
auto itemPostfix = (isVectorField && i == OBS_DATA) ? QString(OBSERVED_DATA_AVALUE_POSTFIX) : QString(""); auto itemPostfix = (isVectorField && i == OBS_DATA) ? QString(OBSERVED_DATA_AVALUE_POSTFIX) : QString("");
for (const auto& iName : itemNames[i]) for (const auto& itemName : itemNames[i])
{ {
QString displayName; QString displayName;
if (isVectorField) if (isVectorField)
{ {
std::string descriptiveName = RiuSummaryVectorDescriptionMap::instance()->fieldInfo(iName); std::string longVectorName = RiuSummaryVectorDescriptionMap::instance()->fieldInfo(itemName);
displayName = QString::fromStdString(descriptiveName); displayName = QString::fromStdString(longVectorName);
displayName += QString(" [%1]").arg(QString::fromStdString(iName)); displayName += QString(" (%1)").arg(QString::fromStdString(itemName));
} }
else else
{ {
displayName = QString::fromStdString(iName); displayName = QString::fromStdString(itemName);
} }
auto optionItem = caf::PdmOptionItemInfo(displayName, QString::fromStdString(iName) + itemPostfix); auto optionItem = caf::PdmOptionItemInfo(displayName, QString::fromStdString(itemName) + itemPostfix);
if (groupItems) if (groupItems)
optionItem.setLevel(1); optionItem.setLevel(1);
options.push_back(optionItem); options.push_back(optionItem);