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

clang-tidy : Remove redundant 'virtual' and add 'override'

Browse Source
This commit is contained in:
Magne Sjaastad
2018-10-18 19:45:57 +02:00
parent c8285602b1
commit 6346ed012c
599 changed files with 2056 additions and 2056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/Summary/RimAsciiDataCurve.h
View File

@@ -49,7 +49,7 @@ class RimAsciiDataCurve : public RimPlotCurve
public:
RimAsciiDataCurve();
virtual ~RimAsciiDataCurve();
~RimAsciiDataCurve() override;
std::vector<double> yValues() const;
const std::vector<time_t>& timeSteps() const;
@@ -65,15 +65,15 @@ public:
protected:
// RimPlotCurve overrides
virtual QString createCurveAutoName() override;
virtual void updateZoomInParentPlot() override;
virtual void onLoadDataAndUpdate(bool updateParentPlot) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
QString createCurveAutoName() override;
void updateZoomInParentPlot() override;
void onLoadDataAndUpdate(bool updateParentPlot) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
bool curveData(std::vector<QDateTime>* timeSteps, std::vector<double>* values) const;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
// Fields

10
ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.h
View File

@@ -38,12 +38,12 @@ class RimCalculatedSummaryCase : public RimSummaryCase
public:
RimCalculatedSummaryCase();
virtual ~RimCalculatedSummaryCase();
~RimCalculatedSummaryCase() override;
virtual QString caseName() const override;
virtual void createSummaryReaderInterface() override;
virtual RifSummaryReaderInterface* summaryReader() override;
virtual void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override;
QString caseName() const override;
void createSummaryReaderInterface() override;
RifSummaryReaderInterface* summaryReader() override;
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override;
void buildMetaData();

6
ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.h
View File

@@ -36,9 +36,9 @@ class RifCalculatedSummaryCurveReader : public RifSummaryReaderInterface
public:
explicit RifCalculatedSummaryCurveReader(RimSummaryCalculationCollection* calculationCollection);
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const override;
virtual std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;
const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const override;
std::string unitName(const RifEclipseSummaryAddress& resultAddress) const override;
void buildMetaData();

8
ApplicationCode/ProjectDataModel/Summary/RimCsvUserData.h
View File

@@ -37,13 +37,13 @@ class RimCsvUserData : public RimObservedData
CAF_PDM_HEADER_INIT;
public:
RimCsvUserData();
virtual ~RimCsvUserData();
~RimCsvUserData() override;
virtual void createSummaryReaderInterface() override;
void createSummaryReaderInterface() override;
virtual RifSummaryReaderInterface* summaryReader() override;
RifSummaryReaderInterface* summaryReader() override;
virtual QString errorMessagesFromReader() override;
QString errorMessagesFromReader() override;
RicPasteAsciiDataToSummaryPlotFeatureUi* parseOptions() const;

10
ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.h
View File

@@ -52,7 +52,7 @@ class RimDerivedEnsembleCase : public RimSummaryCase
public:
RimDerivedEnsembleCase();
~RimDerivedEnsembleCase();
~RimDerivedEnsembleCase() override;
void setInUse(bool inUse);
bool isInUse() const;
@@ -63,10 +63,10 @@ public:
void calculate(const RifEclipseSummaryAddress& address);
virtual QString caseName() const override;
virtual void createSummaryReaderInterface() override;
virtual RifSummaryReaderInterface* summaryReader() override;
virtual void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override;
QString caseName() const override;
void createSummaryReaderInterface() override;
RifSummaryReaderInterface* summaryReader() override;
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override;
RimDerivedEnsembleCaseCollection* parentEnsemble() const;

16
ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.h
View File

