Free Motion Capture for Everyone πβ¨
TypeScript
committing current version
Endurance Idehen93fdaf0fec8b
diff --git a/src/cameras/capture/opencv_camera/opencv_camera.py b/src/cameras/capture/opencv_camera/opencv_camera.pyindex fed00a89..a60ea372 100644--- a/src/cameras/capture/opencv_camera/opencv_camera.py+++ b/src/cameras/capture/opencv_camera/opencv_camera.py@@ -24,12 +24,9 @@ class OpenCVCamera:def __init__(self,config: WebcamConfig,- session_id: str,- session_start_time_perf_counter_ns:int,+ session_id: str=None,+ session_start_time_perf_counter_ns:int=0,calibration_video_bool: bool = False):---self._config = configself._name = f"Camera_{self._config.webcam_id}"self._opencv_video_capture_object: cv2.VideoCapture = None@@ -185,7 +182,7 @@ class OpenCVCamera:### A - see -> https://stackoverflow.com/questions/57716962/difference-between-video-capture-read-and-grabself._opencv_video_capture_object.grab()success, image = self._opencv_video_capture_object.retrieve()- this_frame_timestamp_perf_counter_ns = time.perf_counter_ns()-self._session_start_time_perf_counter_ns+ this_frame_timestamp_perf_counter_ns = time.perf_counter_ns() - self._session_start_time_perf_counter_ns# timestamp_ns_post = time.perf_counter_ns()# it_took_this_many_seconds_to_grab_the_frame = (timestamp_ns_post-timestamp_ns_pre)/1e9@@ -211,13 +208,13 @@ class OpenCVCamera:def stop_frame_capture(self):self.close()- def show(self):+ async def show(self):viewer = CvCamViewer()viewer.begin_viewer(self.webcam_id_as_str)while True:if self.new_frame_ready:viewer.recv_img(self.latest_frame)- # await asyncio.sleep(0)+ await asyncio.sleep(0)def close(self):try:diff --git a/src/freemocap_qt_gui/conference/layout/main_window.py b/src/freemocap_qt_gui/conference/layout/main_window.pyindex 3caaf3a5..9e4c9652 100644--- a/src/freemocap_qt_gui/conference/layout/main_window.py+++ b/src/freemocap_qt_gui/conference/layout/main_window.py@@ -68,7 +68,7 @@ class MainWindow(QMainWindow):def _show_cam_config_screen(self):clearLayout(self._main_layout)- cams = get_or_create_cams()- screen = CameraConfiguration(cams)+ # cams = get_or_create_cams()+ screen = CameraConfiguration()self._main_layout.addWidget(screen)self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)diff --git a/src/freemocap_qt_gui/conference/workers/cam_frame_worker.py b/src/freemocap_qt_gui/conference/workers/cam_frame_worker.pynew file mode 100644index 00000000..d3c5119a--- /dev/null+++ b/src/freemocap_qt_gui/conference/workers/cam_frame_worker.py@@ -0,0 +1,35 @@+import cv2+from PyQt6.QtCore import QThread, Qt, pyqtSignal+from PyQt6.QtGui import QImage++from src.cameras.capture.opencv_camera.opencv_camera import OpenCVCamera+from src.config.webcam_config import WebcamConfig+++class CamFrameWorker(QThread):+ ImageUpdate = pyqtSignal(QImage)++ def __init__(self):+ super().__init__()++ def run(self):+ cam = OpenCVCamera(+ WebcamConfig()+ )+ cam.connect()+ cam.start_frame_capture_thread()++ while cam.is_capturing_frames and self.isRunning():+ if not cam.new_frame_ready:+ continue+ payload = cam.latest_frame+ image = cv2.flip(payload.image, 1)+ image = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)+ converted_frame = QImage(+ image.data,+ image.shape[1],+ image.shape[0],+ QImage.Format.Format_RGB888+ )+ converted_frame = converted_frame.scaled(640, 480, Qt.AspectRatioMode.KeepAspectRatio)+ self.ImageUpdate.emit(converted_frame)diff --git a/src/freemocap_qt_gui/conference/workflows/available_camera.py b/src/freemocap_qt_gui/conference/workflows/available_camera.pyindex f7b7124d..c98ed839 100644--- a/src/freemocap_qt_gui/conference/workflows/available_camera.py+++ b/src/freemocap_qt_gui/conference/workflows/available_camera.py@@ -1,8 +1,5 @@from PyQt6.QtWidgets import QCheckBox, QHBoxLayout, QLabel, QPushButton, QWidget-from src.cameras.capture.opencv_camera.opencv_camera import OpenCVCamera-from src.config.webcam_config import WebcamConfig-class AvailableCamera(QWidget):@@ -14,10 +11,15 @@ class AvailableCamera(QWidget):name_layout.setSpacing(20)name_layout.addWidget(self._create_checkbox())name_layout.addWidget(self._create_title())- name_layout.addWidget(self._create_preview_button())+ self._preview_button = self._create_preview_button()+ name_layout.addWidget(self._preview_button)self.setLayout(name_layout)+ @property+ def preview(self):+ return self._preview_button+def _create_title(self):camera_title = QLabel(f"Camera {self._camera_name}")return camera_title@@ -29,14 +31,4 @@ class AvailableCamera(QWidget):def _create_preview_button(self):preview = QPushButton("Preview")- preview.clicked.connect(self._show)return preview-- def _show(self):- cam = OpenCVCamera(- WebcamConfig()- )- cam.connect()- cam.start_frame_capture_thread()-- cam.show()diff --git a/src/freemocap_qt_gui/conference/workflows/available_cameras_list.py b/src/freemocap_qt_gui/conference/workflows/available_cameras_list.pyindex 39aa1b69..0f762fa3 100644--- a/src/freemocap_qt_gui/conference/workflows/available_cameras_list.py+++ b/src/freemocap_qt_gui/conference/workflows/available_cameras_list.py@@ -1,45 +1,61 @@-import typing+from functools import partial-from PyQt6 import QtCore-from PyQt6.QtCore import Qt+from PyQt6.QtCore import Qt, pyqtSignalfrom PyQt6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidgetfrom src.cameras.detection.models import FoundCamerasResponsefrom src.freemocap_qt_gui.conference.workflows.available_camera import AvailableCamera+from src.freemocap_qt_gui.refactored_gui.workers.cam_detection_thread import CamDetectionWorkerclass AvailableCamerasList(QWidget):- def __init__(- self,- detected_cameras: FoundCamerasResponse- ) -> None:+ PreviewClick = pyqtSignal(str)++ def __init__(self):super().__init__()- self._detected = detected_cameras+ self._worker = CamDetectionWorker()container = QVBoxLayout()title_layout = QHBoxLayout()avail_cam_title = QLabel("Available Cameras")- refresh_button = QPushButton("Refresh")+ self._refresh_button = self._create_refresh_button()title_layout.addWidget(avail_cam_title)- title_layout.addWidget(refresh_button)+ title_layout.addWidget(self._refresh_button)title_layout.setAlignment(Qt.AlignmentFlag.AlignLeft)- camera_list_layout = QVBoxLayout()- for widget in self._create_available_camera_widgets():- camera_list_layout.addWidget(widget)- camera_list_layout.setAlignment(Qt.AlignmentFlag.AlignLeft)+ self._camera_list_layout = QVBoxLayout()+ self._camera_list_layout.setAlignment(Qt.AlignmentFlag.AlignLeft)+container.addLayout(title_layout)- container.addLayout(camera_list_layout)+ container.addLayout(self._camera_list_layout)self.setLayout(container)- def _create_available_camera_widgets(self):- detected = self._detected+ def _create_refresh_button(self):+ refresh_button = QPushButton("Detect")+ refresh_button.clicked.connect(self._detect)+ return refresh_button++ def _detect(self):+ self._worker.finished.connect(lambda detected: self._clear_and_readd_widgets(detected))+ self._worker.start()++ def _create_available_camera_widgets(self, detected: FoundCamerasResponse):camera_widgets = []for cam in detected.cameras_found_list:available_cam = AvailableCamera(cam.webcam_id)+ available_cam.preview.clicked.connect(+ partial(self._handle_camera_preview_click, cam.webcam_id)+ )camera_widgets.append(available_cam)return camera_widgets++ def _clear_and_readd_widgets(self, detected: FoundCamerasResponse):+ for widget in self._create_available_camera_widgets(detected):+ self._camera_list_layout.addWidget(widget)++ def _handle_camera_preview_click(self, cam_id):+ self.PreviewClick.emit(cam_id)diff --git a/src/freemocap_qt_gui/conference/workflows/camera_configuration.py b/src/freemocap_qt_gui/conference/workflows/camera_configuration.pyindex 7c94d2e3..f602a45f 100644--- a/src/freemocap_qt_gui/conference/workflows/camera_configuration.py+++ b/src/freemocap_qt_gui/conference/workflows/camera_configuration.py@@ -6,9 +6,8 @@ from src.freemocap_qt_gui.conference.workflows.available_cameras_list import Avaclass CameraConfiguration(QWidget):- def __init__(self, detected_cameras: FoundCamerasResponse):+ def __init__(self):super().__init__()- self._detected = detected_cameras# Holds the Camera Configuration Titlecontainer = QVBoxLayout()@@ -19,7 +18,8 @@ class CameraConfiguration(QWidget):# Shows the cameras that can be selected, and shows previews(TODO)camera_and_preview_container = QHBoxLayout()- list_widget = AvailableCamerasList(detected_cameras)+ list_widget = AvailableCamerasList()+ list_widget.PreviewClick.connect(lambda cam_id: print(f"Preview this camera: {cam_id}"))camera_and_preview_container.addWidget(list_widget)# Holds the Accept Buttondiff --git a/src/freemocap_qt_gui/refactored_gui/workers/cam_detection_thread.py b/src/freemocap_qt_gui/refactored_gui/workers/cam_detection_thread.pyindex dccb894e..d749bcf1 100644--- a/src/freemocap_qt_gui/refactored_gui/workers/cam_detection_thread.py+++ b/src/freemocap_qt_gui/refactored_gui/workers/cam_detection_thread.py@@ -1,11 +1,12 @@-from PyQt6.QtCore import QObject, pyqtSignal+from PyQt6.QtCore import QThread, pyqtSignalfrom src.cameras.detection.cam_singleton import get_or_create_cams+from src.cameras.detection.models import FoundCamerasResponse-class CamDetectionWorker(QObject):- finished = pyqtSignal()+class CamDetectionWorker(QThread):+ finished = pyqtSignal(FoundCamerasResponse)def run(self):- get_or_create_cams()- self.finished.emit()+ cams = get_or_create_cams(always_create=True)+ self.finished.emit(cams)