X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=doc%2Fsalome%2Fexamples%2Fprimitives_ex02.py;h=82cf5e4490459ffc5c6b81230eb00143b44ecc49;hb=fe74d236e05f37685de15cf5c2420a1e0ffea78d;hp=a0e73ff5fbd3c96af4155ae73d64c228d1a983e9;hpb=b9cd395cc3b809c23349b26b31940dcaccc93a21;p=modules%2Fgeom.git

diff --git a/doc/salome/examples/primitives_ex02.py b/doc/salome/examples/primitives_ex02.py
index a0e73ff5f..82cf5e449 100644
--- a/doc/salome/examples/primitives_ex02.py
+++ b/doc/salome/examples/primitives_ex02.py
@@ -1,46 +1,49 @@
 # Creation of a Cylinder
 
+import math
+
 import salome
 salome.salome_init()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New(salome.myStudy)
 
-import math
 gg = salome.ImportComponentGUI("GEOM")
 
 # create a vertex and a vector
 p1 = geompy.MakeVertex(25, 35, 45)
 p2 = geompy.MakeVertex(70, 70, 70)
-v = geompy.MakeVector(p1, p2)
+v  = geompy.MakeVector(p1, p2)
 
 # create cylinders
-height = 40
-
+height  = 40
 radius1 = 15
+radius2 = 30
+angle1  = 45.  * math.pi / 180.
+angle2  = 210. * math.pi / 180.
+
 cylinder1 = geompy.MakeCylinder(p1, v, radius1, height)
-angle1 = 45.*math.pi / 180.
-cylinder1a = geompy.MakeCylinderA(p1, v, radius1, height, angle1)
-geompy.TranslateDXDYDZ(cylinder1a,80.,0.,0.)
 
-radius2 = 30
 cylinder2 = geompy.MakeCylinderRH(radius2, height)
-angle2 = 210.*math.pi / 180.
-cylinder2a = geompy.MakeCylinderRHA(radius2, height, angle2)
-geompy.TranslateDXDYDZ(cylinder2a,80.,0.,0.)
+
+cylinder3 = geompy.MakeCylinderA(p1, v, radius1, height, angle1)
+geompy.TranslateDXDYDZ(cylinder3, 80., 0., 0.)
+
+cylinder4 = geompy.MakeCylinderRHA(radius2, height, angle2)
+geompy.TranslateDXDYDZ(cylinder4, 80., 0., 0.)
 
 # add objects in the study
 id_cylinder1 = geompy.addToStudy(cylinder1,"Cylinder1")
 id_cylinder2 = geompy.addToStudy(cylinder2,"Cylinder2")
-id_cylinder1a = geompy.addToStudy(cylinder1a,"Cylinder1a")
-id_cylinder2a = geompy.addToStudy(cylinder2a,"Cylinder2a")
+id_cylinder3 = geompy.addToStudy(cylinder3,"Cylinder3")
+id_cylinder4 = geompy.addToStudy(cylinder4,"Cylinder4")
 
 # display the cylinders
 gg.createAndDisplayGO(id_cylinder1)
 gg.setDisplayMode(id_cylinder1,1)
 gg.createAndDisplayGO(id_cylinder2)
 gg.setDisplayMode(id_cylinder2,1)
-gg.createAndDisplayGO(id_cylinder1a)
-gg.setDisplayMode(id_cylinder1a,1)
-gg.createAndDisplayGO(id_cylinder2a)
-gg.setDisplayMode(id_cylinder2a,1)
+gg.createAndDisplayGO(id_cylinder3)
+gg.setDisplayMode(id_cylinder3,1)
+gg.createAndDisplayGO(id_cylinder4)
+gg.setDisplayMode(id_cylinder4,1)