Update the "Colors / Size" dialog.

diff --git a/doc/salome/gui/SMESH/images/blsurf_parameters_enforced_vertices.png b/doc/salome/gui/SMESH/images/blsurf_parameters_enforced_vertices.png
index 4a76b1a73cd7269d0375e24bdf8dee40a8fd7822..be0536d83194191dca132c116104bdd23624a41b 100644 (file)
Binary files a/doc/salome/gui/SMESH/images/blsurf_parameters_enforced_vertices.png and b/doc/salome/gui/SMESH/images/blsurf_parameters_enforced_vertices.png differ

diff --git a/doc/salome/gui/SMESH/input/blsurf_hypo.doc b/doc/salome/gui/SMESH/input/blsurf_hypo.doc
index 94c1697bf1890a2fe699aa05e414222b89758158..6a546759953ac5bf437e42ee7b6bb335b63242c1 100644 (file)
--- a/doc/salome/gui/SMESH/input/blsurf_hypo.doc
+++ b/doc/salome/gui/SMESH/input/blsurf_hypo.doc
@@ -417,6 +417,8 @@ The enforced vertex is the projection of a point defined by its
 <li>If a group name is specified, the enforced nodes will be added in the group. If the group does not exist it will be created.
 </ul>
 
 <li>If a group name is specified, the enforced nodes will be added in the group. If the group does not exist it will be created.
 </ul>
 

+You can specify BLSURF to use the internal vertices of the faces as enforced vertices by checking <i>Use internal vertices</i>.
+

 <br><b>See Also</b> a sample TUI Script of the \ref tui_blsurf "creation of a BLSurf hypothesis", including enforced vertices.
 
 \ref blsurf_top "Back to top"
 <br><b>See Also</b> a sample TUI Script of the \ref tui_blsurf "creation of a BLSurf hypothesis", including enforced vertices.
 
 \ref blsurf_top "Back to top"

