Skip to content

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

TypeScript

cam config works

Endurance Idehen5fb5f585ec58
diff --git a/src/freemocap_qt_gui/conference/layout/main_window.py b/src/freemocap_qt_gui/conference/layout/main_window.py
index 87a3d6e7..da3f8e5d 100644
--- a/src/freemocap_qt_gui/conference/layout/main_window.py
+++ b/src/freemocap_qt_gui/conference/layout/main_window.py
@@ -10,6 +10,7 @@ from src.freemocap_qt_gui.conference.workflows.calibration_instructions import \
from src.freemocap_qt_gui.conference.workflows.camera_configuration import CameraConfiguration
from src.freemocap_qt_gui.conference.workflows.new_recording_session import \
NewRecordingSession
+from src.freemocap_qt_gui.conference.workflows.show_cams_charuco import ShowCamsCharuco
class MainWindow(QMainWindow):
@@ -60,12 +61,14 @@ class MainWindow(QMainWindow):
action.triggered.connect(self._show_recording_session_screen)
return action
+ # more top-level screens go here
+ # this will be refactored later
def _show_recording_session_screen(self):
clearLayout(self._main_layout)
- widg = NewRecordingSession()
- self._main_layout.addWidget(widg)
+ screen = NewRecordingSession()
+ self._main_layout.addWidget(screen)
self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
- widg.submit.clicked.connect(self._show_cam_config_screen)
+ screen.submit.clicked.connect(self._show_cam_config_screen)
def _show_cam_config_screen(self):
clearLayout(self._main_layout)
@@ -79,5 +82,11 @@ class MainWindow(QMainWindow):
screen = CalibrationInstructions()
self._main_layout.addWidget(screen)
self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
+ screen.continue_button.clicked.connect(self._show_calibration_screen)
+ def _show_calibration_screen(self):
+ clearLayout(self._main_layout)
+ screen = ShowCamsCharuco()
+ self._main_layout.addWidget(screen)
+ self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
diff --git a/src/freemocap_qt_gui/conference/main.py b/src/freemocap_qt_gui/conference/main.py
index 319e240e..fbd13374 100644
--- a/src/freemocap_qt_gui/conference/main.py
+++ b/src/freemocap_qt_gui/conference/main.py
@@ -20,6 +20,5 @@ if __name__ == "__main__":
timer.start(500)
timer.timeout.connect(lambda: None) # Let the interpreter run each 500 ms.
win = MainWindow()
- # win = AvailableCamera()
win.show()
sys.exit(app.exec())
diff --git a/src/freemocap_qt_gui/conference/workers/cam_charuco_frame_worker.py b/src/freemocap_qt_gui/conference/workers/cam_charuco_frame_worker.py
new file mode 100644
index 00000000..33dd198b
--- /dev/null
+++ b/src/freemocap_qt_gui/conference/workers/cam_charuco_frame_worker.py
@@ -0,0 +1,52 @@
+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
+from src.pipelines.calibration_pipeline.charuco_board_detection.charuco_board_detector import \
+ CharucoBoardDetector
+
+
+class CamCharucoFrameWorker(QThread):
+ ImageUpdate = pyqtSignal(QImage)
+
+ def __init__(self, cam_id=None):
+ super().__init__()
+ self._board_thingy = CharucoBoardDetector()
+ self._cam_id = cam_id
+
+ def run(self):
+ cam = OpenCVCamera(
+ WebcamConfig(
+ webcam_id=self._cam_id
+ )
+ )
+ cam.connect()
+ cam.start_frame_capture_thread()
+
+ self._cam = cam
+ try:
+ while cam.is_capturing_frames:
+ if not cam.new_frame_ready:
+ continue
+ payload = cam.latest_frame
+ charuco_payload = self._board_thingy.detect_charuco_board(payload)
+ image_to_display = charuco_payload.annotated_image
+ image_to_display = cv2.flip(image_to_display, 1)
+ image_to_display = cv2.cvtColor(image_to_display, cv2.COLOR_BGR2RGB)
+ converted_frame = QImage(
+ image_to_display.data,
+ image_to_display.shape[1],
+ image_to_display.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()
+
+ def quit(self):
+ self._cam.close()
+ super().quit()
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 7e691981..9bd84e38 100644
--- a/src/freemocap_qt_gui/conference/workers/cam_frame_worker.py
+++ b/src/freemocap_qt_gui/conference/workers/cam_frame_worker.py
@@ -9,13 +9,9 @@ from src.config.webcam_config import WebcamConfig
class CamFrameWorker(QThread):
ImageUpdate = pyqtSignal(QImage)
- def __init__(self):
+ def __init__(self, cam_id=None):
super().__init__()
- self._cam_id = None
-
- def quit(self) -> None:
- self._cam.close()
- super().quit()
+ self._cam_id = cam_id
def run(self):
cam = OpenCVCamera(
@@ -44,3 +40,7 @@ class CamFrameWorker(QThread):
finally:
print("Closing the camera")
self._cam.close()
+
+ def quit(self):
+ self._cam.close()
+ super().quit()
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 a9299da8..f56306b8 100644
--- a/src/freemocap_qt_gui/conference/workflows/available_cameras_list.py
+++ b/src/freemocap_qt_gui/conference/workflows/available_cameras_list.py
@@ -11,6 +11,7 @@ from src.freemocap_qt_gui.refactored_gui.workers.cam_detection_thread import Cam
class AvailableCamerasList(QWidget):
PreviewClick = pyqtSignal(str)
+
def __init__(self):
super().__init__()
self._worker = CamDetectionWorker()
diff --git a/src/freemocap_qt_gui/conference/workflows/calibration_instructions.py b/src/freemocap_qt_gui/conference/workflows/calibration_instructions.py
index 41fc8ae7..d00c8144 100644
--- a/src/freemocap_qt_gui/conference/workflows/calibration_instructions.py
+++ b/src/freemocap_qt_gui/conference/workflows/calibration_instructions.py
@@ -27,7 +27,7 @@ class CalibrationInstructions(QWidget):
def _create_description_layout(self):
description_layout = QVBoxLayout()
- description_1 = QLabel("Hold up the Curuko boards so all cameras can see every square. Don't have one? Get one here ")
+ description_1 = QLabel("Hold up the Charuko boards so all cameras can see every square. Don't have one? Get one here ")
description_2 = QLabel("Note: You may need to adjust the cameras if you are having an issue")
description_layout.addWidget(description_1)
description_layout.addWidget(description_2)
diff --git a/src/freemocap_qt_gui/conference/workflows/camera_configuration.py b/src/freemocap_qt_gui/conference/workflows/camera_configuration.py
index 6cbb9c31..432154ba 100644
--- a/src/freemocap_qt_gui/conference/workflows/camera_configuration.py
+++ b/src/freemocap_qt_gui/conference/workflows/camera_configuration.py
@@ -12,8 +12,7 @@ class CameraConfiguration(QWidget):
def __init__(self):
super().__init__()
- self._worker = CamFrameWorker()
- self._worker.ImageUpdate.connect(self._handle_image_update)
+ self._worker = self._init_frame_worker()
self._accept_button = self._create_accept_button()
self._accept_button.hide()
@@ -46,6 +45,11 @@ class CameraConfiguration(QWidget):
def config_accepted(self):
return self._accept_button
+ def _init_frame_worker(self):
+ worker = CamFrameWorker()
+ worker.ImageUpdate.connect(self._handle_image_update)
+ return worker
+
def _create_accept_button(self):
accept_button = QPushButton("Accept")
accept_button.clicked.connect(self._handle_accept_button_click)
@@ -78,4 +82,3 @@ class CameraConfiguration(QWidget):
# Save the selected cameras to app state
selected_cams = self._list_widget.get_checked_cameras
APP_STATE.selected_cameras = selected_cams
- print(APP_STATE)
diff --git a/src/freemocap_qt_gui/conference/workflows/new_recording_session.py b/src/freemocap_qt_gui/conference/workflows/new_recording_session.py
index 99c46dac..b0b429cf 100644
--- a/src/freemocap_qt_gui/conference/workflows/new_recording_session.py
+++ b/src/freemocap_qt_gui/conference/workflows/new_recording_session.py
@@ -3,6 +3,7 @@ from PyQt6.QtWidgets import QHBoxLayout, QLabel, QLineEdit, QPushButton, QVBoxLa
QWidget
from src.config.home_dir import create_session_id
+from src.freemocap_qt_gui.refactored_gui.state.app_state import APP_STATE
class NewRecordingSession(QWidget):
@@ -17,6 +18,7 @@ class NewRecordingSession(QWidget):
session_id_text_layout = QHBoxLayout()
session_id_text_layout.addWidget(QLabel("Session Id"))
+ self._session_input = self._create_session_input()
session_id_text_layout.addWidget(self._create_session_input())
container.addLayout(session_id_text_layout)
@@ -43,4 +45,8 @@ class NewRecordingSession(QWidget):
def _create_submit_button(self):
submit = QPushButton("&Start Session")
submit.setFixedWidth(100)
+ submit.clicked.connect(self._assign_session_id_to_state)
return submit
+
+ def _assign_session_id_to_state(self):
+ APP_STATE.session_id = self._session_input.text()
diff --git a/src/freemocap_qt_gui/conference/workflows/show_cams_charuco.py b/src/freemocap_qt_gui/conference/workflows/show_cams_charuco.py
new file mode 100644
index 00000000..b5242b47
--- /dev/null
+++ b/src/freemocap_qt_gui/conference/workflows/show_cams_charuco.py
@@ -0,0 +1,32 @@
+from PyQt6.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget
+
+from src.freemocap_qt_gui.conference.workflows.single_camera import SingleCamera
+from src.freemocap_qt_gui.refactored_gui.state.app_state import APP_STATE
+
+
+class ShowCamsCharuco(QWidget):
+
+ def __init__(self):
+ super().__init__()
+ # TODO: Take it in from init
+ self._selected_cams = APP_STATE.selected_cameras
+
+ container = QVBoxLayout()
+
+ title_layout = QHBoxLayout()
+ title = QLabel("Multi-Camera Calibration")
+ title_layout.addWidget(title)
+
+ video_stream_layout = QHBoxLayout()
+ cam_widgets = []
+ for cam_id in self._selected_cams:
+ single_cam = SingleCamera(cam_id)
+ single_cam.capture()
+ video_stream_layout.addWidget(single_cam)
+ cam_widgets.append(single_cam)
+
+ container.addLayout(title_layout)
+ container.addLayout(video_stream_layout)
+
+ self.setLayout(container)
+
diff --git a/src/freemocap_qt_gui/conference/workflows/single_camera.py b/src/freemocap_qt_gui/conference/workflows/single_camera.py
new file mode 100644
index 00000000..2285606b
--- /dev/null
+++ b/src/freemocap_qt_gui/conference/workflows/single_camera.py
@@ -0,0 +1,58 @@
+import enum
+
+from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtGui import QPixmap
+from PyQt6.QtWidgets import QHBoxLayout, QLabel, QWidget
+
+from src.freemocap_qt_gui.conference.workers.cam_charuco_frame_worker import CamCharucoFrameWorker
+from src.freemocap_qt_gui.conference.workers.cam_frame_worker import CamFrameWorker
+
+
+class WorkerType(enum.Enum):
+ FRAME_CAPTURE = 0
+ CHARUCO = 1
+
+
+def construct_worker(worker_type: WorkerType):
+ if worker_type.CHARUCO:
+ return CamCharucoFrameWorker
+
+ if worker_type.FRAME_CAPTURE:
+ return CamFrameWorker
+
+ raise Exception("What?")
+
+
+class SingleCamera(QWidget):
+ started = pyqtSignal()
+
+ def __init__(self, cam_id):
+ super().__init__()
+ self._cam_id = cam_id
+ self._worker = self._init_frame_worker()
+ self._video = QLabel()
+
+ layout = QHBoxLayout()
+ layout.addWidget(self._video)
+
+ self.setLayout(layout)
+
+ def capture(self):
+ self._create_preview_worker()
+ self.started.emit()
+
+ def _init_frame_worker(self):
+ worker = construct_worker(WorkerType.CHARUCO)(self._cam_id)
+ worker.ImageUpdate.connect(self._handle_image_update)
+ return worker
+
+ def _create_preview_worker(self):
+ # self._video.clear()
+ # if self._worker.isRunning():
+ # self._worker.quit()
+ # while not self._worker.isFinished():
+ # time.sleep(.1)
+ self._worker.start()
+
+ def _handle_image_update(self, image):
+ self._video.setPixmap(QPixmap.fromImage(image))