Join modifications from branch OCC_debug_for_3_2_0b1

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

diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.h b/src/SMESHGUI/SMESHGUI_FilterDlg.h
index cbef2c66feb0c72b981450c71843668a82ecbc21..5c1cfd5b56aad8d9934eb542d241ebf4ae667b04 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_FilterDlg.h
+++ b/src/SMESHGUI/SMESHGUI_FilterDlg.h
@@ -34,7 +34,7 @@
 #include <qmap.h>
 #include <qvaluelist.h>
 
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SALOME_InteractiveObject.hxx"
 #include "SALOME_DataMapOfIOMapOfInteger.hxx"
 #include "SVTK_Selection.h"
@@ -56,7 +56,7 @@ class QStringList;
 class QTable;
 class QTableItem;
 class QWidgetStack;
-class SalomeApp_SelectionMgr;
+class LightApp_SelectionMgr;
 class SMESHGUI;
 class SMESHGUI_FilterLibraryDlg;
 class SVTK_Selector;
@@ -81,9 +81,11 @@ class SMESHGUI_FilterTable : public QFrame
   typedef QMap<int, Table*> TableMap;
 
 public:  
-                            SMESHGUI_FilterTable (QWidget* parent, 
+                            SMESHGUI_FilterTable( SMESHGUI*,
+                                                 QWidget* parent, 
                                                   const int type);
-                            SMESHGUI_FilterTable (QWidget* parent, 
+                            SMESHGUI_FilterTable( SMESHGUI*,
+                                                 QWidget* parent, 
                                                   const QValueList<int>& type);
   virtual                   ~SMESHGUI_FilterTable();
 
@@ -128,6 +130,14 @@ public:
                                           QString&       theText,
                                           const int      theEntityType = -1);
 
+  void                      SetID( const int      theRow,
+                                  const QString& theText,
+                                  const int      theEntityType = -1 ); 
+  
+  bool                      GetID( const int      theRow,
+                                  QString&       theText,
+                                  const int      theEntityType = -1 );
+
   void                      Update();
 
 signals:
@@ -136,7 +146,7 @@ signals:
   void                      AddToClicked();
   void                      EntityTypeChanged (const int);
   void                      NeedValidation();
-  void                      CretarionChanged (const int theRow, const int theEntityType);
+  void                      CriterionChanged (const int theRow, const int theEntityType);
   void                      CurrentChanged (int, int);
 
 private slots:
@@ -172,6 +182,7 @@ private:
   const QMap<int, QString>& getSupportedTypes() const;
 
 private:
+  SMESHGUI*                 mySMESHGUI;
 
   QGroupBox*                myTableGrp;
   QGroupBox*                mySwitchTableGrp;
@@ -187,6 +198,7 @@ private:
   QButtonGroup*             myEntityTypeGrp;
   int                       myEntityType;
   int                       myIsValid;
+  bool                      myIsLocked;
 
   SMESHGUI_FilterLibraryDlg* myLibDlg;
 
@@ -209,7 +221,7 @@ class SMESHGUI_FilterDlg : public QDialog
   enum { Mesh, Selection, Dialog, None };
 
   // Buttons
-  enum { BTN_OK, BTN_Cancel, BTN_Apply, BTN_Close };
+  enum { BTN_OK, BTN_Cancel, BTN_Apply, BTN_Close, BTN_Help };
 
 public:
                             SMESHGUI_FilterDlg( SMESHGUI*,
@@ -239,6 +251,7 @@ private slots:
   void                      onOk();
   bool                      onApply();
   void                      onClose();
+  void                      onHelp();
   void                      onDeactivate();
   void                      onSelectionDone();
   void                      onCriterionChanged (const int, const int);
@@ -287,9 +300,8 @@ private:
   // initial fields
   QValueList<int>           myTypes;
   SMESHGUI*                 mySMESHGUI;
-  SalomeApp_SelectionMgr*   mySelectionMgr;
+  LightApp_SelectionMgr*    mySelectionMgr;
   SVTK_Selector*            mySelector;
-  SVTK_ViewWindow*          myViewWindow;
   SMESH::SMESH_Mesh_ptr     myMesh;
   QWidget*                  mySourceWg;
 
@@ -298,6 +310,8 @@ private:
   QMap< int, SMESH::Filter_var > myFilter;
   QMap< int, bool >              myInsertState;
   QMap< int, int  >              myApplyToState;
+
+  QString                   myHelpFileName;
 };
 
 #endif