From: vsr <vsr@opencascade.com>
Date: Mon, 10 Nov 2014 11:21:42 +0000 (+0300)
Subject: Merge remote branch 'origin/Doc_update_ver741' into V7_5_BR
X-Git-Tag: V7_5_0rc1~8
X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=324d433f277a1ec6552c93db878504f447f8fbad

Merge remote branch 'origin/Doc_update_ver741' into V7_5_BR
---

324d433f277a1ec6552c93db878504f447f8fbad
diff --cc doc/salome/gui/SMESH/input/constructing_meshes.doc
index 5d26cae6c,05d8c663e..2a1a0c3aa
--- a/doc/salome/gui/SMESH/input/constructing_meshes.doc
+++ b/doc/salome/gui/SMESH/input/constructing_meshes.doc
@@@ -160,10 -159,9 +160,10 @@@
        List of sets of hypotheses. Tag <em>[custom]</em> is
        automatically added to the sets defined by the user.
        
-       \note \a Automatic in the names of pre-defined sets of
-       hypotheses means only that initially \ref
-       automatic_length_anchor "Automatic Length" hypothesis was
-       included in these sets, and not that these sets are suitable for
 -      \note \a Automatic in the names of predefined sets of
 -      hypotheses means only that \ref automatic_length_anchor "Automatic Length" hypothesis 
 -	  is included in these sets, and not that these sets are suitable for
++      \note \a "Automatic" in the names of predefined sets of
++      hypotheses came from previous versions of SALOME where
++      \ref automatic_length_anchor "Automatic Length" hypothesis 
++      was included in these sets, and not that these sets are suitable for
        meshing any geometry.
    </li>
  </ol>
diff --cc doc/salome/gui/SMESH/input/reorient_faces.doc
index 519da7ef1,66db53937..20346a9dc
--- a/doc/salome/gui/SMESH/input/reorient_faces.doc
+++ b/doc/salome/gui/SMESH/input/reorient_faces.doc
@@@ -2,20 -2,20 +2,22 @@@
  
  \page reorient_faces_page Reorient faces
  
- \n This operation allows changing orientation of faces two ways.
- <ol>
- <li> To reorient a set of neighboring faces by defining the desired
-   orientation by a vector. <br> Since the direction of face normals in
+ \n This operation allows changing the orientation of a set faces in the following ways:
+ <ul>
 -<li> The new orientation of a set of neighboring faces can be defined  
++<li>The new orientation of a set of neighboring faces can be defined  
+   by a vector. <br> Since the direction of face normals in
    the set can be even opposite, it is necessary to specify a control
-   face whose normal will be compared with the vector. This face can be
-   either <ul>
-     <li> found by proximity to a given point or </li> 
-     <li> specified explicitly. </li> 
- </ul> </li>
- <li> To reorient faces with relation to adjacent volumes. </li>
- </ol>
+   face, the normal to which will be compared with the vector. This face can be
 -  either: <ul>
 -    <li> found by proximity to a given point, or </li> 
 -    <li> specified explicitly. </li> 
 -</ul> </li>
 -<li> Alternatively, the faces can be oriented relatively to the adjacent volumes. </li>
++  either:
++  <ul>
++    <li>found by proximity to a given point, or</li> 
++    <li>specified explicitly.</li> 
++  </ul>
++</li>
++<li>Alternatively, the faces can be oriented relatively to the adjacent volumes.</li>
+ </ul>
  
- Orientation of a face is changed by reverting the order of its nodes.
+ The orientation of a face is changed by reverting the order of its nodes.
  
  <em>To change orientation of faces:</em>
  <ol>
@@@ -26,26 -26,21 +28,19 @@@
  \image html reorient_faces_face.png
  <em>"Reorient faces" button</em>
  </center>
++</li>
  
--The following dialog box will appear:
- 
- <center>
- \image html reorient_2d_point.png "First mode: to reorient adjacent faces according to a vector. The control face is found by point."
- <br>
- \image html reorient_2d_face.png "Second mode: to reorient adjacent faces according to a vector. The control face is explicitly given."
- <br>
- \image html reorient_2d_volume.png "Third mode: to reorient faces with relation to adjacent volumes."
- </center>
++<li>In the "Reorient faces" dialog box
  
 -<center>
 -\image html reorient_2d_point.png "The orientation of adjacent faces is chosen according to a vector. The control face is found by point."
 -<br>
 -
--<li>In this dialog
  <ul>
- <li>Specify either of the tree operation modes.</li>
  <li>Select the \b Object (mesh, sub-mesh or group)
    containing faces to reorient, in the Object Browser or in the 3D
    Viewer.</li>
--<li>To reorient according to vector: <ul>
++
++<li>To reorient according to vector:
++    <ul>
      <li>Specify the coordinates of the \b Point by which the control face
-       will be found or the control \b Face itself. You can easy specify the \b
+       will be found. You can easy specify the \b
        Point by either picking a node in the 3D Viewer or selecting a vertex
        in the Object Browser. It is possible to pick the \b Face by mouse in
        the 3D Viewer or enter its ID.</li>
@@@ -53,16 -48,28 +48,41 @@@
        control face. If you pick a node in the 3D Viewer then the \b Direction
        vector will go from the coordinate system origin to the selected node.
        If you pick two nodes (holding Shift button) then the \b Direction vector
--      will go from the first to the second node.</li> </ul> </li>
- <li>To reorient according to volumes: <ul>
++      will go from the first to the second node.</li>
++    </ul>
+ 
 -
 -
 -\image html reorient_2d_face.png "The orientation of adjacent faces is chosen according to a vector. The control face is explicitly given."
+ <br>
++<center>
++\image html reorient_2d_point.png "The orientation of adjacent faces is chosen according to a vector. The control face is found by point."
++</center>
+ 
 -<li>In the second mode it is possible to directly input the \b Face ID in the corresponding field. </li>
++</li>
+ 
 -\image html reorient_2d_volume.png "The orientation of faces is chosen with relation to adjacent volumes."
++<li>In the second mode it is possible to directly input the \b Face ID in the corresponding field.
++
++<center>
++\image html reorient_2d_face.png "The orientation of adjacent faces is chosen according to a vector. The control face is explicitly given."
+ </center>
+ 
++</li>
+ 
 -<li>In the third mode, the faces can be reoriented according to volumes: <ul>
++<li>In the third mode, the faces can be reoriented according to volumes:
++    <ul>
      <li>Select an object (mesh, sub-mesh or group) containing
        reference \b Volumes, in the Object Browser or in the 3D
        Viewer.</li>
      <li>Specify whether face normals should point outside or inside
        the reference volumes using <b>Face normal outside volume</b>
--      check-box.</li></ul> </li>
--</ul>
++      check-box.</li>
++    </ul>
++
++<br>
++<center>
++\image html reorient_2d_volume.png "The orientation of faces is chosen with relation to adjacent volumes."
++</center>
++
  </li>
++</ul>
  
  <li>Click the \b Apply or <b>Apply and Close</b> button to confirm the operation.</li>
  </ol>