@@ -42,7 +42,7 @@ class RimDerivedEnsembleCaseCollection : public RimSummaryCaseCollection
public:
RimDerivedEnsembleCaseCollection();
virtual ~RimDerivedEnsembleCaseCollection();
~RimDerivedEnsembleCaseCollection() override;
RimSummaryCaseCollection* ensemble1() const { return m_ensemble1; }
RimSummaryCaseCollection* ensemble2() const { return m_ensemble2; }
@@ -52,18 +52,18 @@ public:
void setEnsemble1(RimSummaryCaseCollection* ensemble);
void setEnsemble2(RimSummaryCaseCollection* ensemble);
virtual std::vector<RimSummaryCase*> allSummaryCases() const override;
virtual std::set<RifEclipseSummaryAddress> ensembleSummaryAddresses() const override;
std::vector<RimSummaryCase*> allSummaryCases() const override;
std::set<RifEclipseSummaryAddress> ensembleSummaryAddresses() const override;
void updateDerivedEnsembleCases();
bool hasCaseReference(const RimSummaryCase* sumCase) const;
virtual void onLoadDataAndUpdate() override;
void onLoadDataAndUpdate() override;
private:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName,
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName,
caf::PdmUiEditorAttribute* attribute) override;
void setAllCasesNotInUse();

10
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.h
View File

@@ -46,10 +46,10 @@ public:
QString ensembleParameterName() const;
QString filterId() const;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
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 defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
std::vector<RimSummaryCase*> applyFilter(const std::vector<RimSummaryCase*>& allSumCases);
@@ -57,7 +57,7 @@ public:
EnsembleParameter selectedEnsembleParameter() const;
protected:
virtual caf::PdmFieldHandle* objectToggleField();
caf::PdmFieldHandle* objectToggleField() override;
private:
RimEnsembleCurveSet * parentCurveSet() const;

12
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.h
View File

@@ -44,13 +44,13 @@ public:
void loadDataAndUpdate();
private:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
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 defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /* = "" */);
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /* = "" */) override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual caf::PdmFieldHandle* objectToggleField();
caf::PdmFieldHandle* objectToggleField() override;
private:
caf::PdmField<bool> m_active;

14
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
View File

@@ -66,7 +66,7 @@ public:
enum ColorMode {SINGLE_COLOR, BY_ENSEMBLE_PARAM};
RimEnsembleCurveSet();
virtual ~RimEnsembleCurveSet();
~RimEnsembleCurveSet() override;
bool isCurvesVisible();
void setColor(cvf::Color3f color);
@@ -123,14 +123,14 @@ private:
void updateStatisticsCurves(const std::vector<RimSummaryCase*>& sumCases);
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField();
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
caf::PdmFieldHandle* objectToggleField() override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue, const QVariant& newValue) override;
void appendOptionItemsForSummaryAddresses(QList<caf::PdmOptionItemInfo>* options,

4
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.h
View File

@@ -37,7 +37,7 @@ class RimEnsembleCurveSetCollection : public caf::PdmObject
public:
RimEnsembleCurveSetCollection();
virtual ~RimEnsembleCurveSetCollection();
~RimEnsembleCurveSetCollection() override;
bool isCurveSetsVisible();
@@ -62,7 +62,7 @@ public:
private:
caf::PdmFieldHandle* objectToggleField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue, const QVariant& newValue) override;
private:

4
ApplicationCode/ProjectDataModel/Summary/RimEnsembleStatistics.h
View File

@@ -55,8 +55,8 @@ public:
void disableP90Curve(bool disable);
void disableMeanCurve(bool disable);
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
RimEnsembleCurveSet* parentCurveSet() const;

8
ApplicationCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.h
View File

@@ -46,11 +46,11 @@ public:
bool hasP90Data() const { return !m_p90Data.empty(); }
bool hasMeanData() const { return !m_meanData.empty(); }
virtual QString caseName() const override;
virtual void createSummaryReaderInterface() override;
virtual RifSummaryReaderInterface* summaryReader() override;
QString caseName() const override;
void createSummaryReaderInterface() override;
RifSummaryReaderInterface* summaryReader() override;
virtual void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override {}
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override {}
const RimEnsembleCurveSet* curveSet() const;

12
ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.h
View File

@@ -34,14 +34,14 @@ class RimFileSummaryCase: public RimSummaryCase
CAF_PDM_HEADER_INIT;
public:
RimFileSummaryCase();
virtual ~RimFileSummaryCase();
~RimFileSummaryCase() override;
virtual QString summaryHeaderFilename() const override;
virtual QString caseName() const override;
virtual void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override;
QString summaryHeaderFilename() const override;
QString caseName() const override;
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override;
virtual void createSummaryReaderInterface() override;
virtual RifSummaryReaderInterface* summaryReader() override;
void createSummaryReaderInterface() override;
RifSummaryReaderInterface* summaryReader() override;
void setIncludeRestartFiles(bool includeRestartFiles);

