Merge tag 'V8_3_0a2' into ngr/python3_dev

[modules/smesh.git] / src / SMESH_SWIG / PAL_MESH_041_mesh.py

diff --git a/src/SMESH_SWIG/PAL_MESH_041_mesh.py b/src/SMESH_SWIG/PAL_MESH_041_mesh.py
index bbfdd1abf6612c0ecb4009ec9055ecce9ee2999a..5cb4dfed0379a1022021b749d3ada1abf6f52431 100755 (executable)
--- a/src/SMESH_SWIG/PAL_MESH_041_mesh.py
+++ b/src/SMESH_SWIG/PAL_MESH_041_mesh.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -7,7 +7,7 @@
 # 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.
+# 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
@@ -22,8 +22,14 @@
 #
 
 import salome
-import geompy
-import smesh
+salome.salome_init()
+import GEOM
+from salome.geom import geomBuilder
+geompy = geomBuilder.New(salome.myStudy)
+
+import SMESH, SALOMEDS
+from salome.smesh import smeshBuilder
+smesh =  smeshBuilder.New(salome.myStudy)
 
 
 #-----------------------------GEOM----------------------------------------
@@ -55,14 +61,13 @@ Id_face1 = geompy.addToStudy(face1,"Face1")
 
 
 #-----------------------------SMESH-------------------------------------------
-smesh.SetCurrentStudy(salome.myStudy)
 
 # -- Init mesh --
 plane_mesh = salome.IDToObject( Id_face1)
 
 mesh = smesh.Mesh(plane_mesh, "Mesh_1")
 
-print"---------------------Hypothesis and Algorithms"
+print("---------------------Hypothesis and Algorithms")
 
 #---------------- NumberOfSegments
 
@@ -70,12 +75,12 @@ numberOfSegment = 9
 
 algoWireDes = mesh.Segment()
 listHyp = algoWireDes.GetCompatibleHypothesis()
-print algoWireDes.GetName()
+print(algoWireDes.GetName())
 algoWireDes.SetName("Ware descritisation")
 
 hypNbSeg = algoWireDes.NumberOfSegments(numberOfSegment)
-print hypNbSeg.GetName()
-print hypNbSeg.GetNumberOfSegments()
+print(hypNbSeg.GetName())
+print(hypNbSeg.GetNumberOfSegments())
 smesh.SetName(hypNbSeg, "Nb. Segments")
 
 
@@ -84,19 +89,19 @@ maxElementArea = 200
 
 algoMef = mesh.Triangle()
 listHyp = algoMef.GetCompatibleHypothesis()
-print algoMef.GetName()
+print(algoMef.GetName())
 algoMef.SetName("Triangle (Mefisto)")
 
 hypArea200 = algoMef.MaxElementArea(maxElementArea)
-print hypArea200.GetName()
-print hypArea200.GetMaxElementArea()
+print(hypArea200.GetName())
+print(hypArea200.GetMaxElementArea())
 smesh.SetName(hypArea200, "Max. Element Area")
 
 
-print "---------------------Compute the mesh"
+print("---------------------Compute the mesh")
 
 ret = mesh.Compute()
-print ret
+print(ret)
 
-salome.sg.updateObjBrowser(1)
+salome.sg.updateObjBrowser(True)