work in progress

Author: UrszulaNeuman

dls_barcode/scan/with_geometry/geometry_scanner.py

@@ -113,7 +113,7 @@ def _merge_frame_into_plate(self):
         # If one of the barcodes matches the previous frame and is aligned in the same slot, then we can
         # be fairly sure we are dealing with the same plate. Copy all of the barcodes that we read in the
         # previous plate over to their slot in the new plate. Then read any that we haven't already read.
-        self._plate_scan.new_frame(self._geometry, self._barcodes)
+        self._plate_scan.new_frame(self._frame_img, self._geometry, self._barcodes)
 
     def _find_common_barcode(self, geometry, barcodes):
         """ Determine if the set of finder patterns has any barcodes in common with the existing plate.
@@ -138,7 +138,7 @@ def _find_common_barcode(self, geometry, barcodes):
                 continue
 
             # Read the barcode
-            new_bc.perform_read()
+            new_bc.perform_read(self._frame_img)
 
             if not new_bc.is_valid():
                 continue

dls_barcode/scan/with_geometry/plate_scanner.py

@@ -49,7 +49,7 @@ def _new_slot_frame(self, slot):
         #cv2.imshow("Slot image", slot_image.img)
         #cv2.waitKey(0) 
 
-        slot_scanner = SlotScanner(self._frame_img, slot, barcode, self._force_deep_scan, self.radius_avg, self.brightness_threshold)
+        slot_scanner = SlotScanner(self._frame_img, slot, barcode, self.radius_avg, self.brightness_threshold)
         slot_scanner.scan_slot()
 
     def _calculate_average_radius(self):

dls_barcode/scan/with_geometry/slot_scanner.py

@@ -3,20 +3,18 @@
 import logging
 import math
 
-from dls_barcode.datamatrix import DataMatrix, Locator
 from dls_barcode.plate.slot import Slot
 
 
 class SlotScanner:
     FRAMES_BEFORE_DEEP = 3
 
-    def __init__(self, image, slot, barcode, force_deep_scan, radius_avg, brightness_threshold):
+    def __init__(self, image, slot, barcode, radius_avg, brightness_threshold):
         self._log = logging.getLogger(".".join([__name__]))
 
         self.image = image
         self.slot = slot
         self.barcode = barcode
-        self._force_deep_scan = force_deep_scan
 
         self.radius_avg = radius_avg
         self.side_avg = self.radius_avg * (2 / math.sqrt(2))
@@ -50,67 +48,5 @@ def scan_slot(self):
         # Clear any previous (empty/unread) result
         self.slot.set_no_result()
 
-        #if self._should_do_deep_scan():
-        #    self._perform_deep_contour_slot_scan()
-        #    self._perform_square_slot_scan()
-
     def _should_do_deep_scan(self):
-        return self._force_deep_scan or self.slot.total_frames >= self.FRAMES_BEFORE_DEEP
-    
-    def _perform_deep_contour_slot_scan(self):
-        if self.slot.state() != Slot.VALID:
-            barcode = self.deep_scan()
-            if not self._force_deep_scan and barcode:
-                barcode.perform_read(self.image)
-                self.slot.set_barcode(barcode)
-
-    def _perform_square_slot_scan(self):
-        if self.slot.state() != Slot.VALID:
-            barcode = self.square_scan()
-            if barcode is not None:
-                barcode.perform_read(self.image)
-                self.slot.set_barcode(barcode)
-
-    def deep_scan(self):
-        if not self._is_slot_worth_scanning():
-            return []
-
-        img = self._slot_image()
-        fps = list(Locator().locate_deep(img, self.radius_avg))
-        barcodes = [DataMatrix(fp) for fp in fps]
-
-        return barcodes
-
-    def square_scan(self):
-        if not self._is_slot_worth_scanning():
-            return None
-
-        img = self._slot_image()
-        fp = Locator().locate_square(img, self.side_avg)
-
-        barcode = None
-        if fp is not None:
-            barcode = DataMatrix(fp)
-
-        return barcode
-    
-    def _slot_image(self):
-        center = self.slot.barcode_position()
-        slot_img, _ = self.image.sub_image(center, self.radius_avg * 2)
-        return slot_img
-
-    def _is_slot_worth_scanning(self):
-        state = self.slot.state()
-       # center = self.slot.barcode_position()
-
-        # If we cant see the slot in the current frame, skip it
-        #slot_in_frame = self._image_contains_point(center, self.radius_avg / 2) ### ?????
-        #if not slot_in_frame:
-        #    return False
-
-        if state == Slot.VALID or state == Slot.EMPTY:
-            return False
-
-        return True
-
-   
+        return self.slot.total_frames >= self.FRAMES_BEFORE_DEEP