Revert "I04_1-308: Revised the messages and got 4 scenarios: 2 for side scanner: 1) once the side barcode is not there - display 'No barcodes detected constantly' 2) once the side is there but it was already scanned - display 'Scan Completed'"

This reverts commit 2b95af3

Author: UrszulaNeuman

dls_barcode/camera/scanner_worker.py

@@ -70,7 +70,7 @@ def _process_frame(self, frame, config, overlay_queue, result_queue, message_que
             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()))
+            print(ScanErrorMessage(scan_result.error()))
 
     def _create_scanner(self, cam_position, config):
         if cam_position == CameraPosition.SIDE:

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, ScanErrorMessage
+from dls_barcode.camera import CameraScanner, CameraSwitch, NoNewBarcodeMessage
 from dls_barcode.gui.scan_button import ScanButton
 from dls_util import Beeper
 from dls_util.file import FileManager
@@ -179,15 +179,12 @@ def _read_message_queue(self):
         except queue.Empty:
             return
 
-        if self._camera_switch.is_side():
+        if self._camera_switch.is_side() and isinstance(scanner_msg, NoNewBarcodeMessage):
             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() 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()
+            elif self._has_msg_timer_timeout():
+                self._message_box.display(MessageFactory.scan_completed_message())
         else:
             self._reset_msg_timer()
 
@@ -201,7 +198,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):
@@ -232,6 +229,8 @@ def _read_side_scan(self):
             self._latest_holder_barcode = holder_barcode
             self._latest_holder_image = holder_image
             self._restart_live_capture_from_top()
+        else:
+            self._message_box.display(MessageFactory.scan_completed_message())
 
     def _read_top_scan(self):
         if self._result_queue.empty():
@@ -252,6 +251,7 @@ 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

@@ -3,10 +3,6 @@
 
 class MessageFactory:
 
-    @staticmethod
-    def from_scanner_message(scanner_msg):
-        return Message(MessageType.WARNING, scanner_msg.content())
-
     @staticmethod
     def puck_recorded_message():
         return Message(MessageType.INFO, "Puck barcode recorded")