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

Preps for Geomech RangeFilters: Small refactorings

Browse Source
This commit is contained in:
Jacob Støren
2015-05-21 11:46:04 +02:00
parent 2c7a741805
commit 038c578f97
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@@ -608,8 +608,11 @@ void RivReservoirViewPartMgr::copyByteArray(cvf::UByteArray* destination, const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::computeRangeVisibility(ReservoirGeometryCacheType geometryType, cvf::UByteArray* cellVisibility, const RigGridBase* grid, void RivReservoirViewPartMgr::computeRangeVisibility(ReservoirGeometryCacheType geometryType,
const cvf::UByteArray* nativeVisibility, const RimCellRangeFilterCollection* rangeFilterColl) cvf::UByteArray* cellVisibility,
const RigGridBase* grid,
const cvf::UByteArray* nativeVisibility,
const RimCellRangeFilterCollection* rangeFilterColl)
{ {
CVF_ASSERT(cellVisibility != NULL); CVF_ASSERT(cellVisibility != NULL);
CVF_ASSERT(nativeVisibility != NULL); CVF_ASSERT(nativeVisibility != NULL);
@@ -625,7 +628,7 @@ void RivReservoirViewPartMgr::computeRangeVisibility(ReservoirGeometryCacheType
{ {
// Build range filter for current grid // Build range filter for current grid
cvf::CellRangeFilter gridCellRangeFilter; cvf::CellRangeFilter gridCellRangeFilter;
rangeFilterColl->compoundCellRangeFilter(&gridCellRangeFilter, grid); rangeFilterColl->compoundCellRangeFilter(&gridCellRangeFilter, grid->gridIndex());
const RigLocalGrid* lgr = NULL; const RigLocalGrid* lgr = NULL;
cvf::ref<cvf::UByteArray> parentGridVisibilities; cvf::ref<cvf::UByteArray> parentGridVisibilities;

4
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
View File

@@ -65,7 +65,7 @@ void RimCellRangeFilterCollection::setReservoirView(RimEclipseView* reservoirVie
/// RimCellRangeFilter is using Eclipse 1-based indexing, adjust filter values before /// RimCellRangeFilter is using Eclipse 1-based indexing, adjust filter values before
// populating cvf::CellRangeFilter (which is 0-based) // populating cvf::CellRangeFilter (which is 0-based)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellRangeFilterCollection::compoundCellRangeFilter(cvf::CellRangeFilter* cellRangeFilter, const RigGridBase* grid) const void RimCellRangeFilterCollection::compoundCellRangeFilter(cvf::CellRangeFilter* cellRangeFilter, size_t gridIndex) const
{ {
CVF_ASSERT(cellRangeFilter); CVF_ASSERT(cellRangeFilter);
@@ -74,7 +74,7 @@ void RimCellRangeFilterCollection::compoundCellRangeFilter(cvf::CellRangeFilter*
{ {
RimCellRangeFilter* rangeFilter = *it; RimCellRangeFilter* rangeFilter = *it;
if (rangeFilter && rangeFilter->isActive() && static_cast<size_t>(rangeFilter->gridIndex()) == grid->gridIndex()) if (rangeFilter && rangeFilter->isActive() && static_cast<size_t>(rangeFilter->gridIndex()) == gridIndex)
{ {
if (rangeFilter->filterMode == RimCellFilter::INCLUDE) if (rangeFilter->filterMode == RimCellFilter::INCLUDE)
{ {

2
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.h
View File

@@ -42,7 +42,7 @@ public:
RimCellRangeFilter* createAndAppendRangeFilter(); RimCellRangeFilter* createAndAppendRangeFilter();
void remove(RimCellRangeFilter* rangeFilter); void remove(RimCellRangeFilter* rangeFilter);
void compoundCellRangeFilter(cvf::CellRangeFilter* cellRangeFilter, const RigGridBase* grid) const; void compoundCellRangeFilter(cvf::CellRangeFilter* cellRangeFilter, size_t gridIndex) const;
bool hasActiveFilters() const; bool hasActiveFilters() const;
bool hasActiveIncludeFilters() const; bool hasActiveIncludeFilters() const;