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

10
ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.h
View File

@@ -38,7 +38,7 @@ class Rim3dWellLogCurveCollection : public caf::PdmObject
public:
Rim3dWellLogCurveCollection();
virtual ~Rim3dWellLogCurveCollection();
~Rim3dWellLogCurveCollection() override;
bool has3dWellLogCurves() const;
void add3dWellLogCurve(Rim3dWellLogCurve* curve);
@@ -58,10 +58,10 @@ public:
double* valueAtPoint);
private:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual caf::PdmFieldHandle* objectToggleField() override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* objectToggleField() override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
private:
caf::PdmField<bool> m_showPlot;
caf::PdmField<float> m_planeWidthScaling;

2
ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h
View File

@@ -44,7 +44,7 @@ class RimEllipseFractureTemplate : public RimFractureTemplate
public:
RimEllipseFractureTemplate();
virtual ~RimEllipseFractureTemplate();
~RimEllipseFractureTemplate() override;
void fractureTriangleGeometry(std::vector<cvf::Vec3f>* nodeCoords, std::vector<cvf::uint>* polygonIndices) const override;

6
ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.h
View File

@@ -47,10 +47,10 @@ class RimFishboneWellPath : public RimCheckableNamedObject
public:
RimFishboneWellPath();
virtual ~RimFishboneWellPath();
~RimFishboneWellPath() override;
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void setCoordinates(std::vector< cvf::Vec3d > coordinates);
void setMeasuredDepths(std::vector< double > measuredDepths);

4
ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.h
View File

@@ -44,7 +44,7 @@ public:
void importCompletionsFromFile(const QStringList& filePaths);
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;
std::vector<const RimFishboneWellPath*> wellPaths() const;
double holeDiameter(RiaEclipseUnitTools::UnitSystem unitSystem) const { return m_pipeProperties->holeDiameter(unitSystem); }
@@ -53,7 +53,7 @@ public:
void setUnitSystemSpecificDefaults();
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
void appendCompletion(RimFishboneWellPath* completion);

14
ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.h
View File

@@ -72,7 +72,7 @@ public:
public:
RimFishbonesMultipleSubs();
virtual ~RimFishbonesMultipleSubs();
~RimFishbonesMultipleSubs() override;
bool isActive() const;
QString generatedName() const;
@@ -103,7 +103,7 @@ public:
void setUnitSystemSpecificDefaults();
// Override from Rim3dPropertiesInterface
virtual cvf::BoundingBox boundingBoxInDomainCoords() const override;
cvf::BoundingBox boundingBoxInDomainCoords() const override;
// Overrides from RimWellPathCompletionsInterface
RiaDefines::WellPathComponentType componentType() const override;
@@ -117,12 +117,12 @@ public:
caf::PdmField<cvf::Color3f> fishbonesColor;
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual caf::PdmFieldHandle* objectToggleField() override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void initAfterRead() override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void initAfterRead() override;
private:
void computeRangesAndLocations();

4
ApplicationCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.h
View File

@@ -40,7 +40,7 @@ class RimFishbonesPipeProperties : public caf::PdmObject
public:
RimFishbonesPipeProperties();
virtual ~RimFishbonesPipeProperties();
~RimFishbonesPipeProperties() override;
double skinFactor() const { return m_skinFactor(); }
double holeDiameter(RiaEclipseUnitTools::UnitSystem unitSystem) const;
@@ -48,7 +48,7 @@ public:
void setUnitSystemSpecificDefaults();
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
caf::PdmField<double> m_skinFactor;

12
ApplicationCode/ProjectDataModel/Completions/RimFracture.h
View File

@@ -80,7 +80,7 @@ class RimFracture : public RimCheckableNamedObject, public Rim3dPropertiesInterf
public:
RimFracture(void);
virtual ~RimFracture(void);
~RimFracture(void) override;
double perforationLength() const;
double perforationEfficiency() const;
@@ -110,7 +110,7 @@ public:
std::vector<size_t> getPotentiallyFracturedCells(const RigMainGrid* mainGrid) 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;
cvf::Vec3d fracturePosition() const;
virtual void updateAzimuthBasedOnWellAzimuthAngle() = 0;
@@ -137,9 +137,9 @@ public:
double endMD() const override;
protected:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute) 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;
private:
cvf::Vec3d fracturePositionForUi() const;
@@ -149,7 +149,7 @@ private:
QString wellFractureAzimuthDiffText() const;
QString wellAzimuthAtFracturePositionText() const;
virtual cvf::BoundingBox boundingBoxInDomainCoords() const override;
cvf::BoundingBox boundingBoxInDomainCoords() const override;
protected:
caf::PdmPtrField<RimFractureTemplate*> m_fractureTemplate;

2
ApplicationCode/ProjectDataModel/Completions/RimFractureContainment.h
View File

@@ -31,7 +31,7 @@ class RimFractureContainment : public caf::PdmObject
public:
RimFractureContainment();
~RimFractureContainment();
~RimFractureContainment() override;
bool isEnabled() const;
bool isEclipseCellOpenForFlow(const RigMainGrid* mainGrid,

4
ApplicationCode/ProjectDataModel/Completions/RimFractureExportSettings.h
View File

@@ -39,9 +39,9 @@ public:
caf::PdmField<QString> fileName;
caf::PdmPtrField<RimEclipseCase*> caseToApply;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
protected:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
};

12
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h
View File

@@ -125,7 +125,7 @@ public:
public:
RimFractureTemplate();
virtual ~RimFractureTemplate();
~RimFractureTemplate() override;
int id() const;
QString name() const;
@@ -180,11 +180,11 @@ public:
void loadDataAndUpdateGeometryHasChanged();
protected:
virtual caf::PdmFieldHandle* userDescriptionField() 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) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
caf::PdmFieldHandle* userDescriptionField() 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;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
std::vector<RimFracture*> fracturesUsingThisTemplate() const;
virtual void onLoadDataAndUpdateGeometryHasChanged() = 0;

4
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h
View File

@@ -36,7 +36,7 @@ class RimFractureTemplateCollection : public caf::PdmObject
public:
RimFractureTemplateCollection();
virtual ~RimFractureTemplateCollection();
~RimFractureTemplateCollection() override;
RimFractureTemplate* fractureTemplate(int id) const;
std::vector<RimFractureTemplate*> fractureTemplates() const;
@@ -55,7 +55,7 @@ public:
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath);
protected:
virtual void initAfterRead() override;
void initAfterRead() override;
private:
int nextFractureTemplateId();

8
ApplicationCode/ProjectDataModel/Completions/RimMswCompletionParameters.h
View File

@@ -43,7 +43,7 @@ public:
typedef caf::AppEnum<LengthAndDepthType> LengthAndDepthEnum;
RimMswCompletionParameters();
~RimMswCompletionParameters();
~RimMswCompletionParameters() override;
double linerDiameter(RiaEclipseUnitTools::UnitSystem unitSystem) const;
static double defaultLinerDiameter(RiaEclipseUnitTools::UnitSystem unitSystem);
@@ -61,11 +61,11 @@ public:
void setUnitSystemSpecificDefaults();
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue);
const QVariant& newValue) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void initAfterRead() override;
void initAfterRead() override;
private:
caf::PdmField<double> m_linerDiameter;

2
ApplicationCode/ProjectDataModel/Completions/RimNonDarcyPerforationParameters.h
View File

@@ -36,7 +36,7 @@ public:
};
RimNonDarcyPerforationParameters();
~RimNonDarcyPerforationParameters();
~RimNonDarcyPerforationParameters() override;
NonDarcyFlowEnum nonDarcyFlowType() const;
double userDefinedDFactor() const;

4
ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.h
View File

@@ -41,7 +41,7 @@ class RimPerforationCollection : public RimCheckableNamedObject
public:
RimPerforationCollection();
~RimPerforationCollection();
~RimPerforationCollection() override;
const RimMswCompletionParameters* mswParameters() const;
const RimNonDarcyPerforationParameters* nonDarcyParameters() const;
@@ -51,7 +51,7 @@ public:
private:
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
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;
friend class RiuEditPerforationCollectionWidget;

18
ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.h
View File

@@ -42,7 +42,7 @@ class RimPerforationInterval : public RimCheckableNamedObject, public Rim3dPrope
public:
RimPerforationInterval();
virtual ~RimPerforationInterval();
~RimPerforationInterval() override;
void setStartAndEndMD(double startMD, double endMD);
@@ -59,7 +59,7 @@ public:
bool isActiveOnDate(const QDateTime& date) const;
virtual cvf::BoundingBox boundingBoxInDomainCoords() const override;
cvf::BoundingBox boundingBoxInDomainCoords() const override;
void setUnitSystemSpecificDefaults();
@@ -71,15 +71,15 @@ public:
QString componentLabel() const override;
QString componentTypeLabel() const override;
cvf::Color3f defaultComponentColor() const override;
double startMD() const;
double endMD() const;
double startMD() const override;
double endMD() const override;
protected:
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 defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual void initAfterRead() override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) 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 initAfterRead() override;
private:
caf::PdmField< double > m_startMD;

14
ApplicationCode/ProjectDataModel/Completions/RimSimWellFracture.h
View File

@@ -34,11 +34,11 @@ class RimSimWellFracture : public RimFracture
public:
RimSimWellFracture(void);
virtual ~RimSimWellFracture(void);
~RimSimWellFracture(void) override;
void setClosestWellCoord(cvf::Vec3d& position, size_t branchIndex);
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;
void recomputeWellCenterlineCoordinates();
void updateFracturePositionFromLocation();
@@ -50,14 +50,14 @@ public:
int branchIndex() const { return m_branchIndex(); }
virtual void loadDataAndUpdate() override;
void loadDataAndUpdate() override;
virtual std::vector<cvf::Vec3d> perforationLengthCenterLineCoords() const override;
std::vector<cvf::Vec3d> perforationLengthCenterLineCoords() const override;
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual 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;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
RigMainGrid* ownerCaseMainGrid() const;

2
ApplicationCode/ProjectDataModel/Completions/RimSimWellFractureCollection.h
View File

