X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_SWIG%2FGEOM_Partition5.py;h=8c22f0db46757d8498e2296cad59c3e629414cfb;hb=c31446905814a9a2f97f24aed67df3e69f68031b;hp=9a47c5c19dc2b29b8ee19eda8683124a5bc7a2d2;hpb=ecb53a73db547cbbb50f2df55faa344e3ad41594;p=modules%2Fgeom.git

diff --git a/src/GEOM_SWIG/GEOM_Partition5.py b/src/GEOM_SWIG/GEOM_Partition5.py
index 9a47c5c19..8c22f0db4 100755
--- a/src/GEOM_SWIG/GEOM_Partition5.py
+++ b/src/GEOM_SWIG/GEOM_Partition5.py
@@ -1,38 +1,59 @@
-#%Make geometry (like CEA script (A4)) using Partition algorithm%
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2012  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_Partition5.py
+#  Module : GEOM
 # import gallery_01_GEOM
 # reload(gallery_01_GEOM)
-
 # -- Import geompy pour piloter GEOM par script
-
+#
 import geompy
 geom = geompy.geom
 
 # -- Dimensions de la boite entiˆre
 
 LX, LY, LZ = 300.0, 150.0, 150.0
+p0 = geompy.MakeVertex(0.,0.,0.)
+vy = geompy.MakeVectorDXDYDZ(0.,1.,0.)
 
 # -- D‰finition du plan de sym‰trie (O,Ox,Oz)
 
-symPlane = geompy.MakePlane (
-    geom.MakePointStruct(0.,0.,0.),
-    geom.MakeDirection(geom.MakePointStruct(0.,1.,0.)),
-    10.0 )
+symPlane = geompy.MakePlane(p0, vy, 10.0)
 
 # -- bo
 
-bo = geompy.MakeBox(0.0,0.0,0.0,LX,LY,LZ)
-bo = geompy.MakeTranslation(bo,0.0,-LY/2,-LZ/2)
+bo = geompy.MakeBoxDXDYDZ(LX, LY, LZ)
+bo = geompy.MakeTranslation(bo, 0.0, -LY/2, -LZ/2)
 
 # -- Galerie principale
 
 gal_diam = 80.0
 gal_lony = LY
 gal_x = LX-20.0-gal_diam/2
-gal = geompy.MakeCylinder(
-    geom.MakePointStruct(0.,0.,0.),
-    geom.MakeDirection(geom.MakePointStruct(0.,1.,0.)),
-    gal_diam/2,gal_lony)
-gal = geompy.MakeTranslation(gal,gal_x,-gal_lony/2,0.0)
+
+gal = geompy.MakeCylinder(p0, vy, gal_diam/2, gal_lony)
+gal = geompy.MakeTranslation(gal, gal_x, -gal_lony/2, 0.0)
 
 # -- Galerie perpendiculaire
 # -- Dimensions de la galerie perpendiculaire
@@ -42,53 +63,46 @@ gal = geompy.MakeTranslation(gal,gal_x,-gal_lony/2,0.0)
 gpe_long, gpe_diam = 200.0, 60.0 
 gpe_x = gal_x
 gpe = geompy.MakeCylinder(
-    geom.MakePointStruct(0.,0.,0.),
-    geom.MakeDirection(geom.MakePointStruct(-1.,0.,0.)),
+    p0,
+    geompy.MakeVectorDXDYDZ(-1.,0.,0.),
     gpe_diam/2,gpe_long)
-gpe = geompy.MakeTranslation(gpe,gpe_x,0,0)
+gpe = geompy.MakeTranslation(gpe, gpe_x, 0, 0)
 
 # -- Dimensions d'une alveole
 # -- Construction d'une alv‰ole
 
 alv_long, alv_diam = 60.0, 18.0
-alv01 = geompy.MakeCylinder(
-    geom.MakePointStruct(0.,0.,0.),
-    geom.MakeDirection(geom.MakePointStruct(0.,1.,0.)),
-    alv_diam/2,alv_long)
-alv02 = geompy.MakeMirrorByPlane(alv01,symPlane)
-alv0 = geompy.MakeCompound( [ alv01._get_Name(), alv02._get_Name() ] )
+alv01 = geompy.MakeCylinder(p0, vy, alv_diam/2, alv_long)
+alv02 = geompy.MakeMirrorByPlane(alv01, symPlane)
+alv0 = geompy.MakeCompound([alv01, alv02])
 
 # -- Construction des alv‰oles
 
 alv_del, alv_sep = 40.0, 35.0
-alv1 = geompy.MakeTranslation (
-    alv0,gal_x-gal_diam/2-alv_sep,0.0,0.0 )
-alv2 = geompy.MakeTranslation (
-    alv1,-alv_del,0.0,0.0 )
-alv3 = geompy.MakeTranslation (
-    alv2,-alv_del,0.0,0.0 )
-alv = geompy.MakeCompound( [ alv1._get_Name(), alv2._get_Name(), alv3._get_Name() ] )
+alv1 = geompy.MakeTranslation(alv0, gal_x-gal_diam/2-alv_sep, 0.0, 0.0)
+alv2 = geompy.MakeTranslation(alv1, -alv_del, 0.0, 0.0 )
+alv3 = geompy.MakeTranslation(alv2, -alv_del, 0.0, 0.0 )
+alv = geompy.MakeCompound([alv1, alv2, alv3])
 
 # -- Remplissage de la BO
 
-gallery = geompy.Partition(
-    [ alv._get_Name(), bo._get_Name() ], [], [], [ gal._get_Name(), gpe._get_Name() ])
+gallery = geompy.MakePartition([alv, bo], [], [], [gal, gpe])
 
-subshapes = geompy.SubShapeAll( gallery, geompy.ShapeType["SHAPE"] )
+subshapes = geompy.SubShapeAll(gallery, geompy.ShapeType["SHAPE"])
 
-alvIORs = []
-alvIORs.append( subshapes[0]._get_Name() )
-alvIORs.append( subshapes[1]._get_Name() )
-alvIORs.append( subshapes[2]._get_Name() )
-alvIORs.append( subshapes[3]._get_Name() )
-alvIORs.append( subshapes[4]._get_Name() )
-alvIORs.append( subshapes[5]._get_Name() )
-alvcomp = geompy.MakeCompound( alvIORs )
+alvGOs = []
+alvGOs.append(subshapes[0])
+alvGOs.append(subshapes[1])
+alvGOs.append(subshapes[2])
+alvGOs.append(subshapes[3])
+alvGOs.append(subshapes[4])
+alvGOs.append(subshapes[5])
+alvcomp = geompy.MakeCompound(alvGOs)
 
-boIOR  = subshapes[6]._get_Name()
-galIOR = subshapes[7]._get_Name()
-gpeIOR = subshapes[8]._get_Name()
+boGO  = subshapes[6]
+galGO = subshapes[7]
+gpeGO = subshapes[8]
 
-gallery = geompy.MakeCompound( [ boIOR, alvcomp._get_Name(), gpeIOR, galIOR ] )
+gallery = geompy.MakeCompound([boGO, alvcomp, gpeGO, galGO])
 
 geompy.addToStudy(gallery,"Gallery 2")