X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MultiEditDlg.h;h=f1499681442c854118c3833abfdd9caabe86c506;hp=8cd85ccc6f3d79b9bc2ff8649090bd7d92eec96c;hb=f31477795020e2cfc50d5b625579285c644a6a96;hpb=c63ee099ad2b149bd70136839c973e8910137bc5

diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.h b/src/SMESHGUI/SMESHGUI_MultiEditDlg.h
index 8cd85ccc6..f14996814 100755
--- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.h
+++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.h
@@ -1,4 +1,6 @@
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2007-2008  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
 //
 //  This library is free software; you can redistribute it and/or
@@ -15,27 +17,27 @@
 //  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// File   : SMESHGUI_MultiEditDlg.h
+// Author : Sergey LITONIN, Open CASCADE S.A.S.
 //
-//  File   : SMESHGUI_MultiEditDlg.h
-//  Author : Sergey LITONIN
-//  Module : SMESH
-
+#ifndef SMESHGUI_MULTIEDITDLG_H
+#define SMESHGUI_MULTIEDITDLG_H
 
-#ifndef SMESHGUI_MultiEditDlg_H
-#define SMESHGUI_MultiEditDlg_H
+// SMESH includes
+#include "SMESH_SMESHGUI.hxx"
 
-#include <qdialog.h>
-
-#include "SUIT_SelectionFilter.h"
+// Qt includes 
+#include <QDialog>
 
+// OCCT includes
 #include <TColStd_MapOfInteger.hxx>
 
+// IDL includes
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
-#include CORBA_SERVER_HEADER(SMESH_Filter)
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
 
 class SMESHGUI;
 class SMESHGUI_FilterDlg;
@@ -46,11 +48,8 @@ class SMESH_Actor;
 class LightApp_SelectionMgr;
 class SALOME_Actor;
 class SVTK_Selector;
-class SVTK_ViewWindow;
 
-class QFrame;
-class QObject;
-class QListBox;
+class QListWidget;
 class QComboBox;
 class QCheckBox;
 class QGroupBox;
@@ -64,20 +63,17 @@ class QButtonGroup;
  *               union of two neighboring triangles
  */
 
-class SMESHGUI_MultiEditDlg : public QDialog
+class SMESHGUI_EXPORT SMESHGUI_MultiEditDlg : public QDialog
 {
   Q_OBJECT
 
 public:
-                            SMESHGUI_MultiEditDlg(SMESHGUI* theModule,
-						  const int,
-						  const bool = false,
-						  const char* = 0 );
-  virtual                   ~SMESHGUI_MultiEditDlg();
+  SMESHGUI_MultiEditDlg( SMESHGUI*, const int, const bool = false );
+  virtual ~SMESHGUI_MultiEditDlg();
 
   void                      Init();
 
-  bool                      eventFilter( QObject* object, QEvent* event );
+  bool                      eventFilter( QObject*, QEvent* );
 
 signals:
   void                      ListContensChanged();
@@ -105,17 +101,19 @@ protected slots:
   SMESH::NumericalFunctor_ptr getNumericalFunctor();
 
 protected:
-  void                      closeEvent( QCloseEvent* e ) ;
-  void                      enterEvent ( QEvent * ) ;
-  void                      hideEvent ( QHideEvent * );                        /* ESC key */
-  QFrame*                   createButtonFrame( QWidget* );
-  QFrame*                   createMainFrame  ( QWidget*, const bool );
-  bool                      isValid( const bool ) const;
+  void                      closeEvent( QCloseEvent* );
+  void                      enterEvent( QEvent * );
+  void                      hideEvent( QHideEvent* );                        /* ESC key */
+  void                      keyPressEvent( QKeyEvent* );
+  QWidget*                  createButtonFrame( QWidget* );
+  QWidget*                  createMainFrame( QWidget*, const bool );
+  virtual bool              isValid( const bool );
   SMESH::long_array_var     getIds();
   void                      updateButtons();
   void                      setSelectionMode();
-  virtual bool              isIdValid( const int theID ) const;
-  virtual bool              process( SMESH::SMESH_MeshEditor_ptr, const SMESH::long_array& ) = 0;
+  virtual bool              isIdValid( const int ) const;
+  virtual bool              process( SMESH::SMESH_MeshEditor_ptr, 
+                                     const SMESH::long_array& ) = 0;
   int                       entityType();
 
 protected:
@@ -133,10 +131,11 @@ protected:
   QGroupBox*                mySelGrp;
   QGroupBox*                myCriterionGrp;
 
+  QWidget*                  myChoiceWidget;
   QButtonGroup*             myGroupChoice;
   QComboBox*                myComboBoxFunctor;
 
-  QListBox*                 myListBox;
+  QListWidget*              myListBox;
   QPushButton*              myFilterBtn;
   QPushButton*              myAddBtn;
   QPushButton*              myRemoveBtn;
@@ -171,9 +170,8 @@ class  SMESHGUI_ChangeOrientationDlg : public SMESHGUI_MultiEditDlg
   Q_OBJECT
 
 public:
-               SMESHGUI_ChangeOrientationDlg(SMESHGUI* theModule,
-					     const char* = 0);
-  virtual      ~SMESHGUI_ChangeOrientationDlg();
+  SMESHGUI_ChangeOrientationDlg( SMESHGUI* );
+  virtual ~SMESHGUI_ChangeOrientationDlg();
 
 protected:
   virtual bool process( SMESH::SMESH_MeshEditor_ptr, const SMESH::long_array& );
@@ -188,12 +186,12 @@ class  SMESHGUI_UnionOfTrianglesDlg : public SMESHGUI_MultiEditDlg
   Q_OBJECT
 
 public:
-               SMESHGUI_UnionOfTrianglesDlg(SMESHGUI* theModule,
-					    const char* = 0);
-  virtual      ~SMESHGUI_UnionOfTrianglesDlg();
+  SMESHGUI_UnionOfTrianglesDlg( SMESHGUI* );
+  virtual ~SMESHGUI_UnionOfTrianglesDlg();
 
 protected:
-  virtual bool process( SMESH::SMESH_MeshEditor_ptr, const SMESH::long_array& );
+  virtual bool      isValid( const bool );
+  virtual bool      process( SMESH::SMESH_MeshEditor_ptr, const SMESH::long_array& );
 
 private:
   SMESHGUI_SpinBox* myMaxAngleSpin;
@@ -208,9 +206,8 @@ class  SMESHGUI_CuttingOfQuadsDlg : public SMESHGUI_MultiEditDlg
   Q_OBJECT
 
 public:
-                SMESHGUI_CuttingOfQuadsDlg(SMESHGUI* theModule,
-					   const char* = 0);
-  virtual       ~SMESHGUI_CuttingOfQuadsDlg();
+  SMESHGUI_CuttingOfQuadsDlg( SMESHGUI* );
+  virtual ~SMESHGUI_CuttingOfQuadsDlg();
 
 protected:
   virtual bool  process( SMESH::SMESH_MeshEditor_ptr, const SMESH::long_array& );
@@ -229,4 +226,4 @@ private:
   QCheckBox*    myPreviewChk;
 };
 
-#endif
+#endif // SMESHGUI_MULTIEDITDLG_H