X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fgmu%2FextractionOrienteeMulti.py;h=e9e6c8ff1d284996868df230c0df6198a9ef9b02;hb=7e714e8fc0d0884011007c9daed6e6e492402693;hp=239fe9d2e48abeefccd24b80115f9c7098012838;hpb=0003e6b4fcc95a0aec695ceef8371dee28baf417;p=modules%2Fsmesh.git

diff --git a/src/Tools/blocFissure/gmu/extractionOrienteeMulti.py b/src/Tools/blocFissure/gmu/extractionOrienteeMulti.py
index 239fe9d2e..e9e6c8ff1 100644
--- a/src/Tools/blocFissure/gmu/extractionOrienteeMulti.py
+++ b/src/Tools/blocFissure/gmu/extractionOrienteeMulti.py
@@ -1,15 +1,30 @@
 # -*- coding: utf-8 -*-
+# Copyright (C) 2014-2023  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
+#
+"""Renvoie l'extraction des shapes d'un objet selon leur position par rapport à la fac"""
 
 import logging
+
 from .geomsmesh import geompy
-from .geomsmesh import geomPublish
-from .geomsmesh import geomPublishInFather
-from . import initLog
 
 from .whichSideMulti import whichSideMulti
-
-# -----------------------------------------------------------------------------
-# --- renvoie l'extraction des shapes d'un objet selon leur position par rapport à la face.
+from .extractionOrientee_a import extractionOrientee_a
 
 def extractionOrienteeMulti(faces, ifil, obj, centre, shapeType, tol, prefix=""):
   """
@@ -19,34 +34,20 @@ def extractionOrienteeMulti(faces, ifil, obj, centre, shapeType, tol, prefix="")
   """
   logging.info('start')
   trace = True
-  shapesInside = []
-  shapesOutside = []
-  shapesOnside = []
+  shapesInside = list()
+  shapesOutside = list()
+  shapesOnside = list()
   shapes = geompy.ExtractShapes(obj, geompy.ShapeType[shapeType], False)
-  i=0
-  j=0
-  k=0
+
+  i_aux = 0
+  j_aux = 0
+  k_aux = 0
   prefix = prefix + shapeType
   for shape in shapes:
     side = whichSideMulti(faces, ifil, shape, centre, tol)
-    if side == 1:
-      shapesInside.append(shape)
-      if trace:
-        name = prefix + "_Inside%d"%i
-        geomPublishInFather(initLog.debug, obj, shape, name)
-      i+=1
-    elif side == -1:
-      shapesOutside.append(shape)
-      if trace:
-        name = prefix + "_Outside%d"%j
-        geomPublishInFather(initLog.debug, obj, shape, name)
-      j+=1
-    elif side == 0:
-      shapesOnside.append(shape)
-      if trace:
-        name = prefix + "_Onside%d"%k
-        geomPublishInFather(initLog.debug, obj, shape, name)
-      k+=1
-    logging.debug("--- shape was %s", name)
-  return [shapesInside, shapesOutside, shapesOnside]
+    i_aux, j_aux, k_aux = extractionOrientee_a(obj, shape, side, 1, \
+                                               shapesInside, shapesOutside, shapesOnside, \
+                                               i_aux, j_aux, k_aux, \
+                                               trace, prefix)
 
+  return [shapesInside, shapesOutside, shapesOnside]