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

Faults: Show faults when filters are active

Browse Source
This commit is contained in:
Magne Sjaastad
2014-01-06 12:06:36 +01:00
parent d393368df4
commit c569b9fac1
7 changed files with 132 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@@ -44,6 +44,8 @@ RivReservoirFaultsPartMgr::RivReservoirFaultsPartMgr(const RigMainGrid* grid, c
m_faultParts.push_back(new RivFaultPartMgr(grid, faultCollection, faultCollection->faults[i]));
}
}
m_isFilterPart = false;
}
//--------------------------------------------------------------------------------------------------
@@ -100,19 +102,25 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
// Parts that is overridden by the grid settings
if (rimFault->showFault() || isShowingGrid)
bool forceDisplayOfFault = false;
if (isShowingGrid && m_isFilterPart)
{
if (m_faultCollection->showFaultFaces() || isShowingGrid)
forceDisplayOfFault = true;
}
if (rimFault->showFault() || forceDisplayOfFault)
{
if (m_faultCollection->showFaultFaces() || forceDisplayOfFault)
{
rivFaultPart->appendNativeFaultFacesToModel(&parts);
}
if (m_faultCollection->showOppositeFaultFaces() || isShowingGrid)
if (m_faultCollection->showOppositeFaultFaces() || forceDisplayOfFault)
{
rivFaultPart->appendOppositeFaultFacesToModel(&parts);
}
if (m_faultCollection->showFaultFaces() || m_faultCollection->showOppositeFaultFaces() || m_faultCollection->showNNCs() || isShowingGrid)
if (m_faultCollection->showFaultFaces() || m_faultCollection->showOppositeFaultFaces() || m_faultCollection->showNNCs() || forceDisplayOfFault)
{
rivFaultPart->appendMeshLinePartsToModel(&parts);
}
@@ -218,3 +226,11 @@ void RivReservoirFaultsPartMgr::appendLabelPartsToModel(cvf::ModelBasicList* mod
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirFaultsPartMgr::setFilterPart(bool filterPart)
{
m_isFilterPart = filterPart;
}