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

#3590 Fix changing ov property filter of linked maps. Stop being able to modify a slave.

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-10-31 13:04:47 +01:00
parent 6c25aff479
commit 32fb09ca3c
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/Rim2dEclipseView.cpp
View File

@ -119,7 +119,7 @@ void Rim2dEclipseView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrderi
uiTreeOrdering.add(wellCollection());
uiTreeOrdering.add(faultCollection());
uiTreeOrdering.add(m_rangeFilterCollection());
uiTreeOrdering.add(eclipsePropertyFilterCollection());
uiTreeOrdering.add(nonOverridePropertyFilterCollection());
uiTreeOrdering.skipRemainingChildren();
}

8
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -1853,3 +1853,11 @@ const RimPropertyFilterCollection* RimEclipseView::propertyFilterCollection() co
{
return eclipsePropertyFilterCollection();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimPropertyFilterCollection* RimEclipseView::nonOverridePropertyFilterCollection()
{
return m_propertyFilterCollection();
}

1
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@ -92,6 +92,7 @@ public:
// Access internal objects
const RimPropertyFilterCollection* propertyFilterCollection() const override;
RimPropertyFilterCollection* nonOverridePropertyFilterCollection();
RimEclipsePropertyFilterCollection* eclipsePropertyFilterCollection();
const RimEclipsePropertyFilterCollection* eclipsePropertyFilterCollection() const;