Merge from V4_1_0_maintainance branch (from tag mergeto_BR_QT4_Dev_08Jul08)

build_configure

@@ -32,10 +32,10 @@ fi
 for option
 do
   case $option in
-      -with-ihm | --with-ihm)
+      -with-gui | --with-gui)
           SMESH_WITH_GUI="yes"
           break;;
-      -without-ihm | --without-ihm | -with-ihm=no | --with-ihm=no)
+      -without-gui | --without-gui | -with-gui=no | --with-gui=no)
           SMESH_WITH_GUI="no"
           break;;
   esac

doc/salome/gui/Makefile.am

@@ -41,7 +41,9 @@ usr_docs:
 	filesl=`find .`; \
 	for filen in $${filesl}; do \
 	  sed 's/\([^s1e]\)smeshDC\|^smeshDC/\1smesh/g' $${filen} > ./tmp; \
-	  mv -f tmp $${filen}; \
+	  sed 's/smesh:://g' ./tmp > ./tmp1; \
+	  rm -f tmp; \
+	  mv -f tmp1 $${filen}; \
 	done; \
 	cd ..; \
 	echo "Running doxygen in directory: "`pwd`; \

doc/salome/gui/SMESH/input/1d_meshing_hypo.doc

@@ -102,9 +102,7 @@ length, you define only the <b>Number of Segments</b>.
 
 \image html b-mberofsegments.png
 
-<br><b>Scale Distribution</b> - each next segment differs from the
+<br><b>Scale Distribution</b> - length of segments gradually changes depending on the <b>Scale Factor</b>, which is a ratio of the first segment length to the last segment length.
-previous according to the formula: <b>A</b>i+1 = <b>A</b>i * k, where \b k is a
-<b>Scale Factor</b>.
 
 \image html a-nbsegments2.png
 

doc/salome/gui/SMESH/input/adding_nodes_and_elements.doc

@@ -38,7 +38,7 @@ operations.
 \image html addnode.png
 
 In this dialog box set coordinates for your node in the \b Coordinates
-set of fields and click the \b Apply or \b OK button. Your node will be
+set of fields and click the \b Apply or <b>Apply and Close</b> button. Your node will be
 created:
 
 \image html add_node.png
@@ -51,7 +51,7 @@ created:
 
 In this dialog box specify the nodes which will form your edge by
 selecting them in the 3D viewer with pressed Shift button and click
-the \b Apply or \b OK button. Your edge will be created:
+the \b Apply or <b>Apply and Close</b> button. Your edge will be created:
 
 \image html add_edge.png
 
@@ -63,7 +63,7 @@ the \b Apply or \b OK button. Your edge will be created:
 
 In this dialog box specify the nodes which will form your triangle by
 selecting them in the 3D viewer with pressed Shift button and click
-the \b Apply or \b OK button. Your triangle will be created:
+the \b Apply or <b>Apply and Close</b> button. Your triangle will be created:
 
 \image html add_triangle.png
 
@@ -75,7 +75,7 @@ the \b Apply or \b OK button. Your triangle will be created:
 
 In this dialog box specify the nodes which will form your quadrangle
 by selecting them in the 3D viewer with pressed Shift button and click
-the \b Apply or \b OK button. Your quadrangle will be created:
+the \b Apply or <b>Apply and Close</b> button. Your quadrangle will be created:
 
 \image html add_quadrangle.png
 
@@ -87,7 +87,7 @@ the \b Apply or \b OK button. Your quadrangle will be created:
 
 In this dialog box specify the nodes which will form your polygon by
 selecting them in the 3D viewer with pressed Shift button and click
-the \b Apply or \b OK button.
+the \b Apply or <b>Apply and Close</b> button.
 
 \image html add_polygone.png
 
@@ -99,7 +99,7 @@ the \b Apply or \b OK button.
 
 In this dialog box specify the nodes which will form your tetrahedron
 by selecting them in the 3D viewer with pressed Shift button and click
-the \b Apply or \b OK button. Your tetrahedron will be created:
+the \b Apply or <b>Apply and Close</b> button. Your tetrahedron will be created:
 
 \image html image70.jpg
 
@@ -111,7 +111,7 @@ the \b Apply or \b OK button. Your tetrahedron will be created:
 
 In this dialog box specify the nodes which will form your hexahedron
 by selecting them in the 3D viewer with pressed Shift button and click
-the \b Apply or \b OK button. Your hexahedron will be created:
+the \b Apply or <b>Apply and Close</b> button. Your hexahedron will be created:
 
 \image html image71.jpg
 
@@ -133,7 +133,7 @@ it does not provide you with the necessary level of precision. If you
 select \b Face as <b>Elements Type</b>, you will be able to select the faces
 which will form your polyhedron in the 3D viewer with pressed Shift
 button. If you've managed to obtain the necessary result, click the
-\b Apply or \b OK button. Your polyhedron will be created:
+\b Apply or <b>Apply and Close</b> button. Your polyhedron will be created:
 
 \image html add_polyhedron.png
 

