Merge with version on tag OCC-V2_1_0d

[modules/smesh.git] / src / SMESH_SWIG / SMESH_freebord.py

diff --git a/src/SMESH_SWIG/SMESH_freebord.py b/src/SMESH_SWIG/SMESH_freebord.py
index d24e34070330437a6b0664d8125f2bfd7a06ec1f..d240a354f8429c8a20e815217d3920eaa2e47578 100644 (file)
--- a/src/SMESH_SWIG/SMESH_freebord.py
+++ b/src/SMESH_SWIG/SMESH_freebord.py
@@ -1,34 +1,22 @@
 import salome\r
-from geompy import gg\r
 import geompy\r
 import SMESH\r
-\r
 import StdMeshers\r
 \r
-ShapeTypeCompSolid = 1\r
-ShapeTypeSolid = 2\r
-ShapeTypeShell = 3\r
-ShapeTypeFace = 4\r
-ShapeTypeWire = 5\r
-ShapeTypeEdge = 6\r
-ShapeTypeVertex = 7\r
-\r
-geom  = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")\r
 smesh = salome.lcc.FindOrLoadComponent("FactoryServer", "SMESH")\r
-\r
-geom.GetCurrentStudy(salome.myStudy._get_StudyId())\r
 smesh.SetCurrentStudy(salome.myStudy)\r
 \r
 # Create box without one plane\r
 \r
 box = geompy.MakeBox(0., 0., 0., 10., 20., 30.)\r
-subShapeList = geompy.SubShapeAll(box,ShapeTypeFace)\r
+subShapeList = geompy.SubShapeAll(box, geompy.ShapeType["FACE"])\r
 \r
 FaceList  = []\r
 for i in range( 5 ):\r
-  FaceList.append( subShapeList[ i ]._get_Name() )\r
+  FaceList.append( subShapeList[ i ] )\r
 \r
-aBox = geompy.MakeSewing( FaceList, 1. )\r
+aComp = geompy.MakeCompound( FaceList )\r
+aBox = geompy.Sew( aComp, 1. )\r
 idbox = geompy.addToStudy( aBox, "box" )\r
   \r
 aBox  = salome.IDToObject( idbox )\r