#944 Added clear of watertight flag

ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp

@@ -288,6 +288,14 @@ void RivReservoirFaultsPartMgr::forceWatertightGeometryOn()
     m_forceWatertightGeometry = true;
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RivReservoirFaultsPartMgr::clearWatertightGeometryFlag()
+{
+    m_forceWatertightGeometry = false;
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h

@@ -49,7 +49,9 @@ public:
 
     void setTransform(cvf::Transform* scaleTransform);
     void setCellVisibility(cvf::UByteArray* cellVisibilities);
+
     void forceWatertightGeometryOn();
+    void clearWatertightGeometryFlag();
 
     void setOpacityLevel(float opacity);
     void applySingleColorEffect();

ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp

@@ -199,6 +199,17 @@ void RivReservoirPartMgr::forceWatertightGeometryOn()
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RivReservoirPartMgr::clearWatertightGeometryFlag()
+{
+    if (m_faultsPartMgr.notNull())
+    {
+        m_faultsPartMgr->clearWatertightGeometryFlag();
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ModelVisualization/RivReservoirPartMgr.h

@@ -50,7 +50,9 @@ public:
     void   clearAndSetReservoir(const RigCaseData* eclipseCase, RimEclipseView* reservoirView);
     void   setTransform(cvf::Transform* scaleTransform);
     void   setCellVisibility(size_t gridIndex, cvf::UByteArray* cellVisibilities );
+    
     void   forceWatertightGeometryOn();
+    void   clearWatertightGeometryFlag();
 
     //size_t gridCount() { return m_allGrids.size(); }
     cvf::ref<cvf::UByteArray>  

ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp

@@ -1124,3 +1124,24 @@ void RivReservoirViewPartMgr::forceWatertightGeometryOnForType(RivCellSetEnum ge
         m_geometries[geometryType].forceWatertightGeometryOn();
     }
 }
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RivReservoirViewPartMgr::clearWatertightGeometryFlags()
+{
+    for (size_t i = 0; i < m_propFilteredGeometryFrames.size(); ++i)
+    {
+        if (m_propFilteredGeometryFrames[i].p()) m_propFilteredGeometryFrames[i]->clearWatertightGeometryFlag();
+    }
+
+    for (size_t i = 0; i < m_propFilteredWellGeometryFrames.size(); ++i)
+    {
+        if (m_propFilteredWellGeometryFrames[i].p()) m_propFilteredWellGeometryFrames[i]->clearWatertightGeometryFlag();
+    }
+
+    for (int i = 0; i < PROPERTY_FILTERED; i++)
+    {
+        m_geometries[RivCellSetEnum(i)].clearWatertightGeometryFlag();
+    }
+}

ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h

@@ -79,6 +79,7 @@ public:
     void                        appendFaultLabelsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType, size_t frameIndex);
 
     void                        forceWatertightGeometryOnForType(RivCellSetEnum geometryType);
+    void                        clearWatertightGeometryFlags();
 
 private:
     void                        createGeometry(RivCellSetEnum geometryType);