Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

fix cv2_imshow preview routes & add 'use default config if no config found'

Jon05c1b31cd570
diff --git a/src/api/routes/camera/camera_route.py b/src/api/routes/camera/camera_route.py
index ebb8a9db..263befd1 100644
--- a/src/api/routes/camera/camera_route.py
+++ b/src/api/routes/camera/camera_route.py
@@ -15,7 +15,7 @@ logger = logging.getLogger(__name__)
class CameraPreviewModel(BaseModel):
- session_id: str
+ session_id: str = None
@camera_router.post("/camera/config/{session_id}")
async def config_cam(webcam_config_model: WebcamConfigModel, session_id):
@@ -24,26 +24,29 @@ async def config_cam(webcam_config_model: WebcamConfigModel, session_id):
@camera_router.post("/camera/cv2_imshow_one_camera/{webcam_id}")
-async def cv2_imshow_one_camera(webcam_id: str, camera_preview_model: CameraPreviewModel):
+async def cv2_imshow_one_camera(webcam_id: str, camera_preview_model: CameraPreviewModel = CameraPreviewModel()):
cv_cam_manager = OpenCVCameraManager(session_id=camera_preview_model.session_id)
with cv_cam_manager.start_capture_session_single_cam(webcam_id) as connected_camera_and_writer:
should_continue = True
this_camera = connected_camera_and_writer.cv_camera
+ cv2_window_name = '(ESC to close) PREVIEWING camera_' + webcam_id
while should_continue:
if not this_camera.new_frame_ready:
continue
- cv2.imshow('(ESC to close) PREVIEWING camera_' + webcam_id, this_camera.latest_frame.image)
+ cv2.imshow(cv2_window_name, this_camera.latest_frame.image)
# exit loop when user presses ESC key
exit_key = cv2.waitKey(1)
if exit_key == 27:
logger.info("ESC has been pressed.")
should_continue = False
+ cv2.destroyWindow(cv2_window_name)
@camera_router.post("/camera/cv2_imshow_all_cameras")
-async def cv2_imshow_all_camera(camera_preview_model: CameraPreviewModel):
+async def cv2_imshow_all_camera(camera_preview_model: CameraPreviewModel = CameraPreviewModel()):
cv_cam_manager = OpenCVCameraManager(session_id=camera_preview_model.session_id)
with cv_cam_manager.start_capture_session_all_cams() as connected_cameras_dict:
+ logger.info(f'Available cameras: {connected_cameras_dict}')
should_continue = True
while should_continue:
for this_webcam_id, this_open_cv_camera in connected_cameras_dict.items():
@@ -55,6 +58,7 @@ async def cv2_imshow_all_camera(camera_preview_model: CameraPreviewModel):
if exit_key == 27:
logger.info("ESC has been pressed.")
should_continue = False
+ cv2.destroyAllWindows() #TODO - close each named window specificially by name
@camera_router.get("/camera/detect")
diff --git a/src/api/services/user_config.py b/src/api/services/user_config.py
index 4d0f12a5..3fc700c4 100644
--- a/src/api/services/user_config.py
+++ b/src/api/services/user_config.py
@@ -1,16 +1,18 @@
import json
+import logging
from pathlib import Path
from pydantic import BaseModel
from src.config.home_dir import get_session_path
+logger = logging.getLogger(__name__)
class WebcamConfigModel(BaseModel):
- webcam_id: str = '0'
+ webcam_id: str
exposure: int = -6
- resolution_width: int = 800
- resolution_height: int = 600
+ resolution_width: int = 1280
+ resolution_height: int = 720
def get_camera_name(camera_id: str):
@@ -31,13 +33,20 @@ class UserConfigService:
return webcam_config_json
def webcam_config_by_id(self, webcam_id: str, session_id: str) -> WebcamConfigModel:
- print(f"webcam id: {webcam_id}")
+ if session_id is None:
+ return WebcamConfigModel(webcam_id=webcam_id)
session_path = get_session_path(session_id)
camera_name = get_camera_name(webcam_id)
print(f"webcam id (again): {webcam_id}")
print(f"camera name: {camera_name}")
json_file_name = camera_name + '_config.json'
webcam_config_json_path = Path(session_path) / json_file_name
- print(f'webcam_config_path: {webcam_config_json_path}')
- webcam_config_model = WebcamConfigModel.parse_file(webcam_config_json_path)
- return webcam_config_model
+
+ try:
+ webcam_config_model = WebcamConfigModel.parse_file(webcam_config_json_path)
+ logger.info(f'loading webcam_config from: {webcam_config_json_path}')
+ return webcam_config_model
+ except FileNotFoundError:
+ logger.info(f'No webcam config file found for this camera, using default camera parameters')
+ return WebcamConfigModel(webcam_id=webcam_id)
+
diff --git a/src/cameras/multicam_manager/cv_camera_manager.py b/src/cameras/multicam_manager/cv_camera_manager.py
index f150bf0d..be2f3f05 100644
--- a/src/cameras/multicam_manager/cv_camera_manager.py
+++ b/src/cameras/multicam_manager/cv_camera_manager.py
@@ -23,7 +23,7 @@ class CamAndWriterResponse(BaseModel):
class OpenCVCameraManager:
- def __init__(self, session_id: str):
+ def __init__(self, session_id: str = None):
self._session_id = session_id
self._config_service = UserConfigService()
self._detected_cams_data = get_or_create_cams()
diff --git a/src/config/webcam_config.py b/src/config/webcam_config.py
index ebb15162..1ec9fd31 100644
--- a/src/config/webcam_config.py
+++ b/src/config/webcam_config.py
@@ -8,8 +8,8 @@ from src.config.home_dir import os_independent_home_dir
class WebcamConfig(BaseModel):
webcam_id: int = 0
exposure: int = -6
- resolution_width: int = 800
- resolution_height: int = 600
+ resolution_width: int = 1280
+ resolution_height: int = 720
save_video: bool = False
# fourcc: str = "MP4V"
fourcc: str = "MJPG"