Merge pull request #63 from DiamondLightSource/I04_1-293-table

I04 1 293 table

Author: UrszulaNeuman

dls_barcode/config/barcode_config.py

@@ -26,6 +26,7 @@ def __init__(self, file, file_manager):
             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())
 
@@ -61,6 +62,9 @@ def __init__(self, file, file_manager):
     def col_ok(self):
         return self.color_ok.value()
 
+    def col_accept(self):
+        return self.color_accept.value()
+
     def col_bad(self):
         return self.color_unreadable.value()
 

dls_barcode/geometry/unipuck_locator.py

@@ -49,11 +49,6 @@ def find_location(self):
                 # take the features which have only small convexity defects
 
                 (cx, cy) = self._find_contour_momentum(match_cnt)
-                #blank_image = np.zeros([1000, 1000, 3], np.uint8)
-                #cv2.drawContours(blank_image, [match_cnt], -1, (255, 255, 255), -1)
-                #cv2.drawContours(self.image, [hull], -1, (255, 255, 255), 5)
-                #self.popup_image(255- blank_image, 'cnt1')
-                #self.save_image('C:/Users/rqq82173/PycharmProjects/PuckBarcodeReader/test_' + str(cx) + '.png', 255-blank_image)
 
                 feature_orientation = math.atan2(cy - y, cx - x) # feature orientation
                 puck_orientation = feature_orientation - math.pi / 2  # puck orientation shifted -pi/2 rad from feature orientation
@@ -62,10 +57,6 @@ def find_location(self):
                 uni.set_feature_center(Point(cx, cy))
                 uni.set_feature_boarder(match_cnt)
 
-                #uni.calculate_slot_bounds(uni.center(), uni.radius(), uni.angle())
-                #uni.draw_plate(Image(self.image), Color.White())
-                #self.popup_image(self.image, 'test')
-
         return uni
 
     def _find_puck_contours(self):
@@ -75,9 +66,6 @@ def _find_puck_contours(self):
         cnt = ContoursManager(255 - edged)
         cnt.find_all()
 
-        # self.popup_image(blurred, 'bl')
-        # self.popup_image(edged, 'ero')
-
         return cnt
 
     def _find_enclosing_circle_of_largest_contour(self):
@@ -91,14 +79,10 @@ def _find_contours_of_features(self, x, y, rad):
 
         self.unipuck_contours.draw_largest_cnt(blank_image, Color.Black(), -1)
 
-        # self.popup_image(blank_image, 'cn2')
-
         img_open = ImageMorphology(blank_image).do_open_morph(8)  # removes some white artifacts
         img_open_cnt = ContoursManager(img_open)
         img_open_cnt.find_all()
 
-        # self.popup_image(img_open, 'morph2')
-
         return img_open_cnt
 
     def _find_feature(self, features_cnt):  # do this better
@@ -135,6 +119,4 @@ def popup_image(self, ima, name):
         cv2.imshow(name, ima)
         cv2.waitKey(0)
         cv2.destroyAllWindows()
-    #
-    # def save_image(self, name, img):
-    #     cv2.imwrite(name, img)
+

dls_barcode/geometry/unipuck_locator_script.py

@@ -84,9 +84,11 @@ def _load_store_records(self):
         for n, record in enumerate(self._store.records):
             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:
+            valid_empty = record.num_valid_barcodes + record.num_empty_slots
+            if valid_empty == record.num_slots:
                 color = self._options.col_ok()
+            elif valid_empty < record.num_slots and record.num_valid_barcodes > 0:
+                color = self._options.col_accept()
             else:
                 color = self._options.col_bad()
 

dls_barcode/gui/record_table.py

@@ -5,7 +5,7 @@ Changes merged into master
 --------------------------
 | Jira Task | GitHub Issue | Type | Description |
 |-----------|--------------|------|-------------|
-
+| I04_1-143 | [#63](https://github.com/DiamondLightSource/PuckBarcodeReader/issues/62) | Minor | Record summary table color changes. |
 
 Change Types:
 * Major - Backward incompatible change