0020946: EDF 1466 SMESH: Add a new control criteria: Max element length

Rename "Max Element LEngth 2D/3D" control to "Element Diameter 2D/3D"

diff --git a/doc/salome/gui/SMESH/images/max_element_length_2d.png b/doc/salome/gui/SMESH/images/max_element_length_2d.png
index d19c80e7fd7b3a84a325c7e558fff417aa45b002..012d552f5d47417cc07d89c8f2c1450622cdfe2d 100755 (executable)
Binary files a/doc/salome/gui/SMESH/images/max_element_length_2d.png and b/doc/salome/gui/SMESH/images/max_element_length_2d.png differ

diff --git a/doc/salome/gui/SMESH/images/max_element_length_3d.png b/doc/salome/gui/SMESH/images/max_element_length_3d.png
index 356e5e25d9a1c266ff60d753c195de34da549ca7..fdf1b7688dbf6b27a183a94315d98343f73dd5a8 100755 (executable)
Binary files a/doc/salome/gui/SMESH/images/max_element_length_3d.png and b/doc/salome/gui/SMESH/images/max_element_length_3d.png differ

diff --git a/doc/salome/gui/SMESH/input/max_element_length_2d.doc b/doc/salome/gui/SMESH/input/max_element_length_2d.doc
index 0c062f8728d77e3e8294a6029ad827a0c9207f78..933ac55ee6596eddec68e62519e09109e0557368 100644 (file)
--- a/doc/salome/gui/SMESH/input/max_element_length_2d.doc
+++ b/doc/salome/gui/SMESH/input/max_element_length_2d.doc
@@ -1,20 +1,20 @@
 /*!
 
-\page max_element_length_2d_page Max Element Length 2D
+\page max_element_length_2d_page Element Diameter 2D
 
 \n This quality control criterion consists of calculation of length of
 the edges and diagonals combining the meshing elements (triangles and quadrangles)
 of your mesh.
 
-<em>To apply the Max Element Length 2D quality criterion to your mesh:</em>
+<em>To apply the Element Diameter 2D quality criterion to your mesh:</em>
 <ol>
 <li>Display your mesh in the viewer. </li>
 
-<li>Choose <b>Controls > Face Controls > Max Element Length 2D</b> or click
-<em>"Max Element Length 2D"</em> button in the toolbar. 
+<li>Choose <b>Controls > Face Controls > Element Diameter 2D</b> or click
+<em>"Element Diameter 2D"</em> button in the toolbar. 
 
 \image html image42.png
-<center><em>"Max Element Length 2D" button</em></center>
+<center><em>"Element Diameter 2D" button</em></center>
 
 Your mesh will be displayed in the viewer with its elements colored according to the
 applied mesh quality control criterion:
@@ -24,6 +24,6 @@ applied mesh quality control criterion:
 </ol>
 
 <br><b>See Also</b> a sample TUI Script of a 
-\ref tui_max_element_length_2d "Max Element Length 2D quality control" operation.  
+\ref tui_max_element_length_2d "Element Diameter 2D quality control" operation.  
 
 */
\ No newline at end of file

diff --git a/doc/salome/gui/SMESH/input/max_element_length_3d.doc b/doc/salome/gui/SMESH/input/max_element_length_3d.doc
index 287c3f24cb8a05da633da2f2be0b0584ae532010..9326ad8377ddd633cd999f85f8d7093d036f7f78 100644 (file)
--- a/doc/salome/gui/SMESH/input/max_element_length_3d.doc
+++ b/doc/salome/gui/SMESH/input/max_element_length_3d.doc
@@ -1,21 +1,21 @@
 /*!
 
-\page max_element_length_3d_page Max Element Length 3D
+\page max_element_length_3d_page Element Diameter 3D
 
 \n This quality control criterion consists of calculation of length of
 the edges and diagonals combining the 3D meshing elements
 (tetrahedrons, pyramids, pentahendrons, hexahedrons and polyhedrons)
 of your mesh.
 
-<em>To apply the Max Element Length 3D quality criterion to your mesh:</em>
+<em>To apply the Element Diameter 3D quality criterion to your mesh:</em>
 <ol>
 <li>Display your mesh in the viewer. </li>
 
-<li>Choose <b>Controls > Volume Controls > Max Element Length 3D</b> or click
-<em>"Max Element Length 3D"</em> button in the toolbar. 
+<li>Choose <b>Controls > Volume Controls > Element Diameter 3D</b> or click
+<em>"Element Diameter 3D"</em> button in the toolbar. 
 
 \image html image43.png
-<center><em>"Max Element Length 3D" button</em></center>
+<center><em>"Element Diameter 3D" button</em></center>
 
 Your mesh will be displayed in the viewer with its elements colored according to the
 applied mesh quality control criterion:
@@ -25,6 +25,6 @@ applied mesh quality control criterion:
 </ol>
 
 <br><b>See Also</b> a sample TUI Script of a 
-\ref tui_max_element_length_3d "Max Element Length 3D quality control" operation.  
+\ref tui_max_element_length_3d "Element Diameter 3D quality control" operation.  
 
 */
