Merge branch 'occ/26452_face_ori'

[modules/smesh.git] / doc / salome / examples / defining_hypotheses_ex15.py

diff --git a/doc/salome/examples/defining_hypotheses_ex15.py b/doc/salome/examples/defining_hypotheses_ex15.py
index a08dfbfaeab8e9f5f829af18546d3a68bfdcf52b..7b0cfbaa45aac528d52ad60cfef7281cf7c0ef58 100644 (file)
--- a/doc/salome/examples/defining_hypotheses_ex15.py
+++ b/doc/salome/examples/defining_hypotheses_ex15.py
@@ -1,8 +1,11 @@
 # Quadrangle Parameters example 2 (using different types)
 
-import geompy
-import smesh
-import StdMeshers
+import salome
+salome.salome_init_without_session()
+from salome.geom import geomBuilder
+geompy = geomBuilder.New()
+from salome.smesh import smeshBuilder
+smesh =  smeshBuilder.New()
 
 # Make quadrangle face and explode it on edges.
 Vertex_1 = geompy.MakeVertex(0, 0, 0)
@@ -11,10 +14,6 @@ Vertex_3 = geompy.MakeVertex(40, 30, 0)
 Vertex_4 = geompy.MakeVertex(0, 30, 0)
 Quadrangle_Face_1 = geompy.MakeQuad4Vertices(Vertex_1, Vertex_4, Vertex_3, Vertex_2)
 [Edge_1,Edge_2,Edge_3,Edge_4] = geompy.SubShapeAllSorted(Quadrangle_Face_1, geompy.ShapeType["EDGE"])
-geompy.addToStudy( Vertex_1, "Vertex_1" )
-geompy.addToStudy( Vertex_2, "Vertex_2" )
-geompy.addToStudy( Vertex_3, "Vertex_3" )
-geompy.addToStudy( Vertex_4, "Vertex_4" )
 geompy.addToStudy( Quadrangle_Face_1, "Quadrangle Face_1" )
 geompy.addToStudyInFather( Quadrangle_Face_1, Edge_2, "Edge_2" )
 
@@ -23,25 +22,20 @@ Mesh_1 = smesh.Mesh(Quadrangle_Face_1)
 
 # Create Quadrangle parameters and
 # define the Type as Quadrangle Preference
-Quadrangle_Parameters_1 = smesh.CreateHypothesis('QuadrangleParams')
-Quadrangle_Parameters_1.SetQuadType( StdMeshers.QUAD_QUADRANGLE_PREF )
+Quad_algo = Mesh_1.Quadrangle()
+Quadrangle_Parameters_1 = Quad_algo.QuadrangleParameters( smeshBuilder.QUAD_QUADRANGLE_PREF )
 
 # Define other hypotheses and algorithms
 Regular_1D = Mesh_1.Segment()
 Nb_Segments_1 = Regular_1D.NumberOfSegments(4)
-Nb_Segments_1.SetDistrType( 0 )
-status = Mesh_1.AddHypothesis(Quadrangle_Parameters_1)
-Quadrangle_2D = Mesh_1.Quadrangle()
 
 # Define submesh on one edge to provide different number of segments
 Regular_1D_1 = Mesh_1.Segment(geom=Edge_2)
 Nb_Segments_2 = Regular_1D_1.NumberOfSegments(10)
-Nb_Segments_2.SetDistrType( 0 )
-SubMesh_1 = Regular_1D_1.GetSubMesh()
 
 # Compute mesh (with Quadrangle Preference type)
 isDone = Mesh_1.Compute()
 
 # Change type to Reduced and compute again
-Quadrangle_Parameters_1.SetQuadType( StdMeshers.QUAD_REDUCED )
+Quadrangle_Parameters_1.SetQuadType( smeshBuilder.QUAD_REDUCED )
 isDone = Mesh_1.Compute()