X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fgmu%2FfindWireIntermediateVertices.py;h=1245e2345edc212b7a691abd8b1ec8b477be4748;hb=ea7070c2c8dcfc1f89298412277412fdd8632a83;hp=02cc49909620e072628245188d083dd1d691c826;hpb=6d32f944a0a115b6419184c50b57bf7c4eef5786;p=modules%2Fsmesh.git

diff --git a/src/Tools/blocFissure/gmu/findWireIntermediateVertices.py b/src/Tools/blocFissure/gmu/findWireIntermediateVertices.py
index 02cc49909..1245e2345 100644
--- a/src/Tools/blocFissure/gmu/findWireIntermediateVertices.py
+++ b/src/Tools/blocFissure/gmu/findWireIntermediateVertices.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2019  CEA/DEN, 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,63 +17,33 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+"""Trouver les vertices intermédiaires d'un wire"""
 
 import logging
+
 from .geomsmesh import geompy
-from .geomsmesh import geomPublish
-from .geomsmesh import geomPublishInFather
-from . import initLog
+
+from .findWireVertices import findWireVertices
 
 # -----------------------------------------------------------------------------
 # --- trouver les vertices intermediaires d'un wire
 
 def findWireIntermediateVertices(aWire, getNormals=False):
-  """
-  trouver les vertices d'un wire qui ne sont pas aux extremités
-  calcul optionnel des tangentes. Attention à la tolérance qui peut être élevée (> 0.001)
+  """Trouver les vertices d'un wire qui ne sont pas aux extremités
+
+  Calcul optionnel des tangentes. Attention à la tolérance qui peut être élevée (> 0.001)
   """
   logging.info("start")
   edges = geompy.ExtractShapes(aWire, geompy.ShapeType["EDGE"], False)
-  vertices = []
-  idsubs = {}
-  shortList = []
-  if getNormals:
-    normals = []
-    idnorm = {}
-    shortNorm = []
-  for edge in edges:
-    vert = geompy.ExtractShapes(edge, geompy.ShapeType["VERTEX"], False)
-    vertices += vert
-    if getNormals:
-      v0 = geompy.MakeVertexOnCurve(edge, 0.0)
-      n0 = geompy.MakeTangentOnCurve(edge, 0.0)
-      v1 = geompy.MakeVertexOnCurve(edge, 1.0)
-      n1 = geompy.MakeTangentOnCurve(edge, 1.0)
-      dist = geompy.MinDistance(v0, vert[0])
-      logging.debug("distance %s", dist)
-      if dist < 1.e-2:
-        normals += [n0, n1]
-      else:
-        normals += [n1, n0]
-  for i, sub in enumerate(vertices):
-    subid = geompy.GetSubShapeID(aWire, sub)
-    if subid in list(idsubs.keys()):
-      idsubs[subid].append(sub)
-    else:
-      idsubs[subid] = [sub]
-      name='vertex%d'%i
-      geomPublishInFather(initLog.debug, aWire, sub, name)
-      if getNormals:
-        idnorm[subid] = normals[i]
-        name='norm%d'%i
-        geomPublishInFather(initLog.debug, aWire, normals[i], name)
-  for k, v in idsubs.items():
-    if len(v) > 1:
-      shortList.append(v[0])
+
+  idsubs, idnorm = findWireVertices(aWire, edges, getNormals)
+
+  shortList = list()
+  shortNorm = list()
+  for k_aux, sub in idsubs.items():
+    if ( len(sub) > 1 ):
+      shortList.append(sub[0])
       if getNormals:
-        shortNorm.append(idnorm[k])
-  if getNormals:
-    return shortList, shortNorm
-  else:
-    return shortList
+        shortNorm.append(idnorm[k_aux])
 
+  return shortList, shortNorm