X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=doc%2Fsalome%2Fexamples%2Fcreating_meshes_ex06.py;h=3cc4dc1023d98decd129ae2f8b66bf58b4ed444f;hp=8e52da6be2fb508070ce02f41877f4cb855c6f75;hb=8d297d6698f361d4f2dde723050bcfbaea050920;hpb=a6bce4dabaa3e22cf4417358e150755e4dbb4d2a

diff --git a/doc/salome/examples/creating_meshes_ex06.py b/doc/salome/examples/creating_meshes_ex06.py
index 8e52da6be..3cc4dc102 100644
--- a/doc/salome/examples/creating_meshes_ex06.py
+++ b/doc/salome/examples/creating_meshes_ex06.py
@@ -8,11 +8,11 @@ import salome
 salome.salome_init()
 import GEOM
 from salome.geom import geomBuilder
-geompy = geomBuilder.New(salome.myStudy)
+geompy = geomBuilder.New()
 
 import SMESH, SALOMEDS
 from salome.smesh import smeshBuilder
-smesh =  smeshBuilder.New(salome.myStudy)
+smesh =  smeshBuilder.New()
 
 import math
 
@@ -25,7 +25,7 @@ height = 200
 # Build a cylinder
 # ----------------
 
-base = geompy.MakeVertex(0, 0, 0)
+base      = geompy.MakeVertex(0, 0, 0)
 direction = geompy.MakeVectorDXDYDZ(0, 0, 1)
 
 cylinder = geompy.MakeCylinder(base, direction, radius, height)
@@ -37,9 +37,9 @@ geompy.addToStudy(cylinder, "cylinder")
 
 size = radius/2.0
 
-box_rot = geompy.MakeBox(-size, -size, 0,  +size, +size, height)
+box_rot  = geompy.MakeBox(-size, -size, 0,  +size, +size, height)
 box_axis = geompy.MakeLine(base, direction)
-box = geompy.MakeRotation(box_rot, box_axis, math.pi/4)
+box      = geompy.MakeRotation(box_rot, box_axis, math.pi/4)
 
 hole = geompy.MakeCut(cylinder, box)
 
@@ -50,8 +50,8 @@ plane_b = geompy.MakePlane(base, geompy.MakeVectorDXDYDZ(0, 1, 0), plane_trim)
 
 blocks_part = geompy.MakePartition([hole], [plane_a, plane_b], [], [], geompy.ShapeType["SOLID"])
 blocks_list = [box] + geompy.SubShapeAll(blocks_part, geompy.ShapeType["SOLID"])
-blocks_all = geompy.MakeCompound(blocks_list)
-blocks = geompy.MakeGlueFaces(blocks_all, 0.0001)
+blocks_all  = geompy.MakeCompound(blocks_list)
+blocks      = geompy.MakeGlueFaces(blocks_all, 0.0001)
 
 geompy.addToStudy(blocks, "cylinder:blocks")
 
@@ -62,8 +62,7 @@ def group(name, shape, type, base=None, direction=None):
     t = geompy.ShapeType[type]
     g = geompy.CreateGroup(shape, t)
 
-    geompy.addToStudy(g, name)
-    g.SetName(name)
+    geompy.addToStudyInFather(shape, g, name)
 
     if base!=None:
         l = geompy.GetShapesOnPlaneWithLocationIDs(shape, t, direction, base, GEOM.ST_ON)
@@ -76,7 +75,7 @@ group_a = group("baseA", blocks, "FACE", base, direction)
 base_b  = geompy.MakeVertex(0, 0, height)
 group_b = group("baseB", blocks, "FACE", base_b, direction)
 
-group_1 = group("limit", blocks, "SOLID")
+group_1     = group("limit", blocks, "SOLID")
 group_1_all = geompy.SubShapeAllIDs(blocks, geompy.ShapeType["SOLID"])
 geompy.UnionIDs(group_1, group_1_all)
 group_1_box = geompy.GetBlockNearPoint(blocks, base)
@@ -85,14 +84,14 @@ geompy.DifferenceList(group_1, [group_1_box])
 # Mesh the blocks with hexahedral
 # -------------------------------
 
-smesh.SetCurrentStudy(salome.myStudy)
+smesh.UpdateStudy()
 
-def discretize(x, y, z,  n, s=blocks):
-    p = geompy.MakeVertex(x, y, z)
-    e = geompy.GetEdgeNearPoint(s, p)
-    a = hexa.Segment(e)
-    a.NumberOfSegments(n)
-    a.Propagation()
+def discretize(x, y, z,  nbSeg, shape=blocks):
+    vert = geompy.MakeVertex( x, y, z )
+    edge = geompy.GetEdgeNearPoint( shape, vert )
+    algo = hexa.Segment( edge )
+    algo.NumberOfSegments( nbSeg )
+    algo.Propagation()
 
 hexa = smesh.Mesh(blocks)