From 8deeba66d5900cb617e60fe237ebbec1102e6871 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 18 Nov 2016 13:54:19 +0100 Subject: [PATCH] #945 Added possibility to force watertight flag for property filter geo --- .../RivReservoirViewPartMgr.cpp | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp index 7ab3534070..abf09b397c 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp @@ -1035,11 +1035,28 @@ void RivReservoirViewPartMgr::appendFaultLabelsDynamicGeometryPartsToModel(cvf:: //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RivReservoirViewPartMgr::forceWatertightGeometryOnForType(RivCellSetEnum geometryType, bool forceWatertightGeometry) +void RivReservoirViewPartMgr::forceWatertightGeometryForType(RivCellSetEnum geometryType, bool forceWatertightGeometry) { - if (m_geometriesNeedsRegen[geometryType]) + if (geometryType == PROPERTY_FILTERED) { - createGeometry(geometryType); + for (size_t i = 0; i < m_propFilteredGeometryFrames.size(); ++i) + { + if (m_propFilteredGeometryFrames[i].p()) m_propFilteredGeometryFrames[i]->forceWatertightGeometryOn(forceWatertightGeometry); + } + } + else if (geometryType == PROPERTY_FILTERED_WELL_CELLS) + { + for (size_t i = 0; i < m_propFilteredWellGeometryFrames.size(); ++i) + { + if (m_propFilteredWellGeometryFrames[i].p()) m_propFilteredWellGeometryFrames[i]->forceWatertightGeometryOn(forceWatertightGeometry); + } + } + else + { + if (forceWatertightGeometry && m_geometriesNeedsRegen[geometryType]) + { + createGeometry(geometryType); + } + m_geometries[geometryType].forceWatertightGeometryOn(forceWatertightGeometry); } - m_geometries[geometryType].forceWatertightGeometryOn(forceWatertightGeometry); }