X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FMacMesh%2FMacMesh%2FGenFunctions.py;h=c8067ab37b3e70bff5747021ea8e8f187684f1c8;hp=9b3a33c8b5dd9c2e0a8eb8a84f3364f51a89debf;hb=a274ade365bd0f0e19d56c577acc4a13aa1972a7;hpb=84cf6c491178cc4cea1be9c8b2ba4d13750d02a3

diff --git a/src/Tools/MacMesh/MacMesh/GenFunctions.py b/src/Tools/MacMesh/MacMesh/GenFunctions.py
index 9b3a33c8b..c8067ab37 100644
--- a/src/Tools/MacMesh/MacMesh/GenFunctions.py
+++ b/src/Tools/MacMesh/MacMesh/GenFunctions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2016  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
@@ -27,15 +27,15 @@ import CutnGroup
 import CompositeBox
 
 from salome.geom import geomBuilder
-geompy = geomBuilder.New( Config.theStudy )
+geompy = geomBuilder.New()
 
 from salome.smesh import smeshBuilder
-smesh = smeshBuilder.New( Config.theStudy )
+smesh = smeshBuilder.New()
 
 ##########################################################################################################
 
 def Box11 (MacObject):
-    if Config.debug : print "Generating regular box"
+    if Config.debug : print("Generating regular box")
 
     dummy1 = geompy.MakeScaleAlongAxes( ElemBox11 (), None , MacObject.GeoPar[1][0], MacObject.GeoPar[1][1], 1)
     RectFace = geompy.MakeTranslation(dummy1, MacObject.GeoPar[0][0], MacObject.GeoPar[0][1], 0)
@@ -64,7 +64,7 @@ def Box11 (MacObject):
 ##########################################################################################################
 
 def Box42 (MacObject):
-    if Config.debug : print "Generating box 4-2 reducer"
+    if Config.debug : print("Generating box 4-2 reducer")
 
     Z_Axis = geompy.MakeVectorDXDYDZ(0., 0., 1.)
     RotAngle = {'SN' : lambda : 0,
@@ -105,7 +105,7 @@ def Box42 (MacObject):
 ##########################################################################################################
 
 def BoxAng32 (MacObject):
-    if Config.debug : print "Generating sharp angle"
+    if Config.debug : print("Generating sharp angle")
     Z_Axis = geompy.MakeVectorDXDYDZ(0., 0., 1.)
     RotAngle = {'NE' : lambda : 0,
                 'NW' : lambda : math.pi/2,
@@ -142,7 +142,7 @@ def BoxAng32 (MacObject):
     return MacObject
 ##########################################################################################################
 def CompBox (MacObject):
-    if Config.debug : print "Generating composite box"
+    if Config.debug : print("Generating composite box")
 
     dummy1 = geompy.MakeScaleAlongAxes( ElemBox11 (), None , MacObject.GeoPar[1][0], MacObject.GeoPar[1][1], 1)
     RectFace = geompy.MakeTranslation(dummy1, MacObject.GeoPar[0][0], MacObject.GeoPar[0][1], 0)
@@ -184,7 +184,7 @@ def CompBox (MacObject):
 ##########################################################################################################
 
 def CompBoxF (MacObject):
-    if Config.debug : print "Generating composite box"
+    if Config.debug : print("Generating composite box")
 
     dummy1 = geompy.MakeScaleAlongAxes( ElemBox11 (), None , MacObject.GeoPar[1][0], MacObject.GeoPar[1][1], 1)
     RectFace = geompy.MakeTranslation(dummy1, MacObject.GeoPar[0][0], MacObject.GeoPar[0][1], 0)
@@ -225,7 +225,7 @@ def CompBoxF (MacObject):
 ##########################################################################################################
 
 def NonOrtho (MacObject):
-    if Config.debug : print "Generating Non-orthogonal quadrangle"
+    if Config.debug : print("Generating Non-orthogonal quadrangle")
 
     RectFace = Quadrangler (MacObject.PtCoor)
 
@@ -260,7 +260,7 @@ def NonOrtho (MacObject):
 ##########################################################################################################
 
 def QuartCyl (MacObject):
-    if Config.debug : print "Generating quarter cylinder"
+    if Config.debug : print("Generating quarter cylinder")
     Z_Axis = geompy.MakeVectorDXDYDZ(0., 0., 1.)
     RotAngle = {'NE' : lambda : 0,
                 'NW' : lambda : math.pi/2,
@@ -486,7 +486,7 @@ def ReduceRatio (dx, dy):
                 if not (Output==[0,0]) : break
 
         if Output == [0,0] :
-            print "We are having some trouble while interpreting the following ratio: ",ratio, "\nWe will try a recursive method which may in some cases take some time..."
+            print("We are having some trouble while interpreting the following ratio: ",ratio, "\nWe will try a recursive method which may in some cases take some time...")
             if dy > dx :
                 A = ReduceRatio (dx, dy-dx)
                 return ([A[0],A[1]+A[0]])
@@ -814,7 +814,7 @@ def IndexMultiOcc (Array,Element) :
     """
     Output = []
     try : Array.index(Element)
-    except ValueError : print "No more occurrences"
+    except ValueError : print("No more occurrences")
     else : Output.append(Array.index(Element))
 
     if not(Output == []) and len(Array) > 1 :
@@ -825,8 +825,7 @@ def IndexMultiOcc (Array,Element) :
 
 def SortList (ValList, CritList):
     Output = []
-    SortedCritList = copy.copy(CritList)
-    SortedCritList.sort()
+    SortedCritList = sorted(copy.copy(CritList))
     for i in range(0,len(ValList)):
         if i > 0 :
             if not(SortedCritList[i]==SortedCritList[i-1]):
@@ -852,7 +851,7 @@ def SortPoints(Points):
     Crit = [(abs(Point[0]-Xmin)+0.1*(Xmax-Xmin))*(abs(Point[1]-Ymin)+0.1*(Ymax-Ymin)) for Point in Points]
     #print "Input Points      : ", Points
     #print "Sorting Criterion : ", Crit
-    Order = SortList (range(NbPts), Crit)
+    Order = SortList (list(range(NbPts)), Crit)
     #print "Sorted Results    : ", Order
     Output = []
     Output.append(Points[Order[0]])
@@ -863,7 +862,7 @@ def SortPoints(Points):
     V = [[Point1[0]-Point0[0],Point1[1]-Point0[1]] for Point1 in Points]
     Cosines = [-(vec[0]-1E-10)/(math.sqrt(DotProd(vec,vec)+1e-25)) for vec in V]
     #print "Cosines criterion :", Cosines
-    Order = SortList(range(NbPts),Cosines)
+    Order = SortList(list(range(NbPts)),Cosines)
     #print "Ordered points:", Order
     for PtIndex in Order[:-1]: Output.append(Points[PtIndex])