Free Motion Capture for Everyone πβ¨
TypeScript
porgess
jonmatthisc61cd5099e13
diff --git a/freemocap/gui/qt/main_window/freemocap_main_window.py b/freemocap/gui/qt/main_window/freemocap_main_window.pyindex 22a70825..c165224b 100644--- a/freemocap/gui/qt/main_window/freemocap_main_window.py+++ b/freemocap/gui/qt/main_window/freemocap_main_window.py@@ -15,7 +15,7 @@ from PySide6.QtWidgets import (QHBoxLayout,)from skelly_viewer import SkellyViewer-from skellycam import SkellyCamCameraPanel+from skellycam import SkellyCamCameraPanel, SkellyCamCameraControlPanelfrom tqdm import tqdmfrom freemocap.data_layer.generate_jupyter_notebook.generate_jupyter_notebook import (@@ -128,8 +128,8 @@ class FreemocapMainWindow(QMainWindow):self._tools_dock_widget = self._create_tools_dock_widget()self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self._tools_dock_widget)- # self._control_panel_widget = self._create_control_panel_widget(log_update=self._log_view_widget.add_log)- # self._tools_dock_widget.setWidget(self._control_panel_widget)+ self._control_panel_widget = self._create_control_panel_widget(log_update=self._log_view_widget.add_log)+ self._tools_dock_widget.setWidget(self._control_panel_widget)log_view_dock_widget = QDockWidget("Log View", self)self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, log_view_dock_widget)@@ -211,6 +211,10 @@ class FreemocapMainWindow(QMainWindow):self._skellycam_widget = SkellyCamCameraPanel(parent=self,)+ self._skellycam_widget_control_panel = SkellyCamCameraControlPanel(+ camera_panel=self._skellycam_widget,+ )+# self._skellycam_widget.videos_saved_to_this_folder_signal.connect(# self._handle_videos_saved_to_this_folder_signal# )@@ -269,7 +273,7 @@ class FreemocapMainWindow(QMainWindow):)return ControlPanelWidget(- camera_configuration_parameter_tree_widget=self._camera_configuration_parameter_tree_widget,+ skellycam_widget_control_panel=self._skellycam_widget_control_panel,process_motion_capture_data_panel=self._process_motion_capture_data_panel,visualize_data_widget=self._visualization_control_panel,parent=self,diff --git a/freemocap/gui/qt/widgets/camera_controller_group_box.py b/freemocap/gui/qt/widgets/camera_controller_group_box.pyindex 5b3f740d..e9f33ca1 100644--- a/freemocap/gui/qt/widgets/camera_controller_group_box.py+++ b/freemocap/gui/qt/widgets/camera_controller_group_box.py@@ -12,7 +12,7 @@ from PySide6.QtWidgets import (QRadioButton,QCheckBox,)-from skellycam import SkellyCamCameraPanel+from skellycam import SkellyCamCameraPanel, SkellyCamCameraControlPanelfrom freemocap.gui.user_settings import UserSettingsfrom freemocap.system.paths_and_filenames.file_and_folder_names import SPARKLES_EMOJI_STRING, SKULL_EMOJI_STRING@@ -28,12 +28,14 @@ logger = logging.getLogger(__name__)class CameraControllerGroupBox(QGroupBox):- def __init__(self, skellycam_widget: SkellyCamCameraPanel,+ def __init__(self,+ skellycam_widget: SkellyCamCameraPanel,user_settings: UserSettings,parent=None):super().__init__(parent=parent)self.setStyleSheet("font-size: 12px;")self._skellycam_widget = skellycam_widget+# self._skellycam_controller = SkellyCamControllerWidget(# camera_viewer_widget=skellycam_widget,# parent=self,@@ -51,16 +53,16 @@ class CameraControllerGroupBox(QGroupBox):self._layout.addLayout(self._make_options_layout())- # self._calibration_videos_radio_button.toggled.connect(self._set_record_button_text)- # self._annotate_charuco_checkbox.toggled.connect(self._on_annotate_charuco_checkbox_changed)- # self._mocap_videos_radio_button.toggled.connect(self._set_record_button_text)- # # self._skellycam_widget.cameras_connected_signal.connect(lambda: self._start_recording_button.setEnabled(True))- # # self._stop_recording_button.clicked.connect(self._set_record_button_text)- #- # self._auto_process_videos_checkbox.toggled.connect(self._on_auto_process_videos_checkbox_changed)- # self._generate_jupyter_notebook_checkbox.toggled.connect(self._on_generate_jupyter_notebook_checkbox_changed)- # self._auto_open_in_blender_checkbox.toggled.connect(self._on_auto_open_in_blender_checkbox_changed)- # self._charuco_square_size_line_edit.textChanged.connect(self._on_charuco_square_size_line_edit_changed)+ self._calibration_videos_radio_button.toggled.connect(self._set_record_button_text)+ self._annotate_charuco_checkbox.toggled.connect(self._on_annotate_charuco_checkbox_changed)+ self._mocap_videos_radio_button.toggled.connect(self._set_record_button_text)+ # self._skellycam_widget.cameras_connected_signal.connect(lambda: self._start_recording_button.setEnabled(True))+ self._stop_recording_button.clicked.connect(self._set_record_button_text)++ self._auto_process_videos_checkbox.toggled.connect(self._on_auto_process_videos_checkbox_changed)+ self._generate_jupyter_notebook_checkbox.toggled.connect(self._on_generate_jupyter_notebook_checkbox_changed)+ self._auto_open_in_blender_checkbox.toggled.connect(self._on_auto_open_in_blender_checkbox_changed)+ self._charuco_square_size_line_edit.textChanged.connect(self._on_charuco_square_size_line_edit_changed)@propertydef mocap_videos_radio_button_checked(self) -> bool:@@ -150,18 +152,18 @@ class CameraControllerGroupBox(QGroupBox):def _make_record_button_layout(self):button_vbox = QVBoxLayout()- # self._start_recording_button = self._skellycam_controller.start_recording_button- # self._stop_recording_button = self._skellycam_controller.stop_recording_button- # self._start_recording_button.setStyleSheet("font-size: 14px;")- # self._stop_recording_button.setStyleSheet("font-size: 14px;")- # self._start_recording_button.setText(MOCAP_RECORDING_BUTTON_TEXT)- # self._start_recording_button.setObjectName("start_recording_button")- # self._stop_recording_button.setObjectName("stop_recording_button")- # self._start_recording_button.show()- # self._start_recording_button.setEnabled(False)- # self._stop_recording_button.show()- # button_vbox.addWidget(self._start_recording_button)- # button_vbox.addWidget(self._stop_recording_button)+ self._start_recording_button = self._skellycam_widget.recording_panel.start_recording_button+ self._stop_recording_button = self._skellycam_widget.recording_panel.stop_recording_button+ self._start_recording_button.setStyleSheet("font-size: 14px;")+ self._stop_recording_button.setStyleSheet("font-size: 14px;")+ self._start_recording_button.setText(MOCAP_RECORDING_BUTTON_TEXT)+ self._start_recording_button.setObjectName("start_recording_button")+ self._stop_recording_button.setObjectName("stop_recording_button")+ self._start_recording_button.show()+ self._start_recording_button.setEnabled(False)+ self._stop_recording_button.show()+ button_vbox.addWidget(self._start_recording_button)+ button_vbox.addWidget(self._stop_recording_button)return button_vboxdef _create_videos_will_save_to_layout(self):diff --git a/freemocap/gui/qt/widgets/control_panel/control_panel_dock_widget.py b/freemocap/gui/qt/widgets/control_panel/control_panel_dock_widget.pyindex 9a28bc46..fb9ff498 100644--- a/freemocap/gui/qt/widgets/control_panel/control_panel_dock_widget.py+++ b/freemocap/gui/qt/widgets/control_panel/control_panel_dock_widget.py@@ -5,7 +5,7 @@ from PySide6.QtWidgets import (QWidget,QTabWidget,)-# from skellycam import SkellyCamParameterTreeWidget+from skellycam import SkellyCamCameraControlPanelfrom freemocap.gui.qt.widgets.control_panel.process_mocap_data_panel.process_motion_capture_data_panel import (ProcessMotionCaptureDataPanel,@@ -32,8 +32,8 @@ class ControlPanelDockWidget(QDockWidget):class ControlPanelWidget(QWidget):def __init__(self,- camera_configuration_parameter_tree_widget: 'SkellyCamParameterTreeWidget',- process_motion_capture_data_panel: ProcessMotionCaptureDataPanel,+ skellycam_widget_control_panel:SkellyCamCameraControlPanel,+ process_motion_capture_data_panel: ProcessMotionCaptureDataPanel,visualize_data_widget: QWidget,parent=None,):@@ -46,7 +46,7 @@ class ControlPanelWidget(QWidget):self._layout.addWidget(self._tab_widget)self._tab_widget.addTab(- camera_configuration_parameter_tree_widget,+ skellycam_widget_control_panel,"Camera Configuration",)self._tab_widget.addTab(process_motion_capture_data_panel, "Process Data")diff --git a/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/process_motion_capture_data_panel.py b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/process_motion_capture_data_panel.pyindex 169106e3..81cfcbe8 100644--- a/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/process_motion_capture_data_panel.py+++ b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/process_motion_capture_data_panel.py@@ -29,7 +29,7 @@ from freemocap.gui.qt.workers.process_motion_capture_data_thread_worker import (ProcessMotionCaptureDataThreadWorker,)from freemocap.gui.user_settings import UserSettings-+from skellycam import SkellyCamCameraControlPanellogger = logging.getLogger(__name__)@@ -46,7 +46,6 @@ class ProcessMotionCaptureDataPanel(QWidget):parent=None,):super().__init__(parent=parent)-self._kill_thread_event = kill_thread_eventself._get_active_recording_info = get_active_recording_infoself._log_update = log_update