Merging with WPdev

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

diff --git a/src/SMESHGUI/SMESHGUI.h b/src/SMESHGUI/SMESHGUI.h
index 4efe43dfa26df22bbdf100a6386eaea410c571b0..7dbab6471692f2b7aa0d41e0c56d6b1390c4d683 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.h
+++ b/src/SMESHGUI/SMESHGUI.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,6 +29,8 @@
 #ifndef SMESHGUI_HeaderFile
 #define SMESHGUI_HeaderFile
 
+#include "SMESH_SMESHGUI.hxx"
+
 // SALOME Includes
 #include <SalomeApp_Module.h>
 #include <SALOME_InteractiveObject.hxx>
@@ -44,16 +46,18 @@ class SUIT_ViewWindow;
 class SUIT_ResourceMgr;
 class SUIT_ViewManager;
 
-class SalomeApp_Operation;
+class LightApp_Operation;
 class SalomeApp_Study;
-class SalomeApp_SelectionMgr;
+class LightApp_SelectionMgr;
+
+class SMESHGUI_FilterLibraryDlg;
 
 
 //=================================================================================
 // class    : SMESHGUI
 // purpose  :
 //=================================================================================
-class SMESHGUI : public SalomeApp_Module
+class SMESHGUI_EXPORT SMESHGUI : public SalomeApp_Module
 {
   Q_OBJECT;
 
@@ -63,7 +67,7 @@ public :
 
   static SMESH::SMESH_Gen_var     GetSMESHGen();
   static SMESHGUI*                GetSMESHGUI();
-  static SalomeApp_SelectionMgr*  selectionMgr();
+  static LightApp_SelectionMgr*   selectionMgr();
   static SUIT_ResourceMgr*        resourceMgr();
   static SUIT_Desktop*            desktop() ;
   static SalomeApp_Study*         activeStudy();
@@ -71,7 +75,7 @@ public :
 
   static bool                     automaticUpdate();
 
-  virtual SalomeApp_Displayer*    displayer();
+  virtual LightApp_Displayer*     displayer();
   virtual QString     engineIOR() const;
   virtual void        initialize( CAM_Application* );
   virtual void        windows( QMap<int, int>& ) const;
@@ -83,6 +87,7 @@ public :
   void                ResetState() ;
   void                SetState(int aState) ;
   bool                DefineDlgPosition(QWidget* aDlg, int& x, int& y) ;
+  void                switchToOperation(int id) ;
 
   virtual bool OnGUIEvent        ( int id );
   virtual bool OnMousePress      ( QMouseEvent*, SUIT_ViewWindow* );
@@ -126,7 +131,7 @@ protected:
   void createPopupItem( const int, const QString&, const QString&,
                         const QString& = QString::null, const int = -1 );
   
-  virtual SalomeApp_Operation*      createOperation( const int ) const;
+  virtual LightApp_Operation*      createOperation( const int ) const;
 
 private:
   void OnEditDelete();
@@ -136,7 +141,9 @@ private :
   QDialog*                         myActiveDialogBox;
   int                              myState;
   QMap<int,QString>                myRules;
-  SalomeApp_Displayer*             myDisplayer;
+  LightApp_Displayer*              myDisplayer;
+
+  SMESHGUI_FilterLibraryDlg*       myFilterLibraryDlg;
 };
 
 #endif