#1068 Access mainGrid directly from RimEclipseView

This commit is contained in:
Magne Sjaastad
2017-01-09 15:15:08 +01:00
parent 5ffb1daeca
commit 9cacf0db6c
6 changed files with 30 additions and 40 deletions

View File

@@ -107,16 +107,13 @@ void RimCellRangeFilterCollection::compoundCellRangeFilter(cvf::CellRangeFilter*
RigMainGrid* RimCellRangeFilterCollection::mainGrid() const
{
RimEclipseView* eclipseView = this->eclipseView();
if (eclipseView &&
eclipseView->eclipseCase() &&
eclipseView->eclipseCase()->reservoirData() &&
eclipseView->eclipseCase()->reservoirData()->mainGrid())
if (eclipseView && eclipseView->mainGrid())
{
return eclipseView->eclipseCase()->reservoirData()->mainGrid();
return eclipseView->mainGrid();
}
return NULL;
return nullptr;
}
//--------------------------------------------------------------------------------------------------