#1626 RimView: Add overrides in RimEclipseView and RimGeoMechView

This commit is contained in:
Rebecca Cox
2017-10-19 10:23:24 +02:00
parent 22159a1c63
commit ff0a8242d4
2 changed files with 36 additions and 36 deletions

View File

@@ -63,12 +63,12 @@ public:
RimGeoMechCase* geoMechCase();
virtual RimCase* ownerCase() const override;
virtual void loadDataAndUpdate();
virtual void loadDataAndUpdate() override;
caf::PdmChildField<RimGeoMechCellColors*> 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<cvf::Part>* parts);
virtual void createPartCollectionFromSelection(cvf::Collection<cvf::Part>* 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;