@@ -34,7 +34,7 @@ class RimSimWellFractureCollection : public caf::PdmObject
public:
RimSimWellFractureCollection(void);
virtual ~RimSimWellFractureCollection(void);
~RimSimWellFractureCollection(void) override;
caf::PdmChildArrayField<RimSimWellFracture*> simwellFractures;

4
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
View File

@@ -50,7 +50,7 @@ class RimStimPlanFractureTemplate : public RimFractureTemplate
public:
RimStimPlanFractureTemplate();
virtual ~RimStimPlanFractureTemplate();
~RimStimPlanFractureTemplate() override;
int activeTimeStepIndex();
@@ -107,7 +107,7 @@ private:
std::vector<double> fractureGridResultsForUnitSystem(const QString& resultName, const QString& unitName, size_t timeStepIndex, RiaEclipseUnitTools::UnitSystem requiredUnitSystem) const;
virtual WellFractureIntersectionData wellFractureIntersectionData(const RimFracture* fractureInstance) const override;
WellFractureIntersectionData wellFractureIntersectionData(const RimFracture* fractureInstance) const override;
std::pair<QString, QString> widthParameterNameAndUnit() const;
std::pair<QString, QString> conductivityParameterNameAndUnit() const;

4
ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.h
View File

@@ -59,8 +59,8 @@ public:
void setUnitSystemSpecificDefaults();
protected:
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
QString formatStringForExport(const QString& text, const QString& defaultText = "") const;

14
ApplicationCode/ProjectDataModel/Completions/RimWellPathFracture.h
View File

@@ -35,25 +35,25 @@ class RimWellPathFracture : public RimFracture
public:
RimWellPathFracture(void);
virtual ~RimWellPathFracture(void);
~RimWellPathFracture(void) override;
double fractureMD() const override;
void setMeasuredDepth(double mdValue);
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void updateAzimuthBasedOnWellAzimuthAngle() override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void updateAzimuthBasedOnWellAzimuthAngle() override;
double wellAzimuthAtFracturePosition() const override;
virtual void loadDataAndUpdate() override;
void loadDataAndUpdate() override;
virtual std::vector<cvf::Vec3d> perforationLengthCenterLineCoords() const override;
std::vector<cvf::Vec3d> perforationLengthCenterLineCoords() const override;
static bool compareByWellPathNameAndMD(const RimWellPathFracture* lhs, const RimWellPathFracture* rhs);
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute) override;
private:
void updatePositionFromMeasuredDepth();

2
ApplicationCode/ProjectDataModel/Completions/RimWellPathFractureCollection.h
View File

@@ -47,7 +47,7 @@ public:
typedef caf::AppEnum<ReferenceMDType> ReferenceMDEnum;
RimWellPathFractureCollection(void);
virtual ~RimWellPathFractureCollection(void);
~RimWellPathFractureCollection(void) override;
const RimMswCompletionParameters* mswParameters() const;
void addFracture(RimWellPathFracture* fracture);

12
ApplicationCode/ProjectDataModel/Completions/RimWellPathValve.h
View File

@@ -37,7 +37,7 @@ public:
typedef caf::AppEnum<RiaDefines::WellPathComponentType> CompletionTypeEnum;
RimWellPathValve();
~RimWellPathValve();
~RimWellPathValve() override;
void setMeasuredDepth(double measuredDepth);
@@ -50,11 +50,11 @@ public:
double endMD() const override;
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 defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") 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 defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
private:
caf::PdmField<CompletionTypeEnum> m_type;

22
ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.h
View File

@@ -54,17 +54,17 @@ class RimFlowCharacteristicsPlot : public RimViewWindow
public:
RimFlowCharacteristicsPlot();
virtual ~RimFlowCharacteristicsPlot();
~RimFlowCharacteristicsPlot() override;
void setFromFlowSolution(RimFlowDiagSolution* flowSolution);
void updateCurrentTimeStep();
// RimViewWindow overrides
virtual QWidget* viewWidget() override;
virtual void zoomAll() override;
virtual QWidget* createViewWidget(QWidget* mainWindowParent) override;
virtual void deleteViewWidget() override;
QWidget* viewWidget() override;
void zoomAll() override;
QWidget* createViewWidget(QWidget* mainWindowParent) override;
void deleteViewWidget() override;
void viewGeometryUpdated();
enum TimeSelectionType
@@ -76,14 +76,14 @@ public:
protected:
// RimViewWindow overrides
virtual QImage snapshotWindowContent() override;
QImage snapshotWindowContent() override;
// Overridden PDM methods
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 void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute );
virtual void onLoadDataAndUpdate() 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;
void onLoadDataAndUpdate() override;
private:

4
ApplicationCode/ProjectDataModel/Flow/RimFlowDiagSolution.h
View File

@@ -37,7 +37,7 @@ class RimFlowDiagSolution : public caf::PdmObject
public:
RimFlowDiagSolution();
virtual ~RimFlowDiagSolution();
~RimFlowDiagSolution() override;
QString userDescription() const;
RigFlowDiagResults* flowDiagResults();
@@ -65,7 +65,7 @@ public:
private:
std::map<std::string, std::vector<int> > allTracerActiveCellIndices(size_t timeStepIndex, bool useInjectors) const;
virtual caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmField<QString> m_userDescription;
cvf::ref<RigFlowDiagResults> m_flowDiagResults;

2
ApplicationCode/ProjectDataModel/Flow/RimFlowPlotCollection.h
View File

@@ -34,7 +34,7 @@ class RimFlowPlotCollection : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimFlowPlotCollection();
virtual ~RimFlowPlotCollection();
~RimFlowPlotCollection() override;
void closeDefaultPlotWindowAndDeletePlots();
void loadDataAndUpdate();

18
ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.h
View File

@@ -53,17 +53,17 @@ class RimTofAccumulatedPhaseFractionsPlot : public RimViewWindow
public:
RimTofAccumulatedPhaseFractionsPlot();
virtual ~RimTofAccumulatedPhaseFractionsPlot();
~RimTofAccumulatedPhaseFractionsPlot() override;
void setDescription(const QString& description);
QString description() const;
// RimViewWindow overrides
virtual QWidget* viewWidget() override;
virtual void zoomAll() override;
virtual QWidget* createViewWidget(QWidget* mainWindowParent) override;
virtual void deleteViewWidget() override;
QWidget* viewWidget() override;
void zoomAll() override;
QWidget* createViewWidget(QWidget* mainWindowParent) override;
void deleteViewWidget() override;
void reloadFromWell();
@@ -74,12 +74,12 @@ public:
protected:
// RimViewWindow overrides
virtual void onLoadDataAndUpdate() override;
virtual QImage snapshotWindowContent() override;
void onLoadDataAndUpdate() override;
QImage snapshotWindowContent() override;
// Overridden PDM methods
virtual caf::PdmFieldHandle* userDescriptionField() { return &m_userName; }
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* userDescriptionField() override { return &m_userName; }
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
caf::PdmField<bool> m_showPlotTitle;

18
ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.h
View File

@@ -52,7 +52,7 @@ class RimTotalWellAllocationPlot : public RimViewWindow
public:
RimTotalWellAllocationPlot();
virtual ~RimTotalWellAllocationPlot();
~RimTotalWellAllocationPlot() override;
void setDescription(const QString& description);
QString description() const;
@@ -62,20 +62,20 @@ public:
void clearSlices();
// RimViewWindow overrides
virtual QWidget* viewWidget() override;
virtual void zoomAll() override;
virtual QWidget* createViewWidget(QWidget* mainWindowParent) override;
virtual void deleteViewWidget() override;
QWidget* viewWidget() override;
void zoomAll() override;
QWidget* createViewWidget(QWidget* mainWindowParent) override;
void deleteViewWidget() override;
protected:
// RimViewWindow overrides
virtual void onLoadDataAndUpdate() override;
virtual QImage snapshotWindowContent() override;
void onLoadDataAndUpdate() override;
QImage snapshotWindowContent() override;
// Overridden PDM methods
virtual caf::PdmFieldHandle* userDescriptionField() { return &m_userName; }
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* userDescriptionField() override { return &m_userName; }
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
caf::PdmField<bool> m_showPlotTitle;

22
ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.h
View File

@@ -59,15 +59,15 @@ public:
public:
RimWellAllocationPlot();
virtual ~RimWellAllocationPlot();
~RimWellAllocationPlot() override;
void setFromSimulationWell(RimSimWellInView* simWell);
void setDescription(const QString& description);
QString description() const;
virtual QWidget* viewWidget() override;
virtual void zoomAll() override;
QWidget* viewWidget() override;
void zoomAll() override;
RimWellLogPlot* accumulatedWellFlowPlot();
RimTotalWellAllocationPlot* totalWellFlowPlot();
@@ -83,18 +83,18 @@ public:
void showPlotLegend(bool doShow);
protected:
// Overridden PDM methods
virtual caf::PdmFieldHandle* userDescriptionField() { return &m_userName; }
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* userDescriptionField() override { return &m_userName; }
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
std::set<QString> findSortedWellNames();
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual QImage snapshotWindowContent() override;
QImage snapshotWindowContent() override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void onLoadDataAndUpdate() override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void onLoadDataAndUpdate() override;
private:
void updateFromWell();
@@ -113,8 +113,8 @@ private:
// RimViewWindow overrides
virtual QWidget* createViewWidget(QWidget* mainWindowParent) override;
virtual void deleteViewWidget() override;
QWidget* createViewWidget(QWidget* mainWindowParent) override;
void deleteViewWidget() override;
cvf::Color3f getTracerColor(const QString& tracerName);

6
ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlotLegend.h
View File

@@ -31,14 +31,14 @@ class RimWellAllocationPlotLegend : public caf::PdmObject
public:
RimWellAllocationPlotLegend();
virtual ~RimWellAllocationPlotLegend();
~RimWellAllocationPlotLegend() override;
bool isShowingLegend() { return m_showLegend();}
protected:
virtual caf::PdmFieldHandle* objectToggleField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* objectToggleField() override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
caf::PdmField<bool> m_showLegend;

14
ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.h
View File

