Fix bug 12796: Warning missed for the bad file 'test18.med'

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_MergeNodesDlg.h

diff --git a/src/SMESHGUI/SMESHGUI_MergeNodesDlg.h b/src/SMESHGUI/SMESHGUI_MergeNodesDlg.h
index ad390853bc590a6f3f6b27e3538bdae75eb5df3f..eda961e8c0cc58341743cf5756b24b13281a0b53 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MergeNodesDlg.h
+++ b/src/SMESHGUI/SMESHGUI_MergeNodesDlg.h
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -29,8 +29,9 @@
 #ifndef DIALOGBOX_MERGENODES_H
 #define DIALOGBOX_MERGENODES_H
 
-#include "SALOME_Selection.h"
-#include "SMESH_TypeFilter.hxx"
+#include "LightApp_SelectionMgr.h"
+//#include "SMESH_TypeFilter.hxx"
+#include "SUIT_SelectionFilter.h"
 
 // QT Includes
 #include <qdialog.h>
@@ -49,6 +50,9 @@ class QListBox;
 class SMESHGUI;
 class SMESHGUI_SpinBox;
 class SMESH_Actor;
+class SVTK_ViewWindow;
+class SVTK_Selector;
+
 
 // IDL Headers
 #include <SALOMEconfig.h>
@@ -64,32 +68,38 @@ class SMESHGUI_MergeNodesDlg : public QDialog
     Q_OBJECT
 
 public:
-    SMESHGUI_MergeNodesDlg( QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0 );
+    SMESHGUI_MergeNodesDlg( SMESHGUI*,
+                           const char* name = 0,
+                           bool modal = FALSE,
+                           WFlags fl = 0);
     ~SMESHGUI_MergeNodesDlg();
 
 private:
-
-    void Init() ;
-    void closeEvent( QCloseEvent* e ) ;
-    void enterEvent ( QEvent * ) ;                          /* mouse enter the QWidget */
+    void Init();
+    void closeEvent( QCloseEvent* e );
+    void enterEvent ( QEvent * );                           /* mouse enter the QWidget */
     void hideEvent ( QHideEvent * );                        /* ESC key */
+    void keyPressEvent( QKeyEvent* e );
     void onEditNodesGroup();
-    
-    SMESHGUI*                     mySMESHGUI ;              /* Current SMESHGUI object */
-    SALOME_Selection*             mySelection ;             /* User shape selection */
-        
+
+    SMESHGUI*                     mySMESHGUI;               /* Current SMESHGUI object */
+    LightApp_SelectionMgr*        mySelectionMgr;           /* User shape selection */
+    SVTK_Selector*                mySelector;
+
     QWidget*                      myEditCurrentArgument;
 
     SMESH::SMESH_Mesh_var         myMesh;
     SMESH_Actor*                  myActor;
-    Handle(SMESH_TypeFilter)      myMeshOrSubMeshFilter;
- 
+    //Handle(SMESH_TypeFilter)      myMeshOrSubMeshFilter;
+    SUIT_SelectionFilter*         myMeshOrSubMeshFilter;
+
     QButtonGroup*     GroupConstructors;
     QRadioButton*     RadioButton1;
     QGroupBox*        GroupButtons;
     QPushButton*      buttonOk;
     QPushButton*      buttonCancel;
     QPushButton*      buttonApply;
+    QPushButton*      buttonHelp;
     QGroupBox*        GroupMesh;
     QGroupBox*        GroupCoincident;
     QGroupBox*        GroupEdit;
@@ -104,12 +114,15 @@ private:
     QListView*        ListCoincident;
     QListBox*         ListEdit;
     SMESHGUI_SpinBox* SpinBoxTolerance;
+
+    QString           myHelpFileName;
    
 private slots:
 
     void ClickOnOk();
     void ClickOnCancel();
     bool ClickOnApply();
+    void ClickOnHelp();
     void updateControls();
     void onDetect();
     void onSelectNodesGroup();