doc/salome/gui/SMESH/input/adding_quadratic_elements.doc

@@ -26,7 +26,7 @@ selection).The edges formed by the corner nodes will appear in the
 table. To define the middle nodes for each edge double-click on the
 respective field and input the number of the node. All edges and the
 object formed by them will be displayed in the Object browser. When
-all edges are defined you will be able to click \b OK or \b Apply button to
+all edges are defined you will be able to click \b Apply or <b>Apply and Close</b> button to
 add the element to the mesh.
 
 \image html aqt.png

doc/salome/gui/SMESH/input/basic_meshing_algos.doc

@@ -21,7 +21,7 @@ shape of a mesh.</li>
 <li>For meshing of 2D entities (<b>faces</b>):</li>
 
 <ul>
-<li>Triangle meshing algorithms (Mefisto and Netgen 1D-2D ) - Faces
+<li>Triangle meshing algorithms (Mefisto, Netgen 1D-2D and BLSUFR ) - Faces
 are split into triangular elements.</li>
 <li>Quadrangle meshing algorithm (Mapping) - Faces are split into
 quadrangular elements.</li>
@@ -36,7 +36,7 @@ quadrangular elements.</li>
 <ul>
 <li>Hexahedron meshing algorithm (i,j,k) - Volumes are split into
 hexahedral (cubic) elements.</li>
-<li>Tetrahedron (Netgen) meshing algorithm - Volumes are split into
+<li>Tetrahedron (Netgen and GHS3D) meshing algorithms - Volumes are split into
 tetrahedral (pyramidal) elements.</li>
 </ul>
 
@@ -45,6 +45,8 @@ tetrahedral (pyramidal) elements.</li>
 \image html image126.gif
 </ul>
 
+Note that BLSURF and GHS3D are commercial meshers.\n
+
 There also is a number of more specific algorithms:
 <ul>
 <li>\ref projection_algos_page "for meshing by projection of another mesh"</li>

doc/salome/gui/SMESH/input/blsurf_hypo.doc

