From 605d3c25d6704dc5589d3d262ade6d43da87f5e6 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Tue, 24 Oct 2017 09:57:32 +0200
Subject: [PATCH] #2031 Curve Calculator : Consolidate generation of address
 text

---
 .../Application/RiaSummaryCurveDefinition.h      |  3 ++-
 .../ProjectDataModel/RimSummaryCalculation.cpp   |  9 +++++----
 .../ProjectDataModel/RimSummaryCalculation.h     |  4 ++--
 .../RimSummaryCalculationVariable.cpp            | 16 +---------------
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/ApplicationCode/Application/RiaSummaryCurveDefinition.h b/ApplicationCode/Application/RiaSummaryCurveDefinition.h
index a70978bd54..7978a90a02 100644
--- a/ApplicationCode/Application/RiaSummaryCurveDefinition.h
+++ b/ApplicationCode/Application/RiaSummaryCurveDefinition.h
@@ -46,9 +46,10 @@ public:
 
     QString                             curveDefinitionText() const;
 
-private:
     static QString                      curveDefinitionText(RimSummaryCase* summaryCase, const RifEclipseSummaryAddress& summaryAddress);
 
+private:
+
 private:
     std::pair<RimSummaryCase*, RifEclipseSummaryAddress> m_curveDefinition;
 };
diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp
index 5d1fa2d640..a16c5f3b68 100644
--- a/ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp
+++ b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp
@@ -49,7 +49,7 @@ RimSummaryCalculation::RimSummaryCalculation()
     CAF_PDM_InitFieldNoDefault(&m_description,      "Description",      "Description", "", "", "");
     m_description.uiCapability()->setUiReadOnly(true);
 
-    CAF_PDM_InitFieldNoDefault(&m_expression,       "Expression",       "Expression", "", "", "");
+    CAF_PDM_InitField(&m_expression,                "Expression",       QString("variableName := a"),       "Expression", "", "", "");
     m_expression.uiCapability()->setUiEditorTypeName(caf::PdmUiTextEditor::uiEditorTypeName());
 
     CAF_PDM_InitFieldNoDefault(&m_variables,        "Variables",        "Variables", "", "", "");
@@ -85,9 +85,11 @@ caf::PdmChildArrayFieldHandle* RimSummaryCalculation::variables()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimSummaryCalculationVariable* RimSummaryCalculation::addVariable()
+RimSummaryCalculationVariable* RimSummaryCalculation::addVariable(const QString& name)
 {
     RimSummaryCalculationVariable* v = new RimSummaryCalculationVariable;
+    v->setName(name);
+
     m_variables.push_back(v);
 
     return v;
@@ -176,8 +178,7 @@ bool RimSummaryCalculation::parseExpression()
         {
             if (!findByName(variableName))
             {
-                auto v = this->addVariable();
-                v->setName(variableName);
+                this->addVariable(variableName);
             }
         }
     }
diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCalculation.h b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.h
index 7c26390605..673370f14c 100644
--- a/ApplicationCode/ProjectDataModel/RimSummaryCalculation.h
+++ b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.h
@@ -39,8 +39,6 @@ public:
     QString                         description() const;
 
     caf::PdmChildArrayFieldHandle*  variables();
-    RimSummaryCalculationVariable*  addVariable();
-    void                            deleteVariable(RimSummaryCalculationVariable* calcVariable);
 
     const std::vector<double>&      values() const;
     const std::vector<time_t>&      timeSteps() const;
@@ -55,6 +53,8 @@ public:
 
 private:
     RimSummaryCalculationVariable*  findByName(const QString& name) const;
+    RimSummaryCalculationVariable*  addVariable(const QString& name);
+    void                            deleteVariable(RimSummaryCalculationVariable* calcVariable);
 
     QString                         buildCalculationName() const;
 
diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp b/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp
index 448f7569fc..c003d4077e 100644
--- a/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp
+++ b/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp
@@ -129,21 +129,7 @@ void RimSummaryCalculationVariable::fieldChangedByUi(const caf::PdmFieldHandle*
 //--------------------------------------------------------------------------------------------------
 QString RimSummaryCalculationVariable::summaryAddressDisplayString() const
 {
-    QString caseName;
-    if (m_case()) caseName = m_case->shortName();
-
-    QString summaryCurvename = QString::fromStdString(m_summaryAddress()->address().uiText());
-
-    QString txt;
-    if (!caseName.isEmpty())
-    {
-        txt = caseName;
-        txt += " : ";
-    }
-
-    txt += summaryCurvename;
-
-    return txt;
+    return RiaSummaryCurveDefinition::curveDefinitionText(m_case(), m_summaryAddress()->address());
 }
 
 //--------------------------------------------------------------------------------------------------