X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MultiEditDlg.h;h=09134549338501707bdb0cc7ea885e0d0fd8d8e7;hb=b33324fe602b1fe1158c14a866c3802df12370fa;hp=a35f517581394077e001ba7bf6fb2f8f69762878;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.h b/src/SMESHGUI/SMESHGUI_MultiEditDlg.h
index a35f51758..091345493 100755
--- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.h
+++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.h
@@ -28,13 +28,14 @@
 #define SMESHGUI_MultiEditDlg_H
 
 #include <qdialog.h>
-#include "SMESH_TypeFilter.hxx"
+
+#include "SUIT_SelectionFilter.h"
+
 #include <TColStd_MapOfInteger.hxx>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
 
-class QCloseEvent;
 class SMESHGUI_FilterDlg;
 class QCheckBox;
 class QGroupBox;
@@ -43,9 +44,17 @@ class QFrame;
 class QLineEdit;
 class SMESHGUI_SpinBox;
 class QPushButton;
-class SALOME_Selection;
+class QButtonGroup;
+class QObject;
+
 class SMESH_Actor;
 class SALOME_Actor;
+class SalomeApp_SelectionMgr;
+
+class SMESHGUI;
+class SMESH_Actor;
+class SVTK_Selector;
+class SVTK_ViewWindow;
 
 /*
   Class       : SMESHGUI_MultiEditDlg
@@ -58,13 +67,15 @@ class SMESHGUI_MultiEditDlg : public QDialog
   Q_OBJECT
 
 public:
-                            SMESHGUI_MultiEditDlg( QWidget*,
-                                                   SALOME_Selection*,
-                                                   const int,
-                                                   const char* = 0 );
+                            SMESHGUI_MultiEditDlg(SMESHGUI* theModule,
+						  const int,
+						  const bool = false,
+						  const char* = 0 );
   virtual                   ~SMESHGUI_MultiEditDlg();
 
-  void                      Init( SALOME_Selection* ) ;
+  void                      Init() ;
+
+  bool                      eventFilter( QObject* object, QEvent* event );
 
 signals:
   void                      ListContensChanged();
@@ -87,6 +98,7 @@ protected slots:
   void                      onGroupChk();
   virtual void              onToAllChk();
   void                      onFilterAccepted();
+  void                      on3d2dChanged(int);
   
 protected:
 
@@ -94,23 +106,27 @@ protected:
   void                      enterEvent ( QEvent * ) ;            
   void                      hideEvent ( QHideEvent * );                        /* ESC key */
   QFrame*                   createButtonFrame( QWidget* );
-  QFrame*                   createMainFrame  ( QWidget* );
+  QFrame*                   createMainFrame  ( QWidget*, const bool );
   bool                      isValid( const bool ) const;
   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;
+  int                       entityType();
   
 protected:
 
   QPushButton*              myOkBtn;
   QPushButton*              myApplyBtn;
   QPushButton*              myCloseBtn;
-  SALOME_Selection*         mySelection;
-  SMESH::SMESH_Mesh_var     myMesh;
   SMESH_Actor*              myActor;
+  SMESH::SMESH_Mesh_var     myMesh;
   
+  SalomeApp_SelectionMgr*   mySelectionMgr;
+  SVTK_Selector*            mySelector;
+  SMESHGUI*                 mySMESHGUI;
+
   QGroupBox*                mySelGrp;
   
   QListBox*                 myListBox;
@@ -120,6 +136,7 @@ protected:
   QPushButton*              mySortBtn;
   
   QCheckBox*                myToAllChk;
+  QButtonGroup*             myEntityTypeGrp;
   
   QCheckBox*                mySubmeshChk;
   QPushButton*              mySubmeshBtn;
@@ -132,9 +149,8 @@ protected:
   SMESHGUI_FilterDlg*       myFilterDlg;
   TColStd_MapOfInteger      myIds;
   int                       myFilterType;
-  Handle(SMESH_TypeFilter)  mySubmeshFilter;
-  Handle(SMESH_TypeFilter)  myGroupFilter;
   bool                      myBusy;
+  int                       myEntityType;
 };
 
 /*
@@ -146,9 +162,8 @@ class  SMESHGUI_ChangeOrientationDlg : public SMESHGUI_MultiEditDlg
   Q_OBJECT
 
 public:
-                            SMESHGUI_ChangeOrientationDlg( QWidget*,
-                                                           SALOME_Selection*,
-                                                           const char* = 0 );
+                            SMESHGUI_ChangeOrientationDlg(SMESHGUI* theModule,
+							  const char* = 0);
   virtual                   ~SMESHGUI_ChangeOrientationDlg();
 
 protected:
@@ -165,9 +180,8 @@ class  SMESHGUI_UnionOfTrianglesDlg : public SMESHGUI_MultiEditDlg
   Q_OBJECT
 
 public:
-                            SMESHGUI_UnionOfTrianglesDlg( QWidget*,
-                                                          SALOME_Selection*,
-                                                          const char* = 0 );
+                            SMESHGUI_UnionOfTrianglesDlg(SMESHGUI* theModule,
+							 const char* = 0);
   virtual                   ~SMESHGUI_UnionOfTrianglesDlg();
 
 protected:
@@ -184,9 +198,8 @@ class  SMESHGUI_CuttingOfQuadsDlg : public SMESHGUI_MultiEditDlg
   Q_OBJECT
 
 public:
-                            SMESHGUI_CuttingOfQuadsDlg( QWidget*,
-                                                        SALOME_Selection*,
-                                                        const char* = 0 );
+                            SMESHGUI_CuttingOfQuadsDlg(SMESHGUI* theModule,
+						       const char* = 0);
   virtual                   ~SMESHGUI_CuttingOfQuadsDlg();
 
 protected: