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

#3677 2d Maps: Make sure property filters are handled correctly.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-11-13 11:51:04 +01:00
parent ea053eac2d
commit f3a353039c
4 changed files with 85 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@@ -92,7 +92,6 @@ public:
// Access internal objects
const RimPropertyFilterCollection* propertyFilterCollection() const override;
RimPropertyFilterCollection* nonOverridePropertyFilterCollection();
RimEclipsePropertyFilterCollection* eclipsePropertyFilterCollection();
const RimEclipsePropertyFilterCollection* eclipsePropertyFilterCollection() const;
@@ -138,7 +137,7 @@ public:
bool isUsingFormationNames() const override;
void calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility, int timeStep) override;
virtual void calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility, int timeStep) override;
virtual std::vector<RimLegendConfig*> legendConfigs() const override;
cvf::Color4f colorFromCellCategory(RivCellSetEnum geometryType) const;
@@ -152,7 +151,12 @@ protected:
void createPartCollectionFromSelection(cvf::Collection<cvf::Part>* parts) override;
bool showActiveCellsOnly() override;
virtual void updateCurrentTimeStep() override;
void updateVisibleGeometriesAndCellColors();
void appendWellsAndFracturesToModel();
virtual void createDisplayModel() override;
RimPropertyFilterCollection* nativePropertyFilterCollection();
virtual std::set<RivCellSetEnum> allVisibleFaultGeometryTypes() const;
private:
void updateDisplayModelVisibility() override;
@@ -169,7 +173,6 @@ private:
void resetLegendsInViewer() override;
void updateVirtualConnectionLegendRanges();
std::set<RivCellSetEnum> allVisibleFaultGeometryTypes() const;
void updateFaultColors();
void syncronizeWellsWithResults();