From a131a06c181e1120c864d00e465c0f33e427eb0c Mon Sep 17 00:00:00 2001 From: dmv Date: Mon, 12 Oct 2009 13:47:48 +0000 Subject: [PATCH] correct previous integration (Porting to Python 2.6) --- src/GEOM_SWIG/GEOM_Nut.py | 1 - src/GEOM_SWIG/GEOM_ObjectInfo.py | 1 - src/GEOM_SWIG/GEOM_Partition1.py | 1 - src/GEOM_SWIG/GEOM_Partition2.py | 1 - src/GEOM_SWIG/GEOM_Partition3.py | 1 - src/GEOM_SWIG/GEOM_Partition4.py | 1 - src/GEOM_SWIG/GEOM_Partition5.py | 1 - src/GEOM_SWIG/GEOM_Sketcher.py | 1 - src/GEOM_SWIG/GEOM_Spanner.py | 1 - src/GEOM_SWIG/GEOM_TestAll.py | 1 - src/GEOM_SWIG/GEOM_TestHealing.py | 1 - src/GEOM_SWIG/GEOM_TestMeasures.py | 1 - src/GEOM_SWIG/GEOM_TestOthers.py | 1 - src/GEOM_SWIG/GEOM_blocks.py | 1 - src/GEOM_SWIG/GEOM_cyl2complementary.py | 1 - src/GEOM_SWIG/GEOM_example.py | 1 - src/GEOM_SWIG/GEOM_example2.py | 1 - src/GEOM_SWIG/GEOM_example3.py | 1 - src/GEOM_SWIG/GEOM_example4.py | 1 - src/GEOM_SWIG/GEOM_example5.py | 1 - src/GEOM_SWIG/GEOM_example6.py | 77 +++++++++++----------- src/GEOM_SWIG/GEOM_moteur.py | 1 - src/GEOM_SWIG/GEOM_shared_modules.py | 1 - src/GEOM_SWIG/GEOM_shellSolid.py | 1 - src/GEOM_SWIG/GEOM_tube_geom.py | 1 - src/GEOM_SWIG/GEOM_tube_geom_gg2.py | 1 - src/GEOM_SWIG/GEOM_usinggeom.py | 1 - src/GEOM_SWIG/PAL_MESH_019_020_geometry.py | 1 - src/GEOM_SWIG/PAL_MESH_028_geometry.py | 1 - src/GEOM_SWIG/PAL_MESH_030_geometry.py | 1 - src/GEOM_SWIG/PAL_MESH_033_geometry.py | 1 - src/GEOM_SWIG/PAL_MESH_035_geometry.py | 1 - src/GEOM_SWIG/batchmode_geompy.py | 1 - src/GEOM_SWIG/geompy.py | 1 - src/GEOM_SWIG/geompyDC.py | 1 - 35 files changed, 38 insertions(+), 73 deletions(-) diff --git a/src/GEOM_SWIG/GEOM_Nut.py b/src/GEOM_SWIG/GEOM_Nut.py index 7805fd2e5..cf0d353b4 100755 --- a/src/GEOM_SWIG/GEOM_Nut.py +++ b/src/GEOM_SWIG/GEOM_Nut.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_ObjectInfo.py b/src/GEOM_SWIG/GEOM_ObjectInfo.py index c6b10ab48..dab3549c2 100644 --- a/src/GEOM_SWIG/GEOM_ObjectInfo.py +++ b/src/GEOM_SWIG/GEOM_ObjectInfo.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # GEOM GEOM_SWIG : binding of C++ omplementaion with Python # diff --git a/src/GEOM_SWIG/GEOM_Partition1.py b/src/GEOM_SWIG/GEOM_Partition1.py index b2a7ea8bc..35b8ec0ac 100755 --- a/src/GEOM_SWIG/GEOM_Partition1.py +++ b/src/GEOM_SWIG/GEOM_Partition1.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_Partition2.py b/src/GEOM_SWIG/GEOM_Partition2.py index 94c5bb41b..2f1d47304 100755 --- a/src/GEOM_SWIG/GEOM_Partition2.py +++ b/src/GEOM_SWIG/GEOM_Partition2.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_Partition3.py b/src/GEOM_SWIG/GEOM_Partition3.py index c72bc3aa3..688e6c702 100755 --- a/src/GEOM_SWIG/GEOM_Partition3.py +++ b/src/GEOM_SWIG/GEOM_Partition3.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_Partition4.py b/src/GEOM_SWIG/GEOM_Partition4.py index 5c9b72a1f..edcb8c7fe 100755 --- a/src/GEOM_SWIG/GEOM_Partition4.py +++ b/src/GEOM_SWIG/GEOM_Partition4.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_Partition5.py b/src/GEOM_SWIG/GEOM_Partition5.py index 515e911a2..d052ea29d 100755 --- a/src/GEOM_SWIG/GEOM_Partition5.py +++ b/src/GEOM_SWIG/GEOM_Partition5.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_Sketcher.py b/src/GEOM_SWIG/GEOM_Sketcher.py index 1d726fe62..6b9ba597c 100644 --- a/src/GEOM_SWIG/GEOM_Sketcher.py +++ b/src/GEOM_SWIG/GEOM_Sketcher.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_Spanner.py b/src/GEOM_SWIG/GEOM_Spanner.py index 1c21e9f35..567386ebf 100644 --- a/src/GEOM_SWIG/GEOM_Spanner.py +++ b/src/GEOM_SWIG/GEOM_Spanner.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_TestAll.py b/src/GEOM_SWIG/GEOM_TestAll.py index c7bc7e71e..fb7598780 100644 --- a/src/GEOM_SWIG/GEOM_TestAll.py +++ b/src/GEOM_SWIG/GEOM_TestAll.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_TestHealing.py b/src/GEOM_SWIG/GEOM_TestHealing.py index 8de481fcb..cb8e46c45 100644 --- a/src/GEOM_SWIG/GEOM_TestHealing.py +++ b/src/GEOM_SWIG/GEOM_TestHealing.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_TestMeasures.py b/src/GEOM_SWIG/GEOM_TestMeasures.py index 0365b178c..e8f7c332e 100644 --- a/src/GEOM_SWIG/GEOM_TestMeasures.py +++ b/src/GEOM_SWIG/GEOM_TestMeasures.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_TestOthers.py b/src/GEOM_SWIG/GEOM_TestOthers.py index 5fa81b36d..e78b2aec4 100644 --- a/src/GEOM_SWIG/GEOM_TestOthers.py +++ b/src/GEOM_SWIG/GEOM_TestOthers.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_blocks.py b/src/GEOM_SWIG/GEOM_blocks.py index 43daa1160..4e212ae85 100644 --- a/src/GEOM_SWIG/GEOM_blocks.py +++ b/src/GEOM_SWIG/GEOM_blocks.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_cyl2complementary.py b/src/GEOM_SWIG/GEOM_cyl2complementary.py index d180ef31d..6edb26270 100755 --- a/src/GEOM_SWIG/GEOM_cyl2complementary.py +++ b/src/GEOM_SWIG/GEOM_cyl2complementary.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_example.py b/src/GEOM_SWIG/GEOM_example.py index be4a9e55e..3d34e9364 100644 --- a/src/GEOM_SWIG/GEOM_example.py +++ b/src/GEOM_SWIG/GEOM_example.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_example2.py b/src/GEOM_SWIG/GEOM_example2.py index 914265cd3..08eb90c23 100644 --- a/src/GEOM_SWIG/GEOM_example2.py +++ b/src/GEOM_SWIG/GEOM_example2.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_example3.py b/src/GEOM_SWIG/GEOM_example3.py index 945189242..751d083d5 100644 --- a/src/GEOM_SWIG/GEOM_example3.py +++ b/src/GEOM_SWIG/GEOM_example3.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_example4.py b/src/GEOM_SWIG/GEOM_example4.py index 13feeb51d..8eaa9091e 100755 --- a/src/GEOM_SWIG/GEOM_example4.py +++ b/src/GEOM_SWIG/GEOM_example4.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_example5.py b/src/GEOM_SWIG/GEOM_example5.py index 9f5b2dd3e..763ad63cb 100644 --- a/src/GEOM_SWIG/GEOM_example5.py +++ b/src/GEOM_SWIG/GEOM_example5.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_example6.py b/src/GEOM_SWIG/GEOM_example6.py index 4c17726b8..ca591d952 100755 --- a/src/GEOM_SWIG/GEOM_example6.py +++ b/src/GEOM_SWIG/GEOM_example6.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # @@ -21,42 +20,42 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# GEOM GEOM_SWIG : binding of C++ omplementaion with Python -# File : GEOM_example6.py -# Author : Dmitry MATVEITCHEV -# Module : GEOM -# $Header$ +# GEOM GEOM_SWIG : binding of C++ omplementaion with Python +# File : GEOM_example6.py +# Author : Dmitry MATVEITChEV +# Module : GEOM +# $Header$ # -import salome -import geompy - -ind = 1 -circlelist = [] -while ind < 6: - x1 = 0. + (10. * ind) - y1 = 0. - z1 = 0. - x2 = 10. + (10. * ind) - y2 = 20. * (ind+1) - z2 = 30. * (ind+1) - x3 = 50. + (10. * ind) - y3 = 0. * (ind+1) - z3 = -10. * (ind+1) - - print x1, y1, z1, x2, y2, z2, x3, y3, z3 - - point1 = geompy.MakeVertex(x1, y1, z1) - name1 = "point1_%d"%(ind) - id_pt1 = geompy.addToStudy(point1, name1) - point2 = geompy.MakeVertex(x2, y2, z2) - name2 = "point2_%d"%(ind) - id_pt2 = geompy.addToStudy(point2, name2) - point3 = geompy.MakeVertex(x3, y3, z3) - name3 = "point3_%d"%(ind) - id_pt3 = geompy.addToStudy(point3, name3) - - name = "circle%d"%(ind) - circle = geompy.MakeCircleCenter2Pnt(point1, point2, point3) - id_circle = geompy.addToStudy(circle, name) - circlelist.append(circle) - ind = ind + 1 +import salome +import geompy + +ind = 1 +circlelist = [] +while ind < 6: + x1 = 0. + (10. * ind) + y1 = 0. + z1 = 0. + x2 = 10. + (10. * ind) + y2 = 20. * (ind+1) + z2 = 30. * (ind+1) + x3 = 50. + (10. * ind) + y3 = 0. * (ind+1) + z3 = -10. * (ind+1) + + print x1, y1, z1, x2, y2, z2, x3, y3, z3 + + point1 = geompy.MakeVertex(x1, y1, z1) + name1 = "point1_%d"%(ind) + id_pt1 = geompy.addToStudy(point1, name1) + point2 = geompy.MakeVertex(x2, y2, z2) + name2 = "point2_%d"%(ind) + id_pt2 = geompy.addToStudy(point2, name2) + point3 = geompy.MakeVertex(x3, y3, z3) + name3 = "point3_%d"%(ind) + id_pt3 = geompy.addToStudy(point3, name3) + + name = "circle%d"%(ind) + circle = geompy.MakeCircleCenter2Pnt(point1, point2, point3) + id_circle = geompy.addToStudy(circle, name) + circlelist.append(circle) + ind = ind + 1 diff --git a/src/GEOM_SWIG/GEOM_moteur.py b/src/GEOM_SWIG/GEOM_moteur.py index 847fbb124..303e9f1f5 100644 --- a/src/GEOM_SWIG/GEOM_moteur.py +++ b/src/GEOM_SWIG/GEOM_moteur.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_shared_modules.py b/src/GEOM_SWIG/GEOM_shared_modules.py index 859af1913..a42e111b9 100644 --- a/src/GEOM_SWIG/GEOM_shared_modules.py +++ b/src/GEOM_SWIG/GEOM_shared_modules.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_shellSolid.py b/src/GEOM_SWIG/GEOM_shellSolid.py index 422e94f9c..9decfd45e 100755 --- a/src/GEOM_SWIG/GEOM_shellSolid.py +++ b/src/GEOM_SWIG/GEOM_shellSolid.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_tube_geom.py b/src/GEOM_SWIG/GEOM_tube_geom.py index 0f35fdebb..b69f98b84 100755 --- a/src/GEOM_SWIG/GEOM_tube_geom.py +++ b/src/GEOM_SWIG/GEOM_tube_geom.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_tube_geom_gg2.py b/src/GEOM_SWIG/GEOM_tube_geom_gg2.py index 3f54f652e..beb6eff95 100755 --- a/src/GEOM_SWIG/GEOM_tube_geom_gg2.py +++ b/src/GEOM_SWIG/GEOM_tube_geom_gg2.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/GEOM_usinggeom.py b/src/GEOM_SWIG/GEOM_usinggeom.py index ed9ae3007..0800993b9 100644 --- a/src/GEOM_SWIG/GEOM_usinggeom.py +++ b/src/GEOM_SWIG/GEOM_usinggeom.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py b/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py index d055ac8ca..86571c7a2 100755 --- a/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/PAL_MESH_028_geometry.py b/src/GEOM_SWIG/PAL_MESH_028_geometry.py index c0b9fae14..7b83e09f5 100755 --- a/src/GEOM_SWIG/PAL_MESH_028_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_028_geometry.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/PAL_MESH_030_geometry.py b/src/GEOM_SWIG/PAL_MESH_030_geometry.py index b534a680b..c7df14d14 100755 --- a/src/GEOM_SWIG/PAL_MESH_030_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_030_geometry.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/PAL_MESH_033_geometry.py b/src/GEOM_SWIG/PAL_MESH_033_geometry.py index a1d100b1b..21abb7366 100755 --- a/src/GEOM_SWIG/PAL_MESH_033_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_033_geometry.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/PAL_MESH_035_geometry.py b/src/GEOM_SWIG/PAL_MESH_035_geometry.py index 01d31c6bb..f9c23addb 100755 --- a/src/GEOM_SWIG/PAL_MESH_035_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_035_geometry.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/batchmode_geompy.py b/src/GEOM_SWIG/batchmode_geompy.py index b25e8bdc8..54a149b73 100644 --- a/src/GEOM_SWIG/batchmode_geompy.py +++ b/src/GEOM_SWIG/batchmode_geompy.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/geompy.py b/src/GEOM_SWIG/geompy.py index 29637ba35..081435b2a 100644 --- a/src/GEOM_SWIG/geompy.py +++ b/src/GEOM_SWIG/geompy.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py index 45b71f674..309c667e8 100644 --- a/src/GEOM_SWIG/geompyDC.py +++ b/src/GEOM_SWIG/geompyDC.py @@ -1,4 +1,3 @@ -#! /usr/bin/python # -*- coding: iso-8859-1 -*- # Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # -- 2.39.2