@@ -0,0 +1,221 @@
+/*!
+
+\page blsurf_hypo_page BLSURF Parameters hypothesis
+
+\n BLSURF Parameters hypothesis works only with <b>BLSURF</b> 2d
+algorithm. This algorithm is a commercial software.
+
+\image html blsurf_parameters.png
+
+<ul>
+<li><b>Name</b> - allows to define the name of the hypothesis (BLSURF
+Parameters by default).</li>
+
+<li><b>Physical Mesh</b> - if is set to "Custom", allows to set size
+of mesh elements to generate in <b>User size</b> field.
+</li>
+
+<li><b>User size</b> - size of mesh elements to generate. </li>
+
+<li><b>Max Physical Size</b> - is an upper limit of mesh element size. </li>
+
+<li><b>Min Physical Size</b> - is a lower limit of mesh element size. </li>
+
+<li><b>Geometrical mesh</b> - if is set to "Custom", allows to set
+mesh element deflection from curves and surfaces and element
+size change rate in <b>Angle Mesh S</b>, <b>Angle Mesh C</b> and
+<b>Gradation</b> fields correspondingly. These fields control
+computation of element size, so called <i>geometrical size</i>, conform to
+the surface geometry considering local curvatures. \n
+The eventual element size at each point will be minimum of <b>User
+size</b>, if given, and the <i>geometrical size</i>. </li>
+
+<li><b>Angle Mesh S</b> - maximal allowed angle in degrees at a mesh
+node between the mesh face and the tangent to the geometrical surface. </li>
+
+<li><b>Angle Mesh C</b> - maximal allowed angle in degrees at a mesh
+node between the mesh edge and the tangent to the geometrical curve. </li>
+
+<li><b>Max Geometrical Size</b> - is an upper limit of <i>geometrical size</i>.</li>
+
+<li><b>Min Geometrical Size</b> - is a lower limit of <i>geometrical size</i>.</li>
+
+<li><b>Gradation</b> - maximal allowed ratio between the lengths of
+two adjacent edges. </li>
+
+<li><b>Allow Quadrangles</b> - to create quadrilateral elements.</li>
+
+<li><b>Patch independent</b> - if this box is checked on, geometrical
+edges are not respected and all geometrical faces are meshed as one
+hyper-face.</li>
+
+\image html blsurf_parameters_advanced.png
+
+<li><b>Topology</b> - allows creation of a conform mesh on a shell of
+not sewed faces. 
+<ul>
+  <li>"From CAD" means that mesh conformity is assured by conformity
+  of a shape.</li>
+  <li>"Pre-process" and "Pre-process++" let BLSURF software
+  pre-process the geometrical model to eventually produce a conform
+  mesh. </li>
+</ul>
+
+<li><b>Verbosity level</b> - Defines the percentage of "verbosity" of
+BLSURF [0-100].</li>
+
+<li><b>Add option</b> - provides a choice of multiple advanced
+options, each of which, if selected, appear in a table where you can
+enter a value of the option and edit it later.</li>
+
+<li><b>Clear option</b> - removes option selected in the table.
+
+</ul>
+
+\n
+Commonly usable options are following. The name <i>diag</i> stands there for
+the diagonal of the bounding box of the geometrical object to mesh.
+
+<ul>
+<li><b>topo_eps1</b> (real) - is the tolerance level inside a CAD
+patch. By default is equal to <i>diag</i> × 10-4. This tolerance is used to
+identify nodes to merge within one geometrical face when \b Topology
+option is to pre-process. Default is <i>diag</i>/10.0.</li>
+
+<li><b>topo_eps2</b> (real) - is the tolerance level between two CAD
+patches. By default is equal to <i>diag</i> × 10-4. This tolerance is used to
+identify nodes to merge over different geometrical faces when
+\b Topology option is to pre-process. Default is <i>diag</i>/10.0.</li>
+
+<li>\b LSS (real) - is an abbreviation for "length of sub-segment". It is
+a maximal allowed length of a mesh edge. Default is 0.5.</li>
+
+<li>\b frontal (integer)
+<ul>
+<li> 1 - the mesh generator inserts points with an advancing front method.</li>
+<li> 0 - it inserts them with an algebraic method (on internal edges). This method is
+slightly faster but generates less regular meshes. </li>
+</ul>
+Default is 0.</li>
+
+<li>\b hinterpol_flag (integer) - determines the computation of an
+interpolated value <i>v</i> between two points <i>P1</i> and <i>P2</i> on a
+curve. Let <i>h1</i> be the value at point <i>P1,</i> <i>h2</i> be the value at point
+<i>P2,</i> and <i>t</i> be a parameter varying from 0 to 1 when moving from <i>P1
+to</i> <i>P2</i> . 
+<ul>
+<li>0 - the interpolation is linear: <i>v = h1 + t (h2 - h1 )</i></li>
+<li>1 - the interpolation is geometric: <i>v = h1 * pow( h2/h1, t)</i></li>
+<li>2 - the interpolation is sinusoidal: <i>v = (h1+h2)/2 +
+(h1-h2)/2*cos(PI*t)</i></li>
+</ul>
+Default is 0.</li>
+
+<li>\b hmean_flag (integer) - determines the computation of the mean of several
+values:<ul>
+<li>-1 - the minimum is computed.</li>
+<li>0 or 2 - the arithmetic mean computed.
+<li>1 - the geometric mean is computed.</li>
+</ul>
+Default is 0.</li>
+
+<li>\b CheckAdjacentEdges, \b CheckCloseEdges and \b CheckWellDefined
+(integers) - give number of calls of equally named subroutines the
+purpose of which is to improve the mesh of domains having narrow
+parts. At each iteration,\b CheckCloseEdges decreases the sizes of the
+edges when two boundary curves are neighboring,\b CheckAdjacentEdges
+balances the sizes of adjacent edges, and \b CheckWellDefined checks if
+the parametric domain is well defined. Default values are 0.</li>
+
+
+<li>\b CoefRectangle (real)- defines the relative thickness of the rectangles
+used by subroutine \b CheckCloseEdges (see above). Default is 0.25.</li>
+
+<li>\b eps_collapse (real) - if is more than 0.0, BLSURF removes
+curves whose lengths are less than \b eps_collapse. Here, to obtain an
+approximate value of the length of a curve, the latter is arbitrarily
+split into 20 edges. Default is 0.0.</li>
+
+<li>\b eps_ends (real) - is used to detect curves whose lengths are very
+small, which sometimes constitutes an error. A message is printed
+if<i> fabs(P2-P1) < eps_ends</i>, where <i>P1</i> and <i>P2</i> are the
+extremities of a curve. Default is <i>diag</i>/500.0.</li>
+
+<li>\b prefix (char) - is a prefix of the files generated by
+BLSURF. Default is "x".</li>
+
+<li>\b refs (integer) - reference of a surface, used when exporting
+files. Default is 1.</li>
+</ul>
+
+\n
+The following advanced options are not documented and you can use them
+at your own risk.
+\n\n Interger variables:
+<ul>
+<li>    addsurf_ivertex</li>
+<li>    background     </li>
+<li>    coiter         </li>
+<li>    communication  </li>
+<li>    decim          </li>
+<li>    export_flag    </li>
+<li>    file_h         </li>
+<li>    gridnu         </li>
+<li>    gridnv         </li>
+<li>    intermedfile   </li>
+<li>    memory         </li>
+<li>    normals        </li>
+<li>    optim          </li>
+<li>    pardom_flag    </li>
+<li>    pinch          </li>
+<li>    rigid          </li>
+<li>    surforient     </li>
+<li>    tconf          </li>
+<li>    topo_collapse  </li>
+</ul>
+Real variables:
+<ul>
+<li>    addsurf_angle  </li>
+<li>    addsurf_R      </li>
+<li>    addsurf_H      </li>
+<li>    addsurf_FG     </li>
+<li>    addsurf_r      </li>
+<li>    addsurf_PA     </li>
+<li>    angle_compcurv </li>
+<li>    angle_ridge    </li>
+<li>    eps_pardom     </li>
+</ul>
+String variables:
+<ul>
+<li>    export_format  </li>
+<li>    export_option  </li>
+<li>    import_option  </li>  
+</ul>
+
+
+\n
+Currently BLSURF plugin has the following limitations.
+<ul>
+  <li>Mesh contains inverted elements, if it is based on shape,
+      consisting of more than one face (box, cone, torus...) and if
+      the option "Allow Quadrangles (Test)" was checked before
+      computation.</li>
+
+  <li>SIGFPE exception is raised at trying to compute mesh, based on
+      box, with checked option "Patch independent".</li>
+
+  <li>It has been found out that BLSURF algorithm can't be used as a
+      local algorithm (on sub-meshes) and as a provider of low-level
+      mesh for some 3D algorithms because BLSURF mesher (and
+      consequently plugin) does not provide information on node
+      parameters on edges (U) and faces (U,V). For example the
+      following combinations of algorithms are impossible:
+      <ul>
+        <li> global MEFISTO or Quadrangle(mapping) + local BLSURF;</li>
+        <li> BLSUFR + Projection 2D from faces meshed by BLSURF;</li>
+        <li> local BLSURF + Extrusion 3D;</li>
+      </ul>
+      </li>
+</ul>
+
+*/