12
ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.h
View File

@@ -39,17 +39,17 @@ class RimGridSummaryCase : public RimSummaryCase
CAF_PDM_HEADER_INIT;
public:
RimGridSummaryCase();
virtual ~RimGridSummaryCase();
~RimGridSummaryCase() override;
void setAssociatedEclipseCase(RimEclipseCase* eclipseCase);
RimEclipseCase* associatedEclipseCase();
virtual QString summaryHeaderFilename() const override;
virtual QString caseName() const override;
virtual void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override;
QString summaryHeaderFilename() const override;
QString caseName() const override;
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override;
virtual void createSummaryReaderInterface() override;
virtual RifSummaryReaderInterface* summaryReader() override;
void createSummaryReaderInterface() override;
RifSummaryReaderInterface* summaryReader() override;
void setIncludeRestartFiles(bool includeRestartFiles);

8
ApplicationCode/ProjectDataModel/Summary/RimObservedData.h
View File

@@ -36,8 +36,8 @@ class RimObservedData : public RimSummaryCase
public:
RimObservedData();
virtual QString caseName() const override;
virtual void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override;
QString caseName() const override;
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override;
QString identifierName() const;
RifEclipseSummaryAddress::SummaryVarCategory summaryCategory() const;
@@ -48,8 +48,8 @@ protected:
QString customWellName() const;
private:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
caf::PdmField<caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory> > m_summaryCategory;

2
ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.h
View File

@@ -34,7 +34,7 @@ class RimObservedDataCollection : public caf::PdmObject
public:
RimObservedDataCollection();
virtual ~RimObservedDataCollection();
~RimObservedDataCollection() override;
void removeObservedData(RimObservedData* observedData);
RimObservedData* createAndAddRsmObservedDataFromFile(const QString& fileName, QString* errorText = nullptr);

8
ApplicationCode/ProjectDataModel/Summary/RimObservedEclipseUserData.h
View File

@@ -34,13 +34,13 @@ class RimObservedEclipseUserData : public RimObservedData
CAF_PDM_HEADER_INIT;
public:
RimObservedEclipseUserData();
virtual ~RimObservedEclipseUserData();
~RimObservedEclipseUserData() override;
virtual void createSummaryReaderInterface() override;
void createSummaryReaderInterface() override;
virtual RifSummaryReaderInterface* summaryReader() override;
RifSummaryReaderInterface* summaryReader() override;
virtual QString errorMessagesFromReader() override;
QString errorMessagesFromReader() override;
private:
cvf::ref<RifSummaryReaderInterface> m_summeryReader;

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryAddress.h
View File

@@ -43,7 +43,7 @@ class RimSummaryAddress: public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimSummaryAddress();;
virtual ~RimSummaryAddress();
~RimSummaryAddress() override;
void setAddress(const RifEclipseSummaryAddress& addr);
RifEclipseSummaryAddress address();

12
ApplicationCode/ProjectDataModel/Summary/RimSummaryAxisProperties.h
View File

@@ -80,14 +80,14 @@ public:
bool isActive() const;
protected:
virtual void initAfterRead() override;
virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual caf::PdmFieldHandle* objectToggleField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue,
void initAfterRead() override;
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue,
const QVariant& newValue) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly) override;
private:

6
ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.h
View File

@@ -38,7 +38,7 @@ class RimSummaryCase : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimSummaryCase();
virtual ~RimSummaryCase();
~RimSummaryCase() override;
virtual QString summaryHeaderFilename() const;
virtual QString caseName() const = 0;
@@ -65,7 +65,7 @@ public:
bool operator<(const RimSummaryCase& rhs) const;
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void updateTreeItemName();
caf::PdmField<QString> m_shortName;
@@ -76,5 +76,5 @@ protected:
std::shared_ptr<RigCaseRealizationParameters> m_crlParameters;
private:
virtual void initAfterRead() override;
void initAfterRead() override;
};

8
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h
View File

