Revert "I04_1-308: Revising the messages - fewer messages shown"

This reverts commit bb45714

Author: UrszulaNeuman

dls_barcode/camera/scanner_worker.py

@@ -67,10 +67,9 @@ def _process_frame(self, frame, config, overlay_queue, result_queue, message_que
         elif scan_result.any_valid_barcodes():
             # We have read valid barcodes but they are not new, so the scanner didn't even output a plate
             self._last_puck_time = time.time()
-            message_queue.put(NoNewBarcodeMessage()) #important used in the message logic
+            message_queue.put(NoNewBarcodeMessage())
         elif scan_result.error() is not None and (time.time() - self._last_puck_time > NO_PUCK_TIME):
-            #TODO use log
-            print(ScanErrorMessage(scan_result.error()))
+            message_queue.put(ScanErrorMessage(scan_result.error()))
 
     def _create_scanner(self, cam_position, config):
         if cam_position == CameraPosition.SIDE:

dls_barcode/gui/main_window.py

@@ -184,9 +184,10 @@ def _read_message_queue(self):
                 # The result queue is read at a slower rate - use a timer to give it time to process a new barcode
                 self._start_msg_timer()
             elif self._has_msg_timer_timeout():
-                self._message_box.display(MessageFactory.scan_completed_message())
+                self._message_box.display(MessageFactory.latest_barcode_message())
         else:
             self._reset_msg_timer()
+            self._message_box.display(MessageFactory.from_scanner_message(scanner_msg))
 
     def _reset_msg_timer(self):
         self._record_msg_timer = None
@@ -228,9 +229,10 @@ def _read_side_scan(self):
         if not self._record_table.is_latest_holder_barcode(holder_barcode):
             self._latest_holder_barcode = holder_barcode
             self._latest_holder_image = holder_image
+            self._message_box.display(MessageFactory.puck_recorded_message())
             self._restart_live_capture_from_top()
         else:
-            self._message_box.display(MessageFactory.scan_completed_message())
+            self._message_box.display(MessageFactory.latest_barcode_message())
 
     def _read_top_scan(self):
         if self._result_queue.empty():

dls_barcode/gui/message_factory.py

@@ -2,6 +2,13 @@
 
 
 class MessageFactory:
+    @staticmethod
+    def latest_barcode_message():
+        return Message(MessageType.WARNING, "Puck barcode already in latest record", lifetime=3)
+
+    @staticmethod
+    def from_scanner_message(scanner_msg):
+        return Message(MessageType.WARNING, scanner_msg.content())
 
     @staticmethod
     def puck_recorded_message():

dls_barcode/scan/open/open_scanner.py

@@ -30,7 +30,6 @@ def scan_next_frame(self, frame_img, is_single_image=False):
             barcodes = self._perform_frame_scan()
             result.set_barcodes(barcodes)
         except NoBarcodesDetectedError as ex:
-            # TODO: logging the error
             result.set_error(str(ex))
 
         # Create a 'blank' geometry object to store the barcode locations
@@ -72,7 +71,7 @@ def _locate_all_barcodes_in_image(self):
             barcodes = DataMatrix.locate_all_barcodes_in_image_deep(self._frame_img, self.barcode_sizes)
         else:
             barcodes = DataMatrix.locate_all_barcodes_in_image(self._frame_img, self.barcode_sizes)
-        # TODO: log the error
+
         if len(barcodes) == 0:
             raise NoBarcodesDetectedError()
         return barcodes

dls_barcode/scan/with_geometry/geometry_scanner.py

@@ -36,7 +36,6 @@ def scan_next_frame(self, frame_img, is_single_image=False):
         try:
             self._perform_frame_scan()
             self._frame_result.set_plate(self._plate)
-        #TODO: use logs
         except (NoBarcodesDetectedError, GeometryException, GeometryAdjustmentError) as ex:
             self._frame_result.set_error(str(ex))
 
@@ -83,7 +82,7 @@ def _perform_frame_scan(self):
 
     def _locate_all_barcodes_in_image(self):
         barcodes = DataMatrix.locate_all_barcodes_in_image(self._frame_img, self.barcode_sizes)
-        #TODO: log this
+
         if len(barcodes) == 0:
             raise NoBarcodesDetectedError()