Merge tag 'V8_3_0a2' into ngr/python3_dev

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

diff --git a/src/SMESH_SWIG/SMESH_test1_AndDisplay.py b/src/SMESH_SWIG/SMESH_test1_AndDisplay.py
index 30eb5e17b6b405f54837d800ae3edb5793a7f454..6212075af3d7a083c6c0955580e70a9cad608124 100644 (file)
--- a/src/SMESH_SWIG/SMESH_test1_AndDisplay.py
+++ b/src/SMESH_SWIG/SMESH_test1_AndDisplay.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2014  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
@@ -44,7 +44,7 @@ idbox = geompy.addToStudy(box, "box")
 subShapeList = geompy.SubShapeAll(box, geompy.ShapeType["FACE"])
 face = subShapeList[0]
 name = geompy.SubShapeName(face, box)
-print name
+print(name)
 idface = geompy.addToStudyInFather(box, face, name)
 
 # ---- add shell from box  in study
@@ -52,7 +52,7 @@ idface = geompy.addToStudyInFather(box, face, name)
 subShellList = geompy.SubShapeAll(box, geompy.ShapeType["SHELL"])
 shell = subShellList[0]
 name = geompy.SubShapeName(shell, box)
-print name
+print(name)
 idshell = geompy.addToStudyInFather(box, shell, name)
 
 # ---- add first edge of face in study
@@ -60,7 +60,7 @@ idshell = geompy.addToStudyInFather(box, shell, name)
 edgeList = geompy.SubShapeAll(face, geompy.ShapeType["EDGE"])
 edge = edgeList[0]
 name = geompy.SubShapeName(edge, face)
-print name
+print(name)
 idedge = geompy.addToStudyInFather(face, edge, name)
 
 
@@ -70,48 +70,48 @@ idedge = geompy.addToStudyInFather(face, edge, name)
 
 mesh = smesh.Mesh(box, "Meshbox")
 
-print "-------------------------- add hypothesis to box"
+print("-------------------------- add hypothesis to box")
 algoReg1 = mesh.Segment()
 hypNbSeg1 = algoReg1.NumberOfSegments(7)
-print hypNbSeg1.GetName()
-print hypNbSeg1.GetId()
-print hypNbSeg1.GetNumberOfSegments()
+print(hypNbSeg1.GetName())
+print(hypNbSeg1.GetId())
+print(hypNbSeg1.GetNumberOfSegments())
 smesh.SetName(hypNbSeg1, "NumberOfSegments_7")
 
 algoMef1 = mesh.Triangle()
 hypArea1 = algoMef1.MaxElementArea(2500)
-print hypArea1.GetName()
-print hypArea1.GetId()
-print hypArea1.GetMaxElementArea()
+print(hypArea1.GetName())
+print(hypArea1.GetId())
+print(hypArea1.GetMaxElementArea())
 smesh.SetName(hypArea1, "MaxElementArea_2500")
 
 # ---- add hypothesis to edge
-print "-------------------------- add hypothesis to edge"
+print("-------------------------- add hypothesis to edge")
 edge = salome.IDToObject(idedge)
 
 algoReg2 = mesh.Segment(edge)
 hypLen1 = algoReg2.LocalLength(100)
 smesh.SetName(algoReg2.GetSubMesh(), "SubMeshEdge")
-print hypLen1.GetName()
-print hypLen1.GetId()
-print hypLen1.GetLength()
+print(hypLen1.GetName())
+print(hypLen1.GetId())
+print(hypLen1.GetLength())
 smesh.SetName(hypLen1, "Local_Length_100")
 
 # ---- add hypothesis to face
-print "-------------------------- add hypothesis to face"
+print("-------------------------- add hypothesis to face")
 face = salome.IDToObject(idface)
 
 algoMef2 = mesh.Triangle(face)
 hypArea2 = algoMef2.MaxElementArea(500)
 smesh.SetName(algoMef2.GetSubMesh(), "SubMeshFace")
-print hypArea2.GetName()
-print hypArea2.GetId()
-print hypArea2.GetMaxElementArea()
+print(hypArea2.GetName())
+print(hypArea2.GetId())
+print(hypArea2.GetMaxElementArea())
 smesh.SetName(hypArea2, "MaxElementArea_500")
 
 mesh.Compute()
 
-salome.sg.updateObjBrowser(1);
+salome.sg.updateObjBrowser(True)
 
 sg = salome.ImportComponentGUI('SMESH')
 if type(sg) != type(salome.salome_ComponentGUI):