From ff0a8242d4ed98bfac966949661a55dca8b1d0a6 Mon Sep 17 00:00:00 2001 From: Rebecca Cox Date: Thu, 19 Oct 2017 10:23:24 +0200 Subject: [PATCH] #1626 RimView: Add overrides in RimEclipseView and RimGeoMechView --- .../ProjectDataModel/RimEclipseView.h | 40 +++++++++---------- .../ProjectDataModel/RimGeoMechView.h | 32 +++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.h b/ApplicationCode/ProjectDataModel/RimEclipseView.h index f404142241..8a29d3708a 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.h @@ -97,8 +97,8 @@ public: caf::PdmChildField stimPlanColors; #endif // USE_PROTOTYPE_FEATURE_FRACTURES - caf::PdmChildField wellCollection; - caf::PdmChildField faultCollection; + caf::PdmChildField wellCollection; + caf::PdmChildField faultCollection; // Fields @@ -107,7 +107,7 @@ public: caf::PdmField showMainGrid; // Access internal objects - virtual const RimPropertyFilterCollection* propertyFilterCollection() const; + virtual const RimPropertyFilterCollection* propertyFilterCollection() const override; RimEclipsePropertyFilterCollection* eclipsePropertyFilterCollection(); const RimEclipsePropertyFilterCollection* eclipsePropertyFilterCollection() const; @@ -125,10 +125,10 @@ public: // Display model generation - virtual void loadDataAndUpdate(); + virtual void loadDataAndUpdate() override; bool isTimeStepDependentDataVisible() const; - virtual void scheduleGeometryRegen(RivCellSetEnum geometryType); + virtual void scheduleGeometryRegen(RivCellSetEnum geometryType) override; void scheduleReservoirGridGeometryRegen(); void scheduleSimWellGeometryRegen(); void updateDisplayModelForWellResults(); @@ -141,44 +141,44 @@ public: void calculateVisibleWellCellsIncFence(cvf::UByteArray* visibleCells, RigGridBase * grid); // Overridden PDM methods: - virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue); + virtual 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); + virtual void axisLabels(cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel) override; virtual bool isUsingFormationNames() const override; virtual void calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility, int timeStep) override; protected: - virtual void initAfterRead(); - virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ); - virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = ""); + virtual void initAfterRead() override; + virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; + virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override; - virtual void createPartCollectionFromSelection(cvf::Collection* parts); - virtual bool showActiveCellsOnly(); + virtual void createPartCollectionFromSelection(cvf::Collection* parts) override; + virtual bool showActiveCellsOnly() override; private: - void createDisplayModel(); - void updateDisplayModelVisibility(); - virtual void updateCurrentTimeStep(); + void createDisplayModel() override; + void updateDisplayModelVisibility() override; + virtual void updateCurrentTimeStep() override; void indicesToVisibleGrids(std::vector* gridIndices); - virtual void updateScaleTransform(); - virtual cvf::Transform* scaleTransform(); + virtual void updateScaleTransform() override; + virtual cvf::Transform* scaleTransform() override; - virtual void updateStaticCellColors(); + virtual void updateStaticCellColors() override; void updateStaticCellColors(RivCellSetEnum geometryType); void updateLegends(); void updateMinMaxValuesAndAddLegendToView(QString legendLabel, RimEclipseCellColors* resultColors, RigCaseCellResultsData* cellResultsData); - virtual void resetLegendsInViewer(); + virtual void resetLegendsInViewer() override; std::set allVisibleFaultGeometryTypes() const; void updateFaultColors(); void syncronizeWellsWithResults(); - void clampCurrentTimestep(); + void clampCurrentTimestep() override; caf::PdmChildField m_propertyFilterCollection; diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechView.h b/ApplicationCode/ProjectDataModel/RimGeoMechView.h index a1017ffe7a..e5b3bcaadd 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechView.h +++ b/ApplicationCode/ProjectDataModel/RimGeoMechView.h @@ -63,12 +63,12 @@ public: RimGeoMechCase* geoMechCase(); virtual RimCase* ownerCase() const override; - virtual void loadDataAndUpdate(); + virtual void loadDataAndUpdate() override; caf::PdmChildField cellResult; RimGeoMechResultDefinition* cellResultResultDefinition(); - virtual const RimPropertyFilterCollection* propertyFilterCollection() const; + virtual const RimPropertyFilterCollection* propertyFilterCollection() const override; RimGeoMechPropertyFilterCollection* geoMechPropertyFilterCollection(); const RimGeoMechPropertyFilterCollection* geoMechPropertyFilterCollection() const; @@ -76,37 +76,37 @@ public: bool isTimeStepDependentDataVisible(); - virtual cvf::Transform* scaleTransform(); - virtual void scheduleGeometryRegen(RivCellSetEnum geometryType); + virtual cvf::Transform* scaleTransform() override; + virtual void scheduleGeometryRegen(RivCellSetEnum geometryType) override; void updateIconStateForFilterCollections(); - virtual void axisLabels(cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel); + virtual void axisLabels(cvf::String* xLabel, cvf::String* yLabel, cvf::String* zLabel) override; virtual bool isUsingFormationNames() const override; virtual void calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility, int timeStep) override; protected: - virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = ""); + virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override; - virtual void createPartCollectionFromSelection(cvf::Collection* parts); + virtual void createPartCollectionFromSelection(cvf::Collection* parts) override; private: - virtual void createDisplayModel(); - virtual void updateDisplayModelVisibility(); - virtual void updateScaleTransform(); + virtual void createDisplayModel() override; + virtual void updateDisplayModelVisibility() override; + virtual void updateScaleTransform() override; - virtual void clampCurrentTimestep(); + virtual void clampCurrentTimestep() override; - virtual void updateCurrentTimeStep(); - virtual void updateStaticCellColors(); + virtual void updateCurrentTimeStep() override; + virtual void updateStaticCellColors() override; - virtual void resetLegendsInViewer(); + virtual void resetLegendsInViewer() override; void updateLegends(); - virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue); - virtual void initAfterRead(); + virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; + virtual void initAfterRead() override;