documentation improvement

doc/salome/gui/SMESH/input/display_entity.doc

@@ -7,7 +7,9 @@ edges or combine them.
 
 \image html image56.jpg Only Faces
 
-\image html image58.gif Only Edges
+\image html image58.png Only Edges
+
+\image html image59.png Edges + Faces
 
 If the mesh contains a lot of elements, select <b>Choose...</b> item, 
 

doc/salome/gui/SMESH/input/mesh_preferences.doc

@@ -2,8 +2,8 @@
 
 \page mesh_preferences_page Mesh preferences
 
-In the Mesh module you can set mesh preferences, which can be used in
+In the Mesh module you can set mesh preferences, which can be used right now 
-later sessions with this module.
+or in later sessions with this module according to the preferences.
 
 <h2>General Preferences</h2>
 
@@ -39,12 +39,13 @@ later sessions with this module.
     mesh nodes, at which they are considered coincident by <b>Double nodes</b>
     quality control.
 
-- <b>Display mode</b> - allows to set Wireframe, Shading, Nodes or Shrink
+- <b>Display mode</b>
+  - <b>Default display mode</b> - allows to set Wireframe, Shading, Nodes or Shrink
   presentation mode as default.
 
 - <b>Representation of the 2D quadratic elements</b>
-  - <b>Representation of the 2D quadratic elements</b> combobox - allows
+  - <b>Default mode of the 2D quadratic elements</b> combobox - allows
-    to select lines or arcs for representation of quadratic elements.
+    to select lines or arcs for representation of quadratic elements as default.
   - <b>Maximum Angle</b> - maximum deviation angle used by the
     application to build arcs.
 
@@ -130,13 +131,17 @@ later sessions with this module.
 
 \image html pref22.png
 
-- <b>Nodes</b>
+- <b>Nodes</b> allows to define default parameters for nodes, which will be applied 
+  for a new created mesh only. Customization of already created meshes can be done using 
+  \ref colors_size_page "Properties dialog box" that is called by click on popup menu of mesh.
   - <b>Color</b> -  allows to select the color of nodes. Click on the
     colored line to access to the <b>Select Color</b> dialog box.
   - <b>Type of marker</b> - allows to define the shape of nodes.
   - <b>Scale of marker</b> - allows to define the size of nodes.
 
-- <b>Elements</b>
+- <b>Elements</b> allows to define default parameters for different elements, which will be applied 
+  for a new created mesh only. Customization of already created meshes can be done using 
+  \ref colors_size_page "Properties dialog box" that is called by click on popup menu of mesh.
   - <b>Surface color</b>  - allows to select the surface color of 2D elements
     (seen in Shading mode). Click on the colored line to access to the
     <b>Select Color</b> dialog box.
@@ -149,8 +154,8 @@ later sessions with this module.
   - <b>Reversed volume color</b> - allows to select the surface color
     of reversed 3D elements. Use the slider to select the color generated basing on
     the <b>Volume color</b> by changing its brightness and saturation.
-  - <b>0D elements</b> - allows to choose color of 0D mesh elements.
+  - <b>0D element color</b> - allows to choose color of 0D mesh elements.
-  - <b>Balls</b> - allows to choose color of discrete mesh elements (balls).
+  - <b>Ball color</b> - allows to choose color of discrete mesh elements (balls).
   - <b>Outline color</b> - allows to select the color of element
     borders.
   - <b>Wireframe color</b> - allows to select the color of borders of
@@ -167,10 +172,11 @@ later sessions with this module.
   - <b>Shrink coef.</b> - allows to define relative space of elements
     compared to gaps between them in shrink mode.
 
-- <b>Groups</b> allows to define groups default properties:
+- <b>Groups</b>
   - <b>Names color</b> - specifies color of group names to be used in
     3D viewer.
-  - <b>Default color</b> - specifies default group color.
+  - <b>Default color</b> - specifies default group color, which is used 
+  when creating new mesh group (see \ref creating_groups_page "Create Group dialog box").
 
 - <b>Numbering</b> allows to define properties of numbering functionality:
   - <b>Nodes</b> - specifies text properties of nodes numbering
@@ -178,7 +184,9 @@ later sessions with this module.
   - <b>Elements</b> - same for elements.
 
 - <b>Orientation of Faces</b> - allows to define the behavior of
