X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_SWIG%2Fex02_cube2primitive.py;h=1080b3957917a1f3858650879e131352423c7611;hp=9d70577671c522e2f069c7f905aec406418fd8e3;hb=a0f09b9f1b8f5eac0e1c9277f76d65eb643cac94;hpb=57b43b4d010e2d0a1529d3c131bbb9d416e63258

diff --git a/src/SMESH_SWIG/ex02_cube2primitive.py b/src/SMESH_SWIG/ex02_cube2primitive.py
index 9d7057767..1080b3957 100644
--- a/src/SMESH_SWIG/ex02_cube2primitive.py
+++ b/src/SMESH_SWIG/ex02_cube2primitive.py
@@ -1,28 +1,37 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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.
+# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 #
-#  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.
+# 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, or (at your option) any later version.
 #
-#  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
+# 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.
 #
-#  See http://www.salome-platform.org/
+# 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
 #
-# CEA/LGLS 2004-2005, Francis KLOSS (OCC)
-# =======================================
 
-from geompy import *
+# =======================================
+#
+import salome
+salome.salome_init()
+import GEOM
+from salome.geom import geomBuilder
+geompy = geomBuilder.New(salome.myStudy)
 
-import smesh
+import SMESH, SALOMEDS
+from salome.smesh import smeshBuilder
+smesh =  smeshBuilder.New(salome.myStudy)
 
 # Geometry
 # ========
@@ -41,33 +50,33 @@ arete = 10
 # Points
 # ------
 
-blockPoint111 = MakeVertex(ox      , oy, oz)
-blockPoint211 = MakeVertex(ox+arete, oy, oz)
-blockPoint112 = MakeVertex(ox      , oy, oz+arete)
-blockPoint212 = MakeVertex(ox+arete, oy, oz+arete)
+blockPoint111 = geompy.MakeVertex(ox      , oy, oz)
+blockPoint211 = geompy.MakeVertex(ox+arete, oy, oz)
+blockPoint112 = geompy.MakeVertex(ox      , oy, oz+arete)
+blockPoint212 = geompy.MakeVertex(ox+arete, oy, oz+arete)
 
 # Face and solid
 # --------------
 
-blockFace1 = MakeQuad4Vertices(blockPoint111, blockPoint211, blockPoint212, blockPoint112)
+blockFace1 = geompy.MakeQuad4Vertices(blockPoint111, blockPoint211, blockPoint212, blockPoint112)
 
-blockSolid11  = MakePrismVecH(blockFace1, MakeVectorDXDYDZ(0, 1, 0), arete)
+blockSolid11  = geompy.MakePrismVecH(blockFace1, geompy.MakeVectorDXDYDZ(0, 1, 0), arete)
 
 # Translations
 # ------------
 
-blockSolid21  = MakeTranslation(blockSolid11, arete, 0, 0)
-blockSolid31  = MakeTranslation(blockSolid21, arete, 0, 0)
+blockSolid21  = geompy.MakeTranslation(blockSolid11, arete, 0, 0)
+blockSolid31  = geompy.MakeTranslation(blockSolid21, arete, 0, 0)
 
-blockSolid12  = MakeTranslation(blockSolid11, 0, 0, arete)
-blockSolid22  = MakeTranslation(blockSolid12, arete, 0, 0)
-blockSolid32  = MakeTranslation(blockSolid22, arete, 0, 0)
+blockSolid12  = geompy.MakeTranslation(blockSolid11, 0, 0, arete)
+blockSolid22  = geompy.MakeTranslation(blockSolid12, arete, 0, 0)
+blockSolid32  = geompy.MakeTranslation(blockSolid22, arete, 0, 0)
 
-blockSolid13  = MakeTranslation(blockSolid12, 0, 0, arete)
-blockSolid23  = MakeTranslation(blockSolid13, arete, 0, 0)
-blockSolid33  = MakeTranslation(blockSolid23, arete, 0, 0)
+blockSolid13  = geompy.MakeTranslation(blockSolid12, 0, 0, arete)
+blockSolid23  = geompy.MakeTranslation(blockSolid13, arete, 0, 0)
+blockSolid33  = geompy.MakeTranslation(blockSolid23, arete, 0, 0)
 
-blockSolid111 = MakeTranslation(blockSolid22, 0, arete, 0)
+blockSolid111 = geompy.MakeTranslation(blockSolid22, 0, arete, 0)
 
 # Compound and glue
 # -----------------
@@ -84,14 +93,14 @@ c_l.append(blockSolid23)
 c_l.append(blockSolid33)
 c_l.append(blockSolid111)
 
-c_cpd = MakeCompound(c_l)
+c_cpd = geompy.MakeCompound(c_l)
 
-piece = MakeGlueFaces(c_cpd, 1.e-5)
+piece = geompy.MakeGlueFaces(c_cpd, 1.e-5)
 
 # Add in study
 # ------------
 
-piece_id = addToStudy(piece, "ex02_cube2primitive")
+piece_id = geompy.addToStudy(piece, "ex02_cube2primitive")
 
 # Meshing
 # =======