I04_1-156: prettified messages in UI

Author: IsabellaRey

dls_barcode/camera/camera_scanner.py

@@ -198,7 +198,8 @@ def _scanner_worker(task_queue, overlay_queue, result_queue, message_queue, kill
             plate = scan_result.plate()
 
             if scan_result.already_scanned():
-                message_queue.put(Message(MessageType.INFO, SCANNED_TAG))
+                pass
+                # message_queue.put(Message(MessageType.INFO, SCANNED_TAG))
                 # overlay_queue.put(TextOverlay(SCANNED_TAG, Color.Green()))
             elif scan_result.any_valid_barcodes():
                 overlay_queue.put(PlateOverlay(plate, config))

dls_barcode/gui/main_window.py

@@ -75,6 +75,7 @@ def _init_ui(self):
 
         # Message display
         self._message_display = MessageDisplay()
+        self._message_display.setFixedHeight(64)
 
         # Open options first to make sure the cameras are set up correctly.
         # Start live capture of the side as soon as the dialog box is closed
@@ -221,11 +222,12 @@ def _read_side_scan(self):
 
         # Barcode successfully read
         Beeper.beep()
-        print("MAIN: side barcode recorded")
+        print("MAIN: holder barcode recorded")
         if self._record_table.unique_side_barcode(plate): # if new side barcode
-            self._camera_switch.restart_live_capture_from_top()
             self.original_plate = plate
             self._latest_holder_image = holder_image
+            self._message_display.display_message(Message(MessageType.INFO, "Plate barcode recorded"))
+            self._camera_switch.restart_live_capture_from_top()
 
     def _read_top_scan(self):
         if self._result_queue.empty():
@@ -245,6 +247,7 @@ def _read_top_scan(self):
 
         # Barcodes successfully read
         Beeper.beep()
-        print("Scan Recorded")
+        print("Scan Completed")
+        self._message_display.display_message(Message(MessageType.INFO, "Scan completed"))
         self._camera_switch.restart_live_capture_from_side()
 

dls_barcode/gui/message_display.py

@@ -3,19 +3,21 @@
 
 from dls_util.message import MessageType
 
+RED = "; color: red"
+BLACK = "; color: black"
+BASIC_STYLE_SHEET = "font-size: 14pt"
 
 class MessageDisplay(QGroupBox):
     """GUI component. Displays messages for the user."""
-    RED = "red"
-    BLACK = "black"
+
 
     def __init__(self):
         super(MessageDisplay, self).__init__()
 
         self.setTitle("Information")
 
-        self._colors = {MessageType.INFO: "black",
-                        MessageType.WARNING: "red"}
+        self._style_sheets = {MessageType.INFO: BASIC_STYLE_SHEET + BLACK,
+                              MessageType.WARNING: BASIC_STYLE_SHEET + RED}
         self._init_ui()
 
         # Start a timer to clear old messages
@@ -25,7 +27,7 @@ def __init__(self):
 
     def _init_ui(self):
         self._message_lbl = QLabel()
-        self._message_lbl.setStyleSheet("color: red")
+        self._message_lbl.setStyleSheet(BASIC_STYLE_SHEET)
 
         vbox = QVBoxLayout()
         vbox.addWidget(self._message_lbl)
@@ -35,7 +37,7 @@ def _init_ui(self):
     def display_message(self, message):
         self._message = message
         self._message_lbl.setText(self._message.content())
-        self._message_lbl.setStyleSheet("color: " + self._colors[self._message.type()])
+        self._message_lbl.setStyleSheet(self._style_sheets[self._message.type()])
 
     def _clear_old_message(self):
         if self._message_lbl.text() and self._message.has_expired():