From: maintenance team <salome-mnt@opencascade.com>
Date: Wed, 7 Nov 2007 09:40:09 +0000 (+0000)
Subject: Common update
X-Git-Tag: V4_1_0rc2~59
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9d182ff3a7c91a25ec58db45f57a9928485ccd82;p=modules%2Fsmesh.git

Common update
---

diff --git a/doc/salome/gui/SMESH/input/about_meshes.doc b/doc/salome/gui/SMESH/input/about_meshes.doc
index e1cbd84de..3864329e4 100644
--- a/doc/salome/gui/SMESH/input/about_meshes.doc
+++ b/doc/salome/gui/SMESH/input/about_meshes.doc
@@ -15,7 +15,7 @@ The topology of a mesh is described by the relationships between its
 entities including:
 
 <ul>
-<li>\b Node &mdash; 0D element of a mesh presented by a point with coordinates (x, y, z).</li>
+<li>\b Node &mdash; 0D object of a mesh presented by a point with coordinates (x, y, z).</li>
 <li>\b Edge &mdash; 1D element of a mesh defined by two nodes.</li>
 <li>\b Face &mdash; 2D element of a mesh defined by three or four edges (closed contour).</li>
 <li>\b Volume &mdash; 3D element of a mesh defined by several faces.</li>
@@ -83,4 +83,4 @@ The connections are not only restricted to entities of one dimension
 higher or lower. For example some algorithms may be interested to
 retrieve all the faces surrounding a node.
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/salome/gui/SMESH/input/adding_quadratic_elements.doc b/doc/salome/gui/SMESH/input/adding_quadratic_elements.doc
index c95f47bd2..50d8eafb1 100644
--- a/doc/salome/gui/SMESH/input/adding_quadratic_elements.doc
+++ b/doc/salome/gui/SMESH/input/adding_quadratic_elements.doc
@@ -4,7 +4,7 @@
 
 \n MESH modules allows you to work with <b>Quadratic Elements</b>.
 
-Quadratic Edge in not a straight but a broken line and can be defined
+Quadratic Edge is not a straight but a broken line and can be defined
 by three points: first, middle and last. All more complex \b Quadratic
 \b Elements differ from ordinary ones in that they consist of Quadratic
 Edges.
@@ -38,4 +38,4 @@ nodes. For all other elements it reverses the element.
 
 
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/salome/gui/SMESH/input/aspect_ratio.doc b/doc/salome/gui/SMESH/input/aspect_ratio.doc
index 9888d3423..660b94c3b 100644
--- a/doc/salome/gui/SMESH/input/aspect_ratio.doc
+++ b/doc/salome/gui/SMESH/input/aspect_ratio.doc
@@ -4,10 +4,9 @@
 
 \n The <b>Aspect Ratio</b> quality criterion for mesh elements reveals
 the degree of conformity of a mesh element to the regular element of
-its type (with all edges having the same length).  The criterion can
-be defined as:
+its type (with all edges having the same length).
 
-\image html formula3.png
+  
 
 - The <b>Aspect Ratio</b> of a \b triangle 2D element consisting of 3
 nodes is calculated by the formula:
diff --git a/doc/salome/gui/SMESH/input/aspect_ratio_3d.doc b/doc/salome/gui/SMESH/input/aspect_ratio_3d.doc
index f6965bdb6..1f573226c 100644
--- a/doc/salome/gui/SMESH/input/aspect_ratio_3d.doc
+++ b/doc/salome/gui/SMESH/input/aspect_ratio_3d.doc
@@ -12,7 +12,7 @@ by the formula:
 
 \image html formula1.png
 
-- Other element types like quadrangle, pentahedron and hexahedron use
+- Other element types like polyhedron, pentahedron and hexahedron use
   the following formula:
 
 \image html formula2.png
