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

(#483) Linked Views: Acknowledge visible cells override when disabling tree items

Browse Source 
(Filter items)
This commit is contained in:
Jacob Støren 2015-09-25 14:44:47 +02:00
parent 49ab79219e
commit c065d625e2
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
View File

@ -321,7 +321,8 @@ void RimCellRangeFilterCollection::updateIconState()
bool activeIcon = true;
RimViewController* viewController = baseView()->viewController();
if (viewController && viewController->isRangeFilterOveridden())
if (viewController && ( viewController->isRangeFilterOveridden()
|| viewController->isVisibleCellsOveridden()) )
{
activeIcon = false;
}

3
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.cpp
View File

@ -157,7 +157,8 @@ void RimEclipsePropertyFilterCollection::updateIconState()
RimEclipseView* view = NULL;
this->firstAnchestorOrThisOfType(view);
RimViewController* viewController = view->viewController();
if (viewController && viewController->isPropertyFilterOveridden())
if (viewController && (viewController->isPropertyFilterOveridden()
|| viewController->isVisibleCellsOveridden()))
{
activeIcon = false;
}

3
ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp
View File

@ -159,7 +159,8 @@ void RimGeoMechPropertyFilterCollection::updateIconState()
RimGeoMechView* view = NULL;
this->firstAnchestorOrThisOfType(view);
RimViewController* viewController = view->viewController();
if (viewController && viewController->isPropertyFilterOveridden())
if (viewController && ( viewController->isPropertyFilterOveridden()
|| viewController->isVisibleCellsOveridden()))
{
activeIcon = false;
}