0022097: EDF 2408 SMESH: Hide ID of double node in the function "Merge nodes"

diff --git a/doc/salome/gui/SMESH/images/mergeelems.png b/doc/salome/gui/SMESH/images/mergeelems.png
index eaa5a9323dacc7abaa6eeb652288355bcffe0161..3f59269a67e166edb6b85d09b488aa14bd342911 100755 (executable)
Binary files a/doc/salome/gui/SMESH/images/mergeelems.png and b/doc/salome/gui/SMESH/images/mergeelems.png differ

diff --git a/doc/salome/gui/SMESH/images/mergeelems_auto.png b/doc/salome/gui/SMESH/images/mergeelems_auto.png
index f8ef74f1393eebe1196552a8f1ee73e53709bf27..904d234637a0af9ad75aa018c4b1f5055e53f20b 100644 (file)
Binary files a/doc/salome/gui/SMESH/images/mergeelems_auto.png and b/doc/salome/gui/SMESH/images/mergeelems_auto.png differ

diff --git a/doc/salome/gui/SMESH/images/mergenodes.png b/doc/salome/gui/SMESH/images/mergenodes.png
index 54cb3d17adcd6a78de4edc0cf0eb66aa0ef38886..05286a56e5d1b68d2e53a7e1d5f859046bcb6c2a 100755 (executable)
Binary files a/doc/salome/gui/SMESH/images/mergenodes.png and b/doc/salome/gui/SMESH/images/mergenodes.png differ

diff --git a/doc/salome/gui/SMESH/images/mergenodes_auto.png b/doc/salome/gui/SMESH/images/mergenodes_auto.png
index 71511d22e32e410df5e22a482ae9cc8ed2b9fff0..6a2a92830dcc0c4d8c7c20242e388087fb2cea98 100644 (file)
Binary files a/doc/salome/gui/SMESH/images/mergenodes_auto.png and b/doc/salome/gui/SMESH/images/mergenodes_auto.png differ

diff --git a/doc/salome/gui/SMESH/input/merging_elements.doc b/doc/salome/gui/SMESH/input/merging_elements.doc
index 50513d58fff4173ddeb63cbaaa617bda23712d56..bb65232d392ba7a78a6a0c28af05435bf713f799 100644 (file)
--- a/doc/salome/gui/SMESH/input/merging_elements.doc
+++ b/doc/salome/gui/SMESH/input/merging_elements.doc
@@ -39,6 +39,8 @@ merging. All elements of each group will form one after the operation.
 <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>
+<li><b>Show double elements IDs</b> checkbox shows/hides identifiers of
+elements in the 3D viewer.</li>
 </ul></li>
 <li><b>Edit selected group</b> list allows editing the selected group:
 <br><br>

diff --git a/doc/salome/gui/SMESH/input/merging_nodes.doc b/doc/salome/gui/SMESH/input/merging_nodes.doc
index 3b1bbeaaf23a4c30b43643a1d69c6bd1584614e3..3efec052141621b51abdbe0738acbfc5f92cf19f 100644 (file)
--- a/doc/salome/gui/SMESH/input/merging_nodes.doc
+++ b/doc/salome/gui/SMESH/input/merging_nodes.doc
@@ -46,6 +46,8 @@ operation.
 <li>\b Add button adds to the list a group of nodes selected in the
 viewer with pressed "Shift" key.</li>
 <li><b>Select all</b> checkbox selects all groups.</li>
+<li><b>Show double nodes IDs</b> checkbox shows/hides identifiers of
+nodes in the 3D viewer.</li>
 </ul>
 
 <br>

diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
index b84999e85358b4c007ef3b8635ece9602e76289e..24b96938dd71ef3c4559d7d6e145179087153ea9 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
@@ -430,7 +430,7 @@ SMESHGUI_MergeDlg::SMESHGUI_MergeDlg (SMESHGUI* theModule, int theAction)
   RemoveGroupButton = new QPushButton(tr("SMESH_BUT_REMOVE"), GroupCoincidentWidget);
 
   SelectAllCB = new QCheckBox(tr("SELECT_ALL"), GroupCoincidentWidget);
-  ShowIDs = new QCheckBox(tr("SHOW_IDS"), GroupCoincidentWidget);
+  ShowIDs = new QCheckBox(myAction == 1 ? tr("SHOW_ELEMS_IDS") : tr("SHOW_NODES_IDS"), GroupCoincidentWidget);
 
   GroupCoincidentLayout->addWidget(ListCoincident,    0,   0, 4, 2);
   GroupCoincidentLayout->addWidget(DetectButton,      0,   2);

diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index d0a239665a1a5fe8cbc74e23e21c42991d7410f9..0b92291c74d065a2a7ab21b8fa57e74b97cf7e2a 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -4835,9 +4835,13 @@ Please select a group and try again</translation>
         <translation>Select all</translation>
     </message>
     <message>
-        <source>SHOW_IDS</source>
+        <source>SHOW_NODES_IDS</source>
         <translation>Show double nodes IDs</translation>
     </message>
+    <message>
+        <source>SHOW_ELEMS_IDS</source>
+        <translation>Show double elements IDs</translation>
+    </message>
     <message>
         <source>EXCLUDE_GROUPS</source>
         <translation>Exclude Groups</translation>

diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts
index 965aedad9439c29b2776ae1d18249ad85ddbd789..27645cecb35b98b15044ec7bce02dce129c7197a 100755 (executable)
--- a/src/SMESHGUI/SMESH_msg_fr.ts
+++ b/src/SMESHGUI/SMESH_msg_fr.ts
@@ -4803,9 +4803,13 @@ Choisissez un groupe et essayez de nouveau</translation>
         <translation>Tout sélectionner</translation>
     </message>
     <message>
-        <source>SHOW_IDS</source>
+        <source>SHOW_NODES_IDS</source>
         <translation type="unfinished">Show double nodes IDs</translation>
     </message>
+    <message>
+        <source>SHOW_ELEMS_IDS</source>
+        <translation type="unfinished">Show double elements IDs</translation>
+    </message>
     <message>
         <source>EXCLUDE_GROUPS</source>
         <translation>Exclure les groupes</translation>