OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Range filter: Add grid type drop-down list to enable LGR-grid range filtering

Browse Source 
TP#3995
p4#: 21408
This commit is contained in:
Jacob Støren
2013-04-24 12:00:45 +02:00
parent 4ad0a05822
commit 10e6fbc5bd
9 changed files with 192 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
+2 -2
View File
@@ -62,7 +62,7 @@ void RimCellRangeFilterCollection::setReservoirView(RimReservoirView* reservoirV
/// RimCellRangeFilter is using Eclipse 1-based indexing, adjust filter values before
// populating cvf::CellRangeFilter (which is 0-based)
//--------------------------------------------------------------------------------------------------
void RimCellRangeFilterCollection::compoundCellRangeFilter(cvf::CellRangeFilter* cellRangeFilter) const
void RimCellRangeFilterCollection::compoundCellRangeFilter(cvf::CellRangeFilter* cellRangeFilter, const RigGridBase* grid) const
{
CVF_ASSERT(cellRangeFilter);
@@ -71,7 +71,7 @@ void RimCellRangeFilterCollection::compoundCellRangeFilter(cvf::CellRangeFilter*
{
RimCellRangeFilter* rangeFilter = *it;
if (rangeFilter && rangeFilter->active)
if (rangeFilter && rangeFilter->active && rangeFilter->gridIndex() == grid->gridIndex())
{
if (rangeFilter->filterMode == RimCellFilter::INCLUDE)
{