I04_1-165: record table and main window handle holder barcode separately

Author: IsabellaRey

dls_barcode/data_store/store.py

@@ -125,5 +125,6 @@ def _merge_holder_image_into_pins_image(self, holder_img, pins_img):
         merged_img.paste(small_holder_img, 0, 0)
         return merged_img
 
-
-
+    def is_new_holder_barcode(self, holder_barcode):
+        known_holder_barcodes = [r.holder_barcode for r in self.records]
+        return not holder_barcode in known_holder_barcodes

dls_barcode/gui/main_window.py

@@ -267,8 +267,9 @@ 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
+        holder_barcode = plate.barcodes()[0]
+        if self._record_table.is_new_holder_barcode (holder_barcode):
+            self._current_holder_barcode = holder_barcode
             self._latest_holder_image = holder_image
             self._message_box.display(MessageFactory.puck_recorded_message())
             self._camera_switch.restart_live_capture_from_top()
@@ -286,8 +287,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 _current_holder_barcode read first, top is the plate
+        self._record_table.add_record_frame(self._current_holder_barcode, plate, self._latest_holder_image, pins_image)
         if not plate.is_full_valid():
             return
 

dls_barcode/gui/record_table.py

@@ -16,13 +16,13 @@ class ScanRecordTable(QGroupBox):
     details of the scan to appear in other GUI components (list of barcodes in the barcode
     table and image of the puck in the image frame).
     """
-    COLUMNS = ['Date', 'Time', 'Plate Type', 'Valid', 'Invalid', 'Empty']
+    COLUMNS = ['Date', 'Time', 'Plate Barcode', 'Plate Type', 'Valid', 'Invalid', 'Empty']
 
     def __init__(self, barcode_table, image_frame, options, to_run_on_table_clicked):
         super(ScanRecordTable, self).__init__()
 
         # Read the store from file
-        self._store = Store(options.store_directory.value(), options, FileManager())
+        self._store = Store(options.store_directory.value(), options.store_capacity, FileManager())
         self._options = options
 
         self._barcodeTable = barcode_table
@@ -43,9 +43,10 @@ def _init_ui(self, to_run_on_table_clicked):
         self._table.setColumnWidth(0, 70)
         self._table.setColumnWidth(1, 55)
         self._table.setColumnWidth(2, 85)
-        self._table.setColumnWidth(3, 60)
-        self._table.setColumnWidth(4, 60)
-        self._table.setColumnWidth(5, 60)
+        self._table.setColumnWidth(3, 70)
+        self._table.setColumnWidth(4, 45)
+        self._table.setColumnWidth(5, 50)
+        self._table.setColumnWidth(6, 45)
         self._table.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
         self._table.cellPressed.connect(to_run_on_table_clicked)
         self._table.cellPressed.connect(self._record_selected)
@@ -81,7 +82,7 @@ def _load_store_records(self):
         self._table.setRowCount(self._store.size())
 
         for n, record in enumerate(self._store.records):
-            items = [record.date, record.time, record.plate_type, record.num_valid_barcodes,
+            items = [record.date, record.time, record.holder_barcode, record.plate_type, record.num_valid_barcodes,
                      record.num_unread_slots, record.num_empty_slots]
 
             if (record.num_valid_barcodes + record.num_empty_slots) == record.num_slots:
@@ -136,14 +137,7 @@ 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_new_holder_barcode(self, holder_barcode):
+        return self._store.is_new_holder_barcode(holder_barcode)
+