X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fgmu%2FidentifieElementsFissure.py;h=557c2298d157812dd98d826451406c7892dab954;hb=40631039614fd2e27cedb2e29e6fd7939ce1854c;hp=f67f26a9ac55ea901bf834e5a0bba8770f31077a;hpb=0fc0831670e27a5611b941c52dc152fd63964515;p=modules%2Fsmesh.git

diff --git a/src/Tools/blocFissure/gmu/identifieElementsFissure.py b/src/Tools/blocFissure/gmu/identifieElementsFissure.py
index f67f26a9a..557c2298d 100644
--- a/src/Tools/blocFissure/gmu/identifieElementsFissure.py
+++ b/src/Tools/blocFissure/gmu/identifieElementsFissure.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2020  EDF R&D
+# Copyright (C) 2014-2021  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,17 +17,21 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+"""Identification edges fond de fissure, edges pipe sur la face de fissure,
+edges prolongées
+edges internes communes pipe et fissure, points communs edges fissure peau et edges circulaires
+"""
 
 import logging
 
+from . import initLog
+
 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,
                              fillingFaceExterne, centreFondFiss):
@@ -44,34 +48,32 @@ def identifieElementsFissure(ifil, facesDefaut, partitionPeauFissFond,
   geomPublishInFather(initLog.debug, partitionPeauFissFond, edgesPipeC, "edgesPipeFiss")
   edgesFondC = geompy.GetInPlace(partitionPeauFissFond, geompy.MakeCompound(edgesFondFiss))
   geomPublishInFather(initLog.debug, partitionPeauFissFond, edgesFondC, "edgesFondFiss")
-  
+
   if aretesVivesC is None:
-    [edgesInside, edgesOutside, edgesOnside] = extractionOrientee(fillingFaceExterne, partitionPeauFissFond, centreFondFiss, "EDGE", 1.e-3)
-    [facesInside, facesOutside, facesOnside] = extractionOrientee(fillingFaceExterne, partitionPeauFissFond, centreFondFiss, "FACE", 1.e-3)
+    [edgesInside, _, _] = extractionOrientee(fillingFaceExterne, partitionPeauFissFond, centreFondFiss, "EDGE", 1.e-3)
+    [facesInside, _, facesOnside] = extractionOrientee(fillingFaceExterne, partitionPeauFissFond, centreFondFiss, "FACE", 1.e-3)
   else:
-    [edgesInside, edgesOutside, edgesOnside] = extractionOrienteeMulti(facesDefaut, ifil, partitionPeauFissFond, centreFondFiss, "EDGE", 1.e-3)
-    [facesInside, facesOutside, facesOnside] = extractionOrienteeMulti(facesDefaut, ifil, partitionPeauFissFond, centreFondFiss, "FACE", 1.e-3)
-    
+    [edgesInside, _, _] = extractionOrienteeMulti(facesDefaut, ifil, partitionPeauFissFond, centreFondFiss, "EDGE", 1.e-3)
+    [facesInside, _, facesOnside] = extractionOrienteeMulti(facesDefaut, ifil, partitionPeauFissFond, centreFondFiss, "FACE", 1.e-3)
+
   edgesPipeIn = geompy.GetSharedShapesMulti([edgesPipeC, geompy.MakeCompound(edgesInside)], geompy.ShapeType["EDGE"])
-  verticesPipePeau = []
+  verticesPipePeau = list()
 
-  for i, edge in enumerate(edgesPipeIn):
+  for i_aux, edge in enumerate(edgesPipeIn):
     try:
       vertices = geompy.GetSharedShapesMulti([edge, geompy.MakeCompound(facesOnside)], geompy.ShapeType["VERTEX"])
       verticesPipePeau.append(vertices[0])
-      name = "edgePipeIn%d"%i
+      name = "edgePipeIn{}".format(i_aux)
       geomPublishInFather(initLog.debug, partitionPeauFissFond, edge, name)
-      name = "verticePipePeau%d"%i
+      name = "verticePipePeau{}".format(i_aux)
       geomPublishInFather(initLog.debug, partitionPeauFissFond, vertices[0], name)
-      logging.debug("edgePipeIn%s coupe les faces OnSide", i)
+      logging.debug("edgePipeIn%s coupe les faces OnSide", i_aux)
     except:
-      logging.debug("edgePipeIn%s ne coupe pas les faces OnSide", i)
+      logging.debug("edgePipeIn%s ne coupe pas les faces OnSide", i_aux)
 
-  edgesFondIn =[]
-  if len(verticesPipePeau) > 0: # au moins une extrémité du pipe sur cette face de peau  
-    #tmp = geompy.GetSharedShapesMulti([edgesFondC, geompy.MakeCompound(edgesOutside)], geompy.ShapeType["EDGE"])
-    #edgesFondOut = [ ed for ed in tmp if geompy.MinDistance(ed, geompy.MakeCompound(facesOnside)) < 1.e-3] 
+  edgesFondIn = list()
+  if verticesPipePeau: # au moins une extrémité du pipe sur cette face de peau
     tmp = geompy.GetSharedShapesMulti([edgesFondC, geompy.MakeCompound(edgesInside)], geompy.ShapeType["EDGE"])
     edgesFondIn = [ ed for ed in tmp if geompy.MinDistance(ed, geompy.MakeCompound(facesOnside)) < 1.e-3]
 
-  return (edgesPipeIn, verticesPipePeau, edgesFondIn, facesInside, facesOnside) 
\ No newline at end of file
+  return (edgesPipeIn, verticesPipePeau, edgesFondIn, facesInside, facesOnside)