From b7bdce1d9ead39677b75dfffd2f0c8fce0026997 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Tue, 12 Dec 2017 08:42:09 +0100
Subject: [PATCH] Summary Plot Curve Editor : Use () instead of [] around
 acronyms as [] are used for unit text

---
 .../Summary/RimSummaryCurvesCalculator.cpp           |  9 +++++++--
 .../UserInterface/RiuSummaryCurveDefSelection.cpp    | 12 ++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp
index 5e87b455d2..37cba228b0 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp
@@ -242,10 +242,15 @@ QString RimSummaryPlotYAxisFormatter::autoAxisTitle() const
                 {
                     if (!quantityNameForDisplay.empty())
                     {
-                        quantityNameForDisplay += " ";
+                        quantityNameForDisplay += " (";
+                        quantityNameForDisplay += quantityName;
+                        quantityNameForDisplay += ")";
+                    }
+                    else
+                    {
+                        quantityNameForDisplay += quantityName;
                     }
 
-                    quantityNameForDisplay += quantityName;
                 }
             }
 
diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
index 447ccf99f2..3449269099 100644
--- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
+++ b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
@@ -534,22 +534,22 @@ QList<caf::PdmOptionItemInfo> RiuSummaryCurveDefSelection::calculateValueOptions
                 }
 
                 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;
 
                     if (isVectorField)
                     {
-                        std::string descriptiveName = RiuSummaryVectorDescriptionMap::instance()->fieldInfo(iName);
-                        displayName = QString::fromStdString(descriptiveName);
-                        displayName += QString(" [%1]").arg(QString::fromStdString(iName));
+                        std::string longVectorName = RiuSummaryVectorDescriptionMap::instance()->fieldInfo(itemName);
+                        displayName = QString::fromStdString(longVectorName);
+                        displayName += QString(" (%1)").arg(QString::fromStdString(itemName));
                     }
                     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)
                         optionItem.setLevel(1);
                     options.push_back(optionItem);