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

diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
index dfb2de764751b266be8c8bdbecbd562edde4a4b7..b84999e85358b4c007ef3b8635ece9602e76289e 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
@@ -74,10 +74,6 @@
 #include <vtkIntArray.h>
 #include <vtkProperty2D.h>
 #include <vtkPointData.h>
 #include <vtkIntArray.h>
 #include <vtkProperty2D.h>
 #include <vtkPointData.h>

-#include <vtkConfigure.h>
-#if !defined(VTK_XVERSION)
-#define VTK_XVERSION (VTK_MAJOR_VERSION<<16)+(VTK_MINOR_VERSION<<8)+(VTK_BUILD_VERSION)
-#endif

 
 // Qt includes
 #include <QApplication>
 
 // Qt includes
 #include <QApplication>


@@ -150,9 +146,6 @@ namespace SMESH
     
       myPtsLabeledDataMapper = vtkLabeledDataMapper::New();
       myPtsLabeledDataMapper->SetInputConnection(myPtsSelectVisiblePoints->GetOutputPort());
     
       myPtsLabeledDataMapper = vtkLabeledDataMapper::New();
       myPtsLabeledDataMapper->SetInputConnection(myPtsSelectVisiblePoints->GetOutputPort());

-#if (VTK_XVERSION < 0x050200)
-      myPtsLabeledDataMapper->SetLabelFormat("%g");
-#endif

       myPtsLabeledDataMapper->SetLabelModeToLabelScalars();
     
       vtkTextProperty* aPtsTextProp = vtkTextProperty::New();
       myPtsLabeledDataMapper->SetLabelModeToLabelScalars();
     
       vtkTextProperty* aPtsTextProp = vtkTextProperty::New();


@@ -437,12 +430,14 @@ SMESHGUI_MergeDlg::SMESHGUI_MergeDlg (SMESHGUI* theModule, int theAction)
   RemoveGroupButton = new QPushButton(tr("SMESH_BUT_REMOVE"), GroupCoincidentWidget);
 
   SelectAllCB = new QCheckBox(tr("SELECT_ALL"), GroupCoincidentWidget);
   RemoveGroupButton = new QPushButton(tr("SMESH_BUT_REMOVE"), GroupCoincidentWidget);
 
   SelectAllCB = new QCheckBox(tr("SELECT_ALL"), GroupCoincidentWidget);

+  ShowIDs = new QCheckBox(tr("SHOW_IDS"), GroupCoincidentWidget);

 
   GroupCoincidentLayout->addWidget(ListCoincident,    0,   0, 4, 2);
   GroupCoincidentLayout->addWidget(DetectButton,      0,   2);
   GroupCoincidentLayout->addWidget(AddGroupButton,    2, 2);
   GroupCoincidentLayout->addWidget(RemoveGroupButton, 3, 2);
 
   GroupCoincidentLayout->addWidget(ListCoincident,    0,   0, 4, 2);
   GroupCoincidentLayout->addWidget(DetectButton,      0,   2);
   GroupCoincidentLayout->addWidget(AddGroupButton,    2, 2);
   GroupCoincidentLayout->addWidget(RemoveGroupButton, 3, 2);

-  GroupCoincidentLayout->addWidget(SelectAllCB,       4, 0, 1, 3);
+  GroupCoincidentLayout->addWidget(SelectAllCB,       4, 0);
+  GroupCoincidentLayout->addWidget(ShowIDs,           4, 1);

   GroupCoincidentLayout->setRowMinimumHeight(1, 10);
   GroupCoincidentLayout->setRowStretch(1, 5);
 
   GroupCoincidentLayout->setRowMinimumHeight(1, 10);
   GroupCoincidentLayout->setRowStretch(1, 5);
 


@@ -513,6 +508,8 @@ SMESHGUI_MergeDlg::SMESHGUI_MergeDlg (SMESHGUI* theModule, int theAction)
 
   this->resize(10,10);
 
 
   this->resize(10,10);
 

