Merge branch 'master' of https://gitrepos.estec.esa.int/taste/taste-setup

misc/helper-scripts/taste-progress-dialog.py

 #!/usr/bin/env python
 
 import sys
-import PySide
 import time
 import signal
+from collections import deque
 
+import PySide
 from PySide.QtCore import QThread, Signal, QObject
 
 from PySide.QtGui import (QApplication,
@@ -12,46 +13,77 @@ from PySide.QtGui import (QApplication,
                           QProgressDialog)
 
 class MyThread(QThread, QObject):
-    signal = Signal(str)
-    progress = Signal(int)
-    quit = Signal()
+    ''' Thread waiting for data on stdin and sending signals to the prgress
+    bar in case something came in.
+    Text can be formatted:
+      * if the line starts with a number, it will use the value (range 0..100)
+        to update the progress bar, and it will display the text above the bar.
+      * if the line starts with @ERROR@ the process will stop and all the
+        history will be dispayed in a log dialog.
+      * in all other cases, the line is appended to the log
+    '''
+    text       = Signal(str)
+    progress   = Signal(int)
+    end        = Signal()
+    error      = Signal()
+    log        = deque()
+    force_quit = False
+
     def run(self):
         value = 10
         while True:
             # read from stdin without any buffering
+            if self.force_quit:
+                return
             line = sys.stdin.readline()
             if len(line) == 0:
-                print ("Bye")
-                self.quit.emit()
-                return
-            elif line[0] == 'q':
-                print ("Quit")
-                self.quit.emit()
+                print("Bye")
+                self.end.emit()
                 return
             else:
+                split = line.split()
                 try:
-                    split = line.split()
+                    # check for format "NUMBER text"
                     possible_val = split[0]
                     value = int(possible_val)
+                    if 100 < value < 0:
+                        raise ValueError
                     text = ' '.join(split[1:])
                     self.progress.emit(value)
+                    self.text.emit(text)
+                    if value == 100:
+                        self.end.emit()
+                        return
                 except (ValueError, IndexError):
                     text = line
-                self.signal.emit(text)
-                time.sleep(0.1)
+                self.log.append(text)
+                try:
+                    if split[0] == '@ERROR@':
+                        self.error.emit()
+                except IndexError:
+                    pass
 
 
 
 def run_gui():
-        app = QApplication(sys.argv)
-        thread = MyThread()       
-        progress = QProgressDialog()
-        progress.setValue(0)
-        thread.signal.connect(progress.setLabelText)
-        thread.quit.connect(progress.cancel)
-        thread.progress.connect(progress.setValue)
-        thread.start()
-        progress.exec_()
+    app      = QApplication(sys.argv)
+    thread   = MyThread()
+    progress = QProgressDialog()
+    progress.setValue(0)
+    progress.setAutoClose(True)
+
+    thread.text.connect     (progress.setLabelText)
+    thread.end.connect      (progress.cancel)
+    thread.progress.connect (progress.setValue)
+    thread.setTerminationEnabled(True)
+
+    thread.start()
+    progress.exec_()
+    if progress.wasCanceled:
+        print 'Cancel was pressed'
+        thread.force_quit = True
+    thread.wait()
+    print "end"
 
 def main():
     signal.signal(signal.SIGINT, signal.SIG_DFL)