- Modifing Geometry and Mesh Python scripts from SALOME 6 and before

[modules/smesh.git] / src / SMESH_PY / smeshstudytools.py

diff --git a/src/SMESH_PY/smeshstudytools.py b/src/SMESH_PY/smeshstudytools.py
index 7281fe51961b1920b2fc4d3009745997028a7e57..4a2a9c6926075c8fc08929c406e116ea76079981 100644 (file)
--- a/src/SMESH_PY/smeshstudytools.py
+++ b/src/SMESH_PY/smeshstudytools.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -27,10 +27,9 @@ import salome
 SMESH = None    # SMESH module is loaded only when needed
 
 from salome.kernel.studyedit import getStudyEditor
-try:
-    from salome.gui import helper
-except ImportError:
-    pass
+from salome.kernel.deprecation import is_called_by_sphinx
+if not is_called_by_sphinx():
+  from salome.gui import helper
 
 class SMeshStudyTools:
     """
@@ -98,8 +97,10 @@ class SMeshStudyTools:
         '''
         if entry is None:
             return None
-        import smesh
-        smesh.SetCurrentStudy(self.editor.study)
+        import SMESH
+        from salome.smesh import smeshBuilder
+        smesh = smeshBuilder.New(self.editor.study)
+
         meshObject=smesh.IDToObject(entry)
         return meshObject
 
@@ -154,13 +155,17 @@ class SMeshStudyTools:
 def TEST_createBoxMesh():
     theStudy = helper.getActiveStudy()
     
-    import geompy
-    geompy.init_geom(theStudy)
+    import GEOM
+    from salome.geom import geomBuilder
+    geompy = geomBuilder.New(theStudy)
+    
     box = geompy.MakeBoxDXDYDZ(200, 200, 200)
 
-    import smesh, SMESH, SALOMEDS    
-    smesh.SetCurrentStudy(theStudy)
-    import StdMeshers
+    import SMESH, SALOMEDS
+    from salome.smesh import smeshBuilder
+    smesh = smeshBuilder.New(theStudy) 
+
+    from salome.StdMeshers import StdMeshersBuilder
     boxmesh = smesh.Mesh(box)
     Regular_1D = boxmesh.Segment()
     Nb_Segments_1 = Regular_1D.NumberOfSegments(15)