From: eap <eap@opencascade.com>
Date: Tue, 12 May 2009 06:47:41 +0000 (+0000)
Subject: 0020042: EDF 864 SMESH: Mesh of holes (GHS3D/BLSurf)
X-Git-Tag: V4_1_5rc2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=01d95264bc6dfc769ce1a63c9b93a56e3a5fd876;p=plugins%2Fhybridplugin.git

0020042: EDF 864 SMESH: Mesh of holes (GHS3D/BLSurf)
     fix findShapeID() for case of outer shell of solid bounding a hole
---

diff --git a/src/GHS3DPlugin_GHS3D.cxx b/src/GHS3DPlugin_GHS3D.cxx
index 195de5c..d7bf596 100644
--- a/src/GHS3DPlugin_GHS3D.cxx
+++ b/src/GHS3DPlugin_GHS3D.cxx
@@ -546,11 +546,23 @@ static int findShapeID(SMESH_Mesh&          mesh,
     if ( toMeshHoles )
       return meshDS->ShapeToIndex( solid1 );
 
-    // - are we at a hole boundary face?
+    // - Are we at a hole boundary face?
     if ( shells(1).IsSame( BRepTools::OuterShell( solid1 )) )
-      return meshDS->ShapeToIndex( solid1 ); // - no
+    { // - No, but maybe a hole is bound by two shapes? Does shells(1) touches another shell?
+      bool touch = false;
+      TopExp_Explorer eExp( shells(1), TopAbs_EDGE );
+      // check if any edge of shells(1) belongs to another shell
+      for ( ; eExp.More() && !touch; eExp.Next() ) {
+        ansIt = mesh.GetAncestors( eExp.Current() );
+        for ( ; ansIt.More() && !touch; ansIt.Next() ) {
+          if ( ansIt.Value().ShapeType() == TopAbs_SHELL )
+            touch = ( !ansIt.Value().IsSame( shells(1) ));
+        }
+      }
+      if (!touch)
+        return meshDS->ShapeToIndex( solid1 );
+    }
   }
-
   // find orientation of geom face within the first solid
   TopExp_Explorer fExp( solid1, TopAbs_FACE );
   for ( ; fExp.More(); fExp.Next() )