\ No newline at end of file

diff --git a/doc/salome/gui/SMESH/input/selection_filter_library.doc b/doc/salome/gui/SMESH/input/selection_filter_library.doc
index 00af8c7ebf837e1131bee745798f5efc6c908055..1f612994f18438ce6a05af2a9a0e21b50083a7e5 100644 (file)
--- a/doc/salome/gui/SMESH/input/selection_filter_library.doc
+++ b/doc/salome/gui/SMESH/input/selection_filter_library.doc
@@ -163,10 +163,10 @@ normal to the neighboring face and the normal to the selected face is less then
 angular tolerance (defined in degrees). Selection continues among all neighbor faces of already 
 selected ones.<br>
 </li><li>
-<b>Max Element Length 2D</b> selects triangles and quadrangles combining of the edges and
+<b>Element Diameter 2D</b> selects triangles and quadrangles combining of the edges and
 diagonals with a value of length, which is more, less or equal
 (within a given <b>Tolerance</b>) to the predefined <b>Threshold Value</b>. See also a
-\ref max_element_length_2d_page "Max Element Length 2D quality control".
+\ref max_element_length_2d_page "Element Diameter 2D quality control".
 </li>
 </ul>
 
@@ -180,10 +180,10 @@ Additional criteria to select mesh <b>Volumes</b> are the following:
 \ref volume_page "Volume quality control"), which is more, less or equal (within a given
 <b>Tolerance</b>) to the predefined <b>Threshold Value</b>.
 </li><li>
-<b>Max Element Length 3D</b> selects 3D mesh elements combining of the edges and
+<b>Element Diameter 3D</b> selects 3D mesh elements combining of the edges and
 diagonals with a value of length, which is more, less or equal
 (within a given <b>Tolerance</b>) to the predefined <b>Threshold Value</b>. See also a
-\ref max_element_length_3d_page "Max Element Length 3D quality control".
+\ref max_element_length_3d_page "Element Diameter 3D quality control".
 </li><li>
 <b>Bad oriented volume</b> selects mesh volumes, which are incorrectly oriented from
 the point of view of MED convention.

diff --git a/doc/salome/gui/SMESH/input/tui_filters.doc b/doc/salome/gui/SMESH/input/tui_filters.doc
index a736158086d12fc9c523ea6e2fcfd44542cf60aa..6677b2ab592bb5281c1e18b6fcd7237f4a9977aa 100755 (executable)
--- a/doc/salome/gui/SMESH/input/tui_filters.doc
+++ b/doc/salome/gui/SMESH/input/tui_filters.doc
@@ -337,7 +337,7 @@ print "Number of faces with maximum edge length > 14:", len(ids)
 
 \sa \ref tui_length_2d
 
-\section filter_max_element_length_2d Max Element Length 2D
+\section filter_max_element_length_2d Element Diameter 2D
 
 Filter 2D mesh elements (faces) corresponding to the maximum length
 value of its edges and diagonals:
@@ -356,7 +356,7 @@ print "Number of faces with maximum element length > 10:", len(ids)
 
 \sa \ref tui_max_element_length_2d
 