@@ -62,7 +62,7 @@ class RimSummaryCaseCollection : public caf::PdmObject
public:
RimSummaryCaseCollection();
virtual ~RimSummaryCaseCollection();
~RimSummaryCaseCollection() override;
void removeCase(RimSummaryCase* summaryCase);
void addCase(RimSummaryCase* summaryCase, bool updateCurveSets = true);
@@ -85,13 +85,13 @@ private:
QString nameAndItemCount() const;
void updateIcon();
virtual void initAfterRead() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void initAfterRead() override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
protected:
virtual void onLoadDataAndUpdate();
void updateReferringCurveSets();
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void setNameAsReadOnly();
caf::PdmChildArrayField<RimSummaryCase*> m_cases;

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.h
View File

@@ -37,7 +37,7 @@ class RimSummaryCaseMainCollection : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimSummaryCaseMainCollection();
virtual ~RimSummaryCaseMainCollection();
~RimSummaryCaseMainCollection() override;
RimSummaryCase* summaryCase(size_t idx);
size_t summaryCaseCount() const;

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCrossPlotCollection.h
View File

@@ -32,7 +32,7 @@ class RimSummaryCrossPlotCollection : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimSummaryCrossPlotCollection();
virtual ~RimSummaryCrossPlotCollection();
~RimSummaryCrossPlotCollection() override;
void deleteAllChildObjects();

20
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h
View File

@@ -49,7 +49,7 @@ class RimSummaryCurve : public RimPlotCurve
public:
RimSummaryCurve();
virtual ~RimSummaryCurve();
~RimSummaryCurve() override;
// Y Axis functions
void setSummaryCaseY(RimSummaryCase* sumCase);
@@ -76,19 +76,19 @@ public:
void updateQwtPlotAxis();
void applyCurveAutoNameSettings(const RimSummaryCurveAutoName& autoNameSettings);
virtual QString curveExportDescription(const RifEclipseSummaryAddress& address = RifEclipseSummaryAddress()) const override;
QString curveExportDescription(const RifEclipseSummaryAddress& address = RifEclipseSummaryAddress()) const override;
void forceUpdateCurveAppearanceFromCaseType();
void markCachedDataForPurge();
protected:
// RimPlotCurve overrides
virtual QString createCurveAutoName() override;
virtual void updateZoomInParentPlot() override;
virtual void onLoadDataAndUpdate(bool updateParentPlot) override;
QString createCurveAutoName() override;
void updateZoomInParentPlot() override;
void onLoadDataAndUpdate(bool updateParentPlot) override;
virtual void updateLegendsInPlot() override;
void updateLegendsInPlot() override;
private:
RifSummaryReaderInterface* valuesSummaryReaderX() const;
@@ -98,10 +98,10 @@ private:
void calculateCurveInterpolationFromAddress();
// Overridden PDM methods
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
static void appendOptionItemsForSummaryAddresses(QList<caf::PdmOptionItemInfo>* options,
RimSummaryCase* summaryCase,

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.h
View File

@@ -39,9 +39,9 @@ public:
private:
friend class RimSummaryCurve;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue,
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue,
const QVariant& newValue) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void appendAddressDetails(std::string& text, const RifEclipseSummaryAddress& summaryAddress,
const RimSummaryPlotNameHelper* nameHelper) const;

10
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h
View File

@@ -41,7 +41,7 @@ class RimSummaryCurveCollection : public caf::PdmObject
public:
RimSummaryCurveCollection();
virtual ~RimSummaryCurveCollection();
~RimSummaryCurveCollection() override;
bool isCurvesVisible();
@@ -68,13 +68,13 @@ public:
void handleKeyPressEvent(QKeyEvent* keyEvent);
private:
caf::PdmFieldHandle* objectToggleField();
virtual void defineObjectEditorAttribute(QString uiConfigName,
caf::PdmFieldHandle* objectToggleField() override;
void defineObjectEditorAttribute(QString uiConfigName,
caf::PdmUiEditorAttribute* attribute) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue, const QVariant& newValue) override;
private:

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.h
View File

@@ -46,7 +46,7 @@ class RimSummaryCurveFilter_OBSOLETE : public caf::PdmObject
public:
RimSummaryCurveFilter_OBSOLETE();
virtual ~RimSummaryCurveFilter_OBSOLETE();
~RimSummaryCurveFilter_OBSOLETE() override;
std::vector<RimSummaryCurve*> curves();
void clearCurvesWithoutDelete();

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp
View File

