Merge pull request #124 from lucidcode/feature/highlight-detection-algorithms

Highlight detection algorithm

Author: IAmCoder

software/config.py

@@ -79,6 +79,7 @@ def get(self, setting):
             print(str(e))
 
         if self.default[setting] != None:
+            self.config[setting] = self.default[setting]
             return self.default[setting]
 
         return ""

software/face.py

@@ -16,6 +16,7 @@ def __init__(self, config, comms):
         self.ml_model = None
         self.min_confidence = 0.4
         self.threshold_list = [(math.ceil(self.min_confidence * 255), 255)]
+        self.detector = ""
 
         self.extra_fb = sensor.alloc_extra_fb(sensor.width(), sensor.height(), sensor.GRAYSCALE)
 
@@ -39,6 +40,7 @@ def detect(self, img, global_variance):
 
                 for (x, y, w, h), score in detection_list:
                     self.face_object = (x - w, y - h, w * 4, h * 4)
+                    self.detector = "TensorFlow"
                     self.has_face = True
                     return
 
@@ -57,6 +59,7 @@ def detect(self, img, global_variance):
 
         if face_objects:
             self.face_object = face_objects[0]
+            self.detector = "HaarCascade"
             self.has_face = True
 
             if self.config.get('TrackEyes'):
@@ -76,7 +79,11 @@ def draw_region(self, img):
         if self.face_object[2] == img.width():
             return
 
-        img.draw_rectangle(self.face_object, color=(70, 130, 180))
+        if self.detector == "TensorFlow":
+            img.draw_rectangle(self.face_object, color=(70, 130, 180))
+
+        if self.detector == "HaarCascade":
+            img.draw_rectangle(self.face_object)
 
         if self.correct_angle:
             face_x = self.face_object[0]