Changeset 10928

Timestamp:

06/08/11 14:59:22 (14 years ago)

Author:

ogrimm

Message:

Improved responsiveness of GUI at start-up

Location:

fact

Files:

• Evidence/GUI.cc (modified) (9 diffs)
• Evidence/GUI.h (modified) (4 diffs)
• tools/Edd/Edd.cc (modified) (3 diffs)

fact/Evidence/GUI.cc

@@ -81 +81 @@
   setFrame(false);
   setAttribute(Qt::WA_DeleteOnClose);
+  setText("connecting...");
   
   // Connect to DIM handler
-  if (connect(Handler, SIGNAL(YEP(QString, int, QByteArray, QString, QString)), SLOT(Update(QString, int, QByteArray, QString, QString))) == false) {
+  if (connect(Handler, SIGNAL(YEP(QString, int, QByteArray, QString, QString)), SLOT(Update(QString, int, QByteArray, QString, QString)), Qt::QueuedConnection) == false) {
     printf("Failed connection for %s\n", Name.toAscii().data());
   }
@@ -242 +243 @@
   
   // Connect to DIM handler
-  if (connect(Handler, SIGNAL(YEP(QString, int, QByteArray, QString, QString)), SLOT(Update(QString, int, QByteArray, QString, QString))) == false) {
+  if (connect(Handler, SIGNAL(YEP(QString, int, QByteArray, QString, QString)), SLOT(Update(QString, int, QByteArray, QString, QString)), Qt::QueuedConnection) == false) {
     printf("Failed connection for %s\n", Service.toAscii().data());
   }
@@ -795 +796 @@
   setAttribute(Qt::WA_DeleteOnClose);
   setAutoFillBackground(true);
+  setText("connecting...");
   document()->setMaximumBlockCount(1000);
   Accumulate = true;
   
   // Connect to DIM handler
-  if (connect(Handler, SIGNAL(YEP(QString, int, QByteArray, QString, QString)), SLOT(Update(QString, int, QByteArray, QString, QString))) == false) {
+  if (connect(Handler, SIGNAL(YEP(QString, int, QByteArray, QString, QString)), SLOT(Update(QString, int, QByteArray, QString, QString)), Qt::QueuedConnection) == false) {
     printf("Failed connection for %s\n", Name.toAscii().data());
   }
@@ -839 +841 @@
     Pal.setColor(QPalette::Base, Qt::lightGray);
         setPalette(Pal);
+    setText("n/a");
         return;
   }
@@ -875 +878 @@
     printf("Failed connection in EddDim()\n");
   }
+
+  // To ensure responsiveness of GUI, subscriptions handled only when no GUI events (timeout 0)
+  Timer = new QTimer(this);
+  connect(Timer, SIGNAL(timeout()), SLOT(MakeSubscriptions()));
+  Timer->start();
 }
 
@@ -886 +894 @@
 }
 
-// Subscribe to DIM service
+// Subscribe to DIM service (actual subscription handled in worker thread below)
 void EddDim::Subscribe(QString Name) {
 
   // Lock before accessing list
   QMutexLocker Locker(Mutex);
-
-  // If already subscribed to service, increase usage count and reemit data for new subscriber
+  WaitingList.append(Name);
+}
+
+// Subscriptions handled only when no GUI events waiting (launched by timer, see constructor)
+void EddDim::MakeSubscriptions() {
+
+  if (WaitingList.isEmpty()) return;
+
+  // Lock before accessing list
+  QMutexLocker Locker(Mutex);
+
+  QString Name = WaitingList.first();
+  WaitingList.removeFirst();
+
+  // If already subscribed to service, increase usage count
   if (ServiceList.contains(Name)) {
         ServiceList[Name].Count++;
-        YEP(Name, ServiceList[Name].TimeStamp, ServiceList[Name].ByteArray, ServiceList[Name].Format, ServiceList[Name].Text);
+        //YEP(Name, ServiceList[Name].TimeStamp, ServiceList[Name].ByteArray, ServiceList[Name].Format, ServiceList[Name].Text);
         return;
   }
@@ -904 +925 @@
   ServiceList[Name].Count = 1;
   ServiceList[Name].DIMService = new DimStampedInfo(Name.toAscii().data(), INT_MAX, NO_LINK, this);
-  return;
-}
+}
+
 
 // Unsubsribe from DIM service
@@ -973 +994 @@
 }
 
+// Force reemit of all buffered DIM data (work around for widget update problem)
+void EddDim::ForceEmit() {
+
+  // Lock before accessing list
+  QMutexLocker Locker(Mutex);
+
+  QMap<QString, struct Item>::const_iterator i = ServiceList.constBegin();
+
+  while (i != ServiceList.constEnd()) {
+        YEP(i.key(), i.value().TimeStamp, i.value().ByteArray, i.value().Format, i.value().Text);
+     ++i;
+  }
+}
+
 // Store service information for usage by Subscribe(), update statistics and emit signal to widgets
 void EddDim::Update(QString Name, int Time, QByteArray Data, QString Format, QString Text) {
@@ -1027 +1062 @@
 
   if (M->isVisible()) M->hide();
-  else M->show();
+  else {
+        M->show();
+        M->raise();
+  }
 }
 

fact/Evidence/GUI.h

@@ -3 +3 @@
 
 #include <QtGui>
- 
+#include <QtConcurrentRun>
+
 #include <qwt_plot.h>
 #include <qwt_plot_curve.h>
@@ -224 +225 @@
     QMap<QString, struct Item> ServiceList;
     QMutex *Mutex;
+        QList<QString> WaitingList;
 
         struct HistItem {
@@ -239 +241 @@
         void Update(QString, int, QByteArray, QString, QString);
         void UpdateStatistics();
+        void MakeSubscriptions();
 
   public:
@@ -248 +251 @@
         class EvidenceHistory *GetHistory(QString);
         void DropHistory(QString);
+        void ForceEmit();
 
   signals:

fact/tools/Edd/Edd.cc

@@ -732 +732 @@
   Scope->SetActive(!State);
   StartStopButton->setText(State ? "Start" : "Stop");
-  //if (!State) connect(Handler, SIGNAL(YEP(QString, int, QByteArray, QString, QString)), Scope, SLOT(Update(QString, int, QByteArray, QString, QString)));
-  //else disconnect(Handler, SIGNAL(YEP(QString, int, QByteArray, QString, QString)), Scope, SLOT(Update(QString, int, QByteArray, QString, QString)));
 }
 
@@ -828 +826 @@
 
   Button = new QPushButton();
-  Button->setText("Start DIM browser");
+  Button->setText("DIM browser");
   connect(Button, SIGNAL(released()), SLOT(StartDIMBrowser()));
   Layout->addWidget(Button, 7, 1, 1, 1);
@@ -904 +902 @@
   connect(Timer, SIGNAL(timeout()), this, SLOT(CheckAlarm()));
   Timer->start(5000);
+
+  // Force update of all widgets constructed (in thread for GUI responsiveness) 
+  QtConcurrent::run(Handler, &EddDim::ForceEmit);
 }