X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_SWIG%2FSMESH_box3_tetra.py;h=af4082774b0fd4390abd49f7e59376866933c547;hp=adb7d4944730c27fbbcc8e5d4fc208451c9dcfd3;hb=9d28d73b09e96b23cf9937afa17474f98508df18;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8

diff --git a/src/SMESH_SWIG/SMESH_box3_tetra.py b/src/SMESH_SWIG/SMESH_box3_tetra.py
index adb7d4944..af4082774 100644
--- a/src/SMESH_SWIG/SMESH_box3_tetra.py
+++ b/src/SMESH_SWIG/SMESH_box3_tetra.py
@@ -10,73 +10,63 @@ import geompy
 import StdMeshers
 import NETGENPlugin
 
-geom  = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 smesh = salome.lcc.FindOrLoadComponent("FactoryServer", "SMESH")
 
 smeshgui = salome.ImportComponentGUI("SMESH")
 smeshgui.Init(salome.myStudyId);
 
-ShapeTypeShell     = 3
-ShapeTypeFace      = 4
-ShapeTypeEdge      = 6
-
 # ---- define 3 boxes box1, box2 and box3
 
 box1 = geompy.MakeBox(0., 0., 0., 100., 200., 300.)
 
-idbox1 = geompy.addToStudy(box1,"box1")
+idbox1 = geompy.addToStudy(box1, "box1")
 
 print "Analysis of the geometry box1 :"
-subShellList=geompy.SubShapeAll(box1,ShapeTypeShell)
-subFaceList=geompy.SubShapeAll(box1,ShapeTypeFace)
-subEdgeList=geompy.SubShapeAll(box1,ShapeTypeEdge)
+subShellList = geompy.SubShapeAll(box1, geompy.ShapeType["SHELL"])
+subFaceList  = geompy.SubShapeAll(box1, geompy.ShapeType["FACE"])
+subEdgeList  = geompy.SubShapeAll(box1, geompy.ShapeType["EDGE"])
 
-print "number of Shells in box1 : ",len(subShellList)
-print "number of Faces in box1 : ",len(subFaceList)
-print "number of Edges in box1 : ",len(subEdgeList)
+print "number of Shells in box1 : ", len(subShellList)
+print "number of Faces  in box1 : ", len(subFaceList)
+print "number of Edges  in box1 : ", len(subEdgeList)
 
 box2 = geompy.MakeBox(100., 0., 0., 200., 200., 300.)
 
-idbox2 = geompy.addToStudy(box2,"box2")
+idbox2 = geompy.addToStudy(box2, "box2")
 
 print "Analysis of the geometry box2 :"
-subShellList=geompy.SubShapeAll(box2,ShapeTypeShell)
-subFaceList=geompy.SubShapeAll(box2,ShapeTypeFace)
-subEdgeList=geompy.SubShapeAll(box2,ShapeTypeEdge)
+subShellList = geompy.SubShapeAll(box2, geompy.ShapeType["SHELL"])
+subFaceList  = geompy.SubShapeAll(box2, geompy.ShapeType["FACE"])
+subEdgeList  = geompy.SubShapeAll(box2, geompy.ShapeType["EDGE"])
 
-print "number of Shells in box2 : ",len(subShellList)
-print "number of Faces in box2 : ",len(subFaceList)
-print "number of Edges in box2 : ",len(subEdgeList)
+print "number of Shells in box2 : ", len(subShellList)
+print "number of Faces  in box2 : ", len(subFaceList)
+print "number of Edges  in box2 : ", len(subEdgeList)
 
 box3 = geompy.MakeBox(0., 0., 300., 200., 200., 500.)
 
-idbox3 = geompy.addToStudy(box3,"box3")
+idbox3 = geompy.addToStudy(box3, "box3")
 
 print "Analysis of the geometry box3 :"
-subShellList=geompy.SubShapeAll(box3,ShapeTypeShell)
-subFaceList=geompy.SubShapeAll(box3,ShapeTypeFace)
-subEdgeList=geompy.SubShapeAll(box3,ShapeTypeEdge)
-
-print "number of Shells in box3 : ",len(subShellList)
-print "number of Faces in box3 : ",len(subFaceList)
-print "number of Edges in box3 : ",len(subEdgeList)
+subShellList = geompy.SubShapeAll(box3, geompy.ShapeType["SHELL"])
+subFaceList  = geompy.SubShapeAll(box3, geompy.ShapeType["FACE"])
+subEdgeList  = geompy.SubShapeAll(box3, geompy.ShapeType["EDGE"])
 