-  <b>Orientation of faces</b> functionality:
+  <b>Orientation of faces</b> functionality, which will be applied 
+  for a new created mesh only. Customization of already created meshes can be done using 
+  \ref colors_size_page "Properties dialog box" that is called by click on popup menu of mesh.
   - \b Color - allows to define the color of orientation vertors;
   - \b Scale - allows to define the size of orientation vectors;
   - <b>3D Vector</b> checkbox allows to choose between 2D planar
@@ -191,7 +199,7 @@ later sessions with this module.
 - <b>Selection</b> - performed with mouse-indexing (preselection)
   and left-clicking on an object, whose appearance changes as defined in
   the <b>Preferences</b>.
-  - <b>Object Color</b> -  allows to select the color of mesh (edges and
+  - <b>Object color</b> -  allows to select the color of mesh (edges and
     borders of meshes) of the selected entity. Click on the colored line
     to access to the <b>Select Color</b> dialog box.
   - <b>Element color</b> - allows to select the color of surface of selected
@@ -200,7 +208,7 @@ later sessions with this module.
 
 - <b>Preselection</b> - performed with mouse-indexing on an object,
   whose appearance changes as defined in the <b>Preferences</b>.
-  - <b>Highlight Color</b> -  allows to select the color of mesh (edges and
+  - <b>Highlight color</b> -  allows to select the color of mesh (edges and
     borders of meshes) of the entity . Click on the colored line to access
     to the <b>Select Color</b> dialog box.
 
@@ -211,6 +219,11 @@ later sessions with this module.
 
 \image html pref24.png
 
+\note The following settings are default and will be applied for 
+a new created mesh only. Customization of already created meshes 
+can be done using local \ref scalar_bar_dlg "Scalar Bar Properties dialog box" 
+that is called by click on popup menu of mesh.
+
 - <b>Font</b> - in this menu you can set type, face and color for
   the font of <b>Title</b> and <b>Labels</b>.
 

src/SMESHGUI/SMESHGUI.cxx

@@ -4930,7 +4930,7 @@ void SMESHGUI::createPreferences()
   setPreferenceProperty( doubleNodesTol, "max", 1000000.0 );
   setPreferenceProperty( doubleNodesTol, "step", 0.0000001 );
 
-  int dispgroup = addPreference( tr( "PREF_DISPLAY_MODE" ), genTab );
+  int dispgroup = addPreference( tr( "PREF_DISPLAY_MODE_GROUP" ), genTab );
   setPreferenceProperty( dispgroup, "columns", 2 );
   int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), dispgroup, LightApp_Preferences::Selector, "SMESH", "display_mode" );
   QStringList modes;
@@ -4946,7 +4946,7 @@ void SMESHGUI::createPreferences()
   setPreferenceProperty( dispmode, "strings", modes );
   setPreferenceProperty( dispmode, "indexes", indices );
 
-  int arcgroup = addPreference( tr( "QUADRATIC_REPRESENT_MODE" ), genTab );
+  int arcgroup = addPreference( tr( "QUADRATIC_REPRESENT_MODE_GROUP" ), genTab );
   setPreferenceProperty( arcgroup, "columns", 2 );
   int quadraticmode = addPreference( tr( "QUADRATIC_REPRESENT_MODE" ), arcgroup, LightApp_Preferences::Selector, "SMESH", "quadratic_mode" );
   QStringList quadraticModes;

src/SMESHGUI/SMESH_msg_en.ts

@@ -2318,7 +2318,7 @@ Check algorithm documentation for supported geometry</translation>
     </message>
     <message>
         <source>PREF_NUMBERING_ELEM</source>
-        <translation>Edges: Color</translation>
+        <translation>Elements: Color</translation>
     </message>
     <message>
         <source>PREF_NUMBERING_FONT</source>
@@ -4354,17 +4354,25 @@ Please, create VTK viewer and try again</translation>
         <translation>Display entity</translation>
     </message>
     <message>
-        <source>QUADRATIC_REPRESENT_MODE</source>
+        <source>QUADRATIC_REPRESENT_MODE_GROUP</source>
         <translation>Representation of the 2D quadratic elements</translation>
     </message>
+    <message>
+        <source>QUADRATIC_REPRESENT_MODE</source>
+        <translation>Default mode of the 2D quadratic elements</translation>
+    </message>
     <message>
         <source>MAX_ARC_ANGLE</source>
         <translation>Maximum angle</translation>
     </message>
     <message>