@@ -53,7 +53,7 @@ public:
m_numberOfDecimals = numberOfDecimals;
}
virtual QwtText label(double value) const override
QwtText label(double value) const override
{
if (qFuzzyCompare(scaledValue(value) + 1.0, 1.0))
value = 0.0;
@@ -83,7 +83,7 @@ public:
m_numberOfDecimals = numberOfDecimals;
}
virtual QwtText label(double value) const override
QwtText label(double value) const override
{
if (qFuzzyCompare(scaledValue(value) + 1.0, 1.0))
value = 0.0;

6
ApplicationCode/ProjectDataModel/Summary/RimSummaryFilter.h
View File

@@ -49,20 +49,20 @@ public:
};
RimSummaryFilter();
virtual ~RimSummaryFilter();
~RimSummaryFilter() override;
void updateFromAddress(const RifEclipseSummaryAddress& address);
bool isIncludedByFilter(const RifEclipseSummaryAddress& addr) const;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
friend class RimSummaryCurve;
static bool isSumVarTypeMatchingFilterType(SummaryFilterType sumFilterType, RifEclipseSummaryAddress::SummaryVarCategory sumVarType);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
caf::PdmField<caf::AppEnum<SummaryFilterType> >

6
ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.h
View File

@@ -34,10 +34,10 @@ class RimSummaryObservedDataFile : public RimObservedData
CAF_PDM_HEADER_INIT;
public:
RimSummaryObservedDataFile();
virtual ~RimSummaryObservedDataFile();
~RimSummaryObservedDataFile() override;
virtual void createSummaryReaderInterface() override;
virtual RifSummaryReaderInterface* summaryReader() override;
void createSummaryReaderInterface() override;
RifSummaryReaderInterface* summaryReader() override;
private:
cvf::ref<RifReaderObservedData> m_summaryReader;

28
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h
View File

@@ -61,7 +61,7 @@ class RimSummaryPlot : public RimViewWindow
public:
RimSummaryPlot();
virtual ~RimSummaryPlot();
~RimSummaryPlot() override;
void setDescription(const QString& description);
QString description() const;
@@ -92,7 +92,7 @@ public:
void updateCaseNameHasChanged();
void updateAxes();
virtual void zoomAll() override;
void zoomAll() override;
void updateZoomInQwt();
void updateZoomWindowFromQwt();
@@ -104,7 +104,7 @@ public:
void selectAxisInPropertyEditor(int axis);
virtual QWidget* viewWidget() override;
QWidget* viewWidget() override;
QString asciiDataForPlotExport(DateTimePeriod resamplingPeriod = DateTimePeriod::NONE) const;
@@ -134,9 +134,9 @@ public:
bool containsResamplableCurves() const;
// RimViewWindow overrides
public:
virtual QWidget* createViewWidget(QWidget* mainWindowParent) override;
virtual void deleteViewWidget() override;
virtual void initAfterRead() override;
QWidget* createViewWidget(QWidget* mainWindowParent) override;
void deleteViewWidget() override;
void initAfterRead() override;
private:
void updateMdiWindowTitle() override;
@@ -144,15 +144,15 @@ private:
protected:
// Overridden PDM methods
virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void onLoadDataAndUpdate() override;
caf::PdmFieldHandle* userDescriptionField() override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void onLoadDataAndUpdate() override;
virtual QImage snapshotWindowContent() override;
QImage snapshotWindowContent() override;
void setAsCrossPlot();

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h
View File

@@ -32,7 +32,7 @@ class RimSummaryPlotCollection : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimSummaryPlotCollection();
virtual ~RimSummaryPlotCollection();
~RimSummaryPlotCollection() override;
caf::PdmChildArrayField<RimSummaryPlot*> summaryPlots;

8
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h
View File

@@ -65,15 +65,15 @@ public:
std::vector<caf::PdmFieldHandle*> fieldsToShowInToolbar();
private:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue,
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue,
const QVariant& newValue) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName,
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName,
caf::PdmUiEditorAttribute* attribute) override;
private:

8
ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h
View File

@@ -84,10 +84,10 @@ public:
bool isActive() const;
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual caf::PdmFieldHandle* objectToggleField() override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
caf::PdmFieldHandle* objectToggleField() override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
double fromDateToDisplayTime(const QDateTime& displayTime);
QDateTime fromDisplayTimeToDate(double displayTime);