Merge 'master' branch into 'V9_dev' branch.

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

diff --git a/src/Tools/blocFissure/gmu/identifieElementsFissure.py b/src/Tools/blocFissure/gmu/identifieElementsFissure.py
index e886240342f3039df19864cb39152505639be846..8add85194d18cc515919d7a3ecb6f75dfae95fd4 100644 (file)
--- a/src/Tools/blocFissure/gmu/identifieElementsFissure.py
+++ b/src/Tools/blocFissure/gmu/identifieElementsFissure.py
@@ -2,9 +2,13 @@
 
 import logging
 
-from geomsmesh import geompy
-from extractionOrientee import extractionOrientee
-from extractionOrienteeMulti import extractionOrienteeMulti
+from .geomsmesh import geompy
+from .geomsmesh import geomPublish
+from .geomsmesh import geomPublishInFather
+from . import initLog
+
+from .extractionOrientee import extractionOrientee
+from .extractionOrienteeMulti import extractionOrienteeMulti
  
 def identifieElementsFissure(ifil, facesDefaut, partitionPeauFissFond,
                              edgesPipeFiss, edgesFondFiss, aretesVivesC,
@@ -19,9 +23,9 @@ def identifieElementsFissure(ifil, facesDefaut, partitionPeauFissFond,
   logging.info('start')
 
   edgesPipeC = geompy.GetInPlace(partitionPeauFissFond, geompy.MakeCompound(edgesPipeFiss))
-  geompy.addToStudyInFather(partitionPeauFissFond, edgesPipeC, "edgesPipeFiss")
+  geomPublishInFather(initLog.debug, partitionPeauFissFond, edgesPipeC, "edgesPipeFiss")
   edgesFondC = geompy.GetInPlace(partitionPeauFissFond, geompy.MakeCompound(edgesFondFiss))
-  geompy.addToStudyInFather(partitionPeauFissFond, edgesFondC, "edgesFondFiss")
+  geomPublishInFather(initLog.debug, partitionPeauFissFond, edgesFondC, "edgesFondFiss")
   
   if aretesVivesC is None:
     [edgesInside, edgesOutside, edgesOnside] = extractionOrientee(fillingFaceExterne, partitionPeauFissFond, centreFondFiss, "EDGE", 1.e-3)
@@ -38,9 +42,9 @@ def identifieElementsFissure(ifil, facesDefaut, partitionPeauFissFond,
       vertices = geompy.GetSharedShapesMulti([edge, geompy.MakeCompound(facesOnside)], geompy.ShapeType["VERTEX"])
       verticesPipePeau.append(vertices[0])
       name = "edgePipeIn%d"%i
-      geompy.addToStudyInFather(partitionPeauFissFond, edge, name)
+      geomPublishInFather(initLog.debug, partitionPeauFissFond, edge, name)
       name = "verticePipePeau%d"%i
-      geompy.addToStudyInFather(partitionPeauFissFond, vertices[0], name)
+      geomPublishInFather(initLog.debug, partitionPeauFissFond, vertices[0], name)
       logging.debug("edgePipeIn%s coupe les faces OnSide", i)
     except:
       logging.debug("edgePipeIn%s ne coupe pas les faces OnSide", i)