Merge from BR_plugins_pbyacs 03/04/2013

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

diff --git a/src/SMESH_SWIG/SMESH_controls.py b/src/SMESH_SWIG/SMESH_controls.py
index dc8b4ff35b49fe1594626f3d39c495754fd6355e..e2ff1be234151dd2d0cd4f417a8799eb5944e851 100644 (file)
--- a/src/SMESH_SWIG/SMESH_controls.py
+++ b/src/SMESH_SWIG/SMESH_controls.py
@@ -25,17 +25,16 @@
 #  Author : Sergey LITONIN
 #  Module : SMESH
 #
-import smesh
 import SMESH_mechanic
 
-salome = smesh.salome
-mesh   = SMESH_mechanic.mesh
-
+import SMESH, SALOMEDS
+from salome.smesh import smeshBuilder
+smesh =  smeshBuilder.New(salome.myStudy)
 
 # ---- Criterion : AREA > 100
 
 # create group
-aGroup = mesh.MakeGroup("Area > 100", smesh.FACE, smesh.FT_Area, smesh.FT_MoreThan, 100)
+aGroup = mesh.MakeGroup("Area > 100", SMESH.FACE, SMESH.FT_Area, SMESH.FT_MoreThan, 100)
 
 # print result
 anIds = aGroup.GetIDs()
@@ -47,7 +46,7 @@ print "Criterion: Area > 100 Nb = ", len( anIds )
 # ----  Criterion : Taper > 3e-15
 
 # create group
-aGroup = mesh.MakeGroup("Taper > 3e-15", smesh.FACE, smesh.FT_Taper, smesh.FT_MoreThan, 3e-15)
+aGroup = mesh.MakeGroup("Taper > 3e-15", SMESH.FACE, SMESH.FT_Taper, SMESH.FT_MoreThan, 3e-15)
 
 # print result
 anIds = aGroup.GetIDs()
@@ -59,7 +58,7 @@ print "Criterion: Taper > 3e-15 Nb = ", len( anIds )
 # ----  Criterion : ASPECT RATIO > 1.3
 
 # create group
-aGroup = mesh.MakeGroup("Aspect Ratio > 1.3", smesh.FACE, smesh.FT_AspectRatio, smesh.FT_MoreThan, 1.3)
+aGroup = mesh.MakeGroup("Aspect Ratio > 1.3", SMESH.FACE, SMESH.FT_AspectRatio, SMESH.FT_MoreThan, 1.3)
 
 # print result
 anIds = aGroup.GetIDs()
@@ -71,7 +70,7 @@ print "Criterion: Aspect Ratio > 1.3 Nb = ", len( anIds )
 # ----  Criterion : MINIMUM ANGLE < 30
 
 # create group
-aGroup = mesh.MakeGroup("Minimum Angle < 30", smesh.FACE, smesh.FT_MinimumAngle, smesh.FT_LessThan, 30)
+aGroup = mesh.MakeGroup("Minimum Angle < 30", SMESH.FACE, SMESH.FT_MinimumAngle, SMESH.FT_LessThan, 30)
 
 # print result
 anIds = aGroup.GetIDs()
@@ -83,7 +82,7 @@ print "Criterion: Minimum Angle < 30 Nb = ", len( anIds )
 # ---- Criterion : Warp > 2e-13
 
 # create group
-aGroup = mesh.MakeGroup("Warp > 2e-13", smesh.FACE, smesh.FT_Warping, smesh.FT_MoreThan, 2e-13 )
+aGroup = mesh.MakeGroup("Warp > 2e-13", SMESH.FACE, SMESH.FT_Warping, SMESH.FT_MoreThan, 2e-13 )
 
 # print result
 anIds = aGroup.GetIDs()
@@ -95,7 +94,7 @@ print "Criterion: Warp > 2e-13 Nb = ", len( anIds )
 # ---- Criterion : Skew > 18
 
 # create group
-aGroup = mesh.MakeGroup("Skew > 18", smesh.FACE, smesh.FT_Skew, smesh.FT_MoreThan, 18 )
+aGroup = mesh.MakeGroup("Skew > 18", SMESH.FACE, SMESH.FT_Skew, SMESH.FT_MoreThan, 18 )
 
 # print result
 anIds = aGroup.GetIDs()
@@ -107,7 +106,7 @@ print "Criterion: Skew > 18 Nb = ", len( anIds )
 # Criterion : Length > 10
 
 # create group
-aGroup = mesh.MakeGroup("Length > 10", smesh.FACE, smesh.FT_Length, smesh.FT_MoreThan, 10 )
+aGroup = mesh.MakeGroup("Length > 10", SMESH.FACE, SMESH.FT_Length, SMESH.FT_MoreThan, 10 )
 
 # print result
 anIds = aGroup.GetIDs()
@@ -119,7 +118,7 @@ print "Criterion: Length > 10 Nb = ", len( anIds )
 # Criterion : Borders at multi-connections = 2
 
 # create group
-aGroup = mesh.MakeGroup("Borders at multi-connections = 2", smesh.EDGE, smesh.FT_MultiConnection, smesh.FT_EqualTo, 2)
+aGroup = mesh.MakeGroup("Borders at multi-connections = 2", SMESH.EDGE, SMESH.FT_MultiConnection, SMESH.FT_EqualTo, 2)
 
 # print result
 anIds = aGroup.GetIDs()
@@ -131,7 +130,7 @@ print "Criterion: Borders at multi-connections = 2 Nb = ", len( anIds )
 # Criterion : Element Diameter 2D > 10
 
 # create group
-aGroup = mesh.MakeGroup("Element Diameter 2D > 10", smesh.FACE, smesh.FT_MaxElementLength2D, smesh.FT_MoreThan, 10 )
+aGroup = mesh.MakeGroup("Element Diameter 2D > 10", SMESH.FACE, SMESH.FT_MaxElementLength2D, SMESH.FT_MoreThan, 10 )
 
 # print result
 anIds = aGroup.GetIDs()