I04_1-177: allowing duplicate records

Author: IsabellaRey

dls_barcode/gui/main_window.py

@@ -38,6 +38,7 @@ def __init__(self, config_file, version):
         # Scan elements
         self._camera_scanner = None
         self._camera_switch = None
+        self._latest_holder_plate = None
 
         self._init_ui()
 
@@ -267,14 +268,20 @@ 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._is_latest_holder_plate(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()
         else:
             self._message_box.display(MessageFactory.duplicate_barcode_message())
 
+    def _is_latest_holder_plate(self, plate):
+        if self._latest_holder_plate is None:
+            return False
+
+        return self._latest_holder_plate.barcodes()[0] == plate.barcodes()[0]
+
     def _read_top_scan(self):
         if self._result_queue.empty():
             if self._camera_switch.is_top_scan_timeout():
@@ -286,8 +293,8 @@ def _read_top_scan(self):
         # 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
 

dls_barcode/gui/record_table.py

@@ -136,14 +136,4 @@ 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