I04_1-150: extracted no barcodes detected error

Author: IsabellaRey

dls_barcode/scan/no_barcodes_detected_error.py

@@ -0,0 +1,3 @@
+class NoBarcodesDetectedError(Exception):
+    def __init__(self):
+        super(NoBarcodesDetectedError, self).__init__("No barcode detected")

dls_barcode/scan/open/open_scanner.py

@@ -2,13 +2,10 @@
 
 from dls_barcode.plate import Plate
 from dls_barcode.geometry import Geometry
+from ..no_barcodes_detected_error import NoBarcodesDetectedError
 from .open_scan_result import OpenScanResult
 
 
-class NoBarcodesError(Exception):
-    pass
-
-
 class OpenScanner:
     def __init__(self, barcode_sizes):
         self.plate_type = Geometry.NO_GEOMETRY
@@ -32,7 +29,7 @@ def scan_next_frame(self, frame_img, is_single_image=False):
         try:
             barcodes = self._perform_frame_scan()
             result.set_barcodes(barcodes)
-        except NoBarcodesError as ex:
+        except NoBarcodesDetectedError as ex:
             result.set_error(str(ex))
 
         # Create a 'blank' geometry object to store the barcode locations
@@ -76,7 +73,7 @@ def _locate_all_barcodes_in_image(self):
             barcodes = DataMatrix.locate_all_barcodes_in_image(self._frame_img, self.barcode_sizes)
 
         if len(barcodes) == 0:
-            raise NoBarcodesError("No barcode detected")
+            raise NoBarcodesDetectedError()
         return barcodes
 
     def _is_barcode_new(self, barcode):

dls_barcode/scan/with_geometry/geometry_scanner.py

@@ -8,11 +8,7 @@
 from .plate_scanner import PlateScanner
 from .slot_scanner import SlotScanner
 from ..scan_result import ScanResult
-
-
-class NoBarcodesError(Exception):
-    pass
-
+from ..no_barcodes_detected_error import NoBarcodesDetectedError
 
 class GeometryScanner:
     def __init__(self, plate_type, barcode_sizes):
@@ -38,7 +34,7 @@ def scan_next_frame(self, frame_img, is_single_image=False):
         try:
             self._perform_frame_scan()
             self._frame_result.set_plate(self._plate)
-        except (NoBarcodesError, GeometryException, GeometryAdjustmentError) as ex:
+        except (NoBarcodesDetectedError, GeometryException, GeometryAdjustmentError) as ex:
             self._frame_result.set_error(str(ex))
 
         self._frame_result.end_timer()
@@ -87,7 +83,7 @@ def _locate_all_barcodes_in_image(self):
             barcodes = DataMatrix.locate_all_barcodes_in_image(self._frame_img, self.barcode_sizes)
 
         if len(barcodes) == 0:
-            raise NoBarcodesError("No Barcodes Detected In Image")
+            raise NoBarcodesDetectedError()
 
         return barcodes