diff --git a/doc/salome/gui/SMESH/input/colors_size.doc b/doc/salome/gui/SMESH/input/colors_size.doc
index 1ac27a494152e7ee46b2eadc3802a86282a1968f..07ddd29ac5088ac925b489ca705dd72ceda95c8f 100644 (file)
--- a/doc/salome/gui/SMESH/input/colors_size.doc
+++ b/doc/salome/gui/SMESH/input/colors_size.doc
@@ -1,6 +1,6 @@
 /*!
 
 /*!
 

-\page colors_size_page Colors / Size
+\page colors_size_page Display settings

 
 \image html colors_size.png
 
 
 \image html colors_size.png
 


@@ -16,7 +16,7 @@ generated on base of the <b>Surface color</b> by changing its brightness and sat
 <li><b>Wireframe color</b> - color of element borders in wireframe mode.</li>
 <li><b>0D slements</b> - color of 0D elements.</li>
 <li><b>Size of 0D slements</b> - size of 0D elements.</li>
 <li><b>Wireframe color</b> - color of element borders in wireframe mode.</li>
 <li><b>0D slements</b> - color of 0D elements.</li>
 <li><b>Size of 0D slements</b> - size of 0D elements.</li>

-<li><b>Width</b> - width of lines (edges and borders of elements).</li>
+<li><b>Line width</b> - width of lines (edges and borders of elements).</li>

 <li><b>Shrink coef.</b> - relative space of elements compared to gaps between
        them in shrink mode.</li>
 </ul>
 <li><b>Shrink coef.</b> - relative space of elements compared to gaps between
        them in shrink mode.</li>
 </ul>

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index bac8dd37efe8bf4de3386c891d9fc5f1fa49f3dd..a3a601a831b81859f51529fb251f0ca797e347cb 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -2145,7 +2145,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
 
   case 1134: // Clipping
   case 1133: // Tranparency
 
   case 1134: // Clipping
   case 1133: // Tranparency

-  case 1132: // Colors / Size
+  case 1132: // Display preferences (colors, shrink size, line width, ...)

 
     // Display Mode
   case 215: // Nodes
 
     // Display Mode
   case 215: // Nodes

diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx
index b1ad47d13f9f0e36c8e9ff9d14adc2f9d59c38a3..f512cffddeab435bf495b0e0c26101fa1c7ca3de 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx
@@ -66,7 +66,7 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul
     mySMESHGUI( theModule )
 {
   setModal( true );
     mySMESHGUI( theModule )
 {
   setModal( true );

-  setWindowTitle( tr( "Preferences - Set Color" ) );
+  setWindowTitle( tr( "Display settings (color, line width, shrink size, ...)" ) );

   setSizeGripEnabled( true );
 
   // -------------------------------
   setSizeGripEnabled( true );
 
   // -------------------------------


@@ -83,7 +83,7 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul
   QLabel* TextLabel_Fill = new QLabel( tr( "Surface color" ), ButtonGroup1 );
 
   toolSurfColor = new QtxBiColorTool(ButtonGroup1);
   QLabel* TextLabel_Fill = new QLabel( tr( "Surface color" ), ButtonGroup1 );
 
   toolSurfColor = new QtxBiColorTool(ButtonGroup1);

-  toolSurfColor->setText("Back surface color");
+  toolSurfColor->setText( tr( "Back surface color" ));

 
   QLabel* TextLabel_Outline = new QLabel( tr( "Outline color" ), ButtonGroup1 );
   btnOutlineColor = new QtxColorButton( ButtonGroup1 );
 
   QLabel* TextLabel_Outline = new QLabel( tr( "Outline color" ), ButtonGroup1 );
   btnOutlineColor = new QtxColorButton( ButtonGroup1 );


@@ -102,7 +102,7 @@ SMESHGUI_Preferences_ColorDlg::SMESHGUI_Preferences_ColorDlg( SMESHGUI* theModul
   SpinBox_0DElements_Size->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
   SpinBox_0DElements_Size->setButtonSymbols( QSpinBox::PlusMinus );
 
   SpinBox_0DElements_Size->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
   SpinBox_0DElements_Size->setButtonSymbols( QSpinBox::PlusMinus );
 

-  QLabel* TextLabel_Width = new QLabel( tr( "Width" ), ButtonGroup1 );
+  QLabel* TextLabel_Width = new QLabel( tr( "Line width" ), ButtonGroup1 );

   SpinBox_Width = new SalomeApp_IntSpinBox( ButtonGroup1 );
   SpinBox_Width->setAcceptNames( false ); // No Notebook variables allowed
   SpinBox_Width->setRange( 1, 5 );
   SpinBox_Width = new SalomeApp_IntSpinBox( ButtonGroup1 );
   SpinBox_Width->setAcceptNames( false ); // No Notebook variables allowed
   SpinBox_Width->setRange( 1, 5 );

diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index 089cff567df4da4c6e0efa77c504d76fc1fa7b25..8374d260f47b1a2e17908c46540f00677971cec9 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -205,7 +205,7 @@
     </message>
     <message>
         <source>MEN_COLORS</source>
     </message>
     <message>
         <source>MEN_COLORS</source>

-        <translation>Colors / Size</translation>
+        <translation>Display settings</translation>

     </message>
     <message>
         <source>MEN_COMPUTE</source>
     </message>
     <message>
         <source>MEN_COMPUTE</source>


@@ -2497,7 +2497,7 @@ Please check preferences of Mesh module.
     </message>
     <message>
         <source>STB_COLORS</source>
     </message>
     <message>
         <source>STB_COLORS</source>

-        <translation>Colors / Size</translation>
+        <translation>Display settings</translation>

     </message>
     <message>
         <source>STB_COMPUTE</source>
     </message>
     <message>
         <source>STB_COMPUTE</source>


@@ -3057,7 +3057,7 @@ Please check preferences of Mesh module.
     </message>
     <message>
         <source>TOP_COLORS</source>
     </message>
     <message>
         <source>TOP_COLORS</source>

-        <translation>Colors / Size</translation>
+        <translation>Display settings</translation>

     </message>
     <message>
         <source>TOP_COMPUTE</source>
     </message>
     <message>
         <source>TOP_COMPUTE</source>

diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts
index 569d06b91650fc4c6d97d2bd83b8303c18ad03e2..cde60f25c2f551a65dca2acc71516b5f02cb6577 100755 (executable)
--- a/src/SMESHGUI/SMESH_msg_fr.ts
+++ b/src/SMESHGUI/SMESH_msg_fr.ts
@@ -205,7 +205,7 @@
     </message>
     <message>
         <source>MEN_COLORS</source>
     </message>
     <message>
         <source>MEN_COLORS</source>

-        <translation>Couleurs / Taille</translation>
+        <translation>Paramètres d&apos;affichage</translation>

     </message>
     <message>
         <source>MEN_COMPUTE</source>
     </message>
     <message>
         <source>MEN_COMPUTE</source>


@@ -927,6 +927,78 @@
         <source>STB_SPLIT_TO_TETRA</source>
         <translation>Eclater en tétraèdres</translation>
     </message>
         <source>STB_SPLIT_TO_TETRA</source>
         <translation>Eclater en tétraèdres</translation>
     </message>

+    <message>
+        <source>Display settings (color, line width, shrink size, ...)</source>
+        <translation>Paramètres d&apos;affichage (couleur, épaisseur des traits, taille des éléments réduits, ...)</translation>
+    </message>
+    <message>
+        <source>Elements</source>
+        <translation>Eléments</translation>
+    </message>
+    <message>
+        <source>Surface color</source>
+        <translation>Couleur de surface</translation>
+    </message>
+    <message>
+        <source>Back surface color</source>
+        <translation>Couleur arrière</translation>
+    </message>
+    <message>
+        <source>Outline color</source>
+        <translation>Couleur de contour</translation>
+    </message>
+    <message>
+        <source>Wireframe color</source>
+        <translation>Couleur en mode fil de fer</translation>
+    </message>
+    <message>
+        <source>0D elements</source>
+        <translation>Eléments 0D</translation>
+    </message>
+    <message>
+        <source>Size of 0D elements</source>
+        <translation>Taille des éléments 0D</translation>
+    </message>
+    <message>
+        <source>Line width</source>
+        <translation>Epaisseur des traits</translation>
+    </message>
+    <message>
+        <source>Shrink coef.</source>
+        <translation>Coef. de contraction</translation>
+    </message>
+    <message>
+        <source>Nodes</source>
+        <translation>Nœuds</translation>
+    </message>
+    <message>
+        <source>Color</source>
+        <translation>Couleur</translation>
+    </message>
+    <message>
+        <source>Marker</source>
+        <translation>Marqueur</translation>
+    </message>
+    <message>
+        <source>Orientation of faces</source>
+        <translation>Orientation des faces</translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation>Facteur d'échelle</translation>
+    </message>
+    <message>
+        <source>3D vectors</source>
+        <translation>Vecteurs 3D</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Annuler</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>Ai&amp;de</translation>
+    </message>

     <message>
         <source>MESHERS_FILE_CANT_OPEN</source>
         <translation>Impossible d&apos;ouvrir le fichier de ressource</translation>
     <message>
         <source>MESHERS_FILE_CANT_OPEN</source>
         <translation>Impossible d&apos;ouvrir le fichier de ressource</translation>


@@ -2497,7 +2569,7 @@ Vérifiez la limite dans les préférences du module Mesh.
     </message>
     <message>
         <source>STB_COLORS</source>
     </message>
     <message>
         <source>STB_COLORS</source>

-        <translation>Couleurs / Taille</translation>
+        <translation>Paramètres d&apos;affichage</translation>

     </message>
     <message>
         <source>STB_COMPUTE</source>
     </message>
     <message>
         <source>STB_COMPUTE</source>


@@ -3057,7 +3129,7 @@ Vérifiez la limite dans les préférences du module Mesh.
     </message>
     <message>
         <source>TOP_COLORS</source>
     </message>
     <message>
         <source>TOP_COLORS</source>

-        <translation>Couleurs / Taille</translation>
+        <translation>Paramètres d&apos;affichage</translation>

     </message>
     <message>
         <source>TOP_COMPUTE</source>
     </message>
     <message>
         <source>TOP_COMPUTE</source>


@@ -3688,6 +3760,14 @@ Ouvrez une fenêtre VTK et essayez de nouveau</translation>
         <source>PREF_NB_SEGMENTS</source>
         <translation>Nombre de segments par défaut</translation>
     </message>
         <source>PREF_NB_SEGMENTS</source>
         <translation>Nombre de segments par défaut</translation>
     </message>

+    <message>
+        <source>SMESH_PREF_MESH_LOADING</source>
+        <translation>Chargement de maillage</translation>
+    </message>
+    <message>
+        <source>PREF_FORGET_MESH_AT_HYP_MODIF</source>
+        <translation>Ne pas charger le maillage du fichier d'étude à la modification d'une hypothèse</translation>
+    </message>

     <message>
         <source>PREF_AUTO_UPDATE</source>
         <translation>Mettre à jour automatiquement</translation>
     <message>
         <source>PREF_AUTO_UPDATE</source>
         <translation>Mettre à jour automatiquement</translation>