Changeset 11360 for fact/Evidence/GUI.h

Timestamp:

07/12/11 15:29:14 (13 years ago)

Author:

ogrimm

Message:

Updates to make Edd more responsive with high incoming event rate

File:

• fact/Evidence/GUI.h (modified) (10 diffs)

fact/Evidence/GUI.h

@@ -34 +34 @@
 bool SetStatus(QWidget *, QString, int, QString, int = -1);
 
+// General Edd Widget: has Update() method called by DIM interface
+class EddWidget {
+
+  public:
+        virtual void Update(const QString &, int, const QByteArray &, const QString &, const QString &, int=-1) = 0;
+};
+
 // Base class for Edd plot
 // DeleteCurve() is pure virtual and needs to be implemented iin the application class
@@ -97 +104 @@
                   
 // General indicator for DIM service
-class EddLineDisplay: public QLineEdit {
+class EddLineDisplay: public QLineEdit, public EddWidget {
     Q_OBJECT
 
@@ -112 +119 @@
         
   public:
-    EddLineDisplay(QString, int=0, QWidget * = NULL);
+    EddLineDisplay(QString, int=-1, QWidget * = NULL);
     ~EddLineDisplay();
+        void Update(const QString &, int, const QByteArray &, const QString &, const QString &, int = -1);
 
         bool ShowAsTime;
         
   private slots:
-        void Update(QString, int, QByteArray, QString, QString);
     void contextMenuEvent(QContextMenuEvent *);    
     void MenuOpenHistory();
@@ -143 +150 @@
 
 // Graph class for history display 
-class EddPlot: public EddBasePlot {
+class EddPlot: public EddBasePlot, public EddWidget {
     Q_OBJECT
 
@@ -190 +197 @@
     void AddService(QString, int = 0);
         void DeleteCurve(QwtPlotCurve *);
-
-  private slots:
-        void Update(QString, int, QByteArray, QString, QString);
+        void Update(const QString &, int, const QByteArray &, const QString &, const QString &, int = -1);
+
+  private slots:
         void LegendClicked(QwtPlotItem *);
     void MenuPasteService();
@@ -201 +208 @@
 
 // Text history and output class
-class EddText: public QTextEdit {
+class EddText: public QTextEdit, public EddWidget {
   Q_OBJECT
 
@@ -211 +218 @@
     EddText(QString, bool = false, QWidget * = NULL);
     ~EddText();
+        void Update(const QString &, int, const QByteArray &, const QString &, const QString &, int = -1);
 
         bool Accumulate;
-
-  private slots:
-        void Update(QString, int, QByteArray, QString, QString);
 };
 
@@ -226 +231 @@
         struct Item {
           DimStampedInfo *DIMService;
-          int Count;
+          QMap<class EddWidget *, int> Subscribers;
           int TimeStamp;
           QByteArray ByteArray;
           QString Format;
           QString Text;
+          QStringList Items;
         };
     QMap<QString, struct Item> ServiceList;
-    QMutex *Mutex;
-        QList<QString> WaitingList;
+        QMap<QString, bool> IgnoreMap;
+    QMutex *Mutex, IgnoreMutex;
 
         struct HistItem {
@@ -249 +255 @@
 
   private slots:
-        void Update(QString, int, QByteArray, QString, QString);
+        void Update(QString, int, QByteArray, QString);
         void UpdateStatistics();
-        void MakeSubscriptions();
 
   public:
@@ -257 +262 @@
     ~EddDim();
 
-        void Subscribe(QString);
-        void Unsubscribe (QString);
+        void Subscribe(QString, class EddWidget *, int = -1);
+        void Unsubscribe (QString, class EddWidget *);
+        void Ignore (QString, bool);
         class EvidenceHistory *GetHistory(QString);
         void DropHistory(QString);
-        void ForceEmit();
 
   signals:
-    void YEP(QString, int, QByteArray = QByteArray(), QString = QString(), QString = QString());
-    void INT(QString, int, QByteArray = QByteArray(), QString = QString(), QString = QString());
+    void INT(QString, int, QByteArray = QByteArray(), QString = QString());
 };