doc/salome/gui/SMESH/input/changing_orientation_of_elements.doc

@@ -35,7 +35,7 @@ list.</li>
 </ul>
 
 </li>
-<li>Click the \b Apply or \b OK button to confirm the operation.</li>
+<li>Click the \b Apply or <b>Apply and Close</b> button to confirm the operation.</li>
 </ol>
 
 <br><b>See Also</b> a sample TUI Script of a 

doc/salome/gui/SMESH/input/clipping.doc

@@ -23,6 +23,6 @@ cross-section in the <b>3D Viewer</b>.
 
 \image html image99.gif
 
-To get a new object from \b Clipping, click \b Ok.
+To get a new object from \b Clipping, click \b Apply.
 
 */

doc/salome/gui/SMESH/input/constructing_meshes.doc

@@ -90,12 +90,14 @@ failure is provided.
 \image html meshcomputationfail.png
 
 After you select the error, <b>Show Subshape</b> button allows
-visualizing the mesh elements that cause it.
+visualizing the geometrical entity that causes it.
 
 \image html failed_computation.png
 
-<b>Publish Subshape</b> button allows importing it in a separate MED
+<b>Publish Subshape</b> button publishes the subshape, whose meshing
-or UNV file.
+failed, in GEOM component as a child of the mesh geometry, which
+allows analyzing the problem geometry and creating a submesh on it in
+order to locally tune hypotheses.
 
 <b>NOTE</b> It is possible to define a 1D or a 2D mesh in a
 python script and then use such submeshes in the construction of a 3D

doc/salome/gui/SMESH/input/creating_groups.doc

@@ -43,11 +43,12 @@ mesh elements.
 \n <b>Select from</b> set of fields allows to choose a submesh or an existing
 group whose elements of the previously defined type will be added to
 the list of elements which will form your group.
-\n <b>Color Number</b> (integer only, ranging from 0 to 9999) - allows to
+\n <b>Color</b> - allows to assign to the group a certain color, for
-assign to the group a certain index, for example, defining boundary
+example, defining boundary conditions. This feature introduces a
-conditions. This feature introduces a useful element of preprocessing
+useful element of preprocessing in Mesh module. Note that <b>Color</b> attribute defines
-in Mesh module. Note that <b>Color number</b> attribute has nothing to do
+the colors used for the display of the elements of the group. 
-with the colors used for the display of the elements of the group.
+\n <b>Warning</b> The Med Color group interface may change in future versions of Salome.
+
 
 \image html creategroup.png
 

doc/salome/gui/SMESH/input/creating_meshes.doc

@@ -21,6 +21,8 @@
 <li>\ref a2d_meshing_hypo_page</li>
 <li>\ref max_element_volume_hypo_page</li>
 <li>\ref netgen_2d_3d_hypo_page</li>
+<li>\ref ghs3d_hypo_page</li>
+<li>\ref blsurf_hypo_page</li>
 <li>\ref additional_hypo_page</li>
 </ul>
 <li>\subpage constructing_submeshes_page</li>

doc/salome/gui/SMESH/input/cutting_quadrangles.doc

@@ -50,7 +50,7 @@ list.</li>
 </ul>
 
 </li>
-<li>Click the \b Apply or \b OK button to confirm the operation.</li>
+<li>Click the \b Apply or <b>Apply and Close</b> button to confirm the operation.</li>
 </ol>
 
 \image html image52.jpg

doc/salome/gui/SMESH/input/defining_hypo.doc

