Merge branch 'master' into pre/penta18

[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 0654341721aecd92821acab2aa049ffe6df1175a..dfefee94cb1c4d6fcf07265435d56b37b82aa169 100644 (file)
--- a/src/SMESH_SWIG/SMESH_controls.py
+++ b/src/SMESH_SWIG/SMESH_controls.py
@@ -1,40 +1,42 @@
-#  Copyright (C) 2004  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2016  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
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# 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.
 #
+# 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
 #
+
 #  File   : SMESH_control.py
 #  Author : Sergey LITONIN
 #  Module : SMESH
-
-
-import smesh
+#
+import salome
 import SMESH_mechanic
 
-salome = smesh.salome
-mesh   = SMESH_mechanic.mesh
-
+import SMESH, SALOMEDS
+from salome.smesh import smeshBuilder
+smesh =  smeshBuilder.New(salome.myStudy)
+mesh = SMESH_mechanic.mesh
 
 # ---- 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()
@@ -46,7 +48,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()
@@ -58,7 +60,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()
@@ -70,7 +72,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()
@@ -82,7 +84,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()
@@ -94,7 +96,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()
@@ -106,7 +108,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()
@@ -118,7 +120,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()
@@ -127,4 +129,16 @@ print "Criterion: Borders at multi-connections = 2 Nb = ", len( anIds )
   #print anIds[ i ]
 
 
-salome.sg.updateObjBrowser(1)
+# Criterion : Element Diameter 2D > 10
+
+# create group
+aGroup = mesh.MakeGroup("Element Diameter 2D > 10", SMESH.FACE, SMESH.FT_MaxElementLength2D, SMESH.FT_MoreThan, 10 )
+
+# print result
+anIds = aGroup.GetIDs()
+print "Criterion: Element Diameter 2D > 10 Nb = ", len( anIds )
+#for i in range( len( anIds ) ):
+  #print anIds[ i ]
+
+
+salome.sg.updateObjBrowser(True)