X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fgmu%2FquadranglesToShapeWithCorner.py;h=fa7536e6343ec54dee802e1bfdfc52f14400bf72;hb=eb7885b577e8b570a49ff7e755b8a11302d8571e;hp=8330ef93fbb40e07baf320e2da507bf9640e3ff8;hpb=b4a070b88fa66729853637acf3f5aa91a429a7d7;p=modules%2Fsmesh.git diff --git a/src/Tools/blocFissure/gmu/quadranglesToShapeWithCorner.py b/src/Tools/blocFissure/gmu/quadranglesToShapeWithCorner.py index 8330ef93f..fa7536e63 100644 --- a/src/Tools/blocFissure/gmu/quadranglesToShapeWithCorner.py +++ b/src/Tools/blocFissure/gmu/quadranglesToShapeWithCorner.py @@ -78,11 +78,11 @@ def quadranglesToShapeWithCorner(meshQuad, shapeDefaut, listOfCorners): tmpFace.append(line) setOfLines.append(tmpFace) - for i, face in enumerate(setOfLines): + for i_aux, face in enumerate(setOfLines): # A partir des lignes de chaque face, # on recrée un objet GEOM temporaire par filling. filling = geompy.MakeFilling(geompy.MakeCompound(face), 2, 5, 0.0001, 0.0001, 0, GEOM.FOM_Default, True) - geomPublish(initLog.debug, filling, 'filling_{}'.format(i + 1)) + geomPublish(initLog.debug, filling, 'filling_{}'.format(i_aux+1)) tmpFillings.append(filling) for face in setOfNodes: @@ -96,27 +96,27 @@ def quadranglesToShapeWithCorner(meshQuad, shapeDefaut, listOfCorners): line = geompy.MakeInterpol(tmpPoints, False, False) tmpBords.append(line) - for i, filling in enumerate(tmpFillings): + for i_aux, filling in enumerate(tmpFillings): tmpPartition = geompy.MakePartition([filling], [shapeDefaut], list(), list(), geompy.ShapeType["FACE"], 0, list(), 0, True) tmpExplodeRef = geompy.ExtractShapes(filling, geompy.ShapeType["EDGE"], True) tmpExplodeNum = geompy.ExtractShapes(tmpPartition, geompy.ShapeType["EDGE"], True) if len(tmpExplodeRef) == len(tmpExplodeNum): - geomPublish(initLog.debug, filling, "faceNonCoupee_{}".format(i + 1)) + geomPublish(initLog.debug, filling, "faceNonCoupee_{}".format(i_aux+1)) facesNonCoupees.append(filling) else: - geomPublish(initLog.debug, filling, "faceCoupee_{}".format(i + 1)) + geomPublish(initLog.debug, filling, "faceCoupee_{}".format(i_aux+1)) facesCoupees.append(filling) fillings = facesCoupees, facesNonCoupees - for i, filling in enumerate(tmpBords): + for i_aux, filling in enumerate(tmpBords): tmpPartition = geompy.MakePartition([shapeDefaut], [filling], list(), list(), geompy.ShapeType["SHELL"], 0, list(), 0, True) tmpExplodeRef = geompy.ExtractShapes(shapeDefaut, geompy.ShapeType["EDGE"], True) + geompy.ExtractShapes(shapeDefaut, geompy.ShapeType["VERTEX"], True) tmpExplodeNum = geompy.ExtractShapes(tmpPartition, geompy.ShapeType["EDGE"], True) + geompy.ExtractShapes(tmpPartition, geompy.ShapeType["VERTEX"], True) if len(tmpExplodeRef) == len(tmpExplodeNum): - geomPublish(initLog.debug, filling, "areteNonCoupee_{}".format(i + 1)) + geomPublish(initLog.debug, filling, "areteNonCoupee_{}".format(i_aux+1)) aretesNonCoupees.append(filling) else: - geomPublish(initLog.debug, filling, "areteCoupee_{}".format(i + 1)) + geomPublish(initLog.debug, filling, "areteCoupee_{}".format(i_aux+1)) aretesCoupees.append(filling) bords_Partages = aretesCoupees, aretesNonCoupees