-        <source>PREF_DISPLAY_MODE</source>
+        <source>PREF_DISPLAY_MODE_GROUP</source>
         <translation>Display mode</translation>
     </message>
+    <message>
+        <source>PREF_DISPLAY_MODE</source>
+        <translation>Default display mode</translation>
+    </message>
     <message>
         <source>PREF_ELEMENTS</source>
         <translation>Elements</translation>
@@ -4575,7 +4583,7 @@ Please, create VTK viewer and try again</translation>
     </message>
     <message>
         <source>PREF_COLOR_0D</source>
-        <translation>0D elements</translation>
+        <translation>0D element color</translation>
     </message>
     <message>
         <source>PREF_SIZE_0D</source>
@@ -4583,7 +4591,7 @@ Please, create VTK viewer and try again</translation>
     </message>
     <message>
         <source>PREF_BALL_COLOR</source>
-        <translation>Balls</translation>
+        <translation>Ball color</translation>
     </message>
     <message>
         <source>PREF_BALL_SIZE</source>

src/SMESHGUI/SMESH_msg_fr.ts

@@ -2314,7 +2314,7 @@ Référez-vous à la documentation sur l'algorithme et la géométrie suppo
     </message>
     <message>
         <source>PREF_NUMBERING_ELEM</source>
-        <translation>Arêtes: couleur</translation>
+        <translation>Éléments: couleur</translation>
     </message>
     <message>
         <source>PREF_NUMBERING_FONT</source>
@@ -4350,6 +4350,10 @@ Ouvrez une fenêtre VTK et essayez de nouveau</translation>
         <source>PREF_DISPLAY_ENTITY</source>
         <translation>Eléments à visualiser</translation>
     </message>
+    <message>
+        <source>QUADRATIC_REPRESENT_MODE_GROUP</source>
+        <translation>Mode des éléments quadratiques 2D par défaut</translation>
+    </message>
     <message>
         <source>QUADRATIC_REPRESENT_MODE</source>
         <translation>Représentation des éléments quadratiques 2D</translation>
@@ -4359,9 +4363,13 @@ Ouvrez une fenêtre VTK et essayez de nouveau</translation>
         <translation>Angle maximal</translation>
     </message>
     <message>
-        <source>PREF_DISPLAY_MODE</source>
+        <source>PREF_DISPLAY_MODE_GROUP</source>
         <translation>Mode de visualisation</translation>
     </message>
+    <message>
+        <source>PREF_DISPLAY_MODE</source>
+        <translation>Mode de visualisation par défaut</translation>
+    </message>
     <message>
         <source>PREF_ELEMENTS</source>
         <translation>Eléments</translation>
@@ -4572,7 +4580,7 @@ Ouvrez une fenêtre VTK et essayez de nouveau</translation>
     </message>
     <message>
         <source>PREF_COLOR_0D</source>
-        <translation>Eléments 0D</translation>
+        <translation>Couleur d&apos;elément 0D</translation>
     </message>
     <message>
         <source>PREF_SIZE_0D</source>
@@ -4580,7 +4588,7 @@ Ouvrez une fenêtre VTK et essayez de nouveau</translation>
     </message>
     <message>
         <source>PREF_BALL_COLOR</source>
-        <translation>Particulaires</translation>
+        <translation>Couleur des particulaires</translation>
     </message>
     <message>
         <source>PREF_BALL_SIZE</source>

src/SMESHGUI/SMESH_msg_ja.ts

@@ -4300,6 +4300,10 @@
       <source>PREF_DISPLAY_ENTITY</source>
       <translation>表示する項目</translation>
     </message>
+    <message>
+      <source>QUADRATIC_REPRESENT_MODE_GROUP</source>
+      <translation>2 D の 2 次要素の表現</translation>
+    </message>
     <message>
       <source>QUADRATIC_REPRESENT_MODE</source>
       <translation>2 D の 2 次要素の表現</translation>
@@ -4309,9 +4313,13 @@
       <translation>最大角度</translation>
     </message>
     <message>
-      <source>PREF_DISPLAY_MODE</source>
+      <source>PREF_DISPLAY_MODE_GROUP</source>
       <translation>表示モード</translation>
     </message>
+    <message>
+      <source>PREF_DISPLAY_MODE</source>
+      <translation>既定の表示モード</translation>
+    </message>
     <message>
       <source>PREF_ELEMENTS</source>
       <translation>要素</translation>