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

#2032 Curve Calculator : Rename of calculation and calculation collection

Browse Source
This commit is contained in:
Magne Sjaastad
2017-10-23 14:42:38 +02:00
parent f943a80f95
commit 35a2769cab
16 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimSummaryCalculation.h
View File

@@ -22,7 +22,7 @@
#include "cafPdmObject.h"
#include "cafPdmField.h"
class RimCalculationVariable;
class RimSummaryCalculationVariable;
//==================================================================================================
///
@@ -39,8 +39,8 @@ public:
QString description() const;
caf::PdmChildArrayFieldHandle* variables();
RimCalculationVariable* addVariable();
void deleteVariable(RimCalculationVariable* calcVariable);
RimSummaryCalculationVariable* addVariable();
void deleteVariable(RimSummaryCalculationVariable* calcVariable);
const std::vector<double>& values() const;
const std::vector<time_t>& timeSteps() const;
@@ -54,14 +54,14 @@ public:
static QString findLeftHandSide(const QString& expresion);
private:
RimCalculationVariable* findByName(const QString& name) const;
RimSummaryCalculationVariable* findByName(const QString& name) const;
QString buildCalculationName() const;
private:
caf::PdmField<QString> m_description;
caf::PdmField<QString> m_expression;
caf::PdmChildArrayField<RimCalculationVariable*> m_variables;
caf::PdmChildArrayField<RimSummaryCalculationVariable*> m_variables;
caf::PdmField<std::vector<double>> m_calculatedValues;
caf::PdmField<std::vector<time_t>> m_timesteps;