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

#1626 RimView: Add overrides in RimEclipseView and RimGeoMechView

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@ -97,8 +97,8 @@ public:
caf::PdmChildField<RimStimPlanColors*> stimPlanColors;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmChildField<RimSimWellInViewCollection*> wellCollection;
caf::PdmChildField<RimFaultInViewCollection*> faultCollection;
caf::PdmChildField<RimSimWellInViewCollection*> wellCollection;
caf::PdmChildField<RimFaultInViewCollection*> faultCollection;
// Fields
@ -107,7 +107,7 @@ public:
caf::PdmField<bool> 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<cvf::Part>* parts);
virtual bool showActiveCellsOnly();
virtual void createPartCollectionFromSelection(cvf::Collection<cvf::Part>* 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<size_t>* 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<RivCellSetEnum> allVisibleFaultGeometryTypes() const;
void updateFaultColors();
void syncronizeWellsWithResults();
void clampCurrentTimestep();
void clampCurrentTimestep() override;
caf::PdmChildField<RimEclipsePropertyFilterCollection*> m_propertyFilterCollection;

32
ApplicationCode/ProjectDataModel/RimGeoMechView.h
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;