#3558 Grid items in Project Tree : Use main grid to control fault visibility

This commit is contained in:
Magne Sjaastad
2018-10-29 11:23:19 +01:00
parent a424546e7c
commit d353cfb8ec
3 changed files with 16 additions and 1 deletions
@@ -101,7 +101,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
if (!faultCollection) return; if (!faultCollection) return;
bool isShowingGrid = faultCollection->isGridVisualizationMode(); bool isShowingGrid = m_reservoirView->isMainGridVisible();
if (!faultCollection->showFaultCollection() && !isShowingGrid) return; if (!faultCollection->showFaultCollection() && !isShowingGrid) return;
// Check match between model fault count and fault parts // Check match between model fault count and fault parts
@@ -1433,6 +1433,19 @@ bool RimEclipseView::isVirtualConnectionFactorGeometryVisible() const
return true; return true;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimEclipseView::isMainGridVisible() const
{
auto indicesToVisibleGrids = m_gridCollection->indicesToVisibleGrids();
bool isMainGridVisible = std::find(indicesToVisibleGrids.begin(), indicesToVisibleGrids.end(), 0) != indicesToVisibleGrids.end();
if (!isMainGridVisible) return false;
return this->m_gridCollection->isActive();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -119,6 +119,8 @@ public:
void calculateCompletionTypeAndRedrawIfRequired(); void calculateCompletionTypeAndRedrawIfRequired();
bool isVirtualConnectionFactorGeometryVisible() const; bool isVirtualConnectionFactorGeometryVisible() const;
bool isMainGridVisible() const;
const std::vector<RivCellSetEnum>& visibleGridParts() const; const std::vector<RivCellSetEnum>& visibleGridParts() const;
const RivReservoirViewPartMgr* reservoirGridPartManager() const; const RivReservoirViewPartMgr* reservoirGridPartManager() const;