Ticket I04_1-165: holder barcode displayed above barcodes table

Author: IsabellaRey

dls_barcode/gui/barcode_table.py

@@ -4,7 +4,7 @@
 
 from PyQt4 import QtGui
 from PyQt4.QtCore import Qt
-from PyQt4.QtGui import QGroupBox, QVBoxLayout, QHBoxLayout, QTableWidget
+from PyQt4.QtGui import QGroupBox, QVBoxLayout, QHBoxLayout
 
 from dls_barcode.plate import NOT_FOUND_SLOT_SYMBOL, EMPTY_SLOT_SYMBOL
 
@@ -15,16 +15,15 @@ class BarcodeTable(QGroupBox):
     def __init__(self, options):
         super(BarcodeTable, self).__init__()
 
-        self._barcodes = []
-
         self._options = options
 
         self.setTitle("Plate Barcodes")
         self._init_ui()
+        self.clear()
 
     def _init_ui(self):
-        # Create record table - lists all the records in the store
-        self._table = QTableWidget()
+        # Plate being displayed
+        self._plate_lbl = QtGui.QLabel()
 
         # Create barcode table - lists all the barcodes in a record
         self._table = QtGui.QTableWidget()
@@ -35,70 +34,85 @@ def _init_ui(self):
         self._table.setHorizontalHeaderLabels(['Barcode'])
         self._table.setColumnWidth(0, 100)
 
-
         # Clipboard button - copy the selected barcodes to the clipboard
         self._btn_clipboard = QtGui.QPushButton('Copy To Clipboard')
         self._btn_clipboard.setToolTip('Copy barcodes for the selected record to the clipboard')
         self._btn_clipboard.resize(self._btn_clipboard.sizeHint())
-        self._btn_clipboard.clicked.connect(self.copy_selected_to_clipboard)
-        self._btn_clipboard.setEnabled(False)
+        self._btn_clipboard.clicked.connect(self.copy_to_clipboard)
 
         hbox = QHBoxLayout()
         hbox.setSpacing(10)
         hbox.addWidget(self._btn_clipboard)
         hbox.addStretch(1)
 
         vbox = QVBoxLayout()
+        vbox.addWidget(self._plate_lbl)
         vbox.addWidget(self._table)
         vbox.addLayout(hbox)
 
         self.setLayout(vbox)
 
-    def populate(self, barcodes):
-        """ Called when a new row is selected on the record table. Displays all of the
-        barcodes from the selected record in the barcode table. By default, valid barcodes are
+    def populate(self, holder_barcode, barcodes):
+        """ Called when a new row is selected on the record table.
+        """
+        self._holder_barcode = holder_barcode
+        self._barcodes = barcodes[:]
+        self._update_state()
+
+    def clear(self):
+        self._holder_barcode = None
+        self._barcodes = []
+        self._update_state()
+
+    def _update_state(self):
+        self._populate_table()
+        self._update_button_state()
+        self._update_plate_label()
+
+    def _populate_table(self):
+        """Displays all of the barcodes from the selected record in the barcode table. By default, valid barcodes are
         highlighted green, invalid barcodes are highlighted red, and empty slots are grey.
         """
-        num_slots = len(barcodes)
         self._table.clearContents()
-        self._table.setRowCount(num_slots)
+        self._table.setRowCount(len(self._barcodes))
 
-        for index, barcode in enumerate(barcodes):
-            # Select appropriate background color
+        for index, barcode in enumerate(self._barcodes):
             if barcode == NOT_FOUND_SLOT_SYMBOL:
-                color = self._options.col_bad()
+                cell_color = self._options.col_bad()
             elif barcode == EMPTY_SLOT_SYMBOL:
-                color = self._options.col_empty()
+                cell_color = self._options.col_empty()
             else:
-                color = self._options.col_ok()
+                cell_color = self._options.col_ok()
 
-            color.a = 192
+            cell_color.a = 192
 
             # Set table item
             barcode = QtGui.QTableWidgetItem(barcode)
-            barcode.setBackgroundColor(color.to_qt())
+            barcode.setBackgroundColor(cell_color.to_qt())
             barcode.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled)
             self._table.setItem(index, 0, barcode)
 
-        self._barcodes = barcodes[:]
-        for i, barcode in enumerate(self._barcodes):
-            if barcode in [NOT_FOUND_SLOT_SYMBOL, EMPTY_SLOT_SYMBOL]:
-                self._barcodes[i] = ""
-
-        self._update_button_state()
-
     def _update_button_state(self):
-        if self._barcodes is None or len(self._barcodes) == 0:
-            self._btn_clipboard.setEnabled(False)
-        else:
-            self._btn_clipboard.setEnabled(True)
+        self._btn_clipboard.setEnabled(self._has_barcodes())
 
-    def copy_selected_to_clipboard(self):
+    def copy_to_clipboard(self):
         """ Called when the copy to clipboard button is pressed. Copies the list/s of
         barcodes for the currently selected records to the clipboard so that the user
         can paste it elsewhere.
         """
+        clipboard_barcodes = [self._holder_barcode] + self._barcodes[:]
+        for i, barcode in enumerate(clipboard_barcodes):
+            if barcode in [NOT_FOUND_SLOT_SYMBOL, EMPTY_SLOT_SYMBOL]:
+                clipboard_barcodes[i] = ""
+
         sep = os.linesep
-        if self._barcodes:
+        if clipboard_barcodes:
             import pyperclip
-            pyperclip.copy(sep.join(self._barcodes))
+            pyperclip.copy(sep.join(clipboard_barcodes))
+
+    def _update_plate_label(self):
+        text = "Plate : " + str(self._holder_barcode) if self._has_barcodes() else "Plate:"
+        self._plate_lbl.setText(text)
+
+    def _has_barcodes(self):
+        return self._barcodes is not None and len(self._barcodes) > 0

dls_barcode/gui/record_table.py

@@ -73,7 +73,7 @@ def add_record_frame(self, holder_barcode, plate, holder_img, pins_img):
         self._store.merge_record(holder_barcode, plate, holder_img, pins_img)
         self._load_store_records()
         if self._options.scan_clipboard.value():
-            self._barcodeTable.copy_selected_to_clipboard()
+            self._barcodeTable.copy_to_clipboard()
 
     def _load_store_records(self):
         """ Populate the record table with all of the records in the store.
@@ -109,11 +109,11 @@ def _record_selected(self):
         try:
             row = self._table.selectionModel().selectedRows()[0].row()
             record = self._store.get_record(row)
-            self._barcodeTable.populate(record.barcodes)
+            self._barcodeTable.populate(record.holder_barcode, record.barcodes)
             marked_image = record.marked_image(self._options)
             self._imageFrame.display_puck_image(marked_image)
         except IndexError:
-            self._barcodeTable.populate([])
+            self._barcodeTable.clear()
             self._imageFrame.clear_frame("Record table empty\nNothing to display")
 
     def _delete_selected_records(self):