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

diff --git a/src/SMESH_PY/smeshstudytools.py b/src/SMESH_PY/smeshstudytools.py
index 7b83e570e25e0dc5339059e417d7d205dad53bb8..4a2a9c6926075c8fc08929c406e116ea76079981 100644 (file)
--- a/src/SMESH_PY/smeshstudytools.py
+++ b/src/SMESH_PY/smeshstudytools.py
@@ -97,8 +97,10 @@ class SMeshStudyTools:
         '''
         if entry is None:
             return None
         '''
         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
 
         meshObject=smesh.IDToObject(entry)
         return meshObject
 


@@ -153,13 +155,17 @@ class SMeshStudyTools:
 def TEST_createBoxMesh():
     theStudy = helper.getActiveStudy()
     
 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)
 
     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)
     boxmesh = smesh.Mesh(box)
     Regular_1D = boxmesh.Segment()
     Nb_Segments_1 = Regular_1D.NumberOfSegments(15)

diff --git a/src/SMESH_SWIG/SMESH_mechanic.py b/src/SMESH_SWIG/SMESH_mechanic.py
index d7835f437f087f0c5da8a2952240d12dcf734179..784ccd373bee37b3528328713339129a8ca481d4 100644 (file)
--- a/src/SMESH_SWIG/SMESH_mechanic.py
+++ b/src/SMESH_SWIG/SMESH_mechanic.py
@@ -37,7 +37,7 @@ import SMESH, SALOMEDS
 from salome.smesh import smeshBuilder
 smesh =  smeshBuilder.New(salome.myStudy)
 
 from salome.smesh import smeshBuilder
 smesh =  smeshBuilder.New(salome.myStudy)
 

-import StdMeshers
+from salome.StdMeshers import StdMeshersBuilder

 
 # ---------------------------- GEOM --------------------------------------
 
 
 # ---------------------------- GEOM --------------------------------------
 

diff --git a/src/SMESH_SWIG/SMESH_reg.py b/src/SMESH_SWIG/SMESH_reg.py
index 36fc4b89739416c52abcc71fe9e18efcfa59a29c..2880748b2fc35680fd50fcadce98ad6859f9a284 100644 (file)
--- a/src/SMESH_SWIG/SMESH_reg.py
+++ b/src/SMESH_SWIG/SMESH_reg.py
@@ -34,7 +34,7 @@ import SMESH, SALOMEDS
 from salome.smesh import smeshBuilder
 smesh =  smeshBuilder.New(salome.myStudy)
 
 from salome.smesh import smeshBuilder
 smesh =  smeshBuilder.New(salome.myStudy)
 

-import StdMeshers
+from salome.StdMeshers import StdMeshersBuilder

 
 
 # ---- define a box
 
 
 # ---- define a box

diff --git a/src/SMESH_SWIG/StdMeshersBuilder.py b/src/SMESH_SWIG/StdMeshersBuilder.py
index 32d2724f9cfea963173eb6a35fe56054d9a5880a..8867060244051e1a7fc7c04ff052d54a539a652f 100644 (file)
--- a/src/SMESH_SWIG/StdMeshersBuilder.py
+++ b/src/SMESH_SWIG/StdMeshersBuilder.py
@@ -26,7 +26,7 @@ from salome.smesh.smeshBuilder import AssureGeomPublished, IsEqual, ParseParamet
 from salome.smesh.smeshBuilder import GetName, TreatHypoStatus
 from salome.smesh.smeshBuilder import Mesh
 
 from salome.smesh.smeshBuilder import GetName, TreatHypoStatus
 from salome.smesh.smeshBuilder import Mesh
 

-import StdMeshers
+from salome.StdMeshers import StdMeshersBuilder

 
 #----------------------------
 # Mesh algo type identifiers
 
 #----------------------------
 # Mesh algo type identifiers

diff --git a/src/SMESH_SWIG/batchmode_mefisto.py b/src/SMESH_SWIG/batchmode_mefisto.py
index b13abe69dc824b290e080b0fd09ab7c4431709a9..608edbd83ef11687713c54694e27b087fa24efbb 100644 (file)
--- a/src/SMESH_SWIG/batchmode_mefisto.py
+++ b/src/SMESH_SWIG/batchmode_mefisto.py
@@ -27,7 +27,7 @@ import re
 import batchmode_salome
 import batchmode_geompy
 import batchmode_smesh
 import batchmode_salome
 import batchmode_geompy
 import batchmode_smesh

-import StdMeshers
+from salome.StdMeshers import StdMeshersBuilder

 
 smesh = batchmode_smesh.smesh
 smesh.SetCurrentStudy(batchmode_salome.myStudy)
 
 smesh = batchmode_smesh.smesh
 smesh.SetCurrentStudy(batchmode_salome.myStudy)

diff --git a/src/SMESH_SWIG/ex30_groupsOp.py b/src/SMESH_SWIG/ex30_groupsOp.py
index eea4f55358b87dbd5de0c2fa28ef953f3d58c0e1..5cae0b029c33fc499e9def718acc6c5305b40218 100755 (executable)
--- a/src/SMESH_SWIG/ex30_groupsOp.py
+++ b/src/SMESH_SWIG/ex30_groupsOp.py
@@ -34,7 +34,7 @@ Face_1 = geompy.MakeFaceHW(100, 100, 1)
 geompy.addToStudy( Face_1, "Face_1" )
 
 smesh.SetCurrentStudy(salome.myStudy)
 geompy.addToStudy( Face_1, "Face_1" )
 
 smesh.SetCurrentStudy(salome.myStudy)

-import StdMeshers
+from salome.StdMeshers import StdMeshersBuilder

 pattern = smesh.GetPattern()
 Mesh_1 = smesh.Mesh(Face_1)
 Regular_1D = Mesh_1.Segment()
 pattern = smesh.GetPattern()
 Mesh_1 = smesh.Mesh(Face_1)
 Regular_1D = Mesh_1.Segment()

diff --git a/src/SMESH_SWIG/ex31_dimGroup.py b/src/SMESH_SWIG/ex31_dimGroup.py
index 3b1a480f7dd60b82d050ce67e1718a7ca860843e..65830faac3d04784194793d096437caca757fa49 100755 (executable)
--- a/src/SMESH_SWIG/ex31_dimGroup.py
+++ b/src/SMESH_SWIG/ex31_dimGroup.py
@@ -34,7 +34,7 @@ Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200)
 geompy.addToStudy( Box_1, "Box_1" )
 
 smesh.SetCurrentStudy(salome.myStudy)
 geompy.addToStudy( Box_1, "Box_1" )
 
 smesh.SetCurrentStudy(salome.myStudy)

-import StdMeshers
+from salome.StdMeshers import StdMeshersBuilder

 Mesh_1 = smesh.Mesh(Box_1)
 Regular_1D = Mesh_1.Segment()
 Nb_Segments_1 = Regular_1D.NumberOfSegments(10)
 Mesh_1 = smesh.Mesh(Box_1)
 Regular_1D = Mesh_1.Segment()
 Nb_Segments_1 = Regular_1D.NumberOfSegments(10)