Join modifications for CCRT by Jean Rahuel.src/GEOM_SWIG/Makefile.in

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

diff --git a/src/GEOM_SWIG/GEOM_Partition4.py b/src/GEOM_SWIG/GEOM_Partition4.py
index 17c7632c91e378d70433cd1be4184e0ffa9e0801..348d6b45bd92daca83c20ff68727144d8db3ff8f 100755 (executable)
--- a/src/GEOM_SWIG/GEOM_Partition4.py
+++ b/src/GEOM_SWIG/GEOM_Partition4.py
@@ -1,8 +1,23 @@
-#  GEOM GEOM_SWIG : binding of C++ omplementaion with Python
+#  Copyright (C) 2005  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.
 #
-#  Copyright (C) 2003  CEA/DEN, EDF R&D
+#  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_Partition4.py
 #  Module : GEOM
@@ -39,49 +54,45 @@ geom = geompy.geom
 
 # -- Construction de backfill
 
-backA = geompy.MakeBox(0.0,0.0,0.0,baDx,baDy,baDz)
-back = geompy.MakeTranslation(backA,-baDx/2,-baDy/2,-baDz/2)
+backA = geompy.MakeBox(0.0, 0.0, 0.0, baDx, baDy, baDz)
+back = geompy.MakeTranslation(backA, -baDx/2, -baDy/2, -baDz/2)
 
 # -- Construction de alveolus
 
 import math
 
-alveA = geompy.MakeBox(0.0,0.0,0.0,alDx,alDy,alDz)
-alveB = geompy.MakeTranslation(alveA,-alDx/2,baDy/2,-alDz/2)
-axis  = geompy.geom.MakeAxisStruct(0.0,0.0,0.0,1.0,0.0,0.0)
-alve1 = geompy.MakeRotation(alveB,axis,math.pi)
-alve2 = geompy.MakeTranslation(alveB,+alSepx/2,0.0,0.0)
-alve3 = geompy.MakeTranslation(alveB,-alSepx/2,0.0,0.0)
-IORlist = []
-IORlist.append(alve1._get_Name())
-IORlist.append(alve2._get_Name())
-IORlist.append(alve3._get_Name())
-alve = geompy.MakeCompound(IORlist)
+alveA = geompy.MakeBox(0.0, 0.0, 0.0, alDx, alDy, alDz)
+alveB = geompy.MakeTranslation(alveA, -alDx/2, baDy/2, -alDz/2)
+axis  = geompy.MakeVectorDXDYDZ(1.0, 0.0, 0.0)
+alve1 = geompy.MakeRotation(alveB, axis, math.pi)
+alve2 = geompy.MakeTranslation(alveB, +alSepx/2, 0.0, 0.0)
+alve3 = geompy.MakeTranslation(alveB, -alSepx/2, 0.0, 0.0)
+GOlist = []
+GOlist.append(alve1)
+GOlist.append(alve2)
+GOlist.append(alve3)
+alve = geompy.MakeCompound(GOlist)
 
 # -- Construction de geological medium
 
-geolA = geompy.MakeBox(0.0,0.0,0.0,gmDx,gmDy,gmDz)
-geol = geompy.MakeTranslation(geolA,-gmDx/2,-gmDy/2,-gmDz/2)
+geolA = geompy.MakeBox(0.0, 0.0, 0.0, gmDx, gmDy, gmDz)
+geol = geompy.MakeTranslation(geolA, -gmDx/2, -gmDy/2, -gmDz/2)
 
-geol = geompy.Partition(
-    [alve._get_Name(), geol._get_Name(), back._get_Name()])
+geol = geompy.MakePartition([alve, geol, back])
 
-subshapes = geompy.SubShapeAll( geol, geompy.ShapeType["SHAPE"] )
+subshapes = geompy.SubShapeAll(geol, geompy.ShapeType["SHAPE"])
 
-IORlist = []
-IORlist.append(subshapes[0]._get_Name())
-IORlist.append(subshapes[1]._get_Name())
-IORlist.append(subshapes[2]._get_Name())
-alve = geompy.MakeCompound(IORlist)
+GOlist = []
+GOlist.append(subshapes[0])
+GOlist.append(subshapes[1])
+GOlist.append(subshapes[2])
+alve = geompy.MakeCompound(GOlist)
 
 geol = subshapes[3]
 back = subshapes[4]
 
 # --
 
-geol = geompy.MakeCompound(
-    [geol._get_Name(), back._get_Name(), alve._get_Name()])
-
-geompy.addToStudy(geol,"couplex2 2")
-
+geol = geompy.MakeCompound([geol, back, alve])
 
+geompy.addToStudy(geol, "couplex2 2")