From: vsr <vsr@opencascade.com>
Date: Wed, 22 May 2013 14:03:03 +0000 (+0000)
Subject: 0022097: EDF 2408 SMESH: Hide ID of double node in the function "Merge nodes"
X-Git-Tag: V7_3_0a1~424
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=686e5fb3ee4a4b5d039c42f03470814876573ef3;p=modules%2Fsmesh.git

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 eaa5a9323..3f59269a6 100755
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 f8ef74f13..904d23463 100644
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 54cb3d17a..05286a56e 100755
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 71511d22e..6a2a92830 100644
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 50513d58f..bb65232d3 100644
--- 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 3b1bbeaaf..3efec0521 100644
--- 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 b84999e85..24b96938d 100644
--- 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 d0a239665..0b92291c7 100644
--- 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 965aedad9..27645cecb 100755
--- 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>