X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fgmu%2FpropagateTore.py;h=c6630d177ad44f5f377f9a93300d7885cea6582c;hb=2cf6435f1492b63b9adf4e8256d88968638ed9bf;hp=ab96494a9e08d397887824a1a11b5a26efbca135;hpb=0003e6b4fcc95a0aec695ceef8371dee28baf417;p=modules%2Fsmesh.git

diff --git a/src/Tools/blocFissure/gmu/propagateTore.py b/src/Tools/blocFissure/gmu/propagateTore.py
index ab96494a9..c6630d177 100644
--- a/src/Tools/blocFissure/gmu/propagateTore.py
+++ b/src/Tools/blocFissure/gmu/propagateTore.py
@@ -1,42 +1,61 @@
 # -*- coding: utf-8 -*-
+# 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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+"""Recherche et classement des edges du tore par propagate"""
+
 
 import logging
+
 from .geomsmesh import geompy
-from .geomsmesh import geomPublish
 from .geomsmesh import geomPublishInFather
-from . import initLog
 
-# -----------------------------------------------------------------------------
-# --- recherche et classement des edges du tore par propagate
+from . import initLog
 
 def propagateTore(tore):
-  """
-  Classement des edges du tore par une operation 'propagate'
+  """Classement des edges du tore par une operation 'propagate'
+
   @param tore partionné et coupé
   @return (diams, circles, geners) edges dans le plan de fissure, edges demi circulaires,
   edges selon la generatrice (liste de compounds)
   """
   logging.info("start")
 
-  lencomp = []
+  lencomp = list()
   compounds = geompy.Propagate(tore)
-  for i in range(len(compounds)):
-    #geomPublishInFather(initLog.debug, tore, compounds[i], 'edges' )
-    props = geompy.BasicProperties(compounds[i])
+  for objet in compounds:
+    #geomPublishInFather(initLog.debug, tore, objet, 'edges' )
+    props = geompy.BasicProperties(objet)
     lencomp.append(props[0])
-    pass
+# Remarque : on passe par min et max plutôt que faire lencomp.sort() pour garder l'ordre dans le tri suivant
   minlen = min(lencomp)
   maxlen = max(lencomp)
-  diams = []
-  geners = []
-  circles = []
-  for i in range(len(lencomp)):
-    if (lencomp[i]- minlen)/minlen < 0.01 :
-      diams.append(compounds[i])
-    elif (maxlen - lencomp[i])/lencomp[i] < 0.2 :
-      geners.append(compounds[i])
+
+  diams = list()
+  geners = list()
+  circles = list()
+  for i_aux, longueur in enumerate(lencomp):
+    if ( (longueur- minlen)/minlen < 0.01 ):
+      diams.append(compounds[i_aux])
+    elif ( (maxlen - longueur)/longueur < 0.2 ):
+      geners.append(compounds[i_aux])
     else:
-      circles.append(compounds[i])
+      circles.append(compounds[i_aux])
 
   geomPublishInFather(initLog.debug, tore, diams[0], 'diams0' )
   geomPublishInFather(initLog.debug, tore, diams[1], 'diams1' )