-\section filter_max_element_length_3d Max Element Length 3D
+\section filter_max_element_length_3d Element Diameter 3D
 
 Filter 3D mesh elements (volumes) corresponding to the maximum length
 value of its edges and diagonals:

diff --git a/doc/salome/gui/SMESH/input/tui_quality_controls.doc b/doc/salome/gui/SMESH/input/tui_quality_controls.doc
index acbf89198437b748b58b487c12d7ec581d96b8bc..fc496dcde0f507966b4509ccefe66dd655d9e00d 100644 (file)
--- a/doc/salome/gui/SMESH/input/tui_quality_controls.doc
+++ b/doc/salome/gui/SMESH/input/tui_quality_controls.doc
@@ -603,7 +603,7 @@ aGroup.Add(anIds)
 salome.sg.updateObjBrowser(1)
 \endcode
 
-\section tui_max_element_length_2d Max Element Length 2D
+\section tui_max_element_length_2d Element Diameter 2D
 
 \code
 import SMESH_mechanic
@@ -612,7 +612,7 @@ smesh  = SMESH_mechanic.smesh
 mesh   = SMESH_mechanic.mesh
 salome = SMESH_mechanic.salome
 
-# Criterion : MAX ELEMENT LENGTH 2D > 10
+# Criterion : ELEMENT DIAMETER 2D > 10
 mel_2d_margin = 10
 
 aFilter = smesh.GetFilter(smesh.FACE, smesh.FT_MaxElementLength2D, smesh.FT_MoreThan, mel_2d_margin)
