List serial cams and fix bugs

Author: RamesTheGeneric

BabbleApp/babble_processor.py

@@ -68,6 +68,7 @@ def __init__(
         self.current_image_gray = None
         self.current_frame_number = None
         self.current_fps = None
+        self.FRAMESIZE = [0,0,1]
 
         self.calibration_frame_counter = None
 
@@ -129,6 +130,7 @@ def capture_crop_rotate_image(self):
 
         try:
             # Get frame from capture source, crop to ROI
+            self.FRAMESIZE = self.current_image.shape
             self.current_image = self.current_image[
                 int(self.config.roi_window_y): int(
                     self.config.roi_window_y + self.config.roi_window_h
@@ -238,3 +240,5 @@ def run(self):
             #print(self.output)
             self.output_images_and_update(CamInfo(self.current_algo, self.output))
 
+    def get_framesize(self):
+        return self.FRAMESIZE

BabbleApp/babbleapp.py

@@ -262,7 +262,7 @@ def main():
             config.save()
 
         elif values[CALIB_SETTINGS_RADIO_NAME] and config.cam_display_id != Tab.CALIBRATION:
-            cams[0].stop()
+            cams[0].start()       # Allow tracking to continue in calibration tab
             settings[0].stop()
             settings[1].stop()
             settings[2].start()

BabbleApp/camera.py

@@ -66,6 +66,7 @@ def __init__(
         self.prevft = 0
         self.newft = 0
         self.fl = [0]
+        self.FRAME_SIZE = [0,0]
 
         self.error_message = f"{Fore.YELLOW}[WARN] Capture source {{}} not found, retrying...{Fore.RESET}"
 
@@ -141,6 +142,7 @@ def run(self):
                 if any(x in str(self.config.capture_source) for x in ports):
                     self.get_serial_camera_picture(should_push)
                 else:
+                    self.__del__()
                     self.get_cv2_camera_picture(should_push)
                 if not should_push:
                     # if we get all the way down here, consider ourselves connected
@@ -152,6 +154,7 @@ def get_cv2_camera_picture(self, should_push):
             if not ret:
                 self.cv2_camera.set(cv2.CAP_PROP_POS_FRAMES, 0)
                 raise RuntimeError("Problem while getting frame")
+            self.FRAME_SIZE = image.shape
             frame_number = self.cv2_camera.get(cv2.CAP_PROP_POS_FRAMES)
             # Calculate the fps.
             yeah = time.time()

BabbleApp/camera_widget.py

@@ -8,7 +8,6 @@
 from babble_processor import BabbleProcessor, CamInfoOrigin
 from camera import Camera, CameraState
 from config import BabbleConfig
-from landmark_processor import LandmarkProcessor
 from osc import Tab
 from utils.misc_utils import PlaySound, SND_FILENAME, SND_ASYNC, list_camera_names, get_camera_index_by_name
 
@@ -68,16 +67,6 @@ def __init__(self, widget_id: Tab, main_config: BabbleConfig, osc_queue: Queue):
             self.cam_id,
         )
 
-        self.babble_landmark = LandmarkProcessor(
-            self.config,
-            self.settings_config,
-            self.main_config,
-            self.cancellation_event,
-            self.capture_event,
-            self.capture_queue,
-            self.image_queue,
-            self.cam_id,
-        )
 
         self.camera_status_queue = Queue(maxsize=2)
         self.camera = Camera(
@@ -92,7 +81,7 @@ def __init__(self, widget_id: Tab, main_config: BabbleConfig, osc_queue: Queue):
 
         self.roi_layout = [
             [
-                sg.Button("Auto ROI", key=self.gui_autoroi, button_color='#539e8a', tooltip="Automatically set ROI", ),
+                sg.Button("Select Entire Frame", key=self.gui_autoroi, button_color='#539e8a', tooltip="Automatically set ROI", ),
             ],
             [
                 sg.Graph(
@@ -122,9 +111,10 @@ def __init__(self, widget_id: Tab, main_config: BabbleConfig, osc_queue: Queue):
             ],
             [
                 sg.Button("Start Calibration", key=self.gui_restart_calibration, button_color='#539e8a',
-                          tooltip="Start calibration. Look all arround to all extreams without blinking until sound is heard.", ),
+                          tooltip="Neutural Calibration: Hold a relaxed face, press [Start Calibration] and then press [Stop Calibraion]. \nFull Calibration: Press [Start Calibration] and make as many face movements as you can until it switches back to tracking mode or press [Stop Calibration]", disabled=True),
+                
                 sg.Button("Stop Calibration", key=self.gui_stop_calibration, button_color='#539e8a',
-                          tooltip="Stop calibration manualy.", ),
+                          tooltip="Stop calibration manualy.", disabled=True),
             ],
             [
                 sg.Checkbox(
@@ -133,6 +123,7 @@ def __init__(self, widget_id: Tab, main_config: BabbleConfig, osc_queue: Queue):
                     key=self.use_calibration,
                     background_color='#424042',
                     tooltip="Checked = Calibrated model output. Unchecked = Raw model output",
+                    enable_events=True
                 ),
             ],
             [
@@ -197,7 +188,7 @@ def __init__(self, widget_id: Tab, main_config: BabbleConfig, osc_queue: Queue):
 
     def _movavg_fps(self, next_fps):
         self.movavg_fps_queue.append(next_fps)
-        fps = round(sum(self.movavg_fps_queue) / len(self.movavg_fps_queue))
+        fps = round(sum(self.movavg_fps_queue) / len(self.movavg_fps_queue)) 
         millisec = round((1 / fps if fps else 0) * 1000)
         return f"{fps} Fps {millisec} ms"
 
@@ -283,7 +274,6 @@ def render(self, window, event, values):
             self.config.rotation_angle = int(values[self.gui_rotation_slider])
             changed = True
 
-        #print(self.config.gui_vertical_flip)
         if self.config.gui_vertical_flip != values[self.gui_vertical_flip]:
             self.config.gui_vertical_flip = values[self.gui_vertical_flip]
             changed = True
@@ -313,6 +303,17 @@ def render(self, window, event, values):
             window[self.gui_roi_layout].update(visible=True)
             window[self.gui_tracking_layout].update(visible=False)
 
+        if event == self.use_calibration:
+            print("toggle event")
+            if self.settings_config.use_calibration == True:
+                window[self.gui_restart_calibration].update(disabled = False)
+                window[self.gui_stop_calibration].update(disabled = False)
+                print("Enabled")
+            else:
+                window[self.gui_restart_calibration].update(disabled = True)
+                window[self.gui_stop_calibration].update(disabled = True)
+                print("Disabled")
+
         if event == "{}+UP".format(self.gui_roi_selection):
             # Event for mouse button up in ROI mode
             self.is_mouse_up = True
@@ -334,19 +335,30 @@ def render(self, window, event, values):
                 self.x0, self.y0 = values[self.gui_roi_selection]
             self.x1, self.y1 = values[self.gui_roi_selection]
 
+        if event == self.gui_autoroi:
+            print("Set ROI")
+            output = self.babble_cnn.get_framesize()
+            self.config.roi_window_x = 0
+            self.config.roi_window_y = 0
+            self.config.roi_window_w = output[0]
+            self.config.roi_window_h = output[1]
+            self.main_config.save()
+
         if (event == self.gui_refresh_button): 
-            print("Refreshed Cameralist")
+            print("\033[94m[INFO] Refreshed Camera List\033[0m")
             self.camera_list = list_camera_names()
             print(self.camera_list)
             window[self.gui_camera_addr].update(values=self.camera_list)
 
 
         if event == self.gui_restart_calibration:
-            self.babble_cnn.calibration_frame_counter = 1500
-            PlaySound('Audio/start.wav', SND_FILENAME | SND_ASYNC)
+            if values[self.use_calibration] == True:    # Don't start recording if the calibration filter is disabled.
+                self.babble_cnn.calibration_frame_counter = 1500
+                PlaySound('Audio/start.wav', SND_FILENAME | SND_ASYNC)
 
         if event == self.gui_stop_calibration:
-            self.babble_cnn.calibration_frame_counter = 0
+            if self.babble_cnn.calibration_frame_counter != None: # Only assign the variable if we are in calibration mode.
+                self.babble_cnn.calibration_frame_counter = 0
 
         needs_roi_set = self.config.roi_window_h <= 0 or self.config.roi_window_w <= 0
 

BabbleApp/utils/misc_utils.py

@@ -90,20 +90,21 @@ def list_camera_names():
     if is_nt:
         # On Windows, use pygrabber to list devices
         cam_list = graph.get_input_devices()
-        return cam_list
+        return cam_list + list_serial_ports()
 
     elif os_type == "Linux":
         # On Linux, return UVC device paths like '/dev/video0'
-        return list_linux_uvc_devices()
+        return list_linux_uvc_devices() + list_serial_ports()
 
     elif os_type == "Darwin":
         # On macOS, fallback to OpenCV (device names aren't fetched)
-        return list_cameras_opencv()
+        return list_cameras_opencv() + list_serial_ports()
 
     else:
         return ["Unsupported operating system"]
 
 def list_serial_ports():
+    print("DEBUG: Listed Serial Ports")
     """ Lists serial port names
 
         :raises EnvironmentError: