Merge pull request #67 from DiamondLightSource/308_test

308 test

Author: UrszulaNeuman

dls_barcode/camera/scanner_worker.py

@@ -67,8 +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())
+            message_queue.put(NoNewBarcodeMessage()) #important used in the message logic
         elif scan_result.error() is not None and (time.time() - self._last_puck_time > NO_PUCK_TIME):
+            #TODO use log
             message_queue.put(ScanErrorMessage(scan_result.error()))
 
     def _create_scanner(self, cam_position, config):

dls_barcode/gui/main_window.py

@@ -5,7 +5,7 @@
 from PyQt4 import QtGui, QtCore
 
 from dls_barcode.config import BarcodeConfig, BarcodeConfigDialog
-from dls_barcode.camera import CameraScanner, CameraSwitch, NoNewBarcodeMessage
+from dls_barcode.camera import CameraScanner, CameraSwitch, NoNewBarcodeMessage, ScanErrorMessage
 from dls_barcode.gui.scan_button import ScanButton
 from dls_util import Beeper
 from dls_util.file import FileManager
@@ -179,15 +179,17 @@ def _read_message_queue(self):
         except queue.Empty:
             return
 
-        if self._camera_switch.is_side() and isinstance(scanner_msg, NoNewBarcodeMessage):
+        if self._camera_switch.is_side():
             if not self._msg_timer_is_running():
                 # 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.latest_barcode_message())
+            elif self._has_msg_timer_timeout() and isinstance(scanner_msg, NoNewBarcodeMessage):
+                    self._message_box.display(MessageFactory.scan_completed_message())
+            elif isinstance(scanner_msg, ScanErrorMessage):
+                    self._message_box.display(MessageFactory.from_scanner_message(scanner_msg))
+                    self._reset_msg_timer()
         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
@@ -199,7 +201,7 @@ def _msg_timer_is_running(self):
         return self._record_msg_timer is not None
 
     def _has_msg_timer_timeout(self):
-        timeout = 2 * RESULT_TIMER_PERIOD / 1000
+        timeout =2 * RESULT_TIMER_PERIOD / 1000
         return self._msg_timer_is_running() and time.time() - self._record_msg_timer > timeout
 
     def _read_result_queue(self):
@@ -229,10 +231,7 @@ 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.latest_barcode_message())
 
     def _read_top_scan(self):
         if self._result_queue.empty():
@@ -253,7 +252,6 @@ def _read_top_scan(self):
         # Barcodes successfully read
         Beeper.beep()
         print("Scan Completed",  self._camera_switch.get_scan_time())
-        self._message_box.display(MessageFactory.scan_completed_message())
         self._restart_live_capture_from_side()
 
     def _restart_live_capture_from_top(self):

dls_barcode/gui/message_factory.py

@@ -2,9 +2,6 @@
 
 
 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):

dls_barcode/scan/open/open_scanner.py

@@ -30,6 +30,7 @@ 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
@@ -71,7 +72,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,6 +36,7 @@ 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))
 
@@ -82,7 +83,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()
 

docs/release-notes/release-notes-dev.md

@@ -7,6 +7,7 @@ Changes merged into master
 |-----------|--------------|------|-------------|
 | I04_1-143 | [#62](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/62) | Minor | Record summary table color changes. |
 | I04_1-172 | [#64](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/64) | Minor | New Start/Stop scan button added. |
+| I04_1-308 | [#66](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/66) | Minor | Messages displayed need revision. |
 
 Change Types:
 * Major - Backward incompatible change