@@ -37,4 +37,4 @@ according to the applied mesh quality control criterion:
 <br><b>See Also</b> a sample TUI Script of a 
 \ref tui_aspect_ratio_3d "Aspect Ratio 3D quality control" operation. 
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/salome/gui/SMESH/input/clipping.doc b/doc/salome/gui/SMESH/input/clipping.doc
index 5fa26b493..858789e9a 100644
--- a/doc/salome/gui/SMESH/input/clipping.doc
+++ b/doc/salome/gui/SMESH/input/clipping.doc
@@ -14,15 +14,15 @@ Now you can define the parameters of your cross-section: \b Orientation
 object, if it is set to 0.5 the object is split in two halves; and
 \b Rotation (in angle degrees) <b>around X</b> (Y to Z) and <b>around Y</b> (X to
 Z). If the <b>Show preview</b> button is on, you can see the clipping plane
-in the <b>Object window</b>.
+in the <b>3D Viewer</b>.
 
 \image html image79.jpg
 
 If the <b>Auto Apply</b> button is on, you can preview the
-cross-section in the <b>Object window</b>.
+cross-section in the <b>3D Viewer</b>.
 
 \image html image99.gif
 
 To get a new object from \b Clipping, click \b Ok.
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/salome/gui/SMESH/input/constructing_submeshes.doc b/doc/salome/gui/SMESH/input/constructing_submeshes.doc
index ab158f2d5..571740e5f 100644
--- a/doc/salome/gui/SMESH/input/constructing_submeshes.doc
+++ b/doc/salome/gui/SMESH/input/constructing_submeshes.doc
@@ -6,7 +6,7 @@
 <ul>
 <li>Selecting a mesh which will encapsulate your submesh</li>
 <li>Selecting a geometrical object for meshing</li>
-<li>Applying one or several previously 
+<li>Applying one or several previously described 
 \ref about_hypo_page "hypotheses" and 
 \ref basic_meshing_algos_page "meshing algorithms" which will be used
 at computation of this submesh</li>
@@ -50,4 +50,4 @@ algorithms applied to the construction of the submesh.</li>
 <br><b>See Also</b> a sample TUI Script of a 
 \ref tui_construction_submesh "Construct Submesh" operation.
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/salome/gui/SMESH/input/extrusion.doc b/doc/salome/gui/SMESH/input/extrusion.doc
index 370eff1e0..956c9298f 100644
--- a/doc/salome/gui/SMESH/input/extrusion.doc
+++ b/doc/salome/gui/SMESH/input/extrusion.doc
@@ -2,11 +2,11 @@
 
 \page extrusion_page Extrusion
 
-\n Extrusion is a type of surface meshing by generation from
-discretized lines. It is used to build mesh elements of plus one
-dimension than the swept ones. Each swept 1D element produces one or
-more quadrangles (or triangles if one node of a rotated element lays
-on the revolution axis).
+\n Extrusion is used to build mesh elements of plus one
+dimension than the input ones. Any line or planar element can be
+extruded. Line elements will extrude into quadrilateral plane elements.
+Triangular and Quadrilateral plane elements extrude into Pentahedron
+and Hexahedron solids respectively.
 
 <em>To use extrusion:</em>
 <ol>
@@ -44,4 +44,4 @@ submesh,</li>
 <br><b>See Also</b> a sample TUI Script of an 
 \ref tui_extrusion "Extrusion" operation. 
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/salome/gui/SMESH/input/importing_exporting_meshes.doc b/doc/salome/gui/SMESH/input/importing_exporting_meshes.doc
index a202eea82..e016ffff1 100644
--- a/doc/salome/gui/SMESH/input/importing_exporting_meshes.doc
+++ b/doc/salome/gui/SMESH/input/importing_exporting_meshes.doc
@@ -3,13 +3,13 @@
 \page importing_exporting_meshes_page Importing and exporting meshes
 
 \n In MESH there is a functionality allowing importation/exportation
-of meshes from \b MED and \b UNV (I-DEAS 10) format files.
+of meshes from \b MED, \b UNV (I-DEAS 10), \b DAT (Nastran) and STL format files.
 
 <em>To import a mesh:</em>
 
 <ol>
 <li>From the \b File menu choose the \b Import item, from its sub-menu
