From 383a5c36f62d8fe01f7746fd0fa88f756c2a920a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Fri, 3 Nov 2017 08:36:51 +0100 Subject: [PATCH] #2041 Curve calc. Set initial variable name consitently --- .../ProjectDataModel/RimSummaryCalculation.cpp | 10 +++++++++- .../ProjectDataModel/RimSummaryCalculation.h | 2 ++ .../RimSummaryCalculationCollection.cpp | 5 ++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp index 8d142865e8..58854a2c6f 100644 --- a/ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp +++ b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp @@ -52,7 +52,7 @@ RimSummaryCalculation::RimSummaryCalculation() CAF_PDM_InitFieldNoDefault(&m_description, "Description", "Description", "", "", ""); m_description.uiCapability()->setUiReadOnly(true); - CAF_PDM_InitField(&m_expression, "Expression", QString("variableName := a"), "Expression", "", "", ""); + CAF_PDM_InitField(&m_expression, "Expression", QString(""), "Expression", "", "", ""); m_expression.uiCapability()->setUiEditorTypeName(caf::PdmUiTextEditor::uiEditorTypeName()); CAF_PDM_InitFieldNoDefault(&m_variables, "Variables", "Variables", "", "", ""); @@ -126,6 +126,14 @@ const std::vector& RimSummaryCalculation::timeSteps() const return m_timesteps(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimSummaryCalculation::setDefaultExpression(const QString& expr) +{ + m_expression = expr; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCalculation.h b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.h index 5eb64b80cb..ddc94b42d9 100644 --- a/ApplicationCode/ProjectDataModel/RimSummaryCalculation.h +++ b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.h @@ -47,6 +47,8 @@ public: const std::vector& values() const; const std::vector& timeSteps() const; + void setDefaultExpression(const QString& expr); + bool parseExpression(); bool calculate(); void updateDependentCurvesAndPlots(); diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCalculationCollection.cpp b/ApplicationCode/ProjectDataModel/RimSummaryCalculationCollection.cpp index 4618a877bc..fdc1a50613 100644 --- a/ApplicationCode/ProjectDataModel/RimSummaryCalculationCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimSummaryCalculationCollection.cpp @@ -47,7 +47,10 @@ RimSummaryCalculationCollection::RimSummaryCalculationCollection() RimSummaryCalculation* RimSummaryCalculationCollection::addCalculation() { RimSummaryCalculation* calculation = new RimSummaryCalculation; - calculation->setDescription(QString("Calculation %1").arg(m_calcuations.size())); + + QString varName = QString("Calculation_%1").arg(m_calcuations.size() + 1); + calculation->setDescription(varName); + calculation->setDefaultExpression(varName + " := a + b"); m_calcuations.push_back(calculation);