#2177 Active property filters now considered when evaluation well visibility

This commit is contained in:
Jacob Støren 2017-12-06 12:06:55 +01:00
parent 8608e00b35
commit 03aaa47a60

View File

@ -45,6 +45,7 @@
#include "RigEclipseCaseData.h" #include "RigEclipseCaseData.h"
#include "RigMainGrid.h" #include "RigMainGrid.h"
#include "RigActiveCellInfo.h" #include "RigActiveCellInfo.h"
#include "RimPropertyFilterCollection.h"
CAF_PDM_SOURCE_INIT(RimSimWellInView, "Well"); CAF_PDM_SOURCE_INIT(RimSimWellInView, "Well");
@ -488,8 +489,9 @@ bool RimSimWellInView::isWellPipeVisible(size_t frameIndex) const
if (reservoirView->crossSectionCollection()->hasActiveIntersectionForSimulationWell(this)) if (reservoirView->crossSectionCollection()->hasActiveIntersectionForSimulationWell(this))
return true; return true;
if (reservoirView->wellCollection()->showWellsIntersectingVisibleCells() if ( reservoirView->wellCollection()->showWellsIntersectingVisibleCells()
&& reservoirView->rangeFilterCollection()->hasActiveFilters()) && ( reservoirView->rangeFilterCollection()->hasActiveFilters()
|| reservoirView->propertyFilterCollection()->hasActiveFilters()) )
{ {
return intersectsDynamicWellCellsFilteredCells(frameIndex); return intersectsDynamicWellCellsFilteredCells(frameIndex);
} }