I04_1-172: forgotten color in the configuration

+ scan stop after record table click corrected

Author: UrszulaNeuman

dls_barcode/config/barcode_config.py

@@ -25,10 +25,10 @@ def __init__(self, file, file_manager):
         else:
             default_store = "../store/"
 
-        self.color_ok = add(ColorConfigItem, "Read Color", Color.Green())
-        self.color_accept = add(ColorConfigItem, "Partially Read Color", Color.Yellow())
-        self.color_unreadable = add(ColorConfigItem, "Not Read Color", Color.Red())
-        self.color_empty = add(ColorConfigItem, "Empty Color", Color.Grey())
+        self.color_ok = add(ColorConfigItem, "Pin/Puck Read", Color.Green())
+        self.color_accept = add(ColorConfigItem, "Puck Partially Read", Color.Yellow())
+        self.color_unreadable = add(ColorConfigItem, "Pin/Puck Not Read", Color.Red())
+        self.color_empty = add(ColorConfigItem, "Pin Empty", Color.Grey())
 
         self.plate_type = add(EnumConfigItem, "Sample Plate Type", default=Geometry.UNIPUCK, extra_arg=Geometry.TYPES)
         self.top_barcode_size = add(EnumConfigItem, "Datamatrix Size", default=DataMatrix.DEFAULT_SIZE,
@@ -38,11 +38,11 @@ def __init__(self, file, file_manager):
         self.scan_beep = add(BoolConfigItem, "Beep While Scanning", default=True)
         self.scan_clipboard = add(BoolConfigItem, "Results to Clipboard", default=True)
 
-        self.image_puck = add(BoolConfigItem, "Draw Puck", default=True)
-        self.image_pins = add(BoolConfigItem, "Draw Slot Highlights", default=True)
+        self.image_puck = add(BoolConfigItem, "Puck Highlight", default=True)
+        self.image_pins = add(BoolConfigItem, "Slots Highlight", default=True)
         self.image_crop = add(BoolConfigItem, "Crop to Puck", default=True)
 
-        self.store_directory = add(DirectoryConfigItem, "Startup Store Directory", default=default_store)
+        self.store_directory = add(DirectoryConfigItem, "Store Directory", default=default_store)
         self.store_capacity = add(IntConfigItem, "Results History Size", default=50)
 
         self.console_frame = add(BoolConfigItem, "Print Frame Summary", default=False)

dls_barcode/config/barcode_config_dialog.py

@@ -33,6 +33,7 @@ def _init_ui(self):
         add(cfg.color_ok)
         add(cfg.color_unreadable)
         add(cfg.color_empty)
+        add(cfg.color_accept)
 
         self.start_group("Top Camera")
         add(cfg.top_barcode_size)

dls_barcode/config/camera_config_control.py

@@ -7,7 +7,7 @@
 
 class CameraConfigControl(ConfigControl):
     RES_TEXT_WIDTH = 50
-    BUTTON_WIDTH = 100
+    BUTTON_WIDTH = 150
 
     def __init__(self, camera_config):
         ConfigControl.__init__(self, camera_config)

dls_barcode/geometry/unipuck_locator.py

@@ -42,7 +42,7 @@ def find_location(self):
             hull = cv2.convexHull(match_cnt)
             hull_area = cv2.contourArea(hull)
             feature_area = cv2.contourArea(match_cnt)
-            puck_area = math.pi * math.sqrt(radius)
+            #puck_area = math.pi * math.sqrt(radius)
             area_factor = feature_area / hull_area
             #puck_area_factor = feature_area / puck_area
             if round(area_factor, 2) > FEATURE_HULL_MATCH_FACTOR:# and puck_area_factor > PUCK_FEATURE_AREA_FACTOR_MIN:

dls_barcode/gui/main_window.py

@@ -85,7 +85,7 @@ def _init_ui(self):
         self._image_frame = ImageFrame("Plate Image")
 
         # Scan record table - lists all the records in the store
-        self._record_table = ScanRecordTable(self._barcode_table, self._image_frame, self._config, self._cleanup)
+        self._record_table = ScanRecordTable(self._barcode_table, self._image_frame, self._config, self._to_run_on_table_clicked)
 
         # Message display
         self._message_box = MessageBox()
@@ -116,6 +116,10 @@ def _init_ui(self):
 
         self.show()
 
+    def _to_run_on_table_clicked(self):
+        self._cleanup()
+        self._scan_button.setStartLayout()
+
     def _on_about_action_clicked(self):
         QtGui.QMessageBox.about(self, 'About', "Version: " + self._version)
 

dls_util/config/control.py

@@ -8,7 +8,7 @@ class ConfigControl(QWidget):
     """ Base class for config controls. When subclassing, be sure to implement both update_from_config()
     and save_to_config().
     """
-    LABEL_WIDTH = 115
+    LABEL_WIDTH = 155
 
     def __init__(self, item):
         super(ConfigControl, self).__init__()