Changeset 142 for Evidence/Edd/Edd.h

Timestamp:

01/13/10 12:47:33 (15 years ago)

Author:

ogrimm

Message:

Various updates

File:

• Evidence/Edd/Edd.h (modified) (9 diffs)

Evidence/Edd/Edd.h

@@ -15 +15 @@
 #include <qwt_legend.h>
 #include <qwt_legend_item.h>
+#include <qwt_symbol.h>
 
 #include <limits.h>
@@ -22 +23 @@
 #include "Evidence.h"
 
-#define NO_LINK "__&DIM&NOLINK&__" // for checking if DIMserver is alive
 #define SVN_REVISION "$Revision$"
                   
 // General indicator for DIM service
-class Edd_Indicator: public QLineEdit, public DimClient, public DimBrowser {
+class Edd_Indicator: public QLineEdit, public DimClient {
     Q_OBJECT
-
-    char *ServiceName;
-    DimStampedInfo *Data;
 
     QMenu *Menu;
     QPoint dragStart;
     QwtPlot *LastPlot;
-        
-    void infoHandler();
+        
+    DimStampedInfo *Data;
+        
     void mousePressEvent(QMouseEvent *); 
     void mouseReleaseEvent(QMouseEvent *); 
@@ -45 +43 @@
     ~Edd_Indicator();
 
+        bool ShowAsTime;
+        
   private slots:
+        void Update(DimInfo *, int, QString, QByteArray, QString);
     void contextMenuEvent(QContextMenuEvent *);    
+    void MenuOpenHistory();
     void MenuCopyService();
-
-  signals:
-    void YEP(QString);
 };
 
@@ -72 +71 @@
     QMutex Mutex;
     
+        QString StatusTip;
+        
     QMenu *Menu;
     QAction *YLogAction;
@@ -82 +83 @@
     QwtLegend *Legend;
     
-    void infoHandler();    
     void dragEnterEvent(QDragEnterEvent *);
     void dropEvent(QDropEvent *);
@@ -93 +93 @@
   private slots:
     void UpdatePlot();
+        void Update(DimInfo* Info, int, QString, QByteArray, QString);
+
     void HandleZoom(const QwtDoubleRect &);
     void contextMenuEvent(QContextMenuEvent *);    
@@ -101 +103 @@
     void MenuPrint();
     void MenuPasteService();
- 
- signals:
-     void YEP();
+};
 
+// Textout indicator for DIM service
+class Edd_Textout: public QTextEdit, public DimClient {
+    Q_OBJECT
+
+    DimStampedInfo *Data;
+
+  public:
+    Edd_Textout(QString, QWidget * = NULL);
+    ~Edd_Textout();
+        
+        bool Accumulate;
+        
+  private slots:
+        void Update(DimInfo* Info, int, QString, QByteArray, QString);
 };
 
 // Main window class
-class GUI: public QMainWindow, public DimBrowser {
+class GUI: public QMainWindow, public DimBrowser, public DimInfo {
     Q_OBJECT
 
@@ -118 +132 @@
     QTabWidget *TabWidget;
             
-    void closeEvent(QCloseEvent *); 
-
+    void closeEvent(QCloseEvent *);
+        void infoHandler();
+        
   public:
     GUI();
@@ -127 +142 @@
     void MenuAbout();
     void MenuNewHistory();
+        
+  signals:
+    void YEP(DimInfo *, int, QString = QString(), QByteArray = QByteArray(), QString = QString());
 };