Merge with version on tag OCC-V2_1_0d

[modules/geom.git] / src / GEOM_SWIG / GEOM_Partition5.py

diff --git a/src/GEOM_SWIG/GEOM_Partition5.py b/src/GEOM_SWIG/GEOM_Partition5.py
index cbc1c5c5faff20bda6a44d5c1195a9d78d7cb998..ca6d5de815d2977389f74aa050096385283de03f 100755 (executable)
--- a/src/GEOM_SWIG/GEOM_Partition5.py
+++ b/src/GEOM_SWIG/GEOM_Partition5.py
@@ -19,29 +19,26 @@ geom = geompy.geom
 # -- Dimensions de la boite enti\88re
 
 LX, LY, LZ = 300.0, 150.0, 150.0
+p0 = geompy.MakeVertex(0.,0.,0.)
+vy = geompy.MakeVectorDXDYDZ(0.,1.,0.)
 
 # -- D\89finition du plan de sym\89trie (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
@@ -51,53 +48,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\89ole
 
 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\89oles
 
 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")