Merge pull request #72 from DiamondLightSource/countdown

Countdown

Author: UrszulaNeuman

dls_barcode/gui/countdown_box.py

@@ -0,0 +1,50 @@
+import logging
+
+from PyQt5 import QtCore
+from PyQt5.QtWidgets import QLabel, QGroupBox, QVBoxLayout
+
+BLACK = "; color: black"
+BASIC_STYLE_SHEET = "font-size: 20pt"
+
+
+class CountdownBox(QGroupBox):
+    """GUI component. Displays countdown for the user."""
+
+    def __init__(self):
+        super(CountdownBox, self).__init__()
+
+        self.setTitle("Countdown")
+        self.setMaximumHeight(100)
+        self.setMaximumWidth(100)
+        self._timer = None
+        self._init_ui()
+        self.count = None
+
+    def _init_ui(self):
+        self._message_lbl = QLabel()
+        self._message_lbl.setStyleSheet(BASIC_STYLE_SHEET + BLACK)
+        self._message_lbl.setAlignment(QtCore.Qt.AlignCenter)
+        vbox = QVBoxLayout()
+        vbox.addWidget(self._message_lbl)
+        vbox.addStretch()
+        self.setLayout(vbox)
+
+    def start_countdown(self, count):
+        self.count = count
+        self._timer = QtCore.QTimer()
+        self._timer.timeout.connect(self.display)
+        self._timer.start(1000)
+
+    def reset_countdown(self):
+            if self._timer is not None:
+                self._timer.stop()
+                self._timer = None
+            self._message_lbl.clear()
+            self.count = None
+
+
+    def display(self):
+        self._message_lbl.clear()
+        if self.count is not None and self.count > 0:
+            self._message_lbl.setText(str(self.count))
+            self.count = self.count - 1

dls_barcode/gui/main_window.py

@@ -1,24 +1,21 @@
-import sys
 from PyQt5 import QtWidgets, QtGui
 
 from dls_barcode.config import BarcodeConfigDialog
-
 from dls_barcode.gui.scan_button import ScanButton
-
 from .barcode_table import BarcodeTable
+from .countdown_box import CountdownBox
 from .image_frame import ImageFrame
-from .record_table import ScanRecordTable
+from .menu_bar import MenuBar
 from .message_box import MessageBox
 from .message_factory import MessageFactory
-from .menu_bar import MenuBar
+from .record_table import ScanRecordTable
 
 
 class DiamondBarcodeMainWindow(QtWidgets.QMainWindow):
     """ Main GUI window for the Barcode Scanner App.
     """
 
     def __init__(self, config, version, flags, *args, **kwargs):
-        #super(DiamondBarcodeMainWindow, self).__init__(None, None)
 
         super().__init__(flags, *args, **kwargs)
         self._config = config
@@ -32,6 +29,7 @@ def __init__(self, config, version, flags, *args, **kwargs):
         self._barcode_table = None
         self._image_frame = None
         self._scan_button = None
+        self._countdown_box = None
 
         self._init_ui()
 
@@ -61,6 +59,9 @@ def _init_ui(self):
         # Message display
         self._message_box = MessageBox()
 
+        # Count down display
+        self._countdown_box = CountdownBox()
+
         # Create layout
 
         hbox = QtWidgets.QHBoxLayout()
@@ -75,7 +76,14 @@ def _init_ui(self):
 
         img_vbox = QtWidgets.QVBoxLayout()
         img_vbox.addWidget(self._image_frame)
-        img_vbox.addWidget(self._message_box)
+
+        msg_hbox = QtWidgets.QHBoxLayout()
+        msg_hbox.setSpacing(10)
+        msg_hbox.addWidget(self._message_box)
+        msg_hbox.addWidget(self._countdown_box)
+
+        img_vbox.addLayout(msg_hbox)
+
         hbox.addLayout(img_vbox)
 
         vbox = QtWidgets.QVBoxLayout()
@@ -104,7 +112,6 @@ def _to_run_on_table_clicked(self):
     def _on_about_action_clicked(self):
         QtWidgets.QMessageBox.about(self, 'About', "Version: " + self._version)
 
-
     def _on_scan_action_clicked(self):
         print("MAIN: Scan menu clicked")
         if not self._camera_capture_alive():
@@ -142,3 +149,9 @@ def addRecordFrame(self, latest_holder_barcode, plate, latest_holder_image, pins
 
     def isLatestHolderBarcode(self, holder_barcode):
         return self._record_table.is_latest_holder_barcode(holder_barcode)
+
+    def startCountdown(self, count):
+        self._countdown_box.start_countdown(count)
+
+    def resetCountdown(self):
+        self._countdown_box.reset_countdown()

dls_barcode/gui/message_box.py

@@ -5,7 +5,7 @@
 
 RED = "; color: red"
 BLACK = "; color: black"
-BASIC_STYLE_SHEET = "font-size: 14pt"
+BASIC_STYLE_SHEET = "font-size: 20pt"
 
 
 class MessageBox(QGroupBox):

dls_barcode/main_manager.py

@@ -1,10 +1,10 @@
-
 import multiprocessing
 import queue
 import time
+
 from PyQt5 import QtCore
-from dls_barcode.camera import CameraScanner, CameraSwitch, NoNewBarcodeMessage, ScanErrorMessage
 
+from dls_barcode.camera import CameraScanner, CameraSwitch, NoNewBarcodeMessage, ScanErrorMessage
 from dls_util import Beeper
 
 RESULT_TIMER_PERIOD = 1000  # ms
@@ -27,7 +27,6 @@ def __init__(self, ui, config):
         self._result_queue = multiprocessing.Queue()
         self._view_queue = multiprocessing.Queue()
         self._message_queue = multiprocessing.Queue()
-        #self._reset_msg_timer()
         # initialise all actions
         self._ui.set_actions_triger(self._cleanup, self.initialise_scanner, self._camera_capture_alive)
 
@@ -52,21 +51,25 @@ def _cleanup(self):
         self._camera_scanner.kill()
         self._camera_scanner = None
         self._camera_switch = None
+        self._ui.resetCountdown()
 
     def initialise_scanner(self):
         self._camera_scanner = CameraScanner(self._result_queue, self._view_queue, self._message_queue, self._config)
         self._camera_switch = CameraSwitch(self._camera_scanner, self._config.top_camera_timeout)
         self._restart_live_capture_from_side()
+        self._ui.resetCountdown()
 
     def _camera_capture_alive(self):
         return self._camera_scanner is not None and self._camera_switch is not None
 
     def _restart_live_capture_from_top(self):
         self._camera_switch.restart_live_capture_from_top()
+        self._ui.startCountdown(self._config.top_camera_timeout.value())
 
     def _restart_live_capture_from_side(self):
         self._reset_msg_timer()
         self._camera_switch.restart_live_capture_from_side()
+        self._ui.resetCountdown()
 
     def _read_message_queue(self):
         if self._message_queue.empty():