-blocs = []
-blocs.append(box1._get_Name())
-blocs.append(box2._get_Name())
-blocs.append(box3._get_Name())
+print "number of Shells in box3 : ", len(subShellList)
+print "number of Faces  in box3 : ", len(subFaceList)
+print "number of Edges  in box3 : ", len(subEdgeList)
 
-shell = geompy.Partition(blocs)
+shell = geompy.MakePartition([box1, box2, box3])
 idshell = geompy.addToStudy(shell,"shell")
 
 print "Analysis of the geometry shell (union of box1, box2 and box3) :"
-subShellList=geompy.SubShapeAll(shell,ShapeTypeShell)
-subFaceList=geompy.SubShapeAll(shell,ShapeTypeFace)
-subEdgeList=geompy.SubShapeAll(shell,ShapeTypeEdge)
+subShellList = geompy.SubShapeAll(shell, geompy.ShapeType["SHELL"])
+subFaceList  = geompy.SubShapeAll(shell, geompy.ShapeType["FACE"])
+subEdgeList  = geompy.SubShapeAll(shell, geompy.ShapeType["EDGE"])
 
-print "number of Shells in shell : ",len(subShellList)
-print "number of Faces in shell : ",len(subFaceList)
-print "number of Edges in shell : ",len(subEdgeList)
+print "number of Shells in shell : ", len(subShellList)
+print "number of Faces  in shell : ", len(subFaceList)
+print "number of Edges  in shell : ", len(subEdgeList)
 
 
 ### ---------------------------- SMESH --------------------------------------
@@ -89,7 +79,7 @@ print "-------------------------- NumberOfSegments"
 
 numberOfSegments = 10
 
-hypNbSeg=smesh.CreateHypothesis("NumberOfSegments", "libStdMeshersEngine.so")
+hypNbSeg = smesh.CreateHypothesis("NumberOfSegments", "libStdMeshersEngine.so")
 hypNbSeg.SetNumberOfSegments(numberOfSegments)
 
 print hypNbSeg.GetName()
@@ -102,7 +92,7 @@ print "-------------------------- MaxElementArea"
 
 maxElementArea = 500
 
-hypArea=smesh.CreateHypothesis("MaxElementArea", "libStdMeshersEngine.so")
+hypArea = smesh.CreateHypothesis("MaxElementArea", "libStdMeshersEngine.so")
 hypArea.SetMaxElementArea(maxElementArea)
 
 print hypArea.GetName()
@@ -115,7 +105,7 @@ print "-------------------------- MaxElementVolume"
 
 maxElementVolume = 500
 
-hypVolume=smesh.CreateHypothesis("MaxElementVolume", "libStdMeshersEngine.so")
+hypVolume = smesh.CreateHypothesis("MaxElementVolume", "libStdMeshersEngine.so")
 hypVolume.SetMaxElementVolume(maxElementVolume)
 
 print hypVolume.GetName()
@@ -130,17 +120,17 @@ print "-------------------------- create Algorithms"
 
 print "-------------------------- Regular_1D"
 
-regular1D=smesh.CreateHypothesis("Regular_1D", "libStdMeshersEngine.so")
+regular1D = smesh.CreateHypothesis("Regular_1D", "libStdMeshersEngine.so")
 smeshgui.SetName(salome.ObjectToID(regular1D), "Wire Discretisation")
 
 print "-------------------------- MEFISTO_2D"
 
-mefisto2D=smesh.CreateHypothesis("MEFISTO_2D", "libStdMeshersEngine.so")
+mefisto2D = smesh.CreateHypothesis("MEFISTO_2D", "libStdMeshersEngine.so")
 smeshgui.SetName(salome.ObjectToID(mefisto2D), "MEFISTO_2D")
 
 print "-------------------------- NETGEN_3D"
 
-netgen3D=smesh.CreateHypothesis("NETGEN_3D", "libNETGENEngine.so")
+netgen3D = smesh.CreateHypothesis("NETGEN_3D", "libNETGENEngine.so")
 smeshgui.SetName(salome.ObjectToID(netgen3D), "NETGEN_3D")
 
 # ---- init a Mesh with the shell
@@ -164,10 +154,10 @@ mesh.AddHypothesis(shell,hypVolume)
 salome.sg.updateObjBrowser(1)
 
 print "-------------------------- compute shell"
-ret= smesh.Compute(mesh,shell)
+ret = smesh.Compute(mesh,shell)
 print ret
 if ret != 0:
-    log=mesh.GetLog(0) # no erase trace
+    log = mesh.GetLog(0) # no erase trace
     for linelog in log:
         print linelog
     print "Information about the MeshBox3:"