@@ -36,13 +36,13 @@ class RimWellFlowRateCurve : public RimWellLogCurve
CAF_PDM_HEADER_INIT;
public:
RimWellFlowRateCurve();
virtual ~RimWellFlowRateCurve();
~RimWellFlowRateCurve() override;
void setFlowValuesPrDepthValue(const QString& curveName , const std::vector<double>& depthValues, const std::vector<double>& flowRates);
void updateStackedPlotData();
virtual QString wellName() const override;
virtual QString wellLogChannelName() const override;
QString wellName() const override;
QString wellLogChannelName() const override;
void setGroupId(int groupId);
int groupId() const;
@@ -50,11 +50,11 @@ public:
void setDoFillCurve(bool doFill);
protected:
virtual QString createCurveAutoName() override;
virtual void onLoadDataAndUpdate(bool updateParentPlot) override;
virtual void updateCurveAppearance() override;
QString createCurveAutoName() override;
void onLoadDataAndUpdate(bool updateParentPlot) override;
void updateCurveAppearance() override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
bool isUsingConnectionNumberDepthType() const;

30
ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h
View File

@@ -68,13 +68,13 @@ class RimWellPltPlot : public RimViewWindow
public:
RimWellPltPlot();
virtual ~RimWellPltPlot();
~RimWellPltPlot() override;
void setDescription(const QString& description);
QString description() const;
virtual QWidget* viewWidget() override;
virtual void zoomAll() override;
QWidget* viewWidget() override;
void zoomAll() override;
RimWellLogPlot* wellLogPlot() const;
@@ -85,21 +85,21 @@ public:
protected:
// Overridden PDM methods
virtual caf::PdmFieldHandle* userDescriptionField() { return &m_userName; }
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) override;
caf::PdmFieldHandle* userDescriptionField() override { return &m_userName; }
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
void calculateValueOptionsForWells(QList<caf::PdmOptionItemInfo>& options);
virtual QImage snapshotWindowContent() override;
QImage snapshotWindowContent() override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
virtual void onLoadDataAndUpdate() override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
void onLoadDataAndUpdate() override;
virtual void initAfterRead() override;
virtual void setupBeforeSave() override;
void initAfterRead() override;
void setupBeforeSave() override;
void initAfterLoad();
private:
@@ -121,8 +121,8 @@ private:
// RimViewWindow overrides
void updateWidgetTitleWindowTitle();
virtual QWidget* createViewWidget(QWidget* mainWindowParent) override;
virtual void deleteViewWidget() override;
QWidget* createViewWidget(QWidget* mainWindowParent) override;
void deleteViewWidget() override;
void setPlotXAxisTitles(RimWellLogTrack* plotTrack);

22
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h
View File

@@ -71,13 +71,13 @@ class RimWellRftPlot : public RimViewWindow
public:
RimWellRftPlot();
virtual ~RimWellRftPlot();
~RimWellRftPlot() override;
void setDescription(const QString& description);
QString description() const;
virtual QWidget* viewWidget() override;
virtual void zoomAll() override;
QWidget* viewWidget() override;
void zoomAll() override;
RimWellLogPlot* wellLogPlot() const;
@@ -90,17 +90,17 @@ public:
protected:
// Overridden PDM methods
virtual caf::PdmFieldHandle* userDescriptionField() override { return &m_userName; }
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* userDescriptionField() override { return &m_userName; }
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual QImage snapshotWindowContent() override;
QImage snapshotWindowContent() override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void onLoadDataAndUpdate() override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void onLoadDataAndUpdate() override;
private:
void calculateValueOptionsForWells(QList<caf::PdmOptionItemInfo>& options);
@@ -120,8 +120,8 @@ private:
// RimViewWindow overrides
virtual QWidget* createViewWidget(QWidget* mainWindowParent) override;
virtual void deleteViewWidget() override;
QWidget* createViewWidget(QWidget* mainWindowParent) override;
void deleteViewWidget() override;
void applyCurveAppearance(RimWellLogCurve* newCurve);

8
ApplicationCode/ProjectDataModel/Rim2dGridProjection.h
View File

@@ -50,7 +50,7 @@ public:
typedef caf::AppEnum<ResultAggregationEnum> ResultAggregation;
Rim2dGridProjection();
virtual ~Rim2dGridProjection();
~Rim2dGridProjection() override;
void extractGridData();
void generateVertices(cvf::Vec3fArray* vertices, const caf::DisplayCoordTransform* displayCoordTransform);
@@ -78,9 +78,9 @@ protected:
const RimEclipseResultCase* eclipseCase() const;
RigMainGrid* mainGrid() const;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") 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 defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
protected:
caf::PdmField<double> m_sampleSpacing;

50
ApplicationCode/ProjectDataModel/Rim2dIntersectionView.h
View File

@@ -44,21 +44,21 @@ class Rim2dIntersectionView : public Rim3dView
CAF_PDM_HEADER_INIT;
public:
Rim2dIntersectionView(void);
virtual ~Rim2dIntersectionView(void);
~Rim2dIntersectionView(void) override;
void setVisible(bool isVisible);
void setIntersection(RimIntersection* intersection);
RimIntersection* intersection() const;
virtual bool isUsingFormationNames() const override;
virtual void scheduleGeometryRegen(RivCellSetEnum geometryType) override;
virtual RimCase* ownerCase() const override;
virtual void selectOverlayInfoConfig() override {}
bool isUsingFormationNames() const override;
void scheduleGeometryRegen(RivCellSetEnum geometryType) override;
RimCase* ownerCase() const override;
void selectOverlayInfoConfig() override {}
virtual RimViewLinker* assosiatedViewLinker() const override { return nullptr; }
virtual RimViewController* viewController() const override { return nullptr; }
RimViewLinker* assosiatedViewLinker() const override { return nullptr; }
RimViewController* viewController() const override { return nullptr; }
virtual bool isTimeStepDependentDataVisible() const override;
bool isTimeStepDependentDataVisible() const override;
void update3dInfo();
void updateName();
@@ -66,7 +66,7 @@ public:
cvf::ref<RivIntersectionPartMgr> flatIntersectionPartMgr() const;
cvf::Vec3d transformToUtm(const cvf::Vec3d& unscaledPointInFlatDomain) const;
virtual cvf::ref<caf::DisplayCoordTransform> displayCoordTransform() const override;
cvf::ref<caf::DisplayCoordTransform> displayCoordTransform() const override;
bool showDefiningPoints() const;
@@ -76,23 +76,23 @@ public:
protected:
void updateLegends() override;
virtual bool isGridVisualizationMode() const override;
virtual void axisLabels(cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel) override;
virtual void createDisplayModel() override;
virtual void createPartCollectionFromSelection(cvf::Collection<cvf::Part>* parts) override;
virtual void clampCurrentTimestep() override;
virtual void updateCurrentTimeStep() override;
virtual void onTimeStepChanged() override;
virtual void updateStaticCellColors() override;
virtual void updateScaleTransform() override;
virtual cvf::Transform* scaleTransform() override;
virtual void resetLegendsInViewer() override;
virtual void onLoadDataAndUpdate() override;
virtual bool isWindowVisible() override;
bool isGridVisualizationMode() const override;
void axisLabels(cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel) override;
void createDisplayModel() override;
void createPartCollectionFromSelection(cvf::Collection<cvf::Part>* parts) override;
void clampCurrentTimestep() override;
void updateCurrentTimeStep() override;
void onTimeStepChanged() override;
void updateStaticCellColors() override;
void updateScaleTransform() override;
cvf::Transform* scaleTransform() override;
void resetLegendsInViewer() override;
void onLoadDataAndUpdate() override;
bool isWindowVisible() 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 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;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
bool hasResults();
int timeStepCount();

2
ApplicationCode/ProjectDataModel/Rim2dIntersectionViewCollection.h
View File

@@ -29,7 +29,7 @@ class Rim2dIntersectionViewCollection : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
Rim2dIntersectionViewCollection();
virtual ~Rim2dIntersectionViewCollection();
~Rim2dIntersectionViewCollection() override;
void syncFromExistingIntersections( bool doUpdate );

8
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h
View File

@@ -63,7 +63,7 @@ class Rim3dOverlayInfoConfig : public caf::PdmObject
public:
Rim3dOverlayInfoConfig();
virtual ~Rim3dOverlayInfoConfig();
~Rim3dOverlayInfoConfig() override;
void update3DInfo();
@@ -97,10 +97,10 @@ public:
};
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual caf::PdmFieldHandle* objectToggleField();
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* objectToggleField() override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
void updateEclipse3DInfo(RimEclipseView * reservoirView);

40
ApplicationCode/ProjectDataModel/Rim3dView.h
View File

