X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_SWIG%2FGEOM_example4.py;h=cc8d82941b78f8478d77ed4600c3ac7040993ea6;hb=a6b86fc40dddf212f4e71821d6156f298939c7ca;hp=7d50005a520abe4efd1ceee5d345f4a8d7cf2754;hpb=46fb51231345bb027081f198d3db8daccbc2ae2f;p=modules%2Fgeom.git

diff --git a/src/GEOM_SWIG/GEOM_example4.py b/src/GEOM_SWIG/GEOM_example4.py
index 7d50005a5..cc8d82941 100755
--- a/src/GEOM_SWIG/GEOM_example4.py
+++ b/src/GEOM_SWIG/GEOM_example4.py
@@ -17,28 +17,27 @@
 #  License along with this library; if not, write to the Free Software 
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 # 
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 #
 #  File   : GEOM_example4.py
 #  Module : GEOM
 
-import SMESH
-import smeshpy
+#import SMESH
+#import smeshpy
 import salome
 from salome import sg
 import math
-#import SMESH_BasicHypothesis_idl
 
 import geompy
 
 geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 myBuilder = salome.myStudy.NewBuilder()
-from geompy import gg
+#from geompy import gg
 
-smeshgui = salome.ImportComponentGUI("SMESH")
-smeshgui.Init(salome.myStudyId);
+#smeshgui = salome.ImportComponentGUI("SMESH")
+#smeshgui.Init(salome.myStudyId);
 
 ShapeTypeCompSolid = 1
 ShapeTypeSolid = 2
@@ -69,24 +68,17 @@ rc2=150
 rc3=150
 rc4=300
 # ---------------------------------------------
-point_0 = geom.MakePointStruct(0, 0, 0)
-point_z = geom.MakePointStruct(0, 0, 1)
+point_0 = geompy.MakeVertex(0, 0, 0)
+point_z = geompy.MakeVertex(0, 0, 1)
 
-point_a = geom.MakePointStruct(xa, ya, za)
-point_b = geom.MakePointStruct(xb, yb, zb)
-point_c = geom.MakePointStruct(xc, yc, zc)
+point_a = geompy.MakeVertex(xa, ya, za)
+point_b = geompy.MakeVertex(xb, yb, zb)
+point_c = geompy.MakeVertex(xc, yc, zc)
 
-dir_z = geom.MakeDirection(point_z)
-axe_z = geom.MakeAxisStruct(0, 0, 0, 0, 0, 1)
-
-dir_a = geom.MakeDirection(point_a)
-axe_a = geom.MakeAxisStruct(0, 0, 0, xa, ya, za)
-
-dir_b = geom.MakeDirection(point_b)
-axe_b = geom.MakeAxisStruct(0, 0, 0, xb, yb, zb)
-
-dir_c = geom.MakeDirection(point_c)
-axe_c = geom.MakeAxisStruct(0, 0, 0, xc, yc, zc)
+dir_z = geompy.MakeVector(point_0,point_z)
+dir_a = geompy.MakeVector(point_0,point_a)
+dir_b = geompy.MakeVector(point_0,point_b)
+dir_c = geompy.MakeVector(point_0,point_c)
 
 cyl_1 = geompy.MakeCylinder(point_0, dir_z, rc1, hc1)
 
@@ -100,7 +92,7 @@ cyl_b = geompy.MakeTranslation(cyl_t, -1.2*rc1, -0.1*rc1, -0.5*hc1)
 
 hc4=2*hc1
 cyl_t = geompy.MakeCylinder(point_0, dir_c, rc4, hc4)
-cyl_t = geompy.MakeRotation(cyl_t, axe_c, pi/2)
+cyl_t = geompy.MakeRotation(cyl_t, dir_c, pi/2)
 cyl_c = geompy.MakeTranslation(cyl_t, -hc1, 0, 0)
 cyl_d = geompy.MakeTranslation(cyl_t, -hc1, 0, 1.3*rc4)