Merge tag 'V8_3_0a2' into ngr/python3_dev

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

diff --git a/src/SMESH_SWIG/ex21_lamp.py b/src/SMESH_SWIG/ex21_lamp.py
index befd0e1d8bc638fcd7be663b7c162f6c797f10fd..034037120aa85e62557611344349dd69409abe7e 100644 (file)
--- a/src/SMESH_SWIG/ex21_lamp.py
+++ b/src/SMESH_SWIG/ex21_lamp.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
@@ -23,9 +23,15 @@
 
 # ==================================
 #
-from geompy import *
+import salome
+salome.salome_init()
+import GEOM
+from salome.geom import geomBuilder
+geompy = geomBuilder.New(salome.myStudy)
 
-import smesh
+import SMESH, SALOMEDS
+from salome.smesh import smeshBuilder
+smesh =  smeshBuilder.New(salome.myStudy)
 
 # Geometry
 # ========
@@ -49,53 +55,51 @@ height   = 100
 # Build a box
 # -----------
 
-box  = MakeBox(-cote, -cote, -cote,  +cote, +cote, +cote)
+box  = geompy.MakeBox(-cote, -cote, -cote,  +cote, +cote, +cote)
 
 # Build a cylinder
 # ----------------
 
-pt1 = MakeVertex(0, 0, cote/3)
-di1 = MakeVectorDXDYDZ(0, 0, 1)
-cyl = MakeCylinder(pt1, di1, section, size)
+pt1 = geompy.MakeVertex(0, 0, cote/3)
+di1 = geompy.MakeVectorDXDYDZ(0, 0, 1)
+cyl = geompy.MakeCylinder(pt1, di1, section, size)
 
 # Build a truncated cone
 # ----------------------
 
-pt2 = MakeVertex(0, 0, size)
-cone = MakeCone(pt2, di1, radius_1, radius_2, height)
+pt2 = geompy.MakeVertex(0, 0, size)
+cone = geompy.MakeCone(pt2, di1, radius_1, radius_2, height)
 
 # Fuse
 # ----
 
-box_cyl = MakeFuse(box, cyl)
-piece = MakeFuse(box_cyl, cone)
+box_cyl = geompy.MakeFuse(box, cyl)
+piece = geompy.MakeFuse(box_cyl, cone)
 
 # Add in study
 # ------------
 
-addToStudy(piece, name)
+geompy.addToStudy(piece, name)
 
 # Create a group of faces
 # -----------------------
 
-group = CreateGroup(piece, ShapeType["FACE"])
+group = geompy.CreateGroup(piece, geompy.ShapeType["FACE"])
 
 group_name = name + "_grp"
-addToStudy(group, group_name)
+geompy.addToStudy(group, group_name)
 group.SetName(group_name)
 
 # Add faces in the group
 # ----------------------
 
-faces = SubShapeAllIDs(piece, ShapeType["FACE"])
+faces = geompy.SubShapeAllIDs(piece, geompy.ShapeType["FACE"])
 
-UnionIDs(group, faces)
+geompy.UnionIDs(group, faces)
 
 # Create a mesh
 # =============
 
-smesh.SetCurrentStudy(salome.myStudy)
-
 # Define a mesh on a geometry
 # ---------------------------
 
@@ -116,7 +120,7 @@ algo2d.LengthFromEdges()
 # Define 3D hypothesis
 # --------------------
 
-algo3d = tetra.Tetrahedron(smesh.NETGEN)
+algo3d = tetra.Tetrahedron(smeshBuilder.NETGEN)
 algo3d.MaxElementVolume(100)
 
 # Compute the mesh
@@ -128,3 +132,8 @@ tetra.Compute()
 # ------------------------
 
 tetra.Group(group)
+
+# Update object browser
+# ---------------------
+
+salome.sg.updateObjBrowser(True)
\ No newline at end of file