-select the corresponding format (MED,  UNV) of the file containing
+select the corresponding format (MED, UNV and DAT) of the file containing
 your mesh.</li>
 <li>In the standard <b>Search File</b> dialog box find the file for
 importation.</li>
@@ -23,7 +23,7 @@ importation.</li>
 <ol>
 <li>Select the object you wish to export.</li>
 <li>From the \b File menu choose the \b Export item, from its sub-menu
-select the format (MED, UNV) of the file which will contain your
+select the format (MED, UNV, DAT and STL) of the file which will contain your
 exported mesh.</li>
 <li>In the standard <b>Search File</b> select a location for the
 exported file and enter its name.</li>
@@ -34,4 +34,4 @@ exported file and enter its name.</li>
 
 <br><b>See Also</b> a sample TUI Script of an \ref tui_export_mesh "Export Mesh" operation.
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/salome/gui/SMESH/input/max_element_volume_hypo.doc b/doc/salome/gui/SMESH/input/max_element_volume_hypo.doc
index 617591774..1dd459161 100644
--- a/doc/salome/gui/SMESH/input/max_element_volume_hypo.doc
+++ b/doc/salome/gui/SMESH/input/max_element_volume_hypo.doc
@@ -2,7 +2,7 @@
 
 \page max_element_volume_hypo_page Max Element Volume hypothesis
 
