SMH: 3.0.0 preparation = merged version (POLYWORK + RTVDEBUG01) + adopation for new GUI

[modules/superv.git] / src / SUPERVGUI / SUPERVGUI_Main.h

diff --git a/src/SUPERVGUI/SUPERVGUI_Main.h b/src/SUPERVGUI/SUPERVGUI_Main.h
index 274a179848a2a189abcd66bd2562a18a3f6bcb8b..de7bc80862ca2e128c5ec32f9f2f60be2c182bea 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Main.h
+++ b/src/SUPERVGUI/SUPERVGUI_Main.h
@@ -29,7 +29,6 @@
 #define SUPERVGUI_Main_H
 
 #include "SUPERVGraph_ViewFrame.h"
-#include "QAD_Desktop.h"
 #include "SUPERVGUI_Canvas.h"
 #include "SUPERVGUI_CanvasView.h"
 #include "SUPERVGUI_ArrayView.h"
@@ -38,10 +37,10 @@
 #include <qapplication.h>
 #include <qthread.h>
 
-class QAD_Study;
-class QAD_ObjectBrowser;
-class QAD_Message;
-class QAD_SpinBoxDbl;
+class SUIT_Study;
+class OB_Browser;
+class LogWindow;
+class QtxDblSpinBox;
 class QLineEdit;
 class QComboBox;
 class NOTIFICATION_Consumer;
@@ -55,7 +54,7 @@ class SUPERVGUI_Main: public SUPERVGraph_View {
   friend class SUPERVGUI_Thread;
 
   public:
-    SUPERVGUI_Main(SUPERVGraph_ViewFrame*, QAD_Desktop*, SUPERV_Graph);
+    SUPERVGUI_Main(SUPERVGraph_ViewFrame*, SUIT_Desktop*/*QAD_Desktop**/, SUPERV_Graph);
     virtual ~SUPERVGUI_Main();
 
     void run( const bool andSuspend );
@@ -71,8 +70,8 @@ class SUPERVGUI_Main: public SUPERVGraph_View {
     SUPERVGUI_Canvas* getCanvas();
     SUPERVGUI_CanvasView* getCanvasView();
     SUPERV_Graph getDataflow();
-    QAD_Message* getMessage();
-    QAD_Study* getStudy();
+    LogWindow* getMessage();
+    SUIT_Study* getStudy();
     bool isArrayShown();
     void showPopup(QPopupMenu* p, QMouseEvent* e);
 
@@ -151,28 +150,28 @@ class SUPERVGUI_Main: public SUPERVGraph_View {
 
     void filterNotification();
     void changeDSGraphParameters();
-    void onSubGraphClosed(QAD_StudyFrame* );
-    void onSubGraphActivated(QAD_StudyFrame* );
+    void onSubGraphClosed( SUIT_ViewWindow* );
+    void onSubGraphActivated( SUIT_ViewWindow* );
  
   private slots:
     void chooseData(QListViewItem* item);
     void checkExecution();
 
   private:
-    void init(QAD_Desktop* parent);
+    void init(SUIT_Desktop* parent);
     void syncNotification();
     bool isFiltered(char* graph, char* node, char* type, char* message, char* sender, long counter, char* date, long stamp);
     void closeEvent(QCloseEvent*);
 
     SUPERV_Graph            dataflow;
 
-    QMap<QString, QAD_StudyFrame*> mySubGraphs;
-    QMap<QString, QString>  mySubGraphMap;
-    QAD_StudyFrame*         myLastGraph;
+    QMap<QString, SUIT_ViewWindow*> mySubGraphs;
+    QMap<QString, QString>          mySubGraphMap;
+    SUIT_ViewWindow*                myLastGraph;
 
-    QAD_Study*              study;
-    QAD_ObjectBrowser*      objectBrowser;
-    QAD_Message*            message;
+    SUIT_Study*                     study;
+    OB_Browser*                     objectBrowser;
+    LogWindow*                      message;
 
     GraphViewType           myCurrentView;
     SUPERVGUI_CanvasArray*  myArray;
@@ -222,7 +221,7 @@ class SUPERVGUI_Thread : public QObject, public QThread {
    void KillThread(bool theValue); 
   
  protected:
-  void run();
+  virtual void run();
 
  private:
   bool                myIsActive;
@@ -248,7 +247,7 @@ class SUPERVGUI_DSGraphParameters: public QDialog {
 
     void setData();
 
-    QAD_SpinBoxDbl*      myDeltaTime;
+    QtxDblSpinBox*       myDeltaTime;
     QLineEdit*           myTimeOut;
     QComboBox*           myDataStreamTrace;