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

(#625) Added access to the generalized propertyFilterCollection in the view

Browse Source
This commit is contained in:
Jacob Støren
2015-11-12 10:48:13 +01:00
parent 8b8fd51862
commit 7b65cb91ce
13 changed files with 67 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimViewController.cpp
View File

@@ -268,7 +268,7 @@ void RimViewController::updateOverrides()
{
if (isPropertyFilterOveridden())
{
manEclView->setOverridePropertyFilterCollection(masterEclipseView->propertyFilterCollection());
manEclView->setOverridePropertyFilterCollection(masterEclipseView->eclipsePropertyFilterCollection());
}
else
{
@@ -284,7 +284,7 @@ void RimViewController::updateOverrides()
{
if (isPropertyFilterOveridden())
{
manGeoView->setOverridePropertyFilterCollection(masterGeoView->propertyFilterCollection());
manGeoView->setOverridePropertyFilterCollection(masterGeoView->geoMechPropertyFilterCollection());
}
else
{
@@ -941,7 +941,7 @@ void RimViewController::updateRangeFilterOverrides(RimCellRangeFilter* changedRa
//--------------------------------------------------------------------------------------------------
void RimViewController::applyRangeFilterCollectionByUserChoice()
{
if (!m_managedView->overrideRangeFilterCollection())
if (!m_managedView->hasOverridenRangeFilterCollection())
{
return;
}