@@ -80,7 +80,7 @@ class Rim3dView : public RimViewWindow, public RiuViewerToViewInterface
CAF_PDM_HEADER_INIT;
public:
Rim3dView(void);
virtual ~Rim3dView(void);
~Rim3dView(void) override;
// Public fields:
@@ -116,8 +116,8 @@ public:
virtual bool showActiveCellsOnly();
virtual bool isUsingFormationNames() const = 0;
virtual QImage snapshotWindowContent() override;
virtual void zoomAll() override;
QImage snapshotWindowContent() override;
void zoomAll() override;
void forceShowWindowOn();
// Animation
@@ -163,7 +163,7 @@ protected:
void createHighlightAndGridBoxDisplayModel();
// Implementation of RiuViewerToViewInterface
virtual cvf::Color3f backgroundColor() const override { return m_backgroundColor(); }
cvf::Color3f backgroundColor() const override { return m_backgroundColor(); }
void applyBackgroundColor();
// Abstract methods to implement in subclasses
@@ -200,30 +200,30 @@ protected:
private:
// Overridden PdmObject methods:
virtual caf::PdmFieldHandle* userDescriptionField() override { return &m_name; }
virtual void setupBeforeSave() override;
caf::PdmFieldHandle* userDescriptionField() override { return &m_name; }
void setupBeforeSave() override;
protected:
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:
// Overridden ViewWindow methods:
virtual QWidget* createViewWidget(QWidget* mainWindowParent) override;
virtual void updateViewWidgetAfterCreation() override;
virtual void updateMdiWindowTitle() override;
virtual void deleteViewWidget() override;
virtual QWidget* viewWidget() override;
QWidget* createViewWidget(QWidget* mainWindowParent) override;
void updateViewWidgetAfterCreation() override;
void updateMdiWindowTitle() override;
void deleteViewWidget() override;
QWidget* viewWidget() override;
// Implementation of RiuViewerToViewInterface
virtual void setCameraPosition(const cvf::Mat4d& cameraPosition) override { m_cameraPosition = cameraPosition; }
virtual void setCameraPointOfInterest(const cvf::Vec3d& cameraPointOfInterest) override { m_cameraPointOfInterest = cameraPointOfInterest;}
virtual QString timeStepName(int frameIdx) const override;
virtual void endAnimation() override;
virtual caf::PdmObjectHandle* implementingPdmObject() override { return this; }
virtual void handleMdiWindowClosed() override;
virtual void setMdiWindowGeometry(const RimMdiWindowGeometry& windowGeometry) override;
void setCameraPosition(const cvf::Mat4d& cameraPosition) override { m_cameraPosition = cameraPosition; }
void setCameraPointOfInterest(const cvf::Vec3d& cameraPointOfInterest) override { m_cameraPointOfInterest = cameraPointOfInterest;}
QString timeStepName(int frameIdx) const override;
void endAnimation() override;
caf::PdmObjectHandle* implementingPdmObject() override { return this; }
void handleMdiWindowClosed() override;
void setMdiWindowGeometry(const RimMdiWindowGeometry& windowGeometry) override;
private:
caf::PdmField<QString> m_name;

10
ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.h
View File

@@ -54,7 +54,7 @@ public:
public:
Rim3dWellLogCurve();
virtual ~Rim3dWellLogCurve();
~Rim3dWellLogCurve() override;
void updateCurveIn3dView();
@@ -87,11 +87,11 @@ public:
cvf::ref<Riv3dWellLogCurveGeometryGenerator> geometryGenerator();
protected:
virtual caf::PdmFieldHandle* objectToggleField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* objectToggleField() override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void configurationUiOrdering(caf::PdmUiOrdering& uiOrdering);
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
virtual void initAfterRead();
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
void initAfterRead() override;
private:
void resetMinMaxValues();
protected:

30
ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.h
View File

@@ -40,33 +40,33 @@ class Rim3dWellLogExtractionCurve : public Rim3dWellLogCurve
public:
Rim3dWellLogExtractionCurve();
virtual ~Rim3dWellLogExtractionCurve();
~Rim3dWellLogExtractionCurve() override;
void setPropertiesFromView(Rim3dView* view);
virtual QString resultPropertyString() const override;
QString resultPropertyString() const override;
virtual bool followAnimationTimeStep() const override;
virtual void curveValuesAndMds(std::vector<double>* values, std::vector<double>* measuredDepthValues) const override;
virtual void curveValuesAndMdsAtTimeStep(std::vector<double>* values, std::vector<double>* measuredDepthValues, int timeStep) const override;
virtual std::pair<double, double> findCurveValueRange() override;
bool followAnimationTimeStep() const override;
void curveValuesAndMds(std::vector<double>* values, std::vector<double>* measuredDepthValues) const override;
void curveValuesAndMdsAtTimeStep(std::vector<double>* values, std::vector<double>* measuredDepthValues, int timeStep) const override;
std::pair<double, double> findCurveValueRange() override;
virtual QString name() const override;
virtual QString createAutoName() const override;
QString name() const override;
QString createAutoName() const override;
double rkbDiff() const;
virtual bool isShowingTimeDependentResult() const override;
bool isShowingTimeDependentResult() const override;
virtual bool showInView(const Rim3dView* gridView) const override;
bool showInView(const Rim3dView* gridView) const override;
protected:
virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* userDescriptionField() override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void initAfterRead() override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void initAfterRead() override;
QString wellDate() const;
private:
caf::PdmPtrField<RimCase*> m_case;

18
ApplicationCode/ProjectDataModel/Rim3dWellLogFileCurve.h
View File

@@ -37,24 +37,24 @@ class Rim3dWellLogFileCurve : public Rim3dWellLogCurve
public:
Rim3dWellLogFileCurve();
virtual ~Rim3dWellLogFileCurve();
~Rim3dWellLogFileCurve() override;
void setDefaultFileCurveDataInfo();
virtual void curveValuesAndMds(std::vector<double>* values, std::vector<double>* measuredDepthValues) const override;
virtual QString resultPropertyString() const override;
virtual QString name() const override;
virtual QString createAutoName() const override;
void curveValuesAndMds(std::vector<double>* values, std::vector<double>* measuredDepthValues) const override;
QString resultPropertyString() const override;
QString name() const override;
QString createAutoName() const override;
protected:
virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
caf::PdmFieldHandle* userDescriptionField() override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue) override;
private:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
caf::PdmPtrField<RimWellLogFile*> m_wellLogFile;

18
ApplicationCode/ProjectDataModel/Rim3dWellLogRftCurve.h
View File

@@ -41,26 +41,26 @@ class Rim3dWellLogRftCurve : public Rim3dWellLogCurve
public:
Rim3dWellLogRftCurve();
virtual ~Rim3dWellLogRftCurve();
~Rim3dWellLogRftCurve() override;
virtual void curveValuesAndMds(std::vector<double>* values, std::vector<double>* measuredDepthValues) const override;
void curveValuesAndMds(std::vector<double>* values, std::vector<double>* measuredDepthValues) const override;
virtual QString resultPropertyString() const override;
virtual QString name() const override;
virtual QString createAutoName() const override;
QString resultPropertyString() const override;
QString name() const override;
QString createAutoName() const override;
protected:
virtual caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* userDescriptionField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue) override;
private:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
QString wellName() const;

2
ApplicationCode/ProjectDataModel/RimBinaryExportSettings.h
View File

@@ -37,6 +37,6 @@ public:
caf::PdmField<double> undefinedValue;
protected:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
};

2
ApplicationCode/ProjectDataModel/RimCalcScript.h
View File

@@ -31,7 +31,7 @@ class RimCalcScript : public caf::PdmObject
public:
RimCalcScript();
virtual ~RimCalcScript();
~RimCalcScript() override;
caf::PdmField<QString> absolutePath;
caf::PdmField<QString> content; // TODO: Obsolete field, can be deleted on next project file revision.

6
ApplicationCode/ProjectDataModel/RimCase.h
View File

@@ -47,7 +47,7 @@ class RimCase : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimCase();
virtual ~RimCase();
~RimCase() override;
caf::PdmField<int> caseId;
caf::PdmField<QString> caseUserDescription;
@@ -77,11 +77,11 @@ public:
Rim2dIntersectionViewCollection* intersectionViewCollection();
protected:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual std::vector<Rim3dView*> allSpecialViews() const = 0;
private:
virtual caf::PdmFieldHandle* userDescriptionField() override { return &caseUserDescription; }
caf::PdmFieldHandle* userDescriptionField() override { return &caseUserDescription; }
protected:
caf::PdmChildField<RimTimeStepFilter*> m_timeStepFilter;

2
ApplicationCode/ProjectDataModel/RimCaseCollection.h
View File

@@ -36,7 +36,7 @@ class RimCaseCollection : public caf::PdmObject
public:
RimCaseCollection();
virtual ~RimCaseCollection();
~RimCaseCollection() override;
caf::PdmChildArrayField<RimEclipseCase*> reservoirs;
RimIdenticalGridCaseGroup* parentCaseGroup();

14
ApplicationCode/ProjectDataModel/RimCellEdgeColors.h
View File

@@ -50,7 +50,7 @@ class RimCellEdgeColors : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimCellEdgeColors();
virtual ~RimCellEdgeColors();
~RimCellEdgeColors() override;
enum EdgeFaceType
{
@@ -97,11 +97,11 @@ public:
protected:
virtual void initAfterRead();
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);
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "");
void initAfterRead() 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 defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
QStringList findResultVariableNames();
@@ -111,7 +111,7 @@ private:
void gridScalarResultNames(std::vector<QString>* resultNames);
virtual caf::PdmFieldHandle* objectToggleField();
caf::PdmFieldHandle* objectToggleField() override;
caf::PdmField<QString> m_resultVariable;
caf::PdmField<bool> useXVariable;

6
ApplicationCode/ProjectDataModel/RimCellFilter.h
View File

@@ -38,7 +38,7 @@ public:
};
RimCellFilter();
virtual ~RimCellFilter();
~RimCellFilter() override;
caf::PdmField<QString> name;
caf::PdmField<bool> isActive;
@@ -47,6 +47,6 @@ public:
void updateIconState();
protected:
virtual caf::PdmFieldHandle* userDescriptionField();
virtual caf::PdmFieldHandle* objectToggleField();
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;
};

12
ApplicationCode/ProjectDataModel/RimCellRangeFilter.h
View File

@@ -44,7 +44,7 @@ class RimCellRangeFilter : public RimCellFilter
CAF_PDM_HEADER_INIT;
public:
RimCellRangeFilter();
virtual ~RimCellRangeFilter();
~RimCellRangeFilter() override;
caf::PdmField<int> gridIndex; // The index of the grid that this filter applies to
caf::PdmField<bool> propagateToSubGrids; // Do propagate the effects to the sub-grids
@@ -63,12 +63,12 @@ public:
const std::vector<cvf::Vec3d>& individualCellIndices() const;
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) ;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName);
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 defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override ;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly );
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly ) override;
private:
RimCellRangeFilterCollection* parentContainer();

8
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.h
View File

@@ -38,7 +38,7 @@ class RimCellRangeFilterCollection : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimCellRangeFilterCollection();
virtual ~RimCellRangeFilterCollection();
~RimCellRangeFilterCollection() override;
// Fields
caf::PdmField<bool> isActive;
@@ -53,9 +53,9 @@ public:
void updateIconState();
protected:
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue );
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName);
virtual caf::PdmFieldHandle* objectToggleField();
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) override;
caf::PdmFieldHandle* objectToggleField() override;
private:
Rim3dView* baseView() const;