@@ -8,6 +8,8 @@
 <li>\subpage a2d_meshing_hypo_page</li>
 <li>\subpage max_element_volume_hypo_page</li>
 <li>\subpage netgen_2d_3d_hypo_page</li>
+<li>\subpage ghs3d_hypo_page</li>
+<li>\subpage blsurf_hypo_page</li>
 <li>\subpage additional_hypo_page</li>
 </ul>
 

doc/salome/gui/SMESH/input/deleting_groups.doc

@@ -6,8 +6,8 @@
 select one or several groups you wish to delete in the 3D viewer or in
 the Object Browser.
 \n The selected groups will be listed in <b>Delete groups with contents</b>
-menu. Then click Ok button to remove the selected groups and close the
+menu. Then click <b>Apply and Close</b> button to remove the selected groups and close the
-menu or Apply button to remove them and proceed with the selection.
+menu or \b Apply button to remove them and proceed with the selection.
 
 \image html deletegroups.png
  

doc/salome/gui/SMESH/input/diagonal_inversion_of_elements.doc

@@ -20,7 +20,7 @@ The following dialog box shall appear:
 </li>
 <li>Enter the ID of the required edge in the \b Edge field or select
 this edge in the 3D viewer.</li>
-<li>Click the \b Apply or \b OK button.</li>
+<li>Click the \b Apply or <b>Apply and Close</b> button.</li>
 </ol>
 
 \image html image38.jpg

doc/salome/gui/SMESH/input/editing_groups.doc

@@ -17,7 +17,7 @@ The following dialog box will appear:
 In this dialog box you can modify the name of your group and add or
 remove the elements forming it. For more information see 
 \ref creating_groups_page "Creating Groups" page.
-<li>Click the \b OK or \b Apply button to confirm modification of the
+<li>Click the \b Apply or <b>Apply and Close</b> button to confirm modification of the
 group.</li>
 </ol>
 

doc/salome/gui/SMESH/input/extrusion_along_path.doc

@@ -135,6 +135,9 @@ button and remove them from the list by pressing the <em>"Remove"</em> button.
 \image html image106.gif
 <center><em>"Remove" button</em></center>
 
+<b>Linear variation of the angles</b> option allows defining the angle of gradual rotation for the whole path. 
+At each step the shape will be rotated by angle/nb. of steps. 
+
 </li>
 </ul>
 </li>

doc/salome/gui/SMESH/input/ghs3d_hypo.doc

@@ -0,0 +1,68 @@
+/*!
+
+\page ghs3d_hypo_page GHS3D Parameters hypothesis
+
+\n GHS3D Parameters hypothesis works only with <b>Tetrahedron (GHS3D)</b> 
+algorithm. This algorithm is a commercial software.
+
+\image html ghs3d_parameters_basic.png
+
+<ul>
+<li><b>Name</b> - allows to define the name of the hypothesis (GHS3D 
+Parameters by default).</li>
+
+<li><b>To mesh holes</b> - if this box is checked, the algorithm will 
+create mesh also in holes inside a solid shape, else only the outermost
+shape will be meshed. Volumic elements created within holes are bound
+to the solid.</li>
+
+<li><b>Optimization level</b> - sets the desired optimization level.
+Optimization levels are: none, light, medium, strong, in increasing 
+order of "quality vs speed" ratio.
+</li>
+
+\image html ghs3d_parameters_advanced.png
+
+<li><b>Maximum memory size</b> - launches ghs3d software with
+work space limited to specified Megabytes of memory. If this option is
+checked off, the software will be launched with 0.7 * total RAM space. </li>
+
+<li><b>Initial memory size</b> - starts ghs3d software with
+specified Megabytes of work space. If this option is checked off, the
+software will be started with 100 Megabytes of working space. </li>
+
+<li><b>Working directory</b> - defines folder for input and output
+files of ghs3d software, which are files starting with "GHS3D_" prefix. </li>
+
+<li><b>Keep working files</b> - allows to check input and output files
+of ghs3d software, while usually these files are removed after mesher launch.</li>
+
+<li><b>Verbose level</b> - to choose verbosity level in the range 0 to 10.
+<ul> <li>0, no standard output,
+</li><li>2, prints the data, quality statistics of the skin and final
+meshes and indicates when the final mesh is being saved. In addition
+the software gives indication regarding the CPU time.
+</li><li>10, same as 2 plus the main steps in the computation, quality
+statistics histogram of the skin mesh, quality statistics histogram
+together with the characteristics of the final mesh.
+</li></ul></li>
+
+<li><b>To create new nodes</b> - if this option is checked off, ghs3d
+tries to create tetrahedrons using only nodes of 2D mesh.</li>
+
+<li><b>To use boundary recovery version</b> - enables using a
+boundary recovery module which tries to
+create volume meshes starting from very poor quality surface meshes
+(almost flat triangles on the surface, high density propagation,
+extreme aspect ratios, etc.) which fails with the standard version. The
+resulting volume mesh will however most likely have a very poor
+quality (poor aspect ratio of elements, tetrahedra with a very small
+positive volume).</li>
+
+<li><b>Option as text</b> - allows entering any text that will be
+used as command line option of ghs3d. This is for giving
+advanced options in a free from. </li>
+
+</ul>
+
+*/

