X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_SWIG%2FGEOM_example4.py;h=8eaa9091ef19e48c1d2cadddfb2ba7648d20f114;hb=cb234e246225d575d6682ca4587e54b5f6f30497;hp=a78cd9d012978a29f7f60b7bdab00625cd11aa15;hpb=ecb53a73db547cbbb50f2df55faa344e3ad41594;p=modules%2Fgeom.git

diff --git a/src/GEOM_SWIG/GEOM_example4.py b/src/GEOM_SWIG/GEOM_example4.py
index a78cd9d01..8eaa9091e 100755
--- a/src/GEOM_SWIG/GEOM_example4.py
+++ b/src/GEOM_SWIG/GEOM_example4.py
@@ -1,18 +1,43 @@
-import SMESH
-import smeshpy
+#  -*- coding: iso-8859-1 -*-
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  File   : GEOM_example4.py
+#  Module : GEOM
+#import SMESH
+#import smeshpy
+#
 import salome
 from salome import sg
 import math
-#import SMESH_BasicHypothesis_idl
 
 import geompy
 
-geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+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
@@ -43,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)
 
@@ -74,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)