debug de GetInPlace pour Cas 7 eprouvette courbe non résolu

[modules/smesh.git] / src / Tools / blocFissure / gmu / identifieEdgesPeau.py

diff --git a/src/Tools/blocFissure/gmu/identifieEdgesPeau.py b/src/Tools/blocFissure/gmu/identifieEdgesPeau.py
index 0d74241a0cdf5a21ccb944a87eddd2dddba46c56..a3abb62086425a279d28964a5ce3ebac689ffcb2 100644 (file)
--- a/src/Tools/blocFissure/gmu/identifieEdgesPeau.py
+++ b/src/Tools/blocFissure/gmu/identifieEdgesPeau.py
@@ -3,6 +3,10 @@
 import logging
 
 from geomsmesh import geompy
+from geomsmesh import geomPublish
+from geomsmesh import geomPublishInFather
+import initLog
+
 from substractSubShapes import substractSubShapes
 
 def identifieEdgesPeau(edgesFissExtPipe,verticesPipePeau, facePeau, facesPeauSorted,
@@ -36,13 +40,13 @@ def identifieEdgesPeau(edgesFissExtPipe,verticesPipePeau, facePeau, facesPeauSor
           nameEdge = "edgeRadFacePipePeau%d"%i
           facesPipePeau[i] = face
           endsEdgeFond[i] = sharedVertices[0]
-          geompy.addToStudy(face, nameFace)
-          geompy.addToStudy(sharedVertices[0], nameVert)
+          geomPublish(initLog.debug, face, nameFace)
+          geomPublish(initLog.debug, sharedVertices[0], nameVert)
           edgesFace = geompy.ExtractShapes(face, geompy.ShapeType["EDGE"], True)
           for edge in edgesFace:
             if geompy.MinDistance(edge, sharedVertices[0]) < 1e-3:
               edgeRadFacePipePeau[i] = edge
-              geompy.addToStudy(edge, nameEdge)
+              geomPublish(initLog.debug, edge, nameEdge)
               break
             pass
           pass
@@ -59,14 +63,14 @@ def identifieEdgesPeau(edgesFissExtPipe,verticesPipePeau, facePeau, facesPeauSor
       geompy.UnionList(grpEdgesCirc, edges)
       edgesCircPeau[i] = grpEdgesCirc
       name = "edgeCirc%d"%i
-      geompy.addToStudyInFather(facePeau, grpEdgesCirc, name)
+      geomPublishInFather(initLog.debug, facePeau, grpEdgesCirc, name)
       edgesListees = edgesListees + edges
       vertices = geompy.GetSharedShapesMulti([facePeau, fcirc], geompy.ShapeType["VERTEX"])
       grpVertCircPeau = geompy.CreateGroup(facePeau, geompy.ShapeType["VERTEX"])
       geompy.UnionList(grpVertCircPeau, vertices)
       verticesCircPeau[i] = grpVertCircPeau
       name = "pointEdgeCirc%d"%i
-      geompy.addToStudyInFather(facePeau, grpVertCircPeau, name)
+      geomPublishInFather(initLog.debug, facePeau, grpVertCircPeau, name)
       pass
     pass # --- au moins une extrémité du pipe sur cette face de peau
 
@@ -77,7 +81,7 @@ def identifieEdgesPeau(edgesFissExtPipe,verticesPipePeau, facePeau, facesPeauSor
   for i, edge in enumerate(edgesFilling):
     edgepeau = geompy.GetInPlace(facePeau, edge)
     name = "edgepeau%d"%i
-    geompy.addToStudyInFather(facePeau,edgepeau, name)
+    geomPublishInFather(initLog.debug, facePeau,edgepeau, name)
     logging.debug("edgepeau %s", geompy.ShapeInfo(edgepeau))
     if geompy.ShapeInfo(edgepeau)['EDGE'] > 1:
       logging.debug("  EDGES multiples")
@@ -92,9 +96,10 @@ def identifieEdgesPeau(edgesFissExtPipe,verticesPipePeau, facePeau, facesPeauSor
   geompy.UnionList(groupEdgesBordPeau, edgesBords)
   bordsVifs = None
   if aretesVivesC is not None:
+    logging.debug("identification des bords vifs par GetInPlace (old)")
     bordsVifs = geompy.GetInPlace(facePeau, aretesVivesC)
   if bordsVifs is not None:
-    geompy.addToStudyInFather(facePeau, bordsVifs, "bordsVifs")
+    geomPublishInFather(initLog.debug, facePeau, bordsVifs, "bordsVifs")
     groupEdgesBordPeau = geompy.CutGroups(groupEdgesBordPeau, bordsVifs)
     grptmp = None
     if len(aretesVivesCoupees) > 0:
@@ -108,7 +113,7 @@ def identifieEdgesPeau(edgesFissExtPipe,verticesPipePeau, facePeau, facesPeauSor
       edv = geompy.ExtractShapes(grpnew, geompy.ShapeType["EDGE"], False)
       aretesVivesCoupees += edv
   logging.debug("aretesVivesCoupees %s",aretesVivesCoupees)
-  geompy.addToStudyInFather(facePeau, groupEdgesBordPeau , "EdgesBords")
+  geomPublishInFather(initLog.debug, facePeau, groupEdgesBordPeau , "EdgesBords")
     
   # ---  edges de la face de peau partagées avec la face de fissure
   
@@ -122,7 +127,7 @@ def identifieEdgesPeau(edgesFissExtPipe,verticesPipePeau, facePeau, facesPeauSor
         if (geompy.MinDistance(grpVert, edge) < 1.e-3) and (edge not in edgesFissurePeau):
           edgesFissurePeau[i] = edge
           name = "edgeFissurePeau%d"%i
-          geompy.addToStudyInFather(facePeau,  edge, name)
+          geomPublishInFather(initLog.debug, facePeau,  edge, name)
     for edge in edges: # on ajoute après les edges manquantes
       if edge not in edgesFissurePeau:
         edgesFissurePeau.append(edge)
@@ -130,7 +135,7 @@ def identifieEdgesPeau(edgesFissExtPipe,verticesPipePeau, facePeau, facesPeauSor
     for i, edge in enumerate(edges):
       edgesFissurePeau.append(edge)
       name = "edgeFissurePeau%d"%i
-      geompy.addToStudyInFather(facePeau,  edge, name)
+      geomPublishInFather(initLog.debug, facePeau,  edge, name)
       
   return (endsEdgeFond, facesPipePeau, edgeRadFacePipePeau,
           edgesCircPeau, verticesCircPeau, groupEdgesBordPeau,