4
ApplicationCode/ProjectDataModel/RimCheckableNamedObject.h
View File

@@ -29,13 +29,13 @@ class RimCheckableNamedObject : public RimNamedObject
CAF_PDM_HEADER_INIT;
public:
RimCheckableNamedObject(void);
virtual ~RimCheckableNamedObject(void);
~RimCheckableNamedObject(void) override;
bool isChecked() const;
void setCheckState(bool checkState);
protected:
virtual caf::PdmFieldHandle* objectToggleField() override;
caf::PdmFieldHandle* objectToggleField() override;
protected:
caf::PdmField<bool> m_isChecked;

4
ApplicationCode/ProjectDataModel/RimCheckableObject.h
View File

@@ -30,13 +30,13 @@ class RimCheckableObject : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimCheckableObject(void);
virtual ~RimCheckableObject(void);
~RimCheckableObject(void) override;
bool isChecked() const;
void setCheckState(bool checkState);
protected:
virtual caf::PdmFieldHandle* objectToggleField() override;
caf::PdmFieldHandle* objectToggleField() override;
protected:
caf::PdmField<bool> m_isChecked;

24
ApplicationCode/ProjectDataModel/RimCommandObject.h
View File

@@ -35,7 +35,7 @@ class RimCommandObject : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimCommandObject();
virtual ~RimCommandObject();
~RimCommandObject() override;
virtual bool isAsyncronous() { return false; };
@@ -52,23 +52,23 @@ class RimCommandExecuteScript : public RimCommandObject
CAF_PDM_HEADER_INIT;
public:
RimCommandExecuteScript();
virtual ~RimCommandExecuteScript();
~RimCommandExecuteScript() override;
caf::PdmField<QString> name;
caf::PdmField<bool> isEnabled;
caf::PdmField<bool> execute;
caf::PdmField<QString> scriptText;
virtual void redo();
virtual void undo();
void redo() override;
void undo() override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual caf::PdmFieldHandle* userDescriptionField();
caf::PdmFieldHandle* userDescriptionField() override;
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;
virtual bool isAsyncronous();
bool isAsyncronous() override;
};
//--------------------------------------------------------------------------------------------------
@@ -79,17 +79,17 @@ class RimCommandIssueFieldChanged : public RimCommandObject
CAF_PDM_HEADER_INIT;
public:
RimCommandIssueFieldChanged();
virtual ~RimCommandIssueFieldChanged();
~RimCommandIssueFieldChanged() override;
caf::PdmField<QString> commandName;
caf::PdmField<QString> objectName;
caf::PdmField<QString> fieldName;
caf::PdmField<QString> fieldValueToApply;
virtual void redo();
virtual void undo();
void redo() override;
void undo() override;
virtual caf::PdmFieldHandle* userDescriptionField();
caf::PdmFieldHandle* userDescriptionField() override;
private:
void childObjects(caf::PdmObject* pdmObject, std::vector<caf::PdmObjectHandle*>& children);

18
ApplicationCode/ProjectDataModel/RimEclipseCase.h
View File

@@ -59,7 +59,7 @@ class RimEclipseCase : public RimCase
CAF_PDM_HEADER_INIT;
public:
RimEclipseCase();
virtual ~RimEclipseCase();
~RimEclipseCase() override;
// Fields:
caf::PdmChildArrayField<RimEclipseView*> reservoirViews;
@@ -94,9 +94,9 @@ public:
RimCaseCollection* parentCaseCollection();
virtual QStringList timeStepStrings() const override;
virtual QString timeStepName(int frameIdx) const override;
virtual std::vector<QDateTime> timeStepDates() const override;
QStringList timeStepStrings() const override;
QString timeStepName(int frameIdx) const override;
std::vector<QDateTime> timeStepDates() const override;
cvf::BoundingBox activeCellsBoundingBox() const override;
@@ -107,18 +107,18 @@ public:
virtual void reloadEclipseGridFile() = 0;
virtual double characteristicCellSize() const override;
double characteristicCellSize() const override;
virtual void setFormationNames(RimFormationNames* formationNames) override;
void setFormationNames(RimFormationNames* formationNames) override;
std::set<QString> sortedSimWellNames() const;
protected:
void initAfterRead() override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
virtual void updateFormationNamesData() override;
void updateFormationNamesData() override;
// Internal methods
protected:
@@ -127,7 +127,7 @@ protected:
private:
void createTimeStepFormatString();
virtual std::vector<Rim3dView*> allSpecialViews() const override;
std::vector<Rim3dView*> allSpecialViews() const override;
protected:
caf::PdmField<bool> m_flipXAxis;

2
ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.h
View File

@@ -44,7 +44,7 @@ class RimEclipseCaseCollection : public caf::PdmObject
public:
RimEclipseCaseCollection(void);
virtual ~RimEclipseCaseCollection(void);
~RimEclipseCaseCollection(void) override;
caf::PdmChildArrayField<RimEclipseCase*> cases;
caf::PdmChildArrayField<RimIdenticalGridCaseGroup*> caseGroups;

12
ApplicationCode/ProjectDataModel/RimEclipseCellColors.h
View File

@@ -38,7 +38,7 @@ class RimEclipseCellColors : public RimEclipseResultDefinition
CAF_PDM_HEADER_INIT;
public:
RimEclipseCellColors();
virtual ~RimEclipseCellColors();
~RimEclipseCellColors() override;
void setReservoirView(RimEclipseView* ownerReservoirView);
RimEclipseView* reservoirView();
@@ -50,20 +50,20 @@ public:
RimRegularLegendConfig* legendConfig();
RimTernaryLegendConfig* ternaryLegendConfig();
virtual void setResultVariable(const QString& resultName);
void setResultVariable(const QString& resultName) override;
void updateIconState();
virtual void updateLegendCategorySettings() override;
void updateLegendCategorySettings() override;
protected:
// Overridden methods
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
friend class RimEclipseFaultColors;
friend class RimCellEdgeColors;
virtual void initAfterRead();
void initAfterRead() override;
private:
void changeLegendConfig(QString resultVarNameOfNewLegend);

12
ApplicationCode/ProjectDataModel/RimEclipseFaultColors.h
View File

@@ -37,7 +37,7 @@ class RimEclipseFaultColors : public caf::PdmObject
public:
RimEclipseFaultColors();
virtual ~RimEclipseFaultColors();
~RimEclipseFaultColors() override;
void setReservoirView(RimEclipseView* ownerReservoirView);
@@ -49,11 +49,11 @@ public:
void updateUiFieldsFromActiveResult();
protected:
virtual void initAfterRead();
virtual caf::PdmFieldHandle* objectToggleField();
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) ;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "");
void initAfterRead() override;
caf::PdmFieldHandle* objectToggleField() 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;
private:
caf::PdmChildField<RimEclipseCellColors*> m_customFaultResultColors;

4
ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.h
View File

@@ -36,11 +36,11 @@ class RimEclipseGeometrySelectionItem : public RimGeometrySelectionItem
CAF_PDM_HEADER_INIT;
public:
RimEclipseGeometrySelectionItem();
virtual ~RimEclipseGeometrySelectionItem() override;
~RimEclipseGeometrySelectionItem() override;
void setFromSelectionItem(const RiuEclipseSelectionItem* selectionItem);
virtual QString geometrySelectionText() const override;
QString geometrySelectionText() const override;
RimEclipseCase* eclipseCase() const;
size_t gridIndex() const;

6
ApplicationCode/ProjectDataModel/RimEclipseInputCase.h
View File

@@ -43,7 +43,7 @@ class RimEclipseInputCase : public RimEclipseCase
public:
RimEclipseInputCase();
virtual ~RimEclipseInputCase();
~RimEclipseInputCase() override;
// File open methods
bool openDataFileSet(const QStringList& fileNames);
@@ -67,8 +67,8 @@ private:
std::vector<QString> additionalFiles() const;
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
private:
cvf::ref<RifReaderInterface> createMockModel(QString modelName);

6
ApplicationCode/ProjectDataModel/RimEclipseInputProperty.h
View File

@@ -37,7 +37,7 @@ class RimEclipseInputProperty : public caf::PdmObject
public:
RimEclipseInputProperty();
virtual ~RimEclipseInputProperty();
~RimEclipseInputProperty() override;
enum ResolveState
{
@@ -56,6 +56,6 @@ public:
caf::PdmField<ResolveStateEnum> resolvedState; // ReadOnly and not writable
// PdmObject Overrides
virtual caf::PdmFieldHandle* userDescriptionField() { return &resultName;}
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* userDescriptionField() override { return &resultName;}
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
};

2
ApplicationCode/ProjectDataModel/RimEclipseInputPropertyCollection.h
View File

@@ -41,7 +41,7 @@ class RimEclipseInputPropertyCollection : public caf::PdmObject
public:
RimEclipseInputPropertyCollection();
virtual ~RimEclipseInputPropertyCollection();
~RimEclipseInputPropertyCollection() override;
std::vector<RimEclipseInputProperty*> findInputProperties(QString fileName);
RimEclipseInputProperty* findInputProperty(QString resultName);

12
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.h
View File

@@ -37,7 +37,7 @@ class RimEclipsePropertyFilter : public RimPropertyFilter
public:
RimEclipsePropertyFilter();
virtual ~RimEclipsePropertyFilter();
~RimEclipsePropertyFilter() override;
caf::PdmChildField<RimEclipseResultDefinition*> resultDefinition;
@@ -49,16 +49,16 @@ public:
void computeResultValueRange();
void updateFromCurrentTimeStep();
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void initAfterRead() override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void initAfterRead() override;
void updateUiFieldsFromActiveResult();
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName);
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
private:
friend class RimEclipsePropertyFilterCollection;

12
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.h
View File

