Merge multi-study removal branch.

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

diff --git a/src/SMESH_SWIG/SMESH_hexaedre.py b/src/SMESH_SWIG/SMESH_hexaedre.py
index 66ba9c82421f6b7b6291ebd39abc5c7312a21fe6..6a215780a7b9c1b1135fe343be66c76ab5938e08 100755 (executable)
--- a/src/SMESH_SWIG/SMESH_hexaedre.py
+++ b/src/SMESH_SWIG/SMESH_hexaedre.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
@@ -21,12 +21,16 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 import salome
-import geompy
-import smesh
+salome.salome_init()
+import GEOM
+from salome.geom import geomBuilder
+geompy = geomBuilder.New()
 
-# -----------------------------------------------------------------------------
+import SMESH, SALOMEDS
+from salome.smesh import smeshBuilder
+smesh =  smeshBuilder.New()
 
-geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
+# -----------------------------------------------------------------------------
 
 p0 = geompy.MakeVertex(0., 0., 0.)
 px = geompy.MakeVertex(100., 0., 0.)
@@ -47,18 +51,19 @@ vol1=geompy.MakeCut(sphereExt,sphereA)
 vol2=geompy.MakeCut(vol1,sphereB)
 vol3=geompy.MakeCut(vol2,cylindre)
 blob=geompy.MakeCut(vol3,sphereInt)
+blob=geompy.RemoveExtraEdges(blob)
 
 idblob = geompy.addToStudy(blob,"blob")
 
 edgeGroups = geompy.Propagate( blob )
 assert len( edgeGroups ) == 3
 
-salome.sg.updateObjBrowser(1)
+salome.sg.updateObjBrowser()
 
 # -----------------------------------------------------------------------------
 
 print "-------------------------- mesh"
-smesh.SetCurrentStudy(salome.myStudy)
+smesh.UpdateStudy()
 
 # ---- define a mesh on the geom shape 'blob'
 mesh=smesh.Mesh(blob, "MeshBlob")
@@ -93,4 +98,4 @@ if ok:
 else:
     print "problem when Computing the mesh"
 
-salome.sg.updateObjBrowser(1)
+salome.sg.updateObjBrowser()