-\n <b>Max Element Area</b> hypothesis is applied for meshing of 3D objects
+\n <b>Max Element Volume </b> hypothesis is applied for meshing of 3D objects
 composing your geometrical object. Definition of this hypothesis
 consists of setting the <b>maximum volume</b> of 3D meshing elements
 (depending on the chosen meshing algorithm it can be \b hexahedrons or
@@ -13,4 +13,4 @@ consists of setting the <b>maximum volume</b> of 3D meshing elements
 <br><b>See Also</b> a sample TUI Script of a 
 \ref tui_max_element_volume "Maximum Element Volume hypothesis" operation.  
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/salome/gui/SMESH/input/merging_elements.doc b/doc/salome/gui/SMESH/input/merging_elements.doc
index 5433178e8..fef7cd25a 100644
--- a/doc/salome/gui/SMESH/input/merging_elements.doc
+++ b/doc/salome/gui/SMESH/input/merging_elements.doc
@@ -7,6 +7,43 @@ 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 Tolerance is a maximum distance between elements sufficient for
+merging.
+<ul>
+<li>\b Detect button generates the list of coincident elements for the given
+\b Tolerance.</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
 triangle will be completely merged with the mesh.
@@ -16,4 +53,4 @@ triangle will be completely merged with the mesh.
 <br><b>See Also</b> a sample TUI Script of a 
 \ref tui_merging_elements "Merge Elements" operation.  
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/salome/gui/SMESH/input/skew.doc b/doc/salome/gui/SMESH/input/skew.doc
index e9a1364a2..582ada3a1 100644
--- a/doc/salome/gui/SMESH/input/skew.doc
+++ b/doc/salome/gui/SMESH/input/skew.doc
@@ -3,9 +3,10 @@
 \page skew_page Skew
 
 \n \b Skew mesh quality criterion reflects the angle between the lines
-that join opposite sides of the element. SKEW  is a maximum value of
-all skew angles. This mesh quality criterion can be applied to
-elements composed of 4 and 3 nodes (quadrangles and triangles).
+that join opposite sides of a quadrangle element or the greatesr angle
+between three medians in triangle elements. This mesh quality
+criterion can be applied to elements composed of 4 and 3 nodes
+(quadrangles and triangles).
 
 \image html image27.jpg
 
@@ -28,4 +29,4 @@ according to the applied mesh quality control criterion:
 <br><b>See Also</b> a sample TUI Script of a 
 \ref tui_skew "Skew quality control" operation.  
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/salome/gui/SMESH/input/smoothing.doc b/doc/salome/gui/SMESH/input/smoothing.doc
index 4106d65e4..f1991d62b 100644
--- a/doc/salome/gui/SMESH/input/smoothing.doc
+++ b/doc/salome/gui/SMESH/input/smoothing.doc
@@ -32,8 +32,16 @@ of a mesh then the boundary nodes of an elements set are also
 fixed. Any other nodes may be additionally fixed.</li>
 <li><b>Smoothing Method:</b>
 <ul>
-<li>\b Laplacian smoothing pulls a node toward the center of surrounding nodes directly connected to that node along an element edge. Centroidal smoothing pulls a node toward the element-area-weighted centroid of the surrounding elements. Typically, the Laplacian method will produce the mesh with the least element distortion. It is also the faster method.</li>
-<li>\b Centroidal smoothing usually produces a mesh that has more uniform element sizes. Both methods produce good results with "free" meshes.</li>
+<li>\b Laplacian smoothing pulls a node toward the center of
+surrounding nodes directly connected to that node along an element
+edge. 
+<li>\b Centroidal smoothing pulls a node toward the
+element-area-weighted centroid of the surrounding elements. </li>
+
+Typically, the  Laplacian method will produce the mesh with the least element
+distortion. It is also the faster method.Centroidal smoothing usually
+produces  a mesh that has more uniform element sizes. Both methods
+produce good results with "free" meshes.</li>
 </ul>
 
 \image html image83.gif
@@ -46,7 +54,13 @@ smoothing is reevaluated with the updated nodal locations. This
 process continues until the maximum number of iterations has been
 exceeded, or all elements has aspect ratio less or equal than the
 specified one.</li>
-<li><b>Max. aspect ratio</b>.</li>
+<li><b>Max. aspect ratio</b> allows to define the quality at which the
+smoothing algorithm should stop the iterations as the target of the
+operation has been reached.</li>
+<li>When <b>in parametric space</b> radio button is checked, the
+algorithm tries to improve the shape of faces in the parametric space
+of geometrical surfaces on which they are generated, else the shape of
+faces in the 3D space is improved. </li>   
 </ul>
 
 </li>
@@ -60,4 +74,4 @@ specified one.</li>
 <br><b>See Also</b> a sample TUI Script of a 
 \ref tui_smoothing "Smoothing" operation.  
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/salome/gui/SMESH/input/tui_creating_meshes.doc b/doc/salome/gui/SMESH/input/tui_creating_meshes.doc
index 364a099f5..087b2de25 100644
--- a/doc/salome/gui/SMESH/input/tui_creating_meshes.doc
+++ b/doc/salome/gui/SMESH/input/tui_creating_meshes.doc
@@ -4,8 +4,6 @@
 
 \n First of all see \ref tui_creating_meshes_page "Example of 3d mesh generation",
  which is an example of good python script style for Mesh module.
-\n Other examples of python scripts will be also updated soon to use
- smesh package instead of direct usage of idl interface.
 
 <br>
 <h2>Construction of a Mesh</h2>
@@ -174,4 +172,4 @@ tetra.Compute()
 tetra.ExportMED("/tmp/meshMED.med", 0)
 \endcode
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/salome/gui/SMESH/input/uniting_set_of_triangles.doc b/doc/salome/gui/SMESH/input/uniting_set_of_triangles.doc
index 0896cc1b8..fc3a74aed 100644
--- a/doc/salome/gui/SMESH/input/uniting_set_of_triangles.doc
+++ b/doc/salome/gui/SMESH/input/uniting_set_of_triangles.doc
@@ -26,8 +26,8 @@ triangle will be added to the list. To remove a selected element or
 elements from the list click the \b Remove button. The \b Sort button allows
 to sort the list of IDs. The <b>Set filter</b> button allows to apply a
 definite filter to selection of triangles.</li>
-<li><b>Apply to all</b> radio button allows to modify the orientation of all
-triangles of the currently displayed mesh or submesh.</li>
+<li><b>Apply to all</b> radio button allows to modify connectivity and
+type of all triangles of the currently displayed mesh or submesh.</li>
 <li>\b Criterion menu allows to apply the operation only to those
 object which meet the chosen criterion (from the list of Quality
 Controls, i.e. Skew, Warping, Minimum Angle, etc.)</li>
@@ -50,4 +50,4 @@ the others, the operation on these elements shall take no effect.
 <br><b>See Also</b> a sample TUI Script of a 
 \ref tui_uniting_set_of_triangles "Uniting a Set of Triangles" operation.  
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/salome/gui/SMESH/input/viewing_meshes_overview.doc b/doc/salome/gui/SMESH/input/viewing_meshes_overview.doc
index 59f8d4f53..2a39eeb98 100644
--- a/doc/salome/gui/SMESH/input/viewing_meshes_overview.doc
+++ b/doc/salome/gui/SMESH/input/viewing_meshes_overview.doc
@@ -14,10 +14,10 @@ left mouse click and  get information about it, change its
 presentation parameters and access to other useful options by
 right-clicking on the selected mesh.
 
-\image html image15.jpg
+\image html dialog.png
 
 <ul>
-<li><b>Erase all</b> - allows to hide all objects in the viewer.</li>
+<li><b>Hide all</b> - allows to hide all objects in the viewer.</li>
 <li><b>Update</b> - refreshes the presentation of your mesh in the
 Object Browser, applying all recent changes. </li>
 <li>\ref advanced_mesh_infos_anchor "Advanced Mesh Infos" -  provides
@@ -38,7 +38,7 @@ transparency of mesh elements.</li>
 <li>\ref clipping_page "Clipping" - allows to create cross-sections of the selected objects.</li>
 <li>\ref about_quality_controls_page "Quality Controls" - graphically
 presents various information about meshes.</li>
-<li><b>Erase</b> - allows to hide the selected mesh from the viewer.</li>
+<li><b>Hide</b> - allows to hide the selected mesh from the viewer.</li>
 <li><b>Display Only</b> -allows to display only the selected mesh, hiding all other from the viewer.</li>
 <li><b>Dump view</b> - exports an object from the viewer in bmp, png, jpg or jpeg image format.</li>
 <li><b>Change background</b> - allows to redefine the background color. By default it is black.</li>
diff --git a/doc/salome/gui/SMESH/input/warping.doc b/doc/salome/gui/SMESH/input/warping.doc
index 7ec2c2aaa..9b97aa6a2 100644
--- a/doc/salome/gui/SMESH/input/warping.doc
+++ b/doc/salome/gui/SMESH/input/warping.doc
@@ -2,6 +2,8 @@
 
 \page warping_page Warping
 
+\image html image24.gif
+
 \n \b Warping indicates that a face is not planar and is applied only to
 2D elements with 4 nodes. This quality control criterion is based on a
 projection plane created by:
@@ -18,13 +20,11 @@ length of each half edge is measured and the shortest length is
 assigned ?l?. The warp angle is the arcsine of the ratio of the
 projection height ?h? to the half edge length ?l?.
 
-\image html image24.gif
-
 <em>To apply the Warping quality criterion to your mesh:</em>
 <ol>
 <li>Display your mesh in the viewer.</li>
 
-<li>Choose <b>Controls > Warp</b> or click <em>"Warping angle"</em>
+<li>Choose <b>Controls > Warping Angle</b> or click <em>"Warping angle"</em>
 button of the toolbar.
 
 \image html image39.gif
@@ -40,4 +40,4 @@ according to the applied mesh quality control criterion:
 <br><b>See Also</b> a sample TUI Script of a 
 \ref tui_warping "Warping quality control" operation.  
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/salome/gui/SMESH/pics/dialog.png b/doc/salome/gui/SMESH/pics/dialog.png
new file mode 100755
index 000000000..38ece87dc
Binary files /dev/null and b/doc/salome/gui/SMESH/pics/dialog.png differ
diff --git a/doc/salome/gui/SMESH/pics/mergeelems.png b/doc/salome/gui/SMESH/pics/mergeelems.png
index 9314da8c3..dbd87877e 100755
Binary files a/doc/salome/gui/SMESH/pics/mergeelems.png and b/doc/salome/gui/SMESH/pics/mergeelems.png differ