X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_EditHypothesesDlg.h;h=6c40460e51d335347f1e978d335548e8bfdb8d14;hb=8672ad3e7621ac25fffa8517599afa84ffea509a;hp=2e707dd49f99e56a5dd29db3dbf58d2e54c1a03a;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h b/src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h
index 2e707dd49..6c40460e5 100644
--- a/src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h
+++ b/src/SMESHGUI/SMESHGUI_EditHypothesesDlg.h
@@ -29,9 +29,9 @@
 #ifndef DIALOGBOX_EDIT_HYPOTHESES_H
 #define DIALOGBOX_EDIT_HYPOTHESES_H
 
-#include "SALOME_Selection.h"
-#include "SALOME_TypeFilter.hxx"
-#include "SMESH_TypeFilter.hxx"
+//#include "SMESH_TypeFilter.hxx"
+#include "SUIT_SelectionFilter.h"
+#include "SalomeApp_SelectionMgr.h"
 
 // QT Includes
 #include <qdialog.h>
@@ -39,7 +39,6 @@
 // IDL Headers
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(GEOM_Gen)
-#include CORBA_SERVER_HEADER(GEOM_Shape)
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
 
 #include <map>
@@ -53,26 +52,29 @@ class QListBox;
 class QListBoxItem;
 class SMESHGUI;
 
-typedef map<string, int> MapIOR;
+typedef map<std::string, int> MapIOR;
 
 //=================================================================================
 // class    : SMESHGUI_EditHypothesesDlg
 // purpose  :
 //=================================================================================
 class SMESHGUI_EditHypothesesDlg : public QDialog
-{ 
+{
     Q_OBJECT
 
 public:
-    SMESHGUI_EditHypothesesDlg( QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0 );
+    SMESHGUI_EditHypothesesDlg (SMESHGUI*,
+				const char* name = 0,
+				bool modal = FALSE,
+				WFlags fl = 0);
     ~SMESHGUI_EditHypothesesDlg();
 
 protected:
-    virtual void closeEvent( QCloseEvent* e ); 
-    virtual void enterEvent ( QEvent* );
+    virtual void closeEvent (QCloseEvent*);
+    virtual void enterEvent (QEvent*);
 
 private:
-    void Init( SALOME_Selection* Sel ) ;
+    void Init();
 
     void InitHypDefinition();
     void InitAlgoDefinition();
@@ -86,23 +88,28 @@ private:
     bool StoreMesh();
     bool StoreSubMesh();
 
+    bool IsOld(QListBoxItem* hypItem);
+
 private:
-    SMESHGUI*                     mySMESHGUI ;
-    SALOME_Selection*             mySelection ;
-             
-    GEOM::GEOM_Shape_var          myGeomShape ;
+    SMESHGUI*                     mySMESHGUI;
+    SalomeApp_SelectionMgr*       mySelectionMgr;
+
+    GEOM::GEOM_Object_var         myGeomShape;
     QLineEdit*                    myEditCurrentArgument; 
 
     SMESH::SMESH_Mesh_var         myMesh;
     SMESH::SMESH_subMesh_var      mySubMesh;
 
-    Handle(SALOME_TypeFilter)     myGeomFilter;
-    Handle(SMESH_TypeFilter)      myMeshOrSubMeshFilter;
+    //Handle(SALOME_TypeFilter)     myGeomFilter;
+    //Handle(SMESH_TypeFilter)      myMeshOrSubMeshFilter;
+    SUIT_SelectionFilter*         myGeomFilter;
+    SUIT_SelectionFilter*         myMeshOrSubMeshFilter;
 
     MapIOR                        myMapOldHypos, myMapOldAlgos;
+    int                           myNbModification;
 
     bool                          myImportedMesh;
- 
+
     QGroupBox*    GroupButtons;
     QPushButton*  buttonOk;
     QPushButton*  buttonApply;
@@ -132,10 +139,10 @@ private slots:
     void ClickOnOk();
     bool ClickOnApply();
     void ClickOnCancel();
-    void SetEditCurrentArgument() ;
-    void SelectionIntoArgument() ;
-    void DeactivateActiveDialog() ;
-    void ActivateThisDialog() ;
+    void SetEditCurrentArgument();
+    void SelectionIntoArgument();
+    void DeactivateActiveDialog();
+    void ActivateThisDialog();
 
     void removeItem(QListBoxItem*);
     void addItem(QListBoxItem*);