@@ -620,7 +620,7 @@ aFilter = smesh.GetFilter(smesh.FACE, smesh.FT_MaxElementLength2D, smesh.FT_More
 anIds = mesh.GetIdsFromFilter(aFilter) 
 
 # print the result
-print "Criterion: Max Element Length 2D Ratio > ", mel_2d_margin, " Nb = ", len(anIds)
+print "Criterion: Element Diameter 2D Ratio > ", mel_2d_margin, " Nb = ", len(anIds)
 j = 1
 for i in range(len(anIds)):
   if j > 20: j = 1; print ""
@@ -630,7 +630,7 @@ for i in range(len(anIds)):
 print ""
 
 # create a group
-aGroup = mesh.CreateEmptyGroup(smesh.FACE, "Max Element Length 2D > " + `mel_2d_margin`)
+aGroup = mesh.CreateEmptyGroup(smesh.FACE, "Element Diameter 2D > " + `mel_2d_margin`)
 aGroup.Add(anIds)
 
 salome.sg.updateObjBrowser(1)
@@ -705,7 +705,7 @@ aGroup.Add(anIds)
 salome.sg.updateObjBrowser(1) 
 \endcode
 
-\section tui_max_element_length_3d Max Element Length 3D
+\section tui_max_element_length_3d Element Diameter 3D
 
 \code
 import SMESH_mechanic_tetra
@@ -714,7 +714,7 @@ smesh  = SMESH_mechanic_tetra.smesh
 mesh   = SMESH_mechanic_tetra.mesh
 salome = SMESH_mechanic_tetra.salome
 
-# Criterion : MAX ELEMENT LENGTH 3D > 10
+# Criterion : ELEMENT DIAMETER 3D > 10
 mel_3d_margin = 10
 
 aFilter = smesh.GetFilter(smesh.FACE, smesh.FT_MaxElementLength3D, smesh.FT_MoreThan, mel_3d_margin)
@@ -722,7 +722,7 @@ aFilter = smesh.GetFilter(smesh.FACE, smesh.FT_MaxElementLength3D, smesh.FT_More
 anIds = mesh.GetIdsFromFilter(aFilter) 
 
 # print the result
-print "Criterion: Max Element Length 3D Ratio > ", mel_3d_margin, " Nb = ", len(anIds)
+print "Criterion: Element Diameter 3D Ratio > ", mel_3d_margin, " Nb = ", len(anIds)
 j = 1
 for i in range(len(anIds)):
   if j > 20: j = 1; print ""
@@ -732,7 +732,7 @@ for i in range(len(anIds)):
 print ""
 
 # create a group
-aGroup = mesh.CreateEmptyGroup(smesh.FACE, "Max Element Length 3D > " + `mel_3d_margin`)
+aGroup = mesh.CreateEmptyGroup(smesh.FACE, "Element Diameter 3D > " + `mel_3d_margin`)
 aGroup.Add(anIds)
 
 salome.sg.updateObjBrowser(1)

diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index 8ea5465e14a27963617f211e25130656eed5d0c4..d907649f3737a4c0bdd2a506dbeb808a2a58f220 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -145,11 +145,11 @@
     </message>
     <message>
         <source>MAX_ELEMENT_LENGTH_2D</source>
-        <translation>Max Element Length 2D</translation>
+        <translation>Element Diameter 2D</translation>
     </message>
     <message>
         <source>MAX_ELEMENT_LENGTH_3D</source>
-        <translation>Max Element Length 3D</translation>
+        <translation>Element Diameter 3D</translation>
     </message>
     <message>
         <source>MEN_ADD</source>
@@ -449,11 +449,11 @@
     </message>
     <message>
         <source>MEN_MAX_ELEMENT_LENGTH_2D</source>
-        <translation>Max Element Length 2D</translation>
+        <translation>Element Diameter 2D</translation>
     </message>
     <message>
         <source>MEN_MAX_ELEMENT_LENGTH_3D</source>
-        <translation>Max Element Length 3D</translation>
+        <translation>Element Diameter 3D</translation>
     </message>
     <message>
         <source>MEN_MED</source>
@@ -2480,11 +2480,11 @@ Please check preferences of Mesh module.
     </message>
     <message>
         <source>STB_MAX_ELEMENT_LENGTH_2D</source>
-        <translation>Max Element Length 2D</translation>
+        <translation>Element Diameter 2D</translation>
     </message>
     <message>
         <source>STB_MAX_ELEMENT_LENGTH_3D</source>
-        <translation>Max Element Length 3D</translation>
+        <translation>Element Diameter 3D</translation>
     </message>
     <message>
         <source>STB_MED</source>
@@ -3016,11 +3016,11 @@ Please check preferences of Mesh module.
     </message>
     <message>
         <source>TOP_MAX_ELEMENT_LENGTH_2D</source>
-        <translation>Max Element Length 2D</translation>
+        <translation>Element Diameter 2D</translation>
     </message>
     <message>
         <source>TOP_MAX_ELEMENT_LENGTH_3D</source>
-        <translation>Max Element Length 3D</translation>
+        <translation>Element Diameter 3D</translation>
     </message>
     <message>
         <source>TOP_MED</source>
@@ -4419,11 +4419,11 @@ Please enter correct value and try again</translation>
     </message>
     <message>
         <source>MAX_ELEMENT_LENGTH_2D</source>
-        <translation>Max Element Length 2D</translation>
+        <translation>Element Diameter 2D</translation>
     </message>
     <message>
         <source>MAX_ELEMENT_LENGTH_3D</source>
-        <translation>Max Element Length 3D</translation>
+        <translation>Element Diameter 3D</translation>
     </message>
     <message>
         <source>MINIMUM_ANGLE</source>

diff --git a/src/SMESH_SWIG/SMESH_controls.py b/src/SMESH_SWIG/SMESH_controls.py
index 8cde5ac61bbe8c79a0dd385ca87f18815ffa7f5d..a322e42c5bec9eb8c99ea0e0b18071c3dd53eecb 100644 (file)
--- a/src/SMESH_SWIG/SMESH_controls.py
+++ b/src/SMESH_SWIG/SMESH_controls.py
@@ -128,14 +128,14 @@ print "Criterion: Borders at multi-connections = 2 Nb = ", len( anIds )
   #print anIds[ i ]
 
 
-# Criterion : Max Element Length 2D > 10
+# Criterion : Element Diameter 2D > 10
 
 # create group
-aGroup = mesh.MakeGroup("Max Element Length 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()
-print "Criterion: Max Element Length 2D > 10 Nb = ", len( anIds )
+print "Criterion: Element Diameter 2D > 10 Nb = ", len( anIds )
 #for i in range( len( anIds ) ):
   #print anIds[ i ]