Skip to content

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

TypeScript

allow preview from single cameras at a time

Endurance Idehenb39448a89f14
diff --git a/src/freemocap_qt_gui/conference/workers/cam_frame_worker.py b/src/freemocap_qt_gui/conference/workers/cam_frame_worker.py
index d3c5119a..7e691981 100644
--- a/src/freemocap_qt_gui/conference/workers/cam_frame_worker.py
+++ b/src/freemocap_qt_gui/conference/workers/cam_frame_worker.py
@@ -11,25 +11,36 @@ class CamFrameWorker(QThread):
def __init__(self):
super().__init__()
+ self._cam_id = None
+
+ def quit(self) -> None:
+ self._cam.close()
+ super().quit()
def run(self):
cam = OpenCVCamera(
- WebcamConfig()
+ WebcamConfig(
+ webcam_id=self._cam_id
+ )
)
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)
+ self._cam = cam
+ try:
+ while cam.is_capturing_frames:
+ 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)
+ finally:
+ print("Closing the camera")
+ self._cam.close()
diff --git a/src/freemocap_qt_gui/conference/workflows/available_cameras_list.py b/src/freemocap_qt_gui/conference/workflows/available_cameras_list.py
index 0f762fa3..b6f180cd 100644
--- a/src/freemocap_qt_gui/conference/workflows/available_cameras_list.py
+++ b/src/freemocap_qt_gui/conference/workflows/available_cameras_list.py
@@ -14,6 +14,7 @@ class AvailableCamerasList(QWidget):
def __init__(self):
super().__init__()
self._worker = CamDetectionWorker()
+ self._worker.finished.connect(self._clear_and_readd_widgets)
container = QVBoxLayout()
@@ -39,7 +40,8 @@ class AvailableCamerasList(QWidget):
return refresh_button
def _detect(self):
- self._worker.finished.connect(lambda detected: self._clear_and_readd_widgets(detected))
+ if self._worker.isRunning():
+ return
self._worker.start()
def _create_available_camera_widgets(self, detected: FoundCamerasResponse):
diff --git a/src/freemocap_qt_gui/conference/workflows/camera_configuration.py b/src/freemocap_qt_gui/conference/workflows/camera_configuration.py
index f602a45f..ffdf390f 100644
--- a/src/freemocap_qt_gui/conference/workflows/camera_configuration.py
+++ b/src/freemocap_qt_gui/conference/workflows/camera_configuration.py
@@ -1,6 +1,7 @@
+from PyQt6.QtGui import QPixmap
from PyQt6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget
-from src.cameras.detection.models import FoundCamerasResponse
+from src.freemocap_qt_gui.conference.workers.cam_frame_worker import CamFrameWorker
from src.freemocap_qt_gui.conference.workflows.available_cameras_list import AvailableCamerasList
@@ -10,6 +11,8 @@ class CameraConfiguration(QWidget):
super().__init__()
# Holds the Camera Configuration Title
container = QVBoxLayout()
+ self._worker = CamFrameWorker()
+ self._worker.ImageUpdate.connect(self._handle_image_update)
config_title_layout = QHBoxLayout()
@@ -18,9 +21,10 @@ class CameraConfiguration(QWidget):
# Shows the cameras that can be selected, and shows previews(TODO)
camera_and_preview_container = QHBoxLayout()
- list_widget = AvailableCamerasList()
- list_widget.PreviewClick.connect(lambda cam_id: print(f"Preview this camera: {cam_id}"))
+ list_widget = self._create_available_cams_widget()
+ self._video = self._create_preview_image()
camera_and_preview_container.addWidget(list_widget)
+ camera_and_preview_container.addWidget(self._video)
# Holds the Accept Button
accept_container = QHBoxLayout()
@@ -32,3 +36,21 @@ class CameraConfiguration(QWidget):
container.addLayout(accept_container)
self.setLayout(container)
+
+ def _create_available_cams_widget(self):
+ list_widget = AvailableCamerasList()
+ list_widget.PreviewClick.connect(self._create_preview_worker)
+ return list_widget
+
+ def _create_preview_image(self):
+ video_preview = QLabel()
+ return video_preview
+
+ def _create_preview_worker(self, cam_id):
+ if self._worker.isRunning():
+ self._worker.quit()
+ self._worker._cam_id = cam_id
+ self._worker.start()
+
+ def _handle_image_update(self, image):
+ self._video.setPixmap(QPixmap.fromImage(image))
diff --git a/src/freemocap_qt_gui/conference/workflows/welcome.py b/src/freemocap_qt_gui/conference/workflows/welcome.py
new file mode 100644
index 00000000..eef9c8f6
--- /dev/null
+++ b/src/freemocap_qt_gui/conference/workflows/welcome.py
@@ -0,0 +1,27 @@
+from PyQt6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget
+
+
+class Welcome(QWidget):
+
+ def __init__(self):
+ super().__init__()
+ # Holds the Camera Configuration Title
+ container = QVBoxLayout()
+
+ welcome_title_layout = QVBoxLayout()
+
+ welcome_l1_title = QLabel("Welcome")
+ welcome_l2_title = QLabel("to")
+ welcome_l3_title = QLabel("FreeMoCap")
+
+ welcome_title_layout.addWidget(welcome_l1_title)
+ welcome_title_layout.addWidget(welcome_l2_title)
+ welcome_title_layout.addWidget(welcome_l3_title)
+
+ new_session_container = QHBoxLayout()
+ new_session_button = QPushButton("Start New Session")
+ new_session_container.addWidget(new_session_button)
+
+
+
+