OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2041 Curve calc. Set initial variable name consitently

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2017-11-03 08:36:51 +01:00
parent 0f6d5f9c48
commit 383a5c36f6
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp
View File

@ -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<time_t>& RimSummaryCalculation::timeSteps() const
return m_timesteps();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCalculation::setDefaultExpression(const QString& expr)
{
m_expression = expr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimSummaryCalculation.h
View File

@ -47,6 +47,8 @@ public:
const std::vector<double>& values() const;
const std::vector<time_t>& timeSteps() const;
void setDefaultExpression(const QString& expr);
bool parseExpression();
bool calculate();
void updateDependentCurvesAndPlots();

5
ApplicationCode/ProjectDataModel/RimSummaryCalculationCollection.cpp
View File

@ -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);