@@ -36,7 +36,7 @@ class RimEclipsePropertyFilterCollection : public RimPropertyFilterCollection
CAF_PDM_HEADER_INIT;
public:
RimEclipsePropertyFilterCollection();
virtual ~RimEclipsePropertyFilterCollection();
~RimEclipsePropertyFilterCollection() override;
RimEclipseView* reservoirView();
@@ -44,16 +44,16 @@ public:
caf::PdmChildArrayField<RimEclipsePropertyFilter*> propertyFilters;
// Methods
bool hasActiveFilters() const;
bool hasActiveDynamicFilters() const;
bool hasActiveFilters() const override;
bool hasActiveDynamicFilters() const override;
bool isUsingFormationNames() const;
void loadAndInitializePropertyFilters();
void loadAndInitializePropertyFilters() override;
void updateIconState();
void updateIconState() override;
void updateFromCurrentTimeStep();
protected:
// Overridden methods
virtual void initAfterRead();
void initAfterRead() override;
};

20
ApplicationCode/ProjectDataModel/RimEclipseResultCase.h
View File

@@ -43,25 +43,25 @@ class RimEclipseResultCase : public RimEclipseCase
public:
RimEclipseResultCase();
virtual ~RimEclipseResultCase();
~RimEclipseResultCase() override;
void setGridFileName(const QString& fileName);
void setCaseInfo(const QString& userDescription, const QString& fileName);
void setSourSimFileName(const QString& fileName);
bool hasSourSimFile();
virtual bool openEclipseGridFile();
bool openEclipseGridFile() override;
bool importGridAndResultMetaData(bool showTimeStepFilter);
virtual void reloadEclipseGridFile();
void reloadEclipseGridFile() override;
bool openAndReadActiveCellData(RigEclipseCaseData* mainEclipseCase);
void readGridDimensions(std::vector< std::vector<int> >& gridDimensions);
// Overrides from RimCase
virtual QString locationOnDisc() const;
virtual QString gridFileName() const { return caseFileName();}
virtual void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath);
QString locationOnDisc() const override;
QString gridFileName() const override { return caseFileName();}
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override;
RimFlowDiagSolution* defaultFlowDiagSolution();
std::vector<RimFlowDiagSolution*> flowDiagSolutions();
@@ -70,8 +70,8 @@ public:
RifReaderEclipseRft* rftReader();
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
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;
private:
void loadAndUpdateSourSimData();
@@ -79,9 +79,9 @@ private:
private:
cvf::ref<RifReaderInterface> createMockModel(QString modelName);
virtual void initAfterRead();
void initAfterRead() override;
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering );
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
cvf::ref<RigFlowDiagSolverInterface> m_flowDagSolverInterface;

12
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
View File

@@ -67,7 +67,7 @@ public:
public:
RimEclipseResultDefinition();
virtual ~RimEclipseResultDefinition();
~RimEclipseResultDefinition() override;
void simpleCopy(const RimEclipseResultDefinition* other);
@@ -115,12 +115,12 @@ public:
protected:
virtual void updateLegendCategorySettings() {};
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly);
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void initAfterRead();
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
void initAfterRead() override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
protected:
caf::PdmField< caf::AppEnum< RiaDefines::ResultCatType > > m_resultType;

16
ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.h
View File

@@ -49,7 +49,7 @@ class RimEclipseStatisticsCase : public RimEclipseCase
public:
RimEclipseStatisticsCase();
virtual ~RimEclipseStatisticsCase();
~RimEclipseStatisticsCase() override;
void setMainGrid(RigMainGrid* mainGrid);
@@ -60,8 +60,8 @@ public:
void updateConnectedEditorsAndReservoirViews();
virtual bool openEclipseGridFile();
virtual void reloadEclipseGridFile();
bool openEclipseGridFile() override;
void reloadEclipseGridFile() override;
RimCaseCollection* parentStatisticsCaseCollection() const;
@@ -73,7 +73,7 @@ public:
};
caf::PdmField< bool > m_calculateEditCommand;
virtual void updateFilePathsFromProjectPath(const QString& projectPath, const QString& oldProjectPath){}
void updateFilePathsFromProjectPath(const QString& projectPath, const QString& oldProjectPath) override{}
void populateResultSelectionAfterLoadingGrid();
@@ -91,11 +91,11 @@ private:
void setWellResultsAndUpdateViews(const cvf::Collection<RigSimWellData>& sourceCaseSimWellData);
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) ;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly );
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) 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;
virtual void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute );
void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute ) override;
private:
caf::PdmField< caf::AppEnum< RiaDefines::ResultCatType > > m_resultType;

2
ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.h
View File

@@ -42,7 +42,7 @@ class RimEclipseStatisticsCaseCollection : public caf::PdmObject
public:
RimEclipseStatisticsCaseCollection();
virtual ~RimEclipseStatisticsCaseCollection();
~RimEclipseStatisticsCaseCollection() override;
caf::PdmChildArrayField<RimEclipseStatisticsCase*> cases;

38
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@@ -78,7 +78,7 @@ class RimEclipseView : public RimGridView
CAF_PDM_HEADER_INIT;
public:
RimEclipseView();
virtual ~RimEclipseView();
~RimEclipseView() override;
RimEclipseCellColors* cellResult() const;
RimCellEdgeColors* cellEdgeResult() const;
@@ -93,7 +93,7 @@ public:
bool showMainGrid() const;
// Access internal objects
virtual const RimPropertyFilterCollection* propertyFilterCollection() const override;
const RimPropertyFilterCollection* propertyFilterCollection() const override;
RimEclipsePropertyFilterCollection* eclipsePropertyFilterCollection();
const RimEclipsePropertyFilterCollection* eclipsePropertyFilterCollection() const;
@@ -105,7 +105,7 @@ public:
void setEclipseCase(RimEclipseCase* reservoir);
RimEclipseCase* eclipseCase() const;
virtual RimCase* ownerCase() const override;
RimCase* ownerCase() const override;
RigMainGrid* mainGrid() const;
@@ -113,7 +113,7 @@ public:
bool isTimeStepDependentDataVisible() const override;
virtual void scheduleGeometryRegen(RivCellSetEnum geometryType) override;
void scheduleGeometryRegen(RivCellSetEnum geometryType) override;
void scheduleReservoirGridGeometryRegen();
void scheduleSimWellGeometryRegen();
void updateDisplayModelForWellResults();
@@ -131,42 +131,42 @@ public:
void calculateVisibleWellCellsIncFence(cvf::UByteArray* visibleCells, RigGridBase * grid);
// Overridden PDM methods:
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;
void updateIconStateForFilterCollections();
virtual void axisLabels(cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel) override;
void axisLabels(cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel) override;
virtual bool isUsingFormationNames() const override;
bool isUsingFormationNames() const override;
virtual void calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility, int timeStep) override;
void calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility, int timeStep) override;
std::vector<RimLegendConfig*> legendConfigs() const override;
cvf::Color4f colorFromCellCategory(RivCellSetEnum geometryType) const;
protected:
virtual void initAfterRead() override;
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
virtual void onLoadDataAndUpdate() override;
void initAfterRead() override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
void onLoadDataAndUpdate() override;
virtual void createPartCollectionFromSelection(cvf::Collection<cvf::Part>* parts) override;
virtual bool showActiveCellsOnly() override;
void createPartCollectionFromSelection(cvf::Collection<cvf::Part>* parts) override;
bool showActiveCellsOnly() override;
private:
void createDisplayModel() override;
void updateDisplayModelVisibility() override;
virtual void updateCurrentTimeStep() override;
void updateCurrentTimeStep() override;
void indicesToVisibleGrids(std::vector<size_t>* gridIndices);
virtual void updateScaleTransform() override;
virtual cvf::Transform* scaleTransform() override;
void updateScaleTransform() override;
cvf::Transform* scaleTransform() override;
virtual void updateStaticCellColors() override;
void updateStaticCellColors() override;
void updateStaticCellColors(RivCellSetEnum geometryType);
void updateLegends() override;
void updateMinMaxValuesAndAddLegendToView(QString legendLabel, RimEclipseCellColors* resultColors, RigCaseCellResultsData* cellResultsData);
virtual void resetLegendsInViewer() override;
void resetLegendsInViewer() override;
void updateVirtualConnectionLegendRanges();
std::set<RivCellSetEnum> allVisibleFaultGeometryTypes() const;

2
ApplicationCode/ProjectDataModel/RimExportInputPropertySettings.h
View File

@@ -36,6 +36,6 @@ public:
caf::PdmField<QString> eclipseKeyword;
protected:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
};

10
ApplicationCode/ProjectDataModel/RimFaultInView.h
View File

@@ -40,16 +40,16 @@ class RimFaultInView : public caf::PdmObject
public:
RimFaultInView();
virtual ~RimFaultInView();
~RimFaultInView() override;
void setFaultGeometry(const RigFault* faultGeometry);
const RigFault* faultGeometry() const;
virtual caf::PdmFieldHandle* userDescriptionField();
virtual caf::PdmFieldHandle* objectToggleField();
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void initAfterRead();
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void initAfterRead() override;
caf::PdmField<bool> showFault;

2
ApplicationCode/ProjectDataModel/RimFaultInViewCollection.h
View File

@@ -55,7 +55,7 @@ public:
public:
RimFaultInViewCollection();
virtual ~RimFaultInViewCollection();
~RimFaultInViewCollection() override;
void syncronizeFaults();

6
ApplicationCode/ProjectDataModel/RimFileWellPath.h
View File

@@ -24,7 +24,7 @@ class RimFileWellPath : public RimWellPath
public:
RimFileWellPath();
~RimFileWellPath();
~RimFileWellPath() override;
QString filepath() const;
void setFilepath(const QString& path);
@@ -40,7 +40,7 @@ private:
QString getCacheFileName();
QString getCacheDirectoryPath();
virtual void setupBeforeSave() override;
void setupBeforeSave() override;
caf::PdmField<QString> m_filepath;
caf::PdmField<int> m_wellPathIndexInFile; // -1 means none.
@@ -53,7 +53,7 @@ private:
caf::PdmField<QString> m_surveyType;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
};

6
ApplicationCode/ProjectDataModel/RimFormationNames.h
View File

