OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-24 07:16:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

(#520)(#503) Made sure the Overridden cells actually overrides always.

Browse Source
This commit is contained in:
Jacob Støren 2015-09-28 10:05:20 +02:00
parent 30f3796bab
commit 5d04655d6a
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -488,7 +488,11 @@ void RimEclipseView::updateCurrentTimeStep()
std::vector<RivCellSetEnum> geometriesToRecolor;
if (this->propertyFilterCollection()->hasActiveFilters())
if (this->viewController() && this->viewController()->isVisibleCellsOveridden())
{
geometriesToRecolor.push_back(OVERRIDDEN_CELL_VISIBILITY);
}
else if (this->propertyFilterCollection()->hasActiveFilters())
{
cvf::ref<cvf::ModelBasicList> frameParts = new cvf::ModelBasicList;
@ -581,11 +585,7 @@ void RimEclipseView::updateCurrentTimeStep()
geometriesToRecolor.push_back(RANGE_FILTERED);
geometriesToRecolor.push_back(RANGE_FILTERED_WELL_CELLS);
}
else if (this->viewController() && this->viewController()->isVisibleCellsOveridden())
{
geometriesToRecolor.push_back(OVERRIDDEN_CELL_VISIBILITY);
}
else
else
{
geometriesToRecolor.push_back(ACTIVE);
geometriesToRecolor.push_back(ALL_WELL_CELLS);
@ -1321,7 +1321,6 @@ std::vector<RivCellSetEnum> RimEclipseView::visibleFaultGeometryTypes() const
std::vector<RivCellSetEnum> faultParts;
if (this->viewController() && this->viewController()->isVisibleCellsOveridden())
{
faultParts.push_back(OVERRIDDEN_CELL_VISIBILITY);
if (this->faultCollection()->showFaultsOutsideFilters())
{
faultParts.push_back(ACTIVE);
@ -1332,6 +1331,10 @@ std::vector<RivCellSetEnum> RimEclipseView::visibleFaultGeometryTypes() const
faultParts.push_back(INACTIVE);
}
}
else
{
faultParts.push_back(OVERRIDDEN_CELL_VISIBILITY);
}
}
else if (this->propertyFilterCollection()->hasActiveFilters() && !faultCollection()->showFaultsOutsideFilters())
{
@ -1348,15 +1351,19 @@ std::vector<RivCellSetEnum> RimEclipseView::visibleFaultGeometryTypes() const
{
faultParts.push_back(ACTIVE);
faultParts.push_back(ALL_WELL_CELLS);
/// Why are these added ? JJS -->
faultParts.push_back(RANGE_FILTERED);
faultParts.push_back(RANGE_FILTERED_WELL_CELLS);
faultParts.push_back(VISIBLE_WELL_CELLS_OUTSIDE_RANGE_FILTER);
faultParts.push_back(VISIBLE_WELL_FENCE_CELLS_OUTSIDE_RANGE_FILTER);
/// <-- JJS
if (this->showInactiveCells())
{
faultParts.push_back(INACTIVE);
/// Why is this added ? JJS -->
faultParts.push_back(RANGE_FILTERED_INACTIVE);
/// <-- JJS
}
}
else if (this->rangeFilterCollection()->hasActiveFilters() && this->wellCollection()->hasVisibleWellCells())