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

#1189 Fixed well pipe/sphere visibilities when no range filters are active

Browse Source
This commit is contained in:
Magne Sjaastad 2017-02-08 08:04:08 +01:00
parent c8f682b205
commit d5ec760ddd
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
View File

@ -366,10 +366,12 @@ bool RimEclipseWell::isWellPipeVisible(size_t frameIndex) const
if (!this->showWellPipe()) if (!this->showWellPipe())
return false; return false;
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())
{ {
return intersectsDynamicWellCellsFilteredCells(frameIndex); return intersectsDynamicWellCellsFilteredCells(frameIndex);
} }
@ -384,10 +386,10 @@ bool RimEclipseWell::isWellPipeVisible(size_t frameIndex) const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimEclipseWell::isWellSpheresVisible(size_t frameIndex) const bool RimEclipseWell::isWellSpheresVisible(size_t frameIndex) const
{ {
const RimEclipseView* m_reservoirView = nullptr; const RimEclipseView* reservoirView = nullptr;
this->firstAncestorOrThisOfType(m_reservoirView); this->firstAncestorOrThisOfType(reservoirView);
if (m_reservoirView == nullptr) return false; if (reservoirView == nullptr) return false;
if (this->wellResults() == nullptr) return false; if (this->wellResults() == nullptr) return false;
if (frameIndex >= this->wellResults()->m_resultTimeStepIndexToWellTimeStepIndex.size()) if (frameIndex >= this->wellResults()->m_resultTimeStepIndexToWellTimeStepIndex.size())
@ -401,7 +403,7 @@ bool RimEclipseWell::isWellSpheresVisible(size_t frameIndex) const
return false; return false;
} }
if (!m_reservoirView->wellCollection()->isActive()) if (!reservoirView->wellCollection()->isActive())
return false; return false;
if (!this->showWell()) if (!this->showWell())
@ -410,10 +412,11 @@ bool RimEclipseWell::isWellSpheresVisible(size_t frameIndex) const
if (!this->showWellSpheres()) if (!this->showWellSpheres())
return false; return false;
if (m_reservoirView->crossSectionCollection()->hasActiveIntersectionForSimulationWell(this)) if (reservoirView->crossSectionCollection()->hasActiveIntersectionForSimulationWell(this))
return true; return true;
if (m_reservoirView->wellCollection()->showWellsIntersectingVisibleCells()) if (reservoirView->wellCollection()->showWellsIntersectingVisibleCells()
&& reservoirView->rangeFilterCollection()->hasActiveFilters())
{ {
return intersectsDynamicWellCellsFilteredCells(frameIndex); return intersectsDynamicWellCellsFilteredCells(frameIndex);
} }