doc/salome/gui/SMESH/input/index.doc

@@ -26,6 +26,8 @@
 <li>\ref a2d_meshing_hypo_page</li>
 <li>\ref max_element_volume_hypo_page</li>
 <li>\ref netgen_2d_3d_hypo_page</li>
+<li>\ref ghs3d_hypo_page</li>
+<li>\ref blsurf_hypo_page</li>
 <li>\ref additional_hypo_page</li>
 </ul>
 <li>\ref constructing_submeshes_page</li>

doc/salome/gui/SMESH/input/merging_elements.doc

@@ -8,41 +8,35 @@ selectable in the dialog box.
 \image html mergeelems.png
 
 <ul>
-<li>\b Name is the name of the mesh whose elements will be merged.</li>
+  <li>\b Name is the name of the mesh whose elements will be merged.</li>
-<li>\b Tolerance is a maximum distance between elements sufficient for
+  <li>\b Tolerance is a maximum distance between elements sufficient for merging.
-merging.
+    <ul>
-<ul>
+      <li>\b Detect button generates the list of coincident elements for the given \b Tolerance.</li>
-<li>\b Detect button generates the list of coincident elements for the given
+    </ul></li>
-\b Tolerance.</li>
+  <li><b>Coincident elements</b> is a list of groupes of elements for
+    merging. All elements of each group will form one after the operation.
+    <ul>
+      <li>\b Remove button deletes the selected group from the list.</li>
+      <li>\b Add button adds to the list a group of elements selected in the
+        viewer with pressed "Shift" key.</li>
+      <li><b>Select all</b> checkbox selects all groups.</li>
+    </ul></li>
+  <li><b>Edit selected group</b> list allows editing the selected group:
+    <br><br>
+    \image html add.gif
+    <center>adds to the group the element selected in the viewer.</center>
+    <br>
+    \image html remove.gif
+    <center>removes from the group the selected element.</center>
+    <br>
+    \image html sort.gif
+    <center>moves the selected element to the first position in the
+    group. This means that all other elements will be merged into this
+    one.</center>
+    <br>
+  </li>
+  <li>To confirm your choice click \b Apply or <b>Apply and Close</b> button.</li>
 </ul>
-</li>
-<li><b>Coincident elements</b> is a list of groupes of elements for
-merging. All elements of each group will form one after the operation.
-<ul>
-<li>\b Remove button deletes the selected group from the list.</li>
-<li>\b Add button adds to the list a group of elements selected in the
-viewer with pressed "Shift" key.</li>
-<li><b>Select all</b> checkbox selects all groups.</li>
-</ul>
-</li>
-<li><b>Edit selected group</b> list allows editing the selected
-group:
-<br><br>
-\image html add.gif
-<center>adds to the group the element selected in the viewer.</center>
-<br>
-\image html remove.gif
-<center>removes from the group the selected element.</center>
-<br>
-\image html sort.gif
-<center>moves the selected element to the first position in the
-group. This means that all other elements will be merged into this
-one.</center><br>
-</li>
-</ul>
-</li>
-<li>To confirm your choice click \b OK or \b Apply button.</li>
-</ol>
 
 In this picture you see a triangle which coincides with one of the
 elements of the mesh. After we apply <b>Merge Elements</b> functionality, the

doc/salome/gui/SMESH/input/merging_nodes.doc

@@ -48,7 +48,7 @@ one.</center><br>
 </li>
 </ul>
 </li>
-<li>To confirm your choice click \b OK or \b Apply button.</li>
+<li>To confirm your choice click \b Apply or <b>Apply and Close</b> button.</li>
 </ol>
 
 \image html merging_nodes1.png

doc/salome/gui/SMESH/input/moving_nodes.doc

@@ -23,7 +23,7 @@ The following dialog box shall appear:
 select this node in the 3D viewer. The coordinates of your node will
 be automatically displayed in the \b Coordinates set of fields.</li>
 <li>Set new coordinates for your node in the \b Coordinates set of fields.</li>
-<li>Click the \b Apply or \b OK button.</li>
+<li>Click the \b Apply or <b>Apply and Close</b> button.</li>
 </ol>
 
 \image html moving_nodes1.png

doc/salome/gui/SMESH/input/removing_nodes_and_elements.doc

@@ -7,6 +7,7 @@
 <ul>
 <li>\ref removing_nodes_anchor "Nodes"</li>
 <li>\ref removing_elements_anchor "Elements"</li>
+<li>\ref clear_mesh_anchor "Clear Mesh Data"</li>
 </ul>
 
 <br>
@@ -62,13 +63,32 @@ The following dialog box will appear:
 In this dialog box you can specify one or several elements of your
 mesh (with pressed Shift button) by choosing them in the 3D viewer.
 </li>
