From 11604228fc9aa597b9262b52b087f9256a69f2f5 Mon Sep 17 00:00:00 2001
From: "DSTO\\pivatom" <michael.pivato@dst.defence.gov.au>
Date: Tue, 18 Dec 2018 14:24:33 +1030
Subject: [PATCH] Make hand gesture recogniser and test work on frames

---
 GestureRecognition/SimpleHandRecogniser.py | 14 ++------------
 tests/test_hand_recogniser.py              | 12 +++++-------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/GestureRecognition/SimpleHandRecogniser.py b/GestureRecognition/SimpleHandRecogniser.py
index 00567da..d81171a 100644
--- a/GestureRecognition/SimpleHandRecogniser.py
+++ b/GestureRecognition/SimpleHandRecogniser.py
@@ -3,18 +3,8 @@ import numpy as np
 import cv2
 
 class SimpleHandRecogniser(HandRecogniser):
-    def __init__(self, image_path = ""):
-        self._image_path = image_path
-
-    def load_image(self, image_path = None):
-        """
-        Loads the given image path into memory. This must be called before
-        any other operations can be completed.
-        """
-        if image_path is not None:
-            self._image_path = image_path
-        self.img = cv2.imread(self._image_path, 1)
-        self.img = cv2.resize(self.img, None, fx=0.1, fy=0.1, interpolation = cv2.INTER_AREA)
+    def __init__(self, frame):
+        self.img = frame
     
     def __calc_pos_y(self, x, radius, centre):
         """
diff --git a/tests/test_hand_recogniser.py b/tests/test_hand_recogniser.py
index 49cd771..4ad0b79 100644
--- a/tests/test_hand_recogniser.py
+++ b/tests/test_hand_recogniser.py
@@ -1,20 +1,18 @@
 import unittest
 from GestureRecognition.SimpleHandRecogniser import SimpleHandRecogniser
+import cv2
 
 class TestSimpleHandRecogniser(unittest.TestCase):
 
     def test_5_digits(self):
-        self.recogniser.load_image(self.image_path_5)
-        self.assertEqual(self.recogniser.get_gesture(), 5)
+        self.assertEqual(self.recogniser_5.get_gesture(), 5)
 
     def test_3_digits(self):
-        self.recogniser.load_image(self.image_path_3)
-        self.assertEqual(self.recogniser.get_gesture(), 3)
+        self.assertEqual(self.recogniser_3.get_gesture(), 3)
 
     def setUp(self):
-        self.image_path_5 = "H:\car\GestureRecognition\IMG_0818.png"
-        self.image_path_3 = "H:\car\GestureRecognition\IMG_0825.jpg"
-        self.recogniser = SimpleHandRecogniser()
+        self.recogniser_3 = SimpleHandRecogniser(cv2.imread("H:\car\GestureRecognition\IMG_0825.jpg"))
+        self.recogniser_5 = SimpleHandRecogniser(cv2.imread("H:\car\GestureRecognition\IMG_0818.png"))
 
 if __name__ == '__main__':
     unittest.main()
\ No newline at end of file