X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fgmu%2FextractionOrientee.py;h=e7afb640cb1c6bbfc75a689600a9fe9db9c9cc42;hp=baafc8e74ac2248ffd4a06e8063b98a25b6663da;hb=499f29d24922cec66e41b41a0039a954993bc6df;hpb=6d32f944a0a115b6419184c50b57bf7c4eef5786

diff --git a/src/Tools/blocFissure/gmu/extractionOrientee.py b/src/Tools/blocFissure/gmu/extractionOrientee.py
index baafc8e74..e7afb640c 100644
--- a/src/Tools/blocFissure/gmu/extractionOrientee.py
+++ b/src/Tools/blocFissure/gmu/extractionOrientee.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+# Copyright (C) 2014-2022  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,14 @@
 #
 # 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 face"""
 
 import logging
+
 from .geomsmesh import geompy
-from .geomsmesh import geomPublish
-from .geomsmesh import geomPublishInFather
-from . import initLog
 
 from .whichSide import whichSide
-
-# -----------------------------------------------------------------------------
-# --- renvoie l'extraction des shapes d'un objet selon leur position par rapport à la face.
+from .extractionOrientee_a import extractionOrientee_a
 
 def extractionOrientee(face, obj, ref, shapeType, tol, prefix=""):
   """
@@ -37,36 +34,22 @@ def extractionOrientee(face, obj, ref, shapeType, tol, prefix=""):
   """
   logging.info('start')
   trace = True
-  sideRef = whichSide(face, ref)
-  logging.debug("ref side %s", sideRef)
-  shapesInside = []
-  shapesOutside = []
-  shapesOnside = []
+  side_ref = whichSide(face, ref)
+  logging.debug("ref side %s", side_ref)
+  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 = whichSide(face, shape, tol)
-    if side == sideRef:
-      shapesInside.append(shape)
-      if trace:
-        name = prefix + "_Inside%d"%i
-        geomPublishInFather(initLog.debug, obj, shape, name)
-      i+=1
-    elif side == -sideRef:
-      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, side_ref, \
+                                               shapesInside, shapesOutside, shapesOnside, \
+                                               i_aux, j_aux, k_aux, \
+                                               trace, prefix)
 
+  return [shapesInside, shapesOutside, shapesOnside]