+  ShowIDs->setChecked( true );
+

   Init(); // Initialisations
 }
 
   Init(); // Initialisations
 }
 


@@ -562,6 +559,7 @@ void SMESHGUI_MergeDlg::Init()
   connect(AddGroupButton, SIGNAL (clicked()), this, SLOT(onAddGroup()));
   connect(RemoveGroupButton, SIGNAL (clicked()), this, SLOT(onRemoveGroup()));
   connect(SelectAllCB, SIGNAL(toggled(bool)), this, SLOT(onSelectAll(bool)));
   connect(AddGroupButton, SIGNAL (clicked()), this, SLOT(onAddGroup()));
   connect(RemoveGroupButton, SIGNAL (clicked()), this, SLOT(onRemoveGroup()));
   connect(SelectAllCB, SIGNAL(toggled(bool)), this, SLOT(onSelectAll(bool)));

+  connect(ShowIDs, SIGNAL(toggled(bool)), this, SLOT(onSelectGroup()));

   connect(ListEdit, SIGNAL (itemSelectionChanged()), this, SLOT(onSelectElementFromGroup()));
   connect(AddElemButton, SIGNAL (clicked()), this, SLOT(onAddElement()));
   connect(RemoveElemButton, SIGNAL (clicked()), this, SLOT(onRemoveElement()));
   connect(ListEdit, SIGNAL (itemSelectionChanged()), this, SLOT(onSelectElementFromGroup()));
   connect(AddElemButton, SIGNAL (clicked()), this, SLOT(onAddElement()));
   connect(RemoveElemButton, SIGNAL (clicked()), this, SLOT(onRemoveElement()));


@@ -847,6 +845,7 @@ void SMESHGUI_MergeDlg::onSelectGroup()
     return;
   myEditCurrentArgument = (QWidget*)ListCoincident;
 
     return;
   myEditCurrentArgument = (QWidget*)ListCoincident;
 

+  myIsBusy = true;

   ListEdit->clear();
   
   TColStd_MapOfInteger anIndices;
   ListEdit->clear();
   
   TColStd_MapOfInteger anIndices;


@@ -872,18 +871,22 @@ void SMESHGUI_MergeDlg::onSelectGroup()
   aList.Append(myActor->getIO());
   mySelectionMgr->setSelectedObjects(aList,false);
   
   aList.Append(myActor->getIO());
   mySelectionMgr->setSelectedObjects(aList,false);
   

-  if (myAction == 0) {
-    myIdPreview->SetPointsData(myActor->GetObject()->GetMesh(), anIndices);
-    myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility());
-  }
-  else {
-    std::list< gp_XYZ > aGrCentersXYZ;
-    FindGravityCenter(anIndices, aGrCentersXYZ);
-    myIdPreview->SetElemsData( anIndices, aGrCentersXYZ);
-    myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility());
-  }
+  if (ShowIDs->isChecked()) 
+    if (myAction == 0) {
+      myIdPreview->SetPointsData(myActor->GetObject()->GetMesh(), anIndices);
+      myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility());
+    }
+    else {
+      std::list< gp_XYZ > aGrCentersXYZ;
+      FindGravityCenter(anIndices, aGrCentersXYZ);
+      myIdPreview->SetElemsData( anIndices, aGrCentersXYZ);
+      myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility());
+    }
+  else
+    myIdPreview->SetPointsLabeled(false);

 
   updateControls();
 
   updateControls();

+  myIsBusy = false;

 }
 
 //=================================================================================
 }
 
 //=================================================================================


@@ -920,17 +923,20 @@ void SMESHGUI_MergeDlg::onSelectElementFromGroup()
   SALOME_ListIO aList;
   aList.Append(myActor->getIO());
   mySelectionMgr->setSelectedObjects(aList);
   SALOME_ListIO aList;
   aList.Append(myActor->getIO());
   mySelectionMgr->setSelectedObjects(aList);

