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

Whitespace cleanup

Browse Source
This commit is contained in:
Magne Sjaastad 2017-10-23 21:25:58 +02:00
parent 53d1d284e7
commit 5a15014dee
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ProjectDataModel/RimSummaryCalculation.h
View File

@ -39,7 +39,7 @@ public:
QString description() const;
caf::PdmChildArrayFieldHandle* variables();
RimSummaryCalculationVariable* addVariable();
RimSummaryCalculationVariable* addVariable();
void deleteVariable(RimSummaryCalculationVariable* calcVariable);
const std::vector<double>& values() const;
@ -54,14 +54,15 @@ public:
static QString findLeftHandSide(const QString& expresion);
private:
RimSummaryCalculationVariable* 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<RimSummaryCalculationVariable*> m_variables;
caf::PdmChildArrayField<RimSummaryCalculationVariable*> m_variables;
caf::PdmField<std::vector<double>> m_calculatedValues;
caf::PdmField<std::vector<time_t>> m_timesteps;

16
ApplicationCode/ProjectDataModel/RimSummaryCalculationCollection.h
View File

@ -37,19 +37,19 @@ class RimSummaryCalculationCollection : public caf::PdmObject
public:
RimSummaryCalculationCollection();
RimSummaryCalculation* addCalculation();
void deleteCalculation(RimSummaryCalculation* calculation);
std::vector<RimSummaryCalculation*> calculations() const;
RimSummaryCalculation* addCalculation();
void deleteCalculation(RimSummaryCalculation* calculation);
std::vector<RimSummaryCalculation*> calculations() const;
RimSummaryCase* calculationSummaryCase();
RimSummaryCase* calculationSummaryCase();
void deleteAllContainedObjects();
void rebuildCaseMetaData();
void deleteAllContainedObjects();
void rebuildCaseMetaData();
private:
virtual void initAfterRead() override;
virtual void initAfterRead() override;
private:
caf::PdmChildArrayField<RimSummaryCalculation*> m_calcuations;
caf::PdmChildArrayField<RimSummaryCalculation*> m_calcuations;
caf::PdmChildField<RimCalculatedSummaryCase*> m_calcuationSummaryCase;
};

7
ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.h
View File

@ -49,16 +49,15 @@ public:
RimSummaryAddress* summaryAddress();
private:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
private:
caf::PdmField<QString> m_name;
caf::PdmProxyValueField<QString> m_summaryAddressUi;
caf::PdmField<QString> m_name;
caf::PdmProxyValueField<QString> m_summaryAddressUi;
caf::PdmField<bool> m_button;
caf::PdmField<bool> m_button;
caf::PdmPtrField<RimSummaryCase*> m_case;
caf::PdmChildField<RimSummaryAddress*> m_summaryAddress;