Skip to content

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

TypeScript

Jon/clean up gui (#239)

jonmatthisf6c95cf575cf
diff --git a/src/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_camera_calibrator.py b/src/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_camera_calibrator.py
index 910f8bba..042d6c57 100644
--- a/src/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_camera_calibrator.py
+++ b/src/core_processes/capture_volume_calibration/anipose_camera_calibration/anipose_camera_calibrator.py
@@ -13,7 +13,7 @@ from src.core_processes.capture_volume_calibration.anipose_camera_calibration im
from aniposelib.boards import CharucoBoard as AniposeCharucoBoard
from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
- CharucoBoardDataClass,
+ CharucoBoardDefinition,
)
logger = logging.getLogger(__name__)
@@ -22,7 +22,7 @@ logger = logging.getLogger(__name__)
class AniposeCameraCalibrator:
def __init__(
self,
- charuco_board_object: CharucoBoardDataClass,
+ charuco_board_object: CharucoBoardDefinition,
charuco_square_size: Union[int, float],
calibration_videos_folder_path: Union[str, Path],
progress_callback: Callable[[str], None] = None,
diff --git a/src/core_processes/capture_volume_calibration/charuco_board_detection/charuco_board_detector.py b/src/core_processes/capture_volume_calibration/charuco_board_detection/charuco_board_detector.py
index 07a1f576..e624f199 100644
--- a/src/core_processes/capture_volume_calibration/charuco_board_detection/charuco_board_detector.py
+++ b/src/core_processes/capture_volume_calibration/charuco_board_detection/charuco_board_detector.py
@@ -6,7 +6,7 @@ import numpy as np
from src.cameras.capture.dataclasses.frame_payload import FramePayload
from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
- CharucoBoardDataClass,
+ CharucoBoardDefinition,
)
from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_frame_payload import (
CharucoFramePayload,
@@ -24,7 +24,7 @@ logger = logging.getLogger(__name__)
class CharucoBoardDetector:
def __init__(self):
- self.charuco_board_data_class_object = CharucoBoardDataClass()
+ self.charuco_board_data_class_object = CharucoBoardDefinition()
self.cv2_aruco_charuco_board = (
self.charuco_board_data_class_object.charuco_board
)
diff --git a/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_board_definition.py b/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_board_definition.py
index 755836df..75aca0eb 100644
--- a/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_board_definition.py
+++ b/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_board_definition.py
@@ -6,7 +6,7 @@ import numpy as np
@dataclass
-class CharucoBoardDataClass:
+class CharucoBoardDefinition:
aruco_marker_dict: Dict = cv2.aruco.Dictionary_get(cv2.aruco.DICT_4X4_250)
# number_of_squares_width: int = 5
# number_of_squares_height: int = 3
diff --git a/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_view_data.py b/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_view_data.py
index 6ee2a664..d904d51a 100644
--- a/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_view_data.py
+++ b/src/core_processes/capture_volume_calibration/charuco_board_detection/dataclasses/charuco_view_data.py
@@ -4,7 +4,7 @@ from dataclasses import dataclass
import numpy as np
from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
- CharucoBoardDataClass,
+ CharucoBoardDefinition,
)
logger = logging.getLogger(__name__)
@@ -12,7 +12,7 @@ logger = logging.getLogger(__name__)
@dataclass
class CharucoViewData:
- charuco_board_object: CharucoBoardDataClass = (
+ charuco_board_object: CharucoBoardDefinition = (
None # the charuco board definition this 'view' was trying to detect
)
charuco_corners: np.ndarray = None
diff --git a/src/core_processes/capture_volume_calibration/run_anipose_capture_volume_calibration.py b/src/core_processes/capture_volume_calibration/run_anipose_capture_volume_calibration.py
index f6eb6c32..01bc9df8 100644
--- a/src/core_processes/capture_volume_calibration/run_anipose_capture_volume_calibration.py
+++ b/src/core_processes/capture_volume_calibration/run_anipose_capture_volume_calibration.py
@@ -5,11 +5,12 @@ from src.core_processes.capture_volume_calibration.anipose_camera_calibration.an
AniposeCameraCalibrator,
)
from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
- CharucoBoardDataClass,
+ CharucoBoardDefinition,
)
def run_anipose_capture_volume_calibration(
+ charuco_board_definition: CharucoBoardDefinition,
charuco_square_size: float,
calibration_videos_folder_path: Union[str, Path],
pin_camera_0_to_origin: bool = True,
@@ -17,7 +18,7 @@ def run_anipose_capture_volume_calibration(
session_id=None,
):
anipose_camera_calibrator = AniposeCameraCalibrator(
- CharucoBoardDataClass(),
+ charuco_board_definition,
charuco_square_size=charuco_square_size,
calibration_videos_folder_path=calibration_videos_folder_path,
session_id=session_id,
diff --git a/src/gui/main/main_window/left_panel_controls/control_panel.py b/src/gui/main/main_window/left_panel_controls/control_panel.py
index 5cc3bdf6..54e44b0e 100644
--- a/src/gui/main/main_window/left_panel_controls/control_panel.py
+++ b/src/gui/main/main_window/left_panel_controls/control_panel.py
@@ -58,16 +58,18 @@ class ControlPanel:
@property
def camera_setup_control_panel(self):
- return self._dictionary_of_toolbox_panels["Camera Setup and Control"]
+ return self._dictionary_of_toolbox_panels["1 - Camera Setup and Control"]
@property
def calibrate_capture_volume_panel(self):
- return self._dictionary_of_toolbox_panels["Calibrate Capture Volume"]
+ return self._dictionary_of_toolbox_panels["2 - Calibrate Capture Volume"]
+
@property
def record_motion_capture_videos_panel(self):
return self._dictionary_of_toolbox_panels[
- "Record and Process Motion Capture Videos"
+ "3 - Record and Process Motion Capture Videos"
+
]
@property
@@ -76,7 +78,8 @@ class ControlPanel:
@property
def visualize_motion_capture_data_panel(self):
- return self._dictionary_of_toolbox_panels["Visualize Motion Capture Data"]
+ return self._dictionary_of_toolbox_panels["4 - Visualize Motion Capture Data"]
+
@property
def toolbox_widget(self):
@@ -98,16 +101,17 @@ class ControlPanel:
dictionary_of_toolbox_panels = {}
# self._create_or_load_new_session_panel = WelcomeCreateOrLoadNewSessionPanel()
dictionary_of_toolbox_panels[
- "Camera Setup and Control"
+ "1 - Camera Setup and Control"
] = CameraSetupControlPanel()
dictionary_of_toolbox_panels[
- "Calibrate Capture Volume"
+ "2 - Calibrate Capture Volume"
] = CalibrateCaptureVolumePanel()
dictionary_of_toolbox_panels[
- "Record and Process Motion Capture Videos"
+ "3 - Record and Process Motion Capture Videos"
] = RecordMotionCatpureVideosPanel()
dictionary_of_toolbox_panels[
- "Visualize Motion Capture Data"
+ "4 - Visualize Motion Capture Data"
+
] = VisualizeMotionCaptureDataPanel()
# self._process_session_data_panel = ProcessSessionDataPanel()
return dictionary_of_toolbox_panels
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/calibrate_capture_volume_panel.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/calibrate_capture_volume_panel.py
index 60737256..e2238abb 100644
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/calibrate_capture_volume_panel.py
+++ b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/calibrate_capture_volume_panel.py
@@ -7,8 +7,14 @@ from PyQt6.QtWidgets import (
QCheckBox,
QFormLayout,
QLineEdit,
+ QComboBox,
+ QLabel,
)
+from pyqtgraph.parametertree import Parameter, ParameterTree
+from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
+ CharucoBoardDefinition,
+)
from src.core_processes.capture_volume_calibration.charuco_board_detection.default_charuco_square_size import (
default_charuco_square_size_mm,
)
@@ -40,6 +46,17 @@ class CalibrateCaptureVolumePanel(QWidget):
self._stop_recording_button.setEnabled(False)
record_button_layout.addWidget(self._stop_recording_button)
+ self._process_automatically_checkbox = QCheckBox(
+ "Process Calibration Videos Automatically"
+ )
+
+ self._layout.addWidget(QLabel("Charuco Checkerboard Type:"))
+ self._charuco_board_definition = CharucoBoardDefinition()
+ self._charuco_combo_box = QComboBox()
+ self._charuco_combo_box.addItem("Default (3x5 squares)")
+ self._charuco_combo_box.addItem("Pre-Alpha (5x7 squares)")
+ self._layout.addWidget(self._charuco_combo_box)
+
self._charuco_square_size_form_layout = QFormLayout()
self._charuco_square_size_line_edit_widget = QLineEdit()
self._charuco_square_size_line_edit_widget.setText(
@@ -51,6 +68,12 @@ class CalibrateCaptureVolumePanel(QWidget):
self._layout.addLayout(self._charuco_square_size_form_layout)
+ self._process_automatically_checkbox.setChecked(True)
+ self._process_automatically_checkbox.stateChanged.connect(
+ self._enable_or_disable_calibrate_from_videos_button
+ )
+ self._layout.addWidget(self._process_automatically_checkbox)
+
self._calibrate_capture_volume_from_videos_button = QPushButton(
"Calibrate Capture Volume From Videos"
)
@@ -59,13 +82,6 @@ class CalibrateCaptureVolumePanel(QWidget):
self._calibrate_capture_volume_from_videos_button,
)
- self._process_automatically_checkbox = QCheckBox("Process Automatically")
- self._process_automatically_checkbox.setChecked(True)
- self._process_automatically_checkbox.stateChanged.connect(
- self._enable_or_disable_calibrate_from_videos_button
- )
- self._layout.addWidget(self._process_automatically_checkbox)
-
self._layout.addStretch()
@property
@@ -92,6 +108,10 @@ class CalibrateCaptureVolumePanel(QWidget):
def charuco_square_size(self) -> float:
return float(self._charuco_square_size_line_edit_widget.text())
+ @property
+ def charuco_combo_box_selection(self):
+ return self._charuco_combo_box.currentText()
+
def _create_use_previous_calibration_checkbox(self):
previous_calibration_checkbox = QCheckBox("Use Previous Calibration")
previous_calibration_checkbox.setChecked(False)
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_create_or_load_new_session_panel.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_create_or_load_new_session_panel.py
index fad70f27..0ae490f3 100644
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_create_or_load_new_session_panel.py
+++ b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_create_or_load_new_session_panel.py
@@ -8,6 +8,7 @@ from PyQt6.QtWidgets import (
QLabel,
QLineEdit,
QFormLayout,
+
QPushButton, QCheckBox,
)
@@ -33,17 +34,19 @@ class WelcomeCreateOrLoadNewSessionPanel(QWidget):
self._layout.addLayout(self._create_get_session_id_form_layout())
- self._start_new_session_button = PrimaryButton("&Start New Session")
+ self._start_new_session_button = PrimaryButton("&Start New Session (Ctrl+N)")
self._layout.addWidget(self._start_new_session_button)
self._load_most_recent_session_button = QPushButton(
- "Load Most &Recent Session",
+ "Load Most &Recent Session (Ctrl+D)",
+
)
self._load_most_recent_session_button.setEnabled(True)
self._layout.addWidget(self._load_most_recent_session_button)
self._load_session_button = QPushButton(
- "Load Session",
+ "Load Session (Ctrl+O)",
+
)
self._load_session_button.setEnabled(True)
self._layout.addWidget(self._load_session_button)
@@ -56,6 +59,7 @@ class WelcomeCreateOrLoadNewSessionPanel(QWidget):
self._layout.addStretch()
+
self._send_pings_checkbox = QCheckBox("Send ping to devs to let us know when you make a new session because that will help us get funding for this project :D ")
self._send_pings_checkbox.setChecked(True)
self._layout.addWidget(self._send_pings_checkbox)
@@ -73,6 +77,7 @@ class WelcomeCreateOrLoadNewSessionPanel(QWidget):
return self._load_session_button
@property
+
def send_pings_checkbox(self):
return self._send_pings_checkbox
diff --git a/src/gui/main/main_window/main_window.py b/src/gui/main/main_window/main_window.py
index 20203398..0ced3596 100644
--- a/src/gui/main/main_window/main_window.py
+++ b/src/gui/main/main_window/main_window.py
@@ -18,6 +18,10 @@ from src.config.home_dir import (
get_freemocap_data_folder_path,
get_annotated_videos_folder_path,
)
+from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
+ CharucoBoardDefinition,
+
+)
from src.core_processes.capture_volume_calibration.get_anipose_calibration_object import (
load_most_recent_anipose_calibration_toml,
load_calibration_from_session_id,
@@ -45,6 +49,7 @@ import logging
from src.gui.main.workers.thread_worker_manager import ThreadWorkerManager
from src.log.config import LOG_FILE_PATH
+
from src.sending_anonymous_user_info_to_places.send_pipedream_ping import send_pipedream_ping
# reboot GUI method based on this - https://stackoverflow.com/a/56563926/14662833
@@ -94,6 +99,10 @@ class MainWindow(QMainWindow):
self._thread_worker_manager = ThreadWorkerManager()
+ # actions, signals and slots, o my
+ self._create_actions()
+ self._create_menu_bar()
+ self._connect_actions_to_slots()
self._connect_signals_to_stuff()
self._connect_buttons_to_stuff()
@@ -191,6 +200,105 @@ class MainWindow(QMainWindow):
return panel
def _create_actions(self):
+ # File
+ self._new_session_action = QAction("&Start New Session", parent=self)
+ self._new_session_action.setShortcut("Ctrl+N")
+
+ self._load_most_recent_session_action = QAction(
+ "Load &Most Recent Session", parent=self
+ )
+ self._load_most_recent_session_action.setShortcut("Ctrl+D")
+
+ self._load_session_action = QAction("&Load Session...", parent=self)
+ self._load_session_action.setShortcut("Ctrl+O")
+
+ self._reboot_gui_action = QAction("&Reboot GUI", parent=self)
+ self._reboot_gui_action.setShortcut("Ctrl+R")
+
+ self._exit_action = QAction("E&xit", parent=self)
+ self._exit_action.setShortcut("Ctrl+Q")
+
+ # Help
+ self._open_docs_action = QAction("Open &Documentation", parent=self)
+ self._about_us_action = QAction("&About Us", parent=self)
+
+ # Navigation
+ self._show_camera_control_panel_action = QAction(
+ "&1 - Show Camera Control Panel", parent=self
+ )
+ self._show_camera_control_panel_action.setShortcut("Ctrl+1")
+
+ self._show_calibrate_capture_volume_panel_action = QAction(
+ "&2 - Show Calibrate Capture Volume Panel", parent=self
+ )
+ self._show_calibrate_capture_volume_panel_action.setShortcut("Ctrl+2")
+
+ self._show_record_motion_capture_videos_panel_action = QAction(
+ "&3 - Show Record Motion Capture Videos Panel", parent=self
+ )
+ self._show_record_motion_capture_videos_panel_action.setShortcut("Ctrl+3")
+
+ self._show_visualize_session_panel_action = QAction(
+ "&4 - Show Visualize Session Panel", parent=self
+ )
+ self._show_visualize_session_panel_action.setShortcut("Ctrl+4")
+
+ # Support
+ self._donate_action = QAction("&Donate", parent=self)
+ self._send_usage_statistics_action = QAction(
+ "Send &User Statistics", parent=self
+ )
+ self._user_survey_action = QAction("&User Survey", parent=self)
+
+ def _create_menu_bar(self):
+ """
+ based mostly on: https://realpython.com/python-menus-toolbars/
+ """
+ menu_bar = QMenuBar()
+ self.setMenuBar(menu_bar)
+
+ # file menu
+ file_menu = QMenu("&File", parent=menu_bar)
+ menu_bar.addMenu(file_menu)
+
+ file_menu.addAction(self._new_session_action)
+ file_menu.addAction(self._load_most_recent_session_action)
+ file_menu.addAction(self._load_session_action)
+ file_menu.addAction(self._reboot_gui_action)
+ file_menu.addAction(self._exit_action)
+
+ # navigation menu
+ navigation_menu = QMenu("Na&vigation", parent=menu_bar)
+ menu_bar.addMenu(navigation_menu)
+ navigation_menu.addAction(self._show_camera_control_panel_action)
+ navigation_menu.addAction(self._show_calibrate_capture_volume_panel_action)
+ navigation_menu.addAction(self._show_record_motion_capture_videos_panel_action)
+ navigation_menu.addAction(self._show_visualize_session_panel_action)
+
+ # help menu
+ help_menu = QMenu("&Help", parent=menu_bar)
+ menu_bar.addMenu(help_menu)
+ help_menu.setEnabled(False)
+
+ help_menu.addAction(self._open_docs_action)
+ help_menu.addAction(self._about_us_action)
+
+ # support menu
+ support_menu = QMenu(
+ "\U00002665 &Support the FreeMoCap Project", parent=menu_bar
+ )
+ support_menu.setEnabled(False)
+ menu_bar.addMenu(support_menu)
+
+ support_menu.addAction(self._donate_action)
+ support_menu.addAction(self._send_usage_statistics_action)
+ support_menu.addAction(self._user_survey_action)
+
+ return menu_bar
+
+ def _connect_actions_to_slots(self):
+
+ # File menu
self._new_session_action = QAction("&Start New Session", parent=self)
self._load_most_recent_session_action = QAction(
"Load &Most Recent Session", parent=self
@@ -224,6 +332,31 @@ class MainWindow(QMainWindow):
self._reboot_gui_action.triggered.connect(self._reboot_gui)
self._exit_action.triggered.connect(self.close)
+
+ # Navigation Menu
+
+ self._show_camera_control_panel_action.triggered.connect(
+ lambda: self._control_panel.toolbox_widget.setCurrentWidget(
+ self._control_panel.camera_setup_control_panel
+ )
+ )
+ self._show_calibrate_capture_volume_panel_action.triggered.connect(
+ lambda: self._control_panel.toolbox_widget.setCurrentWidget(
+ self._control_panel.calibrate_capture_volume_panel
+ )
+ )
+ self._show_record_motion_capture_videos_panel_action.triggered.connect(
+ lambda: self._control_panel.toolbox_widget.setCurrentWidget(
+ self._control_panel.record_motion_capture_videos_panel
+ )
+ )
+ self._show_visualize_session_panel_action.triggered.connect(
+ lambda: self._control_panel.toolbox_widget.setCurrentWidget(
+ self._control_panel.visualize_motion_capture_data_panel
+ )
+ )
+
+
# self._open_docs_action.triggered.connect()
# self._about_us_action.triggered.connect()
# self._donate_action.triggered.connect()
@@ -381,6 +514,7 @@ class MainWindow(QMainWindow):
def _start_session(self, session_id: str, new_session: bool = False):
+
if self._middle_viewing_panel.welcome_create_or_load_session_panel.send_pings_checkbox.isChecked():
send_pipedream_ping('session_started')
@@ -400,9 +534,12 @@ class MainWindow(QMainWindow):
self._thread_worker_manager.launch_detect_cameras_worker()
- self._control_panel.toolbox_widget.setCurrentWidget(
- self._control_panel.camera_setup_control_panel
- )
+ self._show_camera_control_panel_action.trigger()
+
+ self._middle_viewing_panel.show_camera_streams()
+
+ if new_session:
+ self._auto_launch_camera_streams = True
self._middle_viewing_panel.show_camera_streams()
@@ -514,13 +651,30 @@ class MainWindow(QMainWindow):
calibration_videos_folder_path = get_calibration_videos_folder_path(
self._session_id
)
+ charuco_board_definition = self._get_user_specified_charuco_definition()
self._thread_worker_manager.launch_anipose_calibration_thread_worker(
+ charuco_board_definition=charuco_board_definition,
calibration_videos_folder_path=calibration_videos_folder_path,
charuco_square_size_mm=self._control_panel.calibrate_capture_volume_panel.charuco_square_size,
session_id=self._session_id,
jupyter_console_print_function_callable=self._right_side_panel.jupyter_console_widget.print_to_console,
)
+ def _get_user_specified_charuco_definition(self):
+ charuco_board_definition = CharucoBoardDefinition()
+ user_charuco_selection = (
+ self._control_panel.calibrate_capture_volume_panel.charuco_combo_box_selection
+ )
+
+ if user_charuco_selection == "Default (3x5 squares)":
+ charuco_board_definition.number_of_squares_width = 5
+ charuco_board_definition.number_of_squares_height = 3
+ elif user_charuco_selection == "Pre-Alpha (5x7 squares)":
+ charuco_board_definition.number_of_squares_width = 7
+ charuco_board_definition.number_of_squares_height = 5
+
+ return charuco_board_definition
+
def _fully_process_mocap_videos(self):
self._auto_process_next_stage = True
self._setup_and_launch_mediapipe_2d_detection_thread_worker(
diff --git a/src/gui/main/visualize_session/gl_3d_view_port.py b/src/gui/main/visualize_session/gl_3d_view_port.py
index 3311b711..8614f843 100644
--- a/src/gui/main/visualize_session/gl_3d_view_port.py
+++ b/src/gui/main/visualize_session/gl_3d_view_port.py
@@ -38,6 +38,9 @@ class Gl3dViewPort(QWidget):
def _setup_3d_view(self, initial_viewing_distance: Union[float, int] = 2e3):
self._opengl_3d_plot_widget.opts["distance"] = initial_viewing_distance
+ self._opengl_3d_plot_widget.opts["azimuth"] = 90
+ self._opengl_3d_plot_widget.opts["elevation"] = 90
+
self._create_grid_planes(grid_scale=initial_viewing_distance)
self._create_rgb_origin_axes()
@@ -113,7 +116,6 @@ class Gl3dViewPort(QWidget):
self._initialize_mediapipe_skeleton_connections(mediapipe3d_trackedPoint_xyz)
def update_mediapipe3d_skeleton(self, mediapipe3d_trackedPoint_xyz: np.ndarray):
- print("helloough892y 89yu23roo")
# update skel dottos
self._mediapipe_skeleton_scatter_item.setData(
diff --git a/src/gui/main/workers/anipose_calibration_thread_worker.py b/src/gui/main/workers/anipose_calibration_thread_worker.py
index 5018e18d..1f01b288 100644
--- a/src/gui/main/workers/anipose_calibration_thread_worker.py
+++ b/src/gui/main/workers/anipose_calibration_thread_worker.py
@@ -4,6 +4,9 @@ from typing import Union
from PyQt6.QtCore import QThread, pyqtSignal
+from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
+ CharucoBoardDefinition,
+)
from src.core_processes.capture_volume_calibration.run_anipose_capture_volume_calibration import (
run_anipose_capture_volume_calibration,
)
@@ -17,11 +20,13 @@ class AniposeCalibrationThreadWorker(QThread):
def __init__(
self,
+ charuco_board_definition: CharucoBoardDefinition,
calibration_videos_folder_path: Union[str, Path],
charuco_square_size_mm: Union[int, float],
session_id: str,
):
super().__init__()
+ self._charuco_board_definition = charuco_board_definition
self._charuco_square_size_mm = charuco_square_size_mm
self._calibration_videos_folder_path = calibration_videos_folder_path
self._session_id = session_id
@@ -38,6 +43,7 @@ class AniposeCalibrationThreadWorker(QThread):
try:
run_anipose_capture_volume_calibration(
+ charuco_board_definition=self._charuco_board_definition,
charuco_square_size=self._charuco_square_size_mm,
calibration_videos_folder_path=self._calibration_videos_folder_path,
pin_camera_0_to_origin=True,
diff --git a/src/gui/main/workers/session_playback_thread_worker.py b/src/gui/main/workers/session_playback_thread_worker.py
index 111773a5..1208740a 100644
--- a/src/gui/main/workers/session_playback_thread_worker.py
+++ b/src/gui/main/workers/session_playback_thread_worker.py
@@ -96,7 +96,7 @@ class SessionPlaybackThreadWorker(QThread):
video_update(image)
def _update_skeleton(self, frame_number: int):
- print(f"skrelelton frame_number: {frame_number}")
+
this_frame_skeleton_data = self._skeleton_3d_frame_trackedPoint_dimension[
frame_number, :, :
diff --git a/src/gui/main/workers/thread_worker_manager.py b/src/gui/main/workers/thread_worker_manager.py
index 2dc579f7..d78a855c 100644
--- a/src/gui/main/workers/thread_worker_manager.py
+++ b/src/gui/main/workers/thread_worker_manager.py
@@ -6,6 +6,9 @@ from PyQt6.QtCore import pyqtSignal
from PyQt6.QtWidgets import QWidget
from src.cameras.detection.models import FoundCamerasResponse
from src.cameras.persistence.video_writer.video_recorder import VideoRecorder
+from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
+ CharucoBoardDefinition,
+)
from src.gui.main.workers.anipose_calibration_thread_worker import (
AniposeCalibrationThreadWorker,
@@ -68,6 +71,7 @@ class ThreadWorkerManager(QWidget):
def launch_anipose_calibration_thread_worker(
self,
+ charuco_board_definition: CharucoBoardDefinition,
calibration_videos_folder_path: Union[str, Path],
charuco_square_size_mm: float,
session_id: str,
@@ -75,6 +79,7 @@ class ThreadWorkerManager(QWidget):
):
logger.info("Launching `Anipose (Charuco Board) Calibration` thread worker")
self._anipose_calibration_worker = AniposeCalibrationThreadWorker(
+ charuco_board_definition=charuco_board_definition,
calibration_videos_folder_path=calibration_videos_folder_path,
charuco_square_size_mm=charuco_square_size_mm,
session_id=session_id,