-<li>Click OK or Apply  to confirm deletion of the specified elements.</li>
+<li>Click \b Apply or <b>Apply and Close</b> to confirm deletion of the specified elements.</li>
 </ol>
 
 \image html remove_elements1.png
 
 \image html remove_elements2.png
 
+
+<br>
+\anchor clear_mesh_anchor
+<h2>Clearing Mesh Data</h2>
+
+<em>To remove all nodes and all types of cells in your mesh at once:</em>
+<ol>
+<li>Select your mesh in the Object Browser or in the 3D viewer.</li>
+
+<li>From the Modification menu choose Remove and from the associated
+submenu select the Clear Mesh Data, or just click <em>"Clear Mesh Data"</em>
+button in the toolbar. You can also right-click on the mesh in the
+Object Browser and select Clear Mesh Data in the pop-up menu.
+</ol>
+
+\image html mesh_clear.png
+<center><em>"Clear Mesh Data" button</em></center>
+
+
 <br><b>See Also</b> a sample TUI Script of a 
 \ref tui_removing_nodes_and_elements "Removing Nodes and Elements" operation.  
 

doc/salome/gui/SMESH/input/renumbering_nodes_and_elements.doc

@@ -29,7 +29,7 @@ The following dialog box will appear:
 
 <li>Fill the \b Mesh field by selecting your mesh in the Object
 Browser or in the 3D viewer.</li>
-<li>Click the \b Apply or \b OK button to perform the operation.</li>
+<li>Click the \b Apply or <b>Apply and Close</b> button to perform the operation.</li>
 </ol>
 
 <br>
@@ -52,7 +52,7 @@ The following dialog box will appear:
 
 <li>Fill the \b Mesh field by selecting your mesh in the Object
 Browser or in the 3D viewer.</li>
-<li>Click the \b Apply or \b OK button to perform the operation.</li>
+<li>Click the \b Apply or <b>Apply and Close</b> button to perform the operation.</li>
 </ol>
 
 <br><b>See Also</b> a sample TUI Script of a 

doc/salome/gui/SMESH/input/revolution.doc

@@ -32,10 +32,22 @@ selecting them in the 3D viewer or select the whole mesh or
 submesh,</li>
 <li>specify the axis (point and vector) around which the elements will
 be revolved,</li>
-<li>angle of rotation,</li>
+<li>angle of rotation and number of steps,</li>
-<li>number of steps,</li>
+<ul> <li> Angle by Step - the elements are extruded by the specified angle at each step (i.e. for Angle=30 and Number of Steps=2, the elements will be extruded 
+ by 30 degrees twice for a total of 30*2=60)</li>
+
+\image html revolutionsn2.png
+
+<li> Total Angle - the elements are extruded by the specified angle only once and the number of steps defines the number of iterations 
+(i.e.for Angle=30 and Number of Steps=2, the elements will be extruded by 30/2=15 degrees twice for a total of 30). </li>
+
+\image html revolutionsn1.png
+
+</ul>
 <li>tolerance of rotation</li>
 </ul>
+
+<li> <b>Preview</b> checkbox allows showing the results of parameter-setting in the viewer </li>
 <li> <b>Generate Groups</b> checkbox allows copying the groups of
 elements of the source mesh to the newly created one. </li>
 </li>
@@ -43,7 +55,6 @@ elements of the source mesh to the newly created one. </li>
 <li>Click the \b Apply or \b OK button.</li>
 </ol>
 
-\image html image78.jpg
 
 <br><b>See Also</b> a sample TUI Script of a 
 \ref tui_revolution "Revolution" operation.

doc/salome/gui/SMESH/input/selection_filter_library.doc

@@ -25,8 +25,10 @@ criterion. The \b Clear button deletes all criteria.
 \n Each <b>Entity type</b> has its specific list of criteria, however all
 filters have common syntax. For each criterion you should specify the
 <b>Threshold Value</b> and whether we search for the elements that should be
