Display and update message processing progress

diff --git a/src/qtui/qtuimessageprocessor.cpp b/src/qtui/qtuimessageprocessor.cpp
index f06030d..a9209ae 100644 (file)
--- a/src/qtui/qtuimessageprocessor.cpp
+++ b/src/qtui/qtuimessageprocessor.cpp
@@ -26,7 +26,10 @@
 #include "messagemodel.h"
 #include "network.h"
 
 #include "messagemodel.h"
 #include "network.h"
 

+const int progressUpdateDelay = 100;  // ms between progress signal updates
+

 QtUiMessageProcessor::QtUiMessageProcessor(QObject *parent) : AbstractMessageProcessor(parent) {
 QtUiMessageProcessor::QtUiMessageProcessor(QObject *parent) : AbstractMessageProcessor(parent) {

+  _msgsProcessed = _msgCount = 0;

   _processing = false;
   _processMode = TimerBased;
   _processTimer.setInterval(0);
   _processing = false;
   _processMode = TimerBased;
   _processTimer.setInterval(0);


@@ -50,13 +53,19 @@ void QtUiMessageProcessor::process(Message &msg) {
 
 void QtUiMessageProcessor::process(QList<Message> &msgs) {
   _processQueue.append(msgs);
 
 void QtUiMessageProcessor::process(QList<Message> &msgs) {
   _processQueue.append(msgs);

+  _msgCount += msgs.count();

   if(!isProcessing()) startProcessing();
   if(!isProcessing()) startProcessing();

+  else updateProgress();

 }
 
 void QtUiMessageProcessor::startProcessing() {
   if(processMode() == TimerBased) {
     if(_currentBatch.isEmpty() && _processQueue.isEmpty()) return;
     _processing = true;
 }
 
 void QtUiMessageProcessor::startProcessing() {
   if(processMode() == TimerBased) {
     if(_currentBatch.isEmpty() && _processQueue.isEmpty()) return;
     _processing = true;

+    _msgsProcessed = 0;
+    _msgCount = _currentBatch.count();
+    foreach(QList<Message> msglist, _processQueue) _msgCount += msglist.count();
+    updateProgress();

     if(!_processTimer.isActive()) _processTimer.start();
   }
 }
     if(!_processTimer.isActive()) _processTimer.start();
   }
 }


@@ -66,12 +75,28 @@ void QtUiMessageProcessor::processNextMessage() {
     if(_processQueue.isEmpty()) {
       _processTimer.stop();
       _processing = false;
     if(_processQueue.isEmpty()) {
       _processTimer.stop();
       _processing = false;

+      _msgsProcessed = _msgCount = 0;
+      updateProgress();

       return;
     }
     _currentBatch = _processQueue.takeFirst();
   }
   Message msg = _currentBatch.takeFirst();
   process(msg);
       return;
     }
     _currentBatch = _processQueue.takeFirst();
   }
   Message msg = _currentBatch.takeFirst();
   process(msg);

+  _msgsProcessed++;
+  updateProgress();
+}
+
+void QtUiMessageProcessor::updateProgress(bool start) {
+  if(start) {
+    _progressTimer.start();
+    emit progressUpdated(_msgsProcessed, _msgCount);
+  } else {
+    if(_msgCount == 0 || _progressTimer.elapsed() >= progressUpdateDelay) {
+      _progressTimer.restart();
+      emit progressUpdated(_msgsProcessed, _msgCount);
+    }
+  }

 }
 
 // TODO optimize checkForHighlight
 }
 
 // TODO optimize checkForHighlight

diff --git a/src/qtui/qtuimessageprocessor.h b/src/qtui/qtuimessageprocessor.h
index 53d4f02..553d580 100644 (file)
--- a/src/qtui/qtuimessageprocessor.h
+++ b/src/qtui/qtuimessageprocessor.h
@@ -21,6 +21,7 @@
 #ifndef QTUIMESSAGEPROCESSOR_H_
 #define QTUIMESSAGEPROCESSOR_H_
 
 #ifndef QTUIMESSAGEPROCESSOR_H_
 #define QTUIMESSAGEPROCESSOR_H_
 

+#include <QTime>

 #include <QTimer>
 
 #include "abstractmessageprocessor.h"
 #include <QTimer>
 
 #include "abstractmessageprocessor.h"


@@ -51,12 +52,15 @@ class QtUiMessageProcessor : public AbstractMessageProcessor {
   private:
     void checkForHighlight(Message &msg);
     void startProcessing();
   private:
     void checkForHighlight(Message &msg);
     void startProcessing();

+    void updateProgress(bool start = false);

 
     QList<QList<Message> > _processQueue;
     QList<Message> _currentBatch;
     QTimer _processTimer;
     bool _processing;
     Mode _processMode;
 
     QList<QList<Message> > _processQueue;
     QList<Message> _currentBatch;
     QTimer _processTimer;
     bool _processing;
     Mode _processMode;

+    int _msgsProcessed, _msgCount;
+    QTime _progressTimer;

 };
 
 #endif
 };
 
 #endif