From 65f118ba2461e2da13c4bf4c5a80773790559b8a Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 4 Nov 2016 14:40:24 +0100
Subject: [PATCH] #864 Improved UI label names

---
 .../Summary/RimSummaryCurveAutoName.cpp        | 18 +++++++++---------
 .../Summary/RimSummaryCurveAutoName.h          | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
index c73d8c8d07..4a5ee2a033 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
@@ -34,16 +34,16 @@ RimSummaryCurveAutoName::RimSummaryCurveAutoName()
 {
     CAF_PDM_InitObject("RimSummaryCurveAutoName", "", "", "");
 
-    CAF_PDM_InitField(&m_quantity,          "Quantity",           true, "Quantity", "", "", "");
+    CAF_PDM_InitField(&m_vectorName,        "VectorName",         true, "Vector Name", "", "", "");
     CAF_PDM_InitField(&m_unit,              "Unit",               true, "Unit", "", "", "");
-    CAF_PDM_InitField(&m_regionNumber,      "RegionNumber",       true, "RegionNumber", "", "", "");
-    CAF_PDM_InitField(&m_wellGroupName,     "WellGroupName",      true, "WellGroupName", "", "", "");
-    CAF_PDM_InitField(&m_wellName,          "WellName",           true, "WellName", "", "", "");
-    CAF_PDM_InitField(&m_wellSegmentNumber, "WellSegmentNumber",  true, "WellSegmentNumber", "", "", "");
-    CAF_PDM_InitField(&m_lgrName,           "LgrName",            true, "LgrName", "", "", "");
+    CAF_PDM_InitField(&m_regionNumber,      "RegionNumber",       true, "Region Number", "", "", "");
+    CAF_PDM_InitField(&m_wellGroupName,     "WellGroupName",      true, "Well Group Name", "", "", "");
+    CAF_PDM_InitField(&m_wellName,          "WellName",           true, "Well Name", "", "", "");
+    CAF_PDM_InitField(&m_wellSegmentNumber, "WellSegmentNumber",  true, "Well Segment Number", "", "", "");
+    CAF_PDM_InitField(&m_lgrName,           "LgrName",            true, "Lgr Name", "", "", "");
     CAF_PDM_InitField(&m_completion,        "Completion",         true, "Completion", "", "", "");
     
-    CAF_PDM_InitField(&m_caseName,          "CaseName",           true, "CaseName", "", "", "");
+    CAF_PDM_InitField(&m_caseName,          "CaseName",           true, "Case Name", "", "", "");
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -56,7 +56,7 @@ QString RimSummaryCurveAutoName::curveName(const RifEclipseSummaryAddress& summa
     RimSummaryCurve* summaryCurve = nullptr;
     this->firstAncestorOrThisOfType(summaryCurve);
 
-    if (m_quantity)
+    if (m_vectorName)
     {
         text += summaryAddress.quantityName();
 
@@ -231,7 +231,7 @@ void RimSummaryCurveAutoName::fieldChangedByUi(const caf::PdmFieldHandle* change
 void RimSummaryCurveAutoName::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
     uiOrdering.add(&m_caseName);
-    uiOrdering.add(&m_quantity);
+    uiOrdering.add(&m_vectorName);
     uiOrdering.add(&m_unit);
     uiOrdering.add(&m_regionNumber);
     uiOrdering.add(&m_wellGroupName);
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.h
index dc17db80dd..43ee7d0be3 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.h
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.h
@@ -31,21 +31,21 @@ class RimSummaryCurveAutoName : public caf::PdmObject
 public:
     RimSummaryCurveAutoName();;
 
-    QString curveName(const RifEclipseSummaryAddress& summaryAddress) const;
+    QString         curveName(const RifEclipseSummaryAddress& summaryAddress) const;
 
-
-    virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
+    virtual void    fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
 
 protected:
     friend RimSummaryCurve;
-    virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
+
+    virtual void    defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
 
 private:
-    void appendWellName(std::string& text, const RifEclipseSummaryAddress& summaryAddress) const;
-    void appendLgrName(std::string& text, const RifEclipseSummaryAddress& summaryAddress) const;
+    void            appendWellName(std::string& text, const RifEclipseSummaryAddress& summaryAddress) const;
+    void            appendLgrName(std::string& text, const RifEclipseSummaryAddress& summaryAddress) const;
 
 private:
-    caf::PdmField<bool> m_quantity;
+    caf::PdmField<bool> m_vectorName;
     caf::PdmField<bool> m_unit;
     caf::PdmField<bool> m_regionNumber;
     caf::PdmField<bool> m_wellGroupName;