-
-  if (myAction == 0) {
-    myIdPreview->SetPointsData(myActor->GetObject()->GetMesh(), anIndices);
-    myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility());
-  }
-  else {
-    std::list< gp_XYZ > aGrCentersXYZ;
-    FindGravityCenter(anIndices, aGrCentersXYZ);
-    myIdPreview->SetElemsData(anIndices, aGrCentersXYZ);
-    myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility());
-  }
+  
+  if (ShowIDs->isChecked())
+    if (myAction == 0) {
+      myIdPreview->SetPointsData(myActor->GetObject()->GetMesh(), anIndices);
+      myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility());
+    }
+    else {
+      std::list< gp_XYZ > aGrCentersXYZ;
+      FindGravityCenter(anIndices, aGrCentersXYZ);
+      myIdPreview->SetElemsData(anIndices, aGrCentersXYZ);
+      myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility());
+    }
+  else 
+    myIdPreview->SetPointsLabeled(false);

 }
 
 //=================================================================================
 }
 
 //=================================================================================


@@ -982,8 +988,9 @@ void SMESHGUI_MergeDlg::onRemoveGroup()
     delete anItem;
 
   ListEdit->clear();
     delete anItem;
 
   ListEdit->clear();

+  myIdPreview->SetPointsLabeled(false);

   updateControls();
   updateControls();

-
+  SMESH::UpdateView();

   myIsBusy = false;
 }
 
   myIsBusy = false;
 }
 

diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.h b/src/SMESHGUI/SMESHGUI_MergeDlg.h
index 8065b6f3516af44931125fb144510c3d826651e5..de4fa51e6818210937157134c7450b9a6c370042 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MergeDlg.h
+++ b/src/SMESHGUI/SMESHGUI_MergeDlg.h
@@ -130,6 +130,7 @@ private:
   QPushButton*              AddGroupButton;
   QPushButton*              RemoveGroupButton;
   QCheckBox*                SelectAllCB;
   QPushButton*              AddGroupButton;
   QPushButton*              RemoveGroupButton;
   QCheckBox*                SelectAllCB;

+  QCheckBox*                ShowIDs;

 
   QGroupBox*                GroupEdit;
   QListWidget*              ListEdit;
 
   QGroupBox*                GroupEdit;
   QListWidget*              ListEdit;

diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index 25b69aa828259ced8127fff606e66db166ff4528..d0a239665a1a5fe8cbc74e23e21c42991d7410f9 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -4834,6 +4834,10 @@ Please select a group and try again</translation>
         <source>SELECT_ALL</source>
         <translation>Select all</translation>
     </message>
         <source>SELECT_ALL</source>
         <translation>Select all</translation>
     </message>

+    <message>
+        <source>SHOW_IDS</source>
+        <translation>Show double nodes IDs</translation>
+    </message>

     <message>
         <source>EXCLUDE_GROUPS</source>
         <translation>Exclude Groups</translation>
     <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 f9ca69371eacc18b47e443e52d731499393b8bf9..965aedad9439c29b2776ae1d18249ad85ddbd789 100755 (executable)
--- a/src/SMESHGUI/SMESH_msg_fr.ts
+++ b/src/SMESHGUI/SMESH_msg_fr.ts
@@ -4802,6 +4802,10 @@ Choisissez un groupe et essayez de nouveau</translation>
         <source>SELECT_ALL</source>
         <translation>Tout sélectionner</translation>
     </message>
         <source>SELECT_ALL</source>
         <translation>Tout sélectionner</translation>
     </message>

+    <message>
+        <source>SHOW_IDS</source>
+        <translation type="unfinished">Show double nodes IDs</translation>
+    </message>

     <message>
         <source>EXCLUDE_GROUPS</source>
         <translation>Exclure les groupes</translation>
     <message>
         <source>EXCLUDE_GROUPS</source>
         <translation>Exclure les groupes</translation>