Merge branch 'V8_3_BR' into ngr/python3_dev

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

diff --git a/src/SMESH_SWIG/SMESH_reg.py b/src/SMESH_SWIG/SMESH_reg.py
index 77439c83ef0bab8cd3e20155a672f963a9596ef4..2c5aa2465697d6f7cb197de63ffb7a86f5750ef2 100644 (file)
--- a/src/SMESH_SWIG/SMESH_reg.py
+++ b/src/SMESH_SWIG/SMESH_reg.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2013  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
@@ -25,36 +25,42 @@
 #  Module : SMESH
 #
 import salome
-import geompy
-import smesh
+salome.salome_init()
+import GEOM
+from salome.geom import geomBuilder
+geompy = geomBuilder.New(salome.myStudy)
 
-import StdMeshers
+import SMESH, SALOMEDS
+from salome.smesh import smeshBuilder
+smesh =  smeshBuilder.New(salome.myStudy)
+
+from salome.StdMeshers import StdMeshersBuilder
 
 
 # ---- define a box
-print "Define box"
+print("Define box")
 box = geompy.MakeBox(0., 0., 0., 100., 200., 300.)
 idbox = geompy.addToStudy(box, "box")
 
 # ---- add faces of box to study
-print "Add faces to study"
+print("Add faces to study")
 idface = []
 subShapeList = geompy.SubShapeAll(box, geompy.ShapeType["FACE"])
 for f in subShapeList:
   name = geompy.SubShapeName(f, box)
-  print name
+  print(name)
   idface.append( geompy.addToStudyInFather(box, f, name) )
 
 # ---- add edges of box to study
-print "Add edges to study"
+print("Add edges to study")
 idedge = []
 subShapeList = geompy.SubShapeAll(box, geompy.ShapeType["EDGE"])
 for f in subShapeList:
   name = geompy.SubShapeName(f, box)
-  print name
+  print(name)
   idedge.append( geompy.addToStudyInFather(box, f, name) )
 
-salome.sg.updateObjBrowser(1);
+salome.sg.updateObjBrowser(True)
 
 # ---- launch SMESH
 smeshgui = salome.ImportComponentGUI("SMESH")
@@ -67,7 +73,7 @@ box = salome.IDToObject(idbox)
 names = [ "MeshBoxReg", "MeshBoxScale", "MeshBoxTable", "MeshBoxExpr" ]
 
 
-print "-------------------------- Create ", names[0], " mesh"
+print("-------------------------- Create ", names[0], " mesh")
 mesh = smesh.Mesh(box, names[0])
 algo = mesh.Segment()
 hyp = algo.NumberOfSegments(7)
@@ -76,7 +82,7 @@ smesh.SetName(hyp, "NumberOfSegmentsReg")
 algo = mesh.Triangle()
 algo.MaxElementArea(2500)
 
-print "-------------------------- Create ", names[1], " mesh"
+print("-------------------------- Create ", names[1], " mesh")
 mesh = smesh.Mesh(box, names[1])
 algo = mesh.Segment()
 hyp = algo.NumberOfSegments(7)
@@ -86,7 +92,7 @@ smesh.SetName(hyp, "NumberOfSegmentsScale")
 algo = mesh.Triangle()
 algo.MaxElementArea(2500)
 
-print "-------------------------- Create ", names[2], " mesh"
+print("-------------------------- Create ", names[2], " mesh")
 mesh = smesh.Mesh(box,names[2])
 algo = mesh.Segment()
 hyp = algo.NumberOfSegments(7)
@@ -97,7 +103,7 @@ smesh.SetName(hyp, "NumberOfSegmentsTable")
 algo = mesh.Triangle()
 algo.MaxElementArea(2500)
 
-print "-------------------------- Create ", names[3], " mesh"
+print("-------------------------- Create ", names[3], " mesh")
 mesh = smesh.Mesh(box, names[3])
 algo = mesh.Segment()
 hyp = algo.NumberOfSegments(10)
@@ -109,5 +115,5 @@ algo = mesh.Triangle()
 algo.MaxElementArea(2500)
 
 
-salome.sg.updateObjBrowser(1);
+salome.sg.updateObjBrowser(True)