Merge pull request #50 from DiamondLightSource/I04_1-177_allow_duplicates

I04 1 177 allow duplicates

Author: IsabellaRey

dls_barcode/gui/main_window.py

@@ -32,7 +32,6 @@ def __init__(self, config_file, version):
         # UI elements
         self._record_table = None
         self._barcode_table = None
-        self.sideBarcodeWindow = None
         self._image_frame = None
 
         # Scan elements
@@ -61,7 +60,7 @@ def __init__(self, config_file, version):
         self._message_timer.timeout.connect(self._read_message_queue)
         self._message_timer.start(MESSAGE_TIMER_PERIOD)
 
-        self._camera_switch.restart_live_capture_from_side()
+        self._restart_live_capture_from_side()
 
     def _init_ui(self):
         """ Create the basic elements of the user interface.
@@ -166,7 +165,7 @@ def _on_scan_action_clicked(self):
         if not self._camera_capture_alive():
             self._initialise_scanner()
 
-        self._camera_switch.restart_live_capture_from_side()
+        self._restart_live_capture_from_side()
 
     def _on_options_action_clicked(self):
         result_ok = self._open_options_dialog()
@@ -175,7 +174,7 @@ def _on_options_action_clicked(self):
 
         self._cleanup()
         self._initialise_scanner()
-        self._camera_switch.restart_live_capture_from_side()
+        self._restart_live_capture_from_side()
 
     def _open_options_dialog(self):
         dialog = BarcodeConfigDialog(self._config, self._before_test_camera)
@@ -237,22 +236,23 @@ 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.duplicate_barcode_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._duplicate_msg_timer = None
+        self._duplicate_record_msg_timer = None
 
     def _start_msg_timer(self):
-        self._duplicate_msg_timer = time.time()
+        self._duplicate_record_msg_timer = time.time()
 
     def _msg_timer_is_running(self):
-        return self._duplicate_msg_timer is not None
+        return self._duplicate_record_msg_timer is not None
 
     def _has_msg_timer_timeout(self):
-        return self._msg_timer_is_running() and time.time() - self._duplicate_msg_timer > 2 * RESULT_TIMER_PERIOD / 1000
+        timeout = 2 * RESULT_TIMER_PERIOD / 1000
+        return self._msg_timer_is_running() and time.time() - self._duplicate_record_msg_timer > timeout
 
     def _read_result_queue(self):
         """ Called every second; read any new results from the scan results queue, store them and display them.
@@ -277,33 +277,40 @@ def _read_side_scan(self):
         # Barcode successfully read
         Beeper.beep()
         print("MAIN: puck barcode recorded")
-        if self._record_table.unique_side_barcode(plate): # if new side barcode
-            self.original_plate = plate
+        if not self._record_table.is_latest_holder_barcode(plate):
+            self._latest_holder_plate = plate
             self._latest_holder_image = holder_image
             self._message_box.display(MessageFactory.puck_recorded_message())
-            self._camera_switch.restart_live_capture_from_top()
+            self._restart_live_capture_from_top()
         else:
-            self._message_box.display(MessageFactory.duplicate_barcode_message())
+            self._message_box.display(MessageFactory.latest_barcode_message())
 
     def _read_top_scan(self):
         if self._result_queue.empty():
             if self._camera_switch.is_top_scan_timeout():
                 self._message_box.display(MessageFactory.scan_timeout_message())
                 print("\n*** Scan timeout ***")
-                self._camera_switch.restart_live_capture_from_side()
+                self._restart_live_capture_from_side()
             return
 
         # Get the result
         plate, pins_image = self._result_queue.get(False)
 
-        # Add new record to the table - side is the original_plate read first, top is the plate
-        self._record_table.add_record_frame(self.original_plate, plate, self._latest_holder_image, pins_image)
+        # Add new record to the table - side is the _latest_holder_plate read first, top is the plate
+        self._record_table.add_record_frame(self._latest_holder_plate, plate, self._latest_holder_image, pins_image)
         if not plate.is_full_valid():
             return
 
         # Barcodes successfully read
         Beeper.beep()
         print("Scan Completed")
         self._message_box.display(MessageFactory.scan_completed_message())
+        self._restart_live_capture_from_side()
+
+    def _restart_live_capture_from_top(self):
+        self._camera_switch.restart_live_capture_from_top()
+
+    def _restart_live_capture_from_side(self):
+        self._reset_msg_timer()
         self._camera_switch.restart_live_capture_from_side()
 

dls_barcode/gui/message_factory.py

@@ -3,8 +3,8 @@
 
 class MessageFactory:
     @staticmethod
-    def duplicate_barcode_message():
-        return Message(MessageType.WARNING, "Puck barcode already in database", lifetime=3)
+    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/gui/record_table.py

@@ -136,14 +136,12 @@ def _delete_selected_records(self):
             self._store.delete_records(records_to_delete)
             self._load_store_records()
 
-    def unique_side_barcode(self, plate):
-        barcodes = []
-        plate_barcodes = plate.barcodes()
-        store = self._store
-        rec = store.records
-        for m,record in enumerate(rec):
-            barcodes = barcodes + record.barcodes[:]
-        if plate_barcodes[0] in barcodes:
-            return False
-        return True
+    def is_latest_holder_barcode(self, plate):
+        latest_record = self._store.get_record(0)
+
+        if latest_record is not None and plate.barcodes()[0] in latest_record.barcodes:
+            return True
+
+        return False
+