@@ -32,7 +32,7 @@ class RimFormationNames : public caf::PdmObject
public:
RimFormationNames();
~RimFormationNames();
~RimFormationNames() override;
void setFileName(const QString& fileName);
const QString& fileName();
@@ -45,8 +45,8 @@ public:
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath);
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void initAfterRead() override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void initAfterRead() override;
private:
void updateUiTreeName();

2
ApplicationCode/ProjectDataModel/RimFormationNamesCollection.h
View File

@@ -31,7 +31,7 @@ class RimFormationNamesCollection: public caf::PdmObject
public:
RimFormationNamesCollection();
~RimFormationNamesCollection();
~RimFormationNamesCollection() override;
const caf::PdmChildArrayField<RimFormationNames*>& formationNamesList() const { return m_formationNamesList;}

36
ApplicationCode/ProjectDataModel/RimGeoMechCase.h
View File

@@ -51,7 +51,7 @@ public:
CASE_OPEN_ERROR
};
RimGeoMechCase(void);
virtual ~RimGeoMechCase(void);
~RimGeoMechCase(void) override;
void setFileName(const QString& fileName);
QString caseFileName() const;
@@ -64,18 +64,18 @@ public:
RimGeoMechView* createAndAddReservoirView();
virtual void updateFilePathsFromProjectPath(const QString& projectPath, const QString& oldProjectPath);
void updateFilePathsFromProjectPath(const QString& projectPath, const QString& oldProjectPath) override;
virtual std::vector<QDateTime> timeStepDates() const override;
virtual QStringList timeStepStrings() const override;
virtual QString timeStepName(int frameIdx) const override;
std::vector<QDateTime> timeStepDates() const override;
QStringList timeStepStrings() const override;
QString timeStepName(int frameIdx) const override;
virtual cvf::BoundingBox activeCellsBoundingBox() const override;
virtual cvf::BoundingBox allCellsBoundingBox() const override;
cvf::BoundingBox activeCellsBoundingBox() const override;
cvf::BoundingBox allCellsBoundingBox() const override;
virtual double characteristicCellSize() const override;
double characteristicCellSize() const override;
virtual void setFormationNames(RimFormationNames* formationNames) override;
void setFormationNames(RimFormationNames* formationNames) override;
void addElementPropertyFiles(const std::vector<caf::FilePath>& filenames);
@@ -87,24 +87,24 @@ public:
caf::PdmChildArrayField<RimGeoMechView*> geoMechViews;
private:
virtual cvf::Vec3d displayModelOffset() const override;
cvf::Vec3d displayModelOffset() const override;
static std::vector<QDateTime> vectorOfValidDateTimesFromTimeStepStrings(const QStringList& timeStepStrings);
static QDateTime dateTimeFromTimeStepString(const QString& timeStepString);
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 = "") override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual 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;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual void updateFormationNamesData() override;
void updateFormationNamesData() override;
virtual void initAfterRead() override;
void initAfterRead() override;
static QString subStringOfDigits(const QString& timeStepString, int numberOfDigitsToFind);
void closeSelectedElementPropertyFiles();
void reloadSelectedElementPropertyFiles();
virtual std::vector<Rim3dView*> allSpecialViews() const override;
std::vector<Rim3dView*> allSpecialViews() const override;
private:
cvf::ref<RigGeoMechCaseData> m_geoMechCaseData;

4
ApplicationCode/ProjectDataModel/RimGeoMechCellColors.h
View File

@@ -37,12 +37,12 @@ class RimGeoMechCellColors : public RimGeoMechResultDefinition
public:
RimGeoMechCellColors(void);
virtual ~RimGeoMechCellColors(void);
~RimGeoMechCellColors(void) override;
caf::PdmChildField<RimRegularLegendConfig*> legendConfig;
void updateIconState();
virtual void initAfterRead() override;
void initAfterRead() override;
protected:
void updateLegendCategorySettings() override;

2
ApplicationCode/ProjectDataModel/RimGeoMechModels.h
View File

@@ -36,7 +36,7 @@ class RimGeoMechModels : public caf::PdmObject
public:
RimGeoMechModels(void);
virtual ~RimGeoMechModels(void);
~RimGeoMechModels(void) override;
caf::PdmChildArrayField<RimGeoMechCase*> cases;

10
ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.h
View File

@@ -37,7 +37,7 @@ class RimGeoMechPropertyFilter : public RimPropertyFilter
public:
RimGeoMechPropertyFilter();
virtual ~RimGeoMechPropertyFilter();
~RimGeoMechPropertyFilter() override;
caf::PdmChildField<RimGeoMechResultDefinition*> resultDefinition;
@@ -54,10 +54,10 @@ public:
bool isActiveAndHasResult();
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) ;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName);
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
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;
private:
void updateReadOnlyStateOfAllFields();

4
ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.h
View File

@@ -37,7 +37,7 @@ class RimGeoMechPropertyFilterCollection : public RimPropertyFilterCollection
CAF_PDM_HEADER_INIT;
public:
RimGeoMechPropertyFilterCollection();
virtual ~RimGeoMechPropertyFilterCollection();
~RimGeoMechPropertyFilterCollection() override;
RimGeoMechView* reservoirView();
@@ -54,5 +54,5 @@ public:
protected:
// Overridden methods
virtual void initAfterRead() override;
void initAfterRead() override;
};

12
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h
View File

@@ -42,7 +42,7 @@ class RimGeoMechResultDefinition : public RimFemResultObserver
CAF_PDM_HEADER_INIT;
public:
RimGeoMechResultDefinition(void);
virtual ~RimGeoMechResultDefinition(void);
~RimGeoMechResultDefinition(void) override;
void setGeoMechCase(RimGeoMechCase* geomCase);
@@ -52,7 +52,7 @@ public:
void setAddWellPathDerivedResults(bool addWellPathDerivedResults);
RigFemResultAddress resultAddress() const;
virtual std::vector<RigFemResultAddress> observedResults() const override;
std::vector<RigFemResultAddress> observedResults() const override;
RigFemResultPosEnum resultPositionType() const;
QString resultFieldName() const;
@@ -66,18 +66,18 @@ public:
protected:
virtual void updateLegendCategorySettings() {};
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
// Overridden PDM methods
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,
void fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue) override;
virtual void initAfterRead() override;
void initAfterRead() override;
// Metadata and option build tools

38
ApplicationCode/ProjectDataModel/RimGeoMechView.h
View File

@@ -61,16 +61,16 @@ class RimGeoMechView : public RimGridView
public:
RimGeoMechView(void);
virtual ~RimGeoMechView(void);
~RimGeoMechView(void) override;
void setGeoMechCase(RimGeoMechCase* gmCase);
RimGeoMechCase* geoMechCase();
virtual RimCase* ownerCase() const override;
RimCase* ownerCase() const override;
caf::PdmChildField<RimGeoMechCellColors*> cellResult;
RimGeoMechResultDefinition* cellResultResultDefinition();
virtual const RimPropertyFilterCollection* propertyFilterCollection() const override;
const RimPropertyFilterCollection* propertyFilterCollection() const override;
RimGeoMechPropertyFilterCollection* geoMechPropertyFilterCollection();
const RimGeoMechPropertyFilterCollection* geoMechPropertyFilterCollection() const;
@@ -78,15 +78,15 @@ public:
bool isTimeStepDependentDataVisible() const override ;
virtual cvf::Transform* scaleTransform() override;
virtual void scheduleGeometryRegen(RivCellSetEnum geometryType) override;
cvf::Transform* scaleTransform() override;
void scheduleGeometryRegen(RivCellSetEnum geometryType) override;
void updateIconStateForFilterCollections();
virtual void axisLabels(cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel) override;
void axisLabels(cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel) override;
virtual bool isUsingFormationNames() const override;
bool isUsingFormationNames() const override;
virtual void calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility, int timeStep) override;
void calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility, int timeStep) override;
void updateLegendTextAndRanges(RimRegularLegendConfig* legendConfig, int timeStepIndex);
@@ -102,28 +102,28 @@ public:
void convertCameraPositionFromOldProjectFiles();
protected:
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
virtual void onLoadDataAndUpdate() override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
void onLoadDataAndUpdate() override;
virtual void createPartCollectionFromSelection(cvf::Collection<cvf::Part>* parts) override;
void createPartCollectionFromSelection(cvf::Collection<cvf::Part>* parts) override;
private:
virtual void createDisplayModel() override;
virtual void updateScaleTransform() override;
void createDisplayModel() override;
void updateScaleTransform() override;
virtual void clampCurrentTimestep() override;
void clampCurrentTimestep() override;
virtual void updateCurrentTimeStep() override;
virtual void updateStaticCellColors() override;
void updateCurrentTimeStep() override;
void updateStaticCellColors() override;
virtual void resetLegendsInViewer() override;
void resetLegendsInViewer() override;
void updateLegends() override;
void updateTensorLegendTextAndRanges(RimRegularLegendConfig* legendConfig, int timeStepIndex);
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void initAfterRead() override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void initAfterRead() override;
caf::PdmChildField<RimTensorResults*> m_tensorResults;

2
ApplicationCode/ProjectDataModel/RimGeometrySelectionItem.h
View File

@@ -25,7 +25,7 @@ class RimGeometrySelectionItem : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimGeometrySelectionItem();
virtual ~RimGeometrySelectionItem();
~RimGeometrySelectionItem() override;
virtual QString geometrySelectionText() const = 0;
};

8
ApplicationCode/ProjectDataModel/RimGridCollection.h
View File

@@ -32,14 +32,14 @@ class RimGridCollection : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimGridCollection();
virtual ~RimGridCollection();
~RimGridCollection() override;
virtual caf::PdmFieldHandle* objectToggleField();
caf::PdmFieldHandle* objectToggleField() override;
caf::PdmField<bool> isActive;
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void initAfterRead();
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void initAfterRead() override;
};

14
ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.h
View File

@@ -48,7 +48,7 @@ public:
public:
RimGridTimeHistoryCurve();
virtual ~RimGridTimeHistoryCurve();
~RimGridTimeHistoryCurve() override;
void setFromSelectionItem(const RiuSelectionItem* selectionItem);
RiaDefines::PlotAxis yAxis() const;
@@ -62,14 +62,14 @@ public:
QString caseName() const;
protected:
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 defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void initAfterRead() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void initAfterRead() override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
RigMainGrid* mainGrid();

