Refactor SymbolDetector to fit into threaded process

joshenlim · Oct 1, 2019 · 004dc7a · 004dc7a
1 parent 69c5ea6
commit 004dc7a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/communicator/MultiThread.py b/src/communicator/MultiThread.py
@@ -40,6 +40,7 @@ def __init__(self):
         # self.android.connect()
         # self.arduino.connect()
         # self.pc.connect()
+        self.detector.start()
 
         self.android_queue = queue.Queue(maxsize= 0)
         self.arduino_queue = queue.Queue(maxsize=0)
@@ -110,6 +111,10 @@ def write_pc(self, pc_queue):
                 log.info('Write PC: ' + str(msg))
 
     def detect_symbols(self):
-        self.detector.start()
-        self.detector.detect()
+        while True:
+            frame = self.detector.get_frame()
+            symbol_match = self.detector.detect(frame)
+            if symbol_match is not None:
+                # Push to queue
+                print('Symbol Match ID: ' + str(symbol_match))
 
diff --git a/src/detector/SymbolDetector.py b/src/detector/SymbolDetector.py
@@ -41,7 +41,6 @@ def get_frame(self):
         return self.video_stream.read()
 
     def detect(self, image):
-        image = self.video_stream.read()
         pre_proc_frame = preprocess_frame(image)
 
         # Uncomment if debugging threshold value
@@ -109,7 +108,8 @@ def detect(self, image):
                     self.match_count = self.match_count + 1
                     if (self.match_count == MATCH_CONFIDENCE_COUNT):
                         # TO-DO: Ping to PC/N7 about the detected Symbol's ID
-                        log.info('Found: ' + str(closest_match['symbol']) + '; ID: ' + str(closest_match['id']))
+                        # log.info('Found: ' + str(closest_match['symbol']) + '; ID: ' + str(closest_match['id']))
+                        return(closest_match['id'])
                 else:
                     self.match_symbol_id = closest_match['id']
                     self.match_count = 1