Merge 'master' branch into 'V9_dev' branch.

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

diff --git a/src/Tools/blocFissure/gmu/identifieFacesPeau.py b/src/Tools/blocFissure/gmu/identifieFacesPeau.py
index 693586b8fbdf9ccaadc1fb685a0d1c5c35fbf7ed..ab009b7c8ab0bde4a00bd2d4ad7b4807f7f1da15 100644 (file)
--- a/src/Tools/blocFissure/gmu/identifieFacesPeau.py
+++ b/src/Tools/blocFissure/gmu/identifieFacesPeau.py
@@ -2,10 +2,13 @@
 
 import logging
 
-from geomsmesh import geompy
+from .geomsmesh import geompy
+from .geomsmesh import geomPublish
+from .geomsmesh import geomPublishInFather
+from . import initLog
 
-from sortFaces import sortFaces
-from extractionOrientee import extractionOrientee
+from .sortFaces import sortFaces
+from .extractionOrientee import extractionOrientee
 
 def identifieFacesPeau(ifil, verticesPipePeau, facesOnside, wireFondFiss,
                        verticesEdgesFondIn, pipexts, cercles,
@@ -62,7 +65,7 @@ def identifieFacesPeau(ifil, verticesPipePeau, facesOnside, wireFondFiss,
       pass
       
   name="partitionPeauByPipe%d"%ifil
-  geompy.addToStudy(partitionPeauByPipe, name)
+  geomPublish(initLog.debug, partitionPeauByPipe, name)
   [edgesPeauFondIn, edgesPeauFondOut, edgesPeauFondOn] = extractionOrientee(fillingFaceExterne, partitionPeauByPipe, centreFondFiss, "EDGE", 1.e-3)
   [facesPeauFondIn, facesPeauFondOut, facesPeauFondOn] = extractionOrientee(fillingFaceExterne, partitionPeauByPipe, centreFondFiss, "FACE", 1.e-3)
     
@@ -73,6 +76,6 @@ def identifieFacesPeau(ifil, verticesPipePeau, facesOnside, wireFondFiss,
     facePeau =geompy.MakePartition(facesPeauFondOn, [], [], [], geompy.ShapeType["FACE"], 0, [], 1)
     facesPeauSorted = [facePeau]
   name="facePeau%d"%ifil
-  geompy.addToStudy(facePeau, name)
+  geomPublish(initLog.debug, facePeau, name)
 
   return (facePeau, facesPeauSorted, edgesPeauFondIn)
\ No newline at end of file