12
ApplicationCode/ProjectDataModel/RimGridView.h
View File

@@ -35,7 +35,7 @@ class RimGridView : public Rim3dView
CAF_PDM_HEADER_INIT;
public:
RimGridView();
virtual ~RimGridView(void);
~RimGridView(void) override;
void showGridCells(bool enableGridCells);
@@ -57,17 +57,17 @@ public:
RimViewLinker* assosiatedViewLinker() const override;
virtual bool isGridVisualizationMode() const override;
bool isGridVisualizationMode() const override;
Rim2dGridProjection* grid2dProjection() const;
protected:
virtual void initAfterRead() override;
virtual void onTimeStepChanged() override;
void initAfterRead() override;
void onTimeStepChanged() override;
virtual void calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility, int timeStep) = 0;
virtual void selectOverlayInfoConfig() override;
void selectOverlayInfoConfig() override;
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;
protected: // Fields
caf::PdmChildField<RimIntersectionCollection*> m_crossSectionCollection;

4
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.h
View File

@@ -47,7 +47,7 @@ class RimIdenticalGridCaseGroup : public caf::PdmObject
public:
RimIdenticalGridCaseGroup();
virtual ~RimIdenticalGridCaseGroup();
~RimIdenticalGridCaseGroup() override;
caf::PdmField<QString> name;
caf::PdmField<int> groupId;
@@ -73,7 +73,7 @@ public:
static bool isStatisticsCaseCollection(RimCaseCollection* rimCaseCollection);
protected:
virtual caf::PdmFieldHandle* userDescriptionField();
caf::PdmFieldHandle* userDescriptionField() override;
private:
void updateMainGridAndActiveCellsForStatisticsCases();

14
ApplicationCode/ProjectDataModel/RimIntersection.h
View File

@@ -68,7 +68,7 @@ public:
public:
RimIntersection();
~RimIntersection();
~RimIntersection() override;
caf::PdmField<QString> name;
caf::PdmField<bool> isActive;
@@ -108,16 +108,16 @@ public:
void rebuildGeometryAndScheduleCreateDisplayModel();
protected:
virtual caf::PdmFieldHandle* userDescriptionField();
virtual caf::PdmFieldHandle* objectToggleField();
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;
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;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly);
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
private:

14
ApplicationCode/ProjectDataModel/RimIntersectionBox.h
View File

@@ -58,7 +58,7 @@ public:
public:
RimIntersectionBox();
~RimIntersectionBox();
~RimIntersectionBox() override;
// Fields
caf::PdmField<QString> name;
@@ -77,13 +77,13 @@ public:
void setToDefaultSizeSlice(SinglePlaneState plane, const cvf::Vec3d& position);
protected:
virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual caf::PdmFieldHandle* objectToggleField() override;
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute) 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 initAfterRead() override;
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;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void initAfterRead() override;
protected slots:
void slotScheduleRedraw();

6
ApplicationCode/ProjectDataModel/RimIntersectionCollection.h
View File

@@ -47,7 +47,7 @@ class RimIntersectionCollection : public caf::PdmObject
public:
RimIntersectionCollection();
~RimIntersectionCollection();
~RimIntersectionCollection() override;
caf::PdmField<bool> isActive;
@@ -77,8 +77,8 @@ public:
std::vector<RimIntersectionBox*> intersectionBoxes() const;
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual caf::PdmFieldHandle* objectToggleField();
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* objectToggleField() override;
private:
caf::PdmChildArrayField<RimIntersection*> m_intersections;

2
ApplicationCode/ProjectDataModel/RimLegendConfig.h
View File

@@ -36,7 +36,7 @@ class RimLegendConfig : public caf::PdmObject
public:
RimLegendConfig();
virtual ~RimLegendConfig();
~RimLegendConfig() override;
enum RangeModeType
{

6
ApplicationCode/ProjectDataModel/RimMainPlotCollection.h
View File

@@ -47,7 +47,7 @@ class RimMainPlotCollection : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimMainPlotCollection();
virtual ~RimMainPlotCollection();
~RimMainPlotCollection() override;
RimWellLogPlotCollection* wellLogPlotCollection();
RimRftPlotCollection* rftPlotCollection();
@@ -63,8 +63,8 @@ public:
private:
// Overridden PDM methods
virtual caf::PdmFieldHandle* objectToggleField();
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
caf::PdmFieldHandle* objectToggleField() override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
caf::PdmChildField<RimWellLogPlotCollection*> m_wellLogPlotCollection;

4
ApplicationCode/ProjectDataModel/RimMdiWindowController.h
View File

@@ -37,7 +37,7 @@ class RimMdiWindowController : public caf::PdmObject
public:
RimMdiWindowController();
virtual ~RimMdiWindowController();
~RimMdiWindowController() override;
void setMdiWindowGeometry(const RimMdiWindowGeometry& windowGeometry);
RimMdiWindowGeometry mdiWindowGeometry();
@@ -53,7 +53,7 @@ protected:
RiuMainWindowBase* getMainWindow();
// Overridden PDM methods
virtual void setupBeforeSave() override;
void setupBeforeSave() override;
private:

8
ApplicationCode/ProjectDataModel/RimMimeData.h
View File

@@ -38,8 +38,8 @@ public:
void setIndexes(const QModelIndexList& indexes);
const QModelIndexList& indexes() const;
virtual bool hasFormat(const QString& mimetype) const;
virtual QStringList formats() const;
bool hasFormat(const QString& mimetype) const override;
QStringList formats() const override;
static QString formatName();
private:
@@ -62,8 +62,8 @@ public:
void setReferences(const std::vector<QString>& references);
const std::vector<QString>& references() const;
virtual bool hasFormat(const QString& mimetype) const;
virtual QStringList formats() const;
bool hasFormat(const QString& mimetype) const override;
QStringList formats() const override;
static QString formatName();
private:

6
ApplicationCode/ProjectDataModel/RimMockModelSettings.h
View File

@@ -34,7 +34,7 @@ class RimMockModelSettings : public caf::PdmObject
public:
RimMockModelSettings();
virtual ~RimMockModelSettings();
~RimMockModelSettings() override;
caf::PdmField<quint64> cellCountX;
caf::PdmField<quint64> cellCountY;
@@ -46,8 +46,8 @@ public:
caf::PdmField<quint64> timeStepCount;
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;
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering );
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
};

4
ApplicationCode/ProjectDataModel/RimModeledWellPath.h
View File

@@ -31,7 +31,7 @@ class RimModeledWellPath: public RimWellPath
public:
RimModeledWellPath();
~RimModeledWellPath();
~RimModeledWellPath() override;
void createWellPathGeometry();
void updateWellPathVisualization();
@@ -40,7 +40,7 @@ public:
QString wellPlanText();
private:
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) override;
caf::PdmChildField<RimWellPathGeometryDef*> m_geometryDefinition;

8
ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.h
View File

@@ -38,7 +38,7 @@ class RimMultiSnapshotDefinition : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimMultiSnapshotDefinition();
virtual ~RimMultiSnapshotDefinition();
~RimMultiSnapshotDefinition() override;
caf::PdmField<bool> isActive;
@@ -65,14 +65,14 @@ public:
caf::PdmPtrArrayField<RimCase*> additionalCases;
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
void getTimeStepStrings(QList<caf::PdmOptionItemInfo> &options);
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;
QList<caf::PdmOptionItemInfo> toOptionList(const QStringList& varList);
};

6
ApplicationCode/ProjectDataModel/RimNameConfig.h
View File

@@ -43,7 +43,7 @@ class RimNameConfig : public caf::PdmObject
public:
RimNameConfig(const RimNameConfigHolderInterface* configHolder = nullptr);
virtual ~RimNameConfig();
~RimNameConfig() override;
QString customName() const;
void setCustomName(const QString& name);
virtual void enableAllAutoNameTags(bool enable) {}
@@ -53,10 +53,10 @@ public:
virtual caf::PdmUiGroup* createUiGroup(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
protected:
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;
QString autoName() const;
virtual void updateAllSettings();
virtual void initAfterRead() override;
void initAfterRead() override;
protected:
caf::PdmField<bool> m_isUsingAutoName_OBSOLETE;

4
ApplicationCode/ProjectDataModel/RimNamedObject.h
View File

@@ -32,13 +32,13 @@ class RimNamedObject : public caf::PdmObject
public:
RimNamedObject(void);
virtual ~RimNamedObject(void);
~RimNamedObject(void) override;
QString name() const;
void setName(const QString& name);
protected:
virtual caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* userDescriptionField() override;
// To be used from derived objects when manipulating visibility and ui ordering
caf::PdmFieldHandle* nameField();

2
ApplicationCode/ProjectDataModel/RimNoCommonAreaNNC.h
View File

@@ -36,6 +36,6 @@ public:
caf::PdmField<QString> name;
caf::PdmFieldHandle* userDescriptionField();
caf::PdmFieldHandle* userDescriptionField() override;
};

4
ApplicationCode/ProjectDataModel/RimNoCommonAreaNncCollection.h
View File

@@ -35,11 +35,11 @@ class RimNoCommonAreaNncCollection : public caf::PdmObject
CAF_PDM_HEADER_INIT;
public:
RimNoCommonAreaNncCollection();
virtual ~RimNoCommonAreaNncCollection();
~RimNoCommonAreaNncCollection() override;
void updateName();
virtual caf::PdmFieldHandle* userDescriptionField();
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmField<QString> name;
caf::PdmChildArrayField<RimNoCommonAreaNNC*> noCommonAreaNncs;

2
ApplicationCode/ProjectDataModel/RimOilField.h
View File

@@ -44,7 +44,7 @@ class RimOilField : public caf::PdmObject
public:
RimOilField(void);
virtual ~RimOilField(void);
~RimOilField(void) override;
QString uniqueShortNameForCase(RimSummaryCase* summaryCase);

Some files were not shown because too many files have changed in this diff Show More