Fix negative coordinate handling in FeedForwardFrameCropper. (#54)

Author: brosenberg42

detection/component_util/mpf_component_util/frame_transformers/frame_cropper.py

@@ -25,61 +25,69 @@
 #############################################################################
 
 import abc
+from typing import List, Mapping
 
-from . frame_transformer import BaseDecoratedFrameTransformer
+import numpy as np
+
+import mpf_component_api as mpf
+from . frame_transformer import BaseDecoratedFrameTransformer, IFrameTransformer
 from .. import utils
 
 
 class _BaseFrameCropper(BaseDecoratedFrameTransformer, abc.ABC):
 
-    def get_frame_size(self, frame_index):
+    def get_frame_size(self, frame_index: int) -> utils.Size:
         return self._get_region_of_interest(frame_index).size
 
 
-    def _do_frame_transform(self, frame, frame_index):
+    def _do_frame_transform(self, frame: np.ndarray, frame_index: int) -> np.ndarray:
         region = self._get_region_of_interest(frame_index)
         return frame[region.y:region.br.y, region.x:region.br.x]
 
 
-    def _do_reverse_transform(self, image_location, frame_index):
+    def _do_reverse_transform(self, image_location: mpf.ImageLocation, frame_index: int) -> None:
         region = self._get_region_of_interest(frame_index)
         image_location.x_left_upper += region.x
         image_location.y_left_upper += region.y
 
 
+    def _get_intersecting_region(
+            self, region_of_interest: utils.Rect, frame_index: int) -> utils.Rect:
+        frame_rect = utils.Rect.from_corner_and_size(
+            utils.Point(0, 0), self._get_inner_frame_size(frame_index))
+        return region_of_interest.intersection(frame_rect)
+
+
     @abc.abstractmethod
-    def _get_region_of_interest(self, frame_index):
+    def _get_region_of_interest(self, frame_index: int) -> utils.Rect:
         raise NotImplementedError()
 
 
 
 class SearchRegionFrameCropper(_BaseFrameCropper):
-    def __init__(self, search_region, inner_transform):
+    def __init__(self, search_region: utils.Rect, inner_transform: IFrameTransformer):
         super().__init__(inner_transform)
-        self.__search_region = self.__get_intersecting_region(search_region, 0)
+        self.__search_region: utils.Rect = self._get_intersecting_region(search_region, 0)
 
 
-    def _get_region_of_interest(self, frame_index):
+    def _get_region_of_interest(self, frame_index: int) -> utils.Rect:
         return self.__search_region
 
-    def __get_intersecting_region(self, search_region, frame_index):
-        frame_rect = utils.Rect.from_corner_and_size(utils.Point(0, 0), self._get_inner_frame_size(frame_index))
-        return search_region.intersection(frame_rect)
-
-
 
 class FeedForwardFrameCropper(_BaseFrameCropper):
-    def __init__(self, frame_location_map, inner_transform):
+    def __init__(self, frame_location_map: Mapping[int, mpf.ImageLocation],
+                 inner_transform: IFrameTransformer):
         super().__init__(inner_transform)
-        self.__fed_forward_detections = [utils.Rect.from_image_location(loc)
-                                         for loc in utils.dict_values_ordered_by_key(frame_location_map)]
+        self.__fed_forward_detections: List[utils.Rect] = \
+            [self._get_intersecting_region(utils.Rect.from_image_location(loc), idx)
+             for idx, loc in utils.dict_items_ordered_by_key(frame_location_map)]
 
 
-    def _get_region_of_interest(self, frame_index):
+    def _get_region_of_interest(self, frame_index: int) -> utils.Rect:
         try:
             return self.__fed_forward_detections[frame_index]
         except IndexError:
             raise IndexError(
-                'Attempted to get feed forward region of interest for frame: %s, '
-                'but there are only %s entries in the feed forward track.'
-                % (frame_index, len(self.__fed_forward_detections)))
+                f'Attempted to get feed forward region of interest for frame: {frame_index}, '
+                f'but there are only {len(self.__fed_forward_detections)} entries in the '
+                f'feed forward track.')

detection/component_util/tests/test_affine_transformer.py

@@ -471,6 +471,16 @@ def test_rotation_threshold_with_feed_forward(self):
         self.assertFalse(np.array_equal(original_img, img))
 
 
+    def test_rotation_threshold_with_feed_forward_and_negative_coordinate(self):
+        ff_loc = mpf.ImageLocation(-10, 20, 50, 30, 1, dict(ROTATION='0.5'))
+        job = mpf.ImageJob(
+            'Test job', test_util.get_data_file_path('test_img.png'),
+            dict(FEED_FORWARD_TYPE='REGION', ROTATION_THRESHOLD='1'),
+            dict(), ff_loc)
+        img = mpf_util.ImageReader(job).get_image()
+        self.assertEqual(img.shape, (30, 40, 3))
+
+
     def test_rotation_fill_color(self):
         test_img_path = test_util.get_data_file_path('rotation/hello-world.png')