open scan system test which fails + more logs

Author: UrszulaNeuman

.vscode/launch.json

@@ -7,6 +7,6 @@
             "request": "launch",
             "program": "${workspaceFolder}/main.py",
             "console": "integratedTerminal"
-        }
+          }
     ]
 }

.vscode/settings.json

@@ -4,7 +4,7 @@
       "import sys; sys.path.append('C:\\Users\\rqq82173\\Documents\\PuckBarcodeReader')"
    ],
    "python.testing.pytestArgs": [
-      "./tests/",
+      "tests"
    ],
    "python.testing.pytestEnabled": true,
    "python.testing.unittestEnabled": false,

Pipfile

@@ -21,9 +21,9 @@ pygelf = "*"
 opencv-python = "*"
 pyperclip = "*"
 scipy = "*"
-pyqt5 = "*"
 numpy = "*"
 pytest-isort = "*"
+pyqt5 = "*"
 
 [scripts]
 tests_dls_util = "python -m pytest --cov dls_util tests/unit_tests"

Pipfile.lock

@@ -1,3 +1,4 @@
+import logging
 from dls_barcode.gui.message_factory import MessageFactory
 from dls_barcode.scan.scan_result import ScanResult
 from dls_barcode.camera.camera_position import CameraPosition
@@ -11,7 +12,8 @@ def __init__(self, camera_config, cam_position):
         self.camera_config = camera_config
         self.camera_position = cam_position
         self.stream = None
-        self._scanner = None 
+        self._scanner = None
+        self._log = logging.getLogger(".".join([__name__]))
 
     def initialise_stream(self, ):
         self.stream = CaptureManager(self.camera_config)
@@ -32,6 +34,7 @@ def create_scanner(self,config):
 
         if plate_type == "None":
             self._scanner = OpenScanner(barcode_sizes)
+            self._log.debug("Open Geometry")
         else:
             self._scanner = GeometryScanner(plate_type, barcode_sizes)
 

dls_barcode/camera/stream_manager.py

@@ -154,7 +154,7 @@ def locate_all_barcodes_in_image(grayscale_img, matrix_sizes=[DEFAULT_SIZE]):
         return unread_barcodes
 
     @staticmethod
-    def locate_all_barcodes_in_image_deep(grayscale_img, matrix_sizes=[DEFAULT_SIZE]):
+    def locate_all_barcodes_in_image_deep(grayscale_img, matrix_sizes=[DEFAULT_SIDE_SIZES]):
         """ Searches the image for all datamatrix finder patterns
         """
         # TODO: deep scan is more likely to find some false finder patterns. Filter these out

dls_barcode/datamatrix/datamatrix.py

@@ -1,3 +1,4 @@
+import logging
 from PyQt5.QtCore import QObject, pyqtSignal
 from dls_barcode.camera.scanner_message import ScanErrorMessage
 from dls_barcode.scan.scan_result import ScanResult
@@ -10,14 +11,17 @@ class SideProcessor(QObject):
 
     def __init__(self, side_camera_stream, side_frame) -> None:
         super().__init__()
+        self._log = logging.getLogger(".".join([__name__]))
         self._side_camera_stream = side_camera_stream
         self._side_frame = side_frame 
 
     def run(self):
         side_result = self._side_camera_stream.process_frame(self._side_frame)
         if side_result.error() is not None:
+            self._log.debug(side_result.error().content())
             self.side_scan_error_signal.emit(side_result.error())
         if side_result.has_valid_barcodes():
+            self._log.debug("side has valid barcodes")
             self.side_result_signal.emit(side_result)
 
         self.finished.emit()

dls_barcode/frame_processor.py

@@ -0,0 +1,65 @@
+import os, shutil
+
+from mock import MagicMock
+
+from dls_barcode.config.barcode_config import BarcodeConfig
+from dls_barcode.data_store import Store
+from dls_barcode.data_store.store_writer import StoreWriter
+from dls_barcode.scan import OpenScanner
+from dls_util.image import Image
+from dls_util.file import FileManager
+from dls_util.cv.frame import Frame
+from pylibdmtx.pylibdmtx import decode
+import cv2
+
+
+class TestOpensScan():
+
+    # SHOULD BE OPEN CV 2.4.10
+
+    # Directory storing all of the test images
+    TEST_IMG_DIR = 'tests/test-resources/new_side'
+    CONFIG_FILE = os.path.join(TEST_IMG_DIR, "system_test_config.ini")
+    FILE_MANAGER = FileManager()
+    OPTIONS = BarcodeConfig(CONFIG_FILE, FILE_MANAGER)
+
+    # Clear store before creating a new one
+    store_dir = OPTIONS.store_directory
+    if os.path.isdir(store_dir.value()):
+        shutil.rmtree(store_dir.value())
+
+    comms_manger = StoreWriter(OPTIONS.get_store_directory(), "store")
+    STORE = Store(comms_manger, MagicMock())
+
+
+    def test_generator(self):
+        TEST_CASES = self.generate_test_cases()
+        for params in TEST_CASES:
+            self.run_scans(params[0], params[1])
+
+
+    def run_scans(self, img_file, expected_code):
+        filepath = os.path.join(self.TEST_IMG_DIR, img_file)
+        cv_image = Image.from_file(filepath)
+        f = Frame(None)
+        f._image = cv_image
+        result = OpenScanner([12,14]).scan_next_frame(f, is_single_image=True)
+        barcode = result._barcodes[0].data()
+        assert barcode == expected_code
+        
+
+
+    def generate_test_cases(self):
+        # Barcode data that is expected to appear in each image of the pucks
+        side_code_old ='DF-039'
+
+        side_code_new ='ASAP02'
+
+        # List of files for Puck type 1
+        side_testcases = [('old_side.png', side_code_old),('new_side.jpg', side_code_new)]
+
+        # Create a list of test cases
+        test_cases = []
+        test_cases.extend(side_testcases)
+        return test_cases
+

tests/system_tests/test_open_scan.py

@@ -8,6 +8,7 @@
 from dls_barcode.scan import GeometryScanner
 from dls_util.image import Image
 from dls_util.file import FileManager
+from dls_util.cv.frame import Frame
 
 # SHOULD BE OPEN CV 2.4.10
 
@@ -29,14 +30,15 @@
 def test_generator():
     TEST_CASES = generate_test_cases()
     for params in TEST_CASES:
-        yield run_scans, params[0], params[1]
+        run_scans(params[0], params[1])
 
 
 def run_scans(img_file, expected_codes):
     filepath = os.path.join(TEST_IMG_DIR, img_file)
     cv_image = Image.from_file(filepath)
-    gray_image = cv_image.to_grayscale()
-    results = GeometryScanner("Unipuck", [14]).scan_next_frame(gray_image, is_single_image=True)
+    f = Frame(None)
+    f._image = cv_image
+    results = GeometryScanner("Unipuck", [14]).scan_next_frame(f, is_single_image=True)
     plate = results.plate()
     store_scan(img_file, plate, cv_image)