-\b More, \b Less or \b Equal to this \b Value. You should also specify if the
+\b More, \b Less or \b Equal to this \b Value. You can also nagate the
-criterion is \b Unary or \b Binary.   
+sense of a criterion using \b Unary operator Not and you should
+specify logical relations between criteria using \b Binary operators
+Or and And.
 \n Some criteria should have the additional parameter of \b Tolerance.
 
 When we create a <b>Standalone Group</b> using filters (for this click
@@ -40,7 +42,115 @@ the whole \b Mesh, the <b>Initial Selection</b> or the <b>Current Group</b>.
 existing filter from <b>Selection filter library</b> and <b>Add
 to...</b> button gives you a possibility to save your current filter
 in the Library.
+\n <b>Note:</b> If button <b>Apply and Close</b> is disabled, there
+is no selected mesh in Object Browser and the filter can not be
+created. You have to select the mesh and the button will be enabled.
 
 \image html a-filteronedges.png
 
+Some criteria are applicable to all <b>Entity types</b>:
+<ul><li>
+<b>Belong to Geom</b> selects entities whose all nodes belong to a
+submesh on the shape defined by <b>Threshold Value</b>. The threshold shape
+must be sub-shape of the main shape of mesh.
+</li><li>
+<b>Lying on Geom</b> selects entities whose at least one node belongs to a
+submesh on the shape defined by <b>Threshold Value</b>. The threshold shape
+must be sub-shape of the main shape of mesh.
+</li><li>
+<b>Range of IDs</b> allows selection of entities having certain
+IDs. <b>Threshold Value</b> can be like this: "1,2,3,50-60,63,67,70-78"
+</li>
+</ul>
+
+The following criteria are applicable to all <b>Entity types</b> except <b>Volumes</b>:
+<ul><li>
+<b>Belong to Plane</b> selects entities whose all nodes belong to a
+specified plane within a given <b>Tolerance</b>.
+</li><li>
+<b>Belong to Cylinder</b> selects entities whose all nodes belong to a
+specified cylinder within a given <b>Tolerance</b>.
+</li><li>
+<b>Belong to Surface</b> selects entities whose all nodes belong to a
+specified arbitrary surface within a given <b>Tolerance</b>.
+</li>
+</ul>
+
+Additional criteria to select mesh <b>Edges</b> are the following:
+<ul><li>
+<b>Free Borders</b> selects free 1D mesh elements, i.e. edges belonging to 
+one face only. See also a
+\ref free_borders_page "Free Borders quality control".
+</li><li>
+<b>Borders at Multi-Connections</b> selects edges belonging to several faces.
+The number of faces should be more, less or equal (within a given <b>Tolerance</b>)
+to the predefined <b>Threshold Value</b>. See also a
+\ref borders_at_multi_connection_page "Borders at Multi-Connection quality control".
+</li><li>
+<b>Length</b> selects edges 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 length_page "Length quality control".
+</li>
+</ul>
+
+Additional criteria to select mesh <b>Faces</b> are the following:
+<ul><li>
+<b>Aspect ratio</b> selects 2D mesh elements with an aspect ratio (see also an
+\ref aspect_ratio_page "Aspect Ratio quality control"), which is more, less or equal
+(within a given <b>Tolerance</b>) to the predefined <b>Threshold Value</b>.
+</li><li>
+<b>Warping</b> selects quadrangles with warping angle (see also a
+\ref warping_page "Warping quality control"), which is more, less or equal
+(within a given <b>Tolerance</b>) to the predefined <b>Threshold Value</b>.
+</li><li>
+<b>Minimum angle</b> selects triangles and quadrangles with minimum angle (see also a
+\ref minimum_angle_page "Minimum angle quality control"), which is more, less or equal
+(within a given <b>Tolerance</b>) to the predefined <b>Threshold Value</b>.
+</li><li>
+<b>Taper</b> selects quadrangles cells with taper value (see also a
+\ref taper_page "Taper quality control"), which is more, less or equal (within a given
+<b>Tolerance</b>) to the predefined <b>Threshold Value</b>.
+</li><li>
+<b>Skew</b> selects triangles and quadrangles with skew value (see also a
+\ref skew_page "Skew quality control"), which is more, less or equal (within a given
+<b>Tolerance</b>) to the predefined <b>Threshold Value</b>.
+</li><li>
+<b>Area</b> selects triangles and quadrangles with a value of area (see also an
+\ref area_page "Area quality control"), which is more, less or equal (within a given
+<b>Tolerance</b>) to the predefined <b>Threshold Value</b>.
+</li><li>
+<b>Free edges</b> selects 2D mesh elements consisting of edges belonging to 
+one element of mesh only. See also a
+\ref free_edges_page "Free Edges quality control".
+</li><li>
+<b>Borders at Multi-Connections 2D</b> selects cells consisting of edges belonging to
+several elements of mesh. The number of mesh elements should be more, less or equal
+(within a given <b>Tolerance</b>) to the predefined <b>Threshold Value</b>.
+See also a
+\ref borders_at_multi_connection_2d_page "Borders at Multi-Connection 2D quality control".
+</li><li>
+<b>Length 2D</b> selects triangles and quadrangles combining of the edges 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 length_2d_page "Length 2D quality control".
+</li>
+</ul>
+
+Additional criteria to select mesh <b>Volumes</b> are the following:
+<ul><li>
+<b>Aspect ratio 3D</b> selects 3D mesh elements with an aspect ratio (see also an
+\ref aspect_ratio_3d_page "Aspect Ratio 3D quality control"), which is more, less or equal
+(within a given <b>Tolerance</b>) to the predefined <b>Threshold Value</b>.
+</li><li>
+<b>Volume</b> selects 3D mesh elements with a value of volume (see also a
+\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>Bad oriented volume</b> selects mesh volumes, which are incorrectly oriented from
+the point of view of MED convention.
+</li>
+</ul>
+
+
 */