X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MergeDlg.h;h=bf59266389a29d5000f7107631b1c5afbe51c813;hp=b18e1b38bc692caf989926bd78e8088aba8aa3ef;hb=b09372829929f8f561495d6c16527134971a1909;hpb=a17b36970bc61da1d664453c615754997c925b18

diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.h b/src/SMESHGUI/SMESHGUI_MergeDlg.h
index b18e1b38b..bf5926638 100644
--- a/src/SMESHGUI/SMESHGUI_MergeDlg.h
+++ b/src/SMESHGUI/SMESHGUI_MergeDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -30,11 +30,13 @@
 // SMESH includes
 #include "SMESH_SMESHGUI.hxx"
 
-// Qt includes
+// GUI and Qt includes
 #include <QDialog>
+#include <SVTK_Hash.h>
 
 // OCCT includes
 #include <gp_XYZ.hxx>
+#include <TColStd_MapOfInteger.hxx>
 
 // STL includes
 #include <list>
@@ -59,7 +61,6 @@ class SMESHGUI_SpinBox;
 class SMESH_Actor;
 class SUIT_SelectionFilter;
 class SVTK_Selector;
-class TColStd_MapOfInteger;
 
 namespace SMESH
 {
@@ -72,7 +73,7 @@ namespace SMESH
 //=================================================================================
 class SMESHGUI_EXPORT SMESHGUI_MergeDlg : public QDialog
 {
-  Q_OBJECT;
+  Q_OBJECT
 
 public:
   SMESHGUI_MergeDlg( SMESHGUI*, int );
@@ -85,10 +86,10 @@ private:
   void                      enterEvent( QEvent* );              /* mouse enter the QWidget */
   void                      keyPressEvent( QKeyEvent* );
   void                      onEditGroup();
-  bool                      isKeepNodesIDsSelection();
-  bool                      isNewKeepNodesGroup( const char* entry );
+  bool                      isKeepIDsSelection();
+  bool                      isNewKeepGroup( const char* entry );
 
-  void                      FindGravityCenter( TColStd_MapOfInteger&,
+  void                      FindGravityCenter( SVTK_TVtkIDsMap&,
                                                std::vector<int>& , 
                                                std::list<gp_XYZ>& );
   // add the centers of gravity of ElemsIdMap elements to the GrCentersXYZ list
@@ -96,23 +97,29 @@ private:
 private:
   typedef QList<SMESH::SMESH_GroupBase_var> GrpList;
 
-  SMESHGUI*                 mySMESHGUI;     /* Current SMESHGUI object */
-  LightApp_SelectionMgr*    mySelectionMgr; /* User shape selection */
-  SVTK_Selector*            mySelector;
+  SMESHGUI*                  mySMESHGUI;     /* Current SMESHGUI object */
+  LightApp_SelectionMgr*     mySelectionMgr; /* User shape selection */
+  SVTK_Selector*             mySelector;
   
-  QWidget*                  myEditCurrentArgument;
+  QWidget*                   myEditCurrentArgument;
 
-  SMESH::SMESH_Mesh_var     myMesh;
-  SMESH::SMESH_IDSource_var mySubMeshOrGroup;
-  SMESH_Actor*              myActor;
-  SUIT_SelectionFilter*     myMeshOrSubMeshOrGroupFilter;
-  SUIT_SelectionFilter*     mySubMeshOrGroupFilter;
+  SMESH::SMESH_Mesh_var      myMesh;
+  SMESH::ListOfIDSources_var mySubMeshOrGroups;
+  GrpList                    myGroups;
+  QString                    myEntry;
 
-  SMESHGUI_IdPreview*       myIdPreview;
+  SMESH_Actor*               myActor;
+  SUIT_SelectionFilter*      myMeshOrSubMeshOrGroupFilter;
+  SUIT_SelectionFilter*      mySubMeshOrGroupFilter;
+
+  SMESHGUI_IdPreview*        myIdPreview;
+  QString                    myHelpFileName;
+
+  int                        myAction;
+  bool                       myIsBusy;
+  int                        myTypeId; // manual(1) or automatic(0)
+    
 
-  int                       myAction;
-  bool                      myIsBusy;
-  int                       myTypeId; // manual(1) or automatic(0)
 
   // Widgets
 
@@ -130,6 +137,7 @@ private:
   QWidget*                  NodeSpecWidget;
   SMESHGUI_SpinBox*         SpinBoxTolerance;
   QCheckBox*                SeparateCornersAndMedium;
+  QCheckBox*                AvoidMakingHoles;
 
   QGroupBox*                GroupCoincident;
   //QWidget*                  GroupCoincidentWidget;
@@ -151,18 +159,13 @@ private:
 
   QGroupBox*                GroupKeep;
   QButtonGroup*             KeepFromButGroup;
-  QPushButton*              SelectKeepNodesButton;
-  QPushButton*              AddKeepNodesButton;
-  QPushButton*              RemoveKeepNodesButton;
+  QPushButton*              SelectKeepButton;
+  QPushButton*              AddKeepButton;
+  QPushButton*              RemoveKeepButton;
   QListWidget*              KeepList;
 
   QGroupBox*                TypeBox;
   QButtonGroup*             GroupType;
-    
-  QString                   myHelpFileName;
-
-  QString                   myEntry;
-  GrpList                   myGroups;
 
 protected slots:
   virtual void              reject();
@@ -173,10 +176,10 @@ protected slots:
   void                      ClickOnHelp();
   void                      updateControls();
   void                      onDetect();
-  void                      onAddKeepNode();
-  void                      onRemoveKeepNode();
-  void                      onSelectKeepNode();
-  void                      onKeepNodeSourceChanged(int);
+  void                      onAddKeep();
+  void                      onRemoveKeep();
+  void                      onSelectKeep();
+  void                      onKeepSourceChanged(int);
   void                      onAddGroup();
   void                      onRemoveGroup();
   void                      onSelectGroup();