Free Motion Capture for Everyone πβ¨
TypeScript
saveconfig
Endurance Idehen0bc648a94abb
diff --git a/src/api/__init__.py b/src/api/__init__.pyindex e69de29b..139597f9 100644--- a/src/api/__init__.py+++ b/src/api/__init__.py@@ -0,0 +1,2 @@++diff --git a/src/api/globals.py b/src/api/globals.pynew file mode 100644index 00000000..ba061d96--- /dev/null+++ b/src/api/globals.py@@ -0,0 +1 @@+# TODO: The globals that are saved here will be replaced by different solutions upcomingdiff --git a/src/api/routes/camera/camera_route.py b/src/api/routes/camera/camera_route.pyindex 7a1eba5e..01e1e390 100644--- a/src/api/routes/camera/camera_route.py+++ b/src/api/routes/camera/camera_route.py@@ -1,13 +1,17 @@from fastapi import APIRouter+from src.api.services.user_config import UserConfigServicefrom src.cameras.cam_singleton import get_or_create_cams+from src.cameras.opencv_camera import WebcamConfigcamera_router = APIRouter()-@camera_router.post("/camera/config/{webcam_id}")-async def config_cam(webcam_id: str):- pass+@camera_router.post("/camera/config")+async def config_cam(webcam_config: WebcamConfig):+ s = UserConfigService()+ s.set_webcam_config(webcam_config)+ return s.webcam_configs@camera_router.get("/camera/detect")diff --git a/src/api/services/user_config.py b/src/api/services/user_config.pynew file mode 100644index 00000000..de4b2f13--- /dev/null+++ b/src/api/services/user_config.py@@ -0,0 +1,24 @@+from typing import Dict++from singleton_decorator import singleton++from src.cameras.opencv_camera import WebcamConfig+++@singleton+class UserConfigService:+ _webcam_config: Dict[str, WebcamConfig] = {}++ @property+ def webcam_configs(self):+ return self._webcam_config++ def webcam_config_by_id(self, webcam_id: str):+ if webcam_id in self._webcam_config:+ return self._webcam_config[webcam_id]+ else:+ return WebcamConfig(webcam_id=int(webcam_id))++ def set_webcam_config(self, webcam_config: WebcamConfig):+ as_str = str(webcam_config.webcam_id)+ self._webcam_config[as_str] = webcam_configdiff --git a/src/cameras/cam_factory.py b/src/cameras/cam_factory.pyindex 357d6c25..fa02b6e2 100644--- a/src/cameras/cam_factory.py+++ b/src/cameras/cam_factory.py@@ -1,23 +1,24 @@from typing import List+from src.api.services.user_config import UserConfigServicefrom src.cameras.cam_singleton import get_or_create_cams-from src.cameras.opencv_camera import OpenCVCamera, WebcamConfig+from src.cameras.opencv_camera import OpenCVCameradef create_opencv_cams():+ config_service = UserConfigService()cams = get_or_create_cams()raw_webcam_obj = cams.cams_to_use- cv_cams = [- OpenCVCamera(- config=WebcamConfig(- webcam_id=webcam.webcam_id,- )- )- for webcam in raw_webcam_obj- if int(webcam.webcam_id) < 3- ]+ cv_cams: List[OpenCVCamera] = []+ for webcam in raw_webcam_obj:+ single_config = config_service.webcam_config_by_id(webcam.webcam_id)+ # TODO: OBS Studio issue causes us to ignore a specific camera ID for Jon's computer.+ if int(webcam.webcam_id) < 3:+ cv_cams.append(OpenCVCamera(config=single_config))+for cv_cam in cv_cams:cv_cam.connect()+return cv_camsdiff --git a/src/core_processor/board_detection/board_detection.py b/src/core_processor/board_detection/board_detection.pyindex 49e2439f..e7d516a4 100644--- a/src/core_processor/board_detection/board_detection.py+++ b/src/core_processor/board_detection/board_detection.py@@ -5,7 +5,7 @@ import tracebackimport cv2import numpy as np-from src.cameras.cam_factory import create_opencv_cams+from src.cameras.cam_factory import close_all_cameras, create_opencv_camsfrom src.core_processor.board_detection.base_pose_estimation import detect_charuco_boardfrom src.core_processor.board_detection.charuco_image_annotator import (annotate_image_with_charuco_data,@@ -42,22 +42,21 @@ class BoardDetection:for cv_cam in cv_cams:cv_cam.start_frame_capture(save_video=True)- while True:- try:+ try:+ while True:exit_key = cv2.waitKey(1)if exit_key == 27:cv2.destroyAllWindows()- for cv_cam in cv_cams:- cv_cam.close()+ close_all_cameras(cv_cams)breakfor cv_cam in cv_cams:frame = self._process_single_cam_frame(cv_cam)if frame is not None:cv2.imshow(cv_cam.webcam_id_as_str, frame)- except:- for cv_cam in cv_cams:- cv_cam.close()- cv2.destroyAllWindows()+ except:+ close_all_cameras(cv_cams)+ cv2.destroyAllWindows()+ traceback.print_exc()def _process_single_cam_frame(self, cv_cam):success, frame, timestamp = cv_cam.latest_frame