Skip to content

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

TypeScript

some tweaks to the workflow

Jon4e2619af37d4
diff --git a/src/cameras/save_synchronized_videos.py b/src/cameras/save_synchronized_videos.py
index 4803441e..89503d98 100644
--- a/src/cameras/save_synchronized_videos.py
+++ b/src/cameras/save_synchronized_videos.py
@@ -4,9 +4,10 @@ import numpy as np
from matplotlib import pyplot as plt
from src.cameras.persistence.video_writer.video_recorder import VideoRecorder
+from src.freemocap_qt_gui.refactored_gui.state.app_state import APP_STATE
-def save_synchronized_videos(list_of_video_recorders:List[VideoRecorder], calibration_videos:bool=False):
+def save_synchronized_videos(list_of_video_recorders:List[VideoRecorder], calibration_videos:bool=False, mocap_videos:bool=False):
each_cam_frame_list = []
first_frame_timestamps = []
final_frame_timestamps = []
@@ -53,13 +54,12 @@ def save_synchronized_videos(list_of_video_recorders:List[VideoRecorder], calibr
number_of_frames_per_camera = [len(f) for f in each_cam_not_really_synchronized_frame_list]
print(f" (not_really_synchronized) number_of_frames_per_camera: {number_of_frames_per_camera}")
+ if mocap_videos:
+ APP_STATE.number_of_frames_in_the_mocap_videos = number_of_frames_per_camera[0]
+
final_frame_timestamps = [frame_list[-1].timestamp_unix_time_seconds for frame_list in each_cam_not_really_synchronized_frame_list]
print(f"np.diff(final_frame_timestamps): {np.diff(final_frame_timestamps)}")
for video_recoder, frame_list in zip(list_of_video_recorders, each_cam_not_really_synchronized_frame_list):
video_recoder.save_list_of_frames_to_video_file(list_of_frames=frame_list, calibration_videos=calibration_videos)
-
-
-
-
diff --git a/src/core_processor/mediapipe_skeleton_detector/mediapipe_skeleton_detector.py b/src/core_processor/mediapipe_skeleton_detector/mediapipe_skeleton_detector.py
index 5191eb9e..09e3bfe6 100644
--- a/src/core_processor/mediapipe_skeleton_detector/mediapipe_skeleton_detector.py
+++ b/src/core_processor/mediapipe_skeleton_detector/mediapipe_skeleton_detector.py
@@ -14,6 +14,7 @@ from src.config.home_dir import get_session_folder_path, get_synchronized_videos
get_session_output_data_folder_path
from src.core_processor.mediapipe_skeleton_detector.medaipipe_tracked_points_names_dict import \
mediapipe_tracked_point_names_dict
+from src.freemocap_qt_gui.refactored_gui.state.app_state import APP_STATE
logger = logging.getLogger(__name__)
@@ -155,7 +156,13 @@ class MediaPipeSkeletonDetector:
logger.error(f"Failed to load an image from: {str(this_synchronized_video_file_path)}")
raise Exception
+ frame_number = 0
while success and image is not None:
+
+ frame_number+=1
+ if frame_number%5==0:
+ print(f"frame {frame_number} out of {APP_STATE.number_of_frames_in_the_mocap_videos}")
+
mediapipe2d_data_payload = self.detect_skeleton_in_image(raw_image=image)
this_video_mediapipe_results_list.append(mediapipe2d_data_payload.mediapipe_results)
annotated_image = self._annotate_image(image, mediapipe2d_data_payload.mediapipe_results)
diff --git a/src/freemocap_qt_gui/conference/layout/main_window.py b/src/freemocap_qt_gui/conference/layout/main_window.py
index 15e692f3..c80e47ba 100644
--- a/src/freemocap_qt_gui/conference/layout/main_window.py
+++ b/src/freemocap_qt_gui/conference/layout/main_window.py
@@ -1,7 +1,7 @@
from PyQt6.QtCore import Qt
from PyQt6.QtGui import QAction
from PyQt6.QtWidgets import QMainWindow, QMenuBar, QVBoxLayout, \
- QWidget
+ QWidget, QCheckBox
from src.freemocap_qt_gui.conference.app import get_qt_app
from src.freemocap_qt_gui.conference.qt_utils.clear_layout import clearLayout
@@ -13,6 +13,7 @@ from src.freemocap_qt_gui.conference.workflows.new_recording_session import \
from src.freemocap_qt_gui.conference.workflows.record_videos import RecordVideos
from src.freemocap_qt_gui.conference.workflows.show_cams_charuco import ShowCamsCharuco
from src.freemocap_qt_gui.conference.workflows.welcome import Welcome
+from src.freemocap_qt_gui.refactored_gui.state.app_state import APP_STATE
class MainWindow(QMainWindow):
@@ -23,8 +24,10 @@ class MainWindow(QMainWindow):
self._create_menu_bar()
self.statusBar()
self._main_layout = self._create_basic_layout()
+
self._show_welcome_screen()
+
def _create_basic_layout(self):
main_layout = QVBoxLayout()
widget = QWidget()
@@ -85,7 +88,12 @@ class MainWindow(QMainWindow):
screen = CameraConfiguration()
self._main_layout.addWidget(screen)
self._main_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
- screen.config_accepted.clicked.connect(self._show_calibration_instructions_screen)
+ # screen.config_accepted.clicked.connect(self._show_calibration_instructions_screen)
+ if APP_STATE.use_previous_calibration:
+ screen.config_accepted.clicked.connect(self._show_record_videos_screen)
+ else:
+ screen.config_accepted.clicked.connect(self._show_calibration_screen)
+
def _show_calibration_instructions_screen(self):
clearLayout(self._main_layout)
diff --git a/src/freemocap_qt_gui/conference/main.py b/src/freemocap_qt_gui/conference/main.py
index a6acb6e8..9bbd9801 100644
--- a/src/freemocap_qt_gui/conference/main.py
+++ b/src/freemocap_qt_gui/conference/main.py
@@ -4,7 +4,7 @@ import sys
from PyQt6.QtCore import QTimer
from PyQt6.QtWidgets import QApplication
-from src.api.routes.session.session_router import visualize_session_offline
+# from src.api.routes.session.session_router import visualize_session_offline
from src.freemocap_qt_gui.conference.layout.main_window import MainWindow
from src.freemocap_qt_gui.refactored_gui.app import get_qt_app
@@ -22,6 +22,6 @@ if __name__ == "__main__":
timer.timeout.connect(lambda: None) # Let the interpreter run each 500 ms.
win = MainWindow()
win.show()
- # sys.exit(app.exec())
- app.exec()
- visualize_session_offline()
+ sys.exit(app.exec())
+ # app.exec()
+ # visualize_session_offline()
diff --git a/src/freemocap_qt_gui/conference/shared_widgets/primary_button.py b/src/freemocap_qt_gui/conference/shared_widgets/primary_button.py
index a10ccf43..29ab6864 100644
--- a/src/freemocap_qt_gui/conference/shared_widgets/primary_button.py
+++ b/src/freemocap_qt_gui/conference/shared_widgets/primary_button.py
@@ -1,10 +1,8 @@
from PyQt6.QtWidgets import QPushButton
-class PrimaryButton(QPushButton):
- def __init__(self, *args, **kwargs):
- super().__init__(*args, **kwargs)
- self.setStyleSheet("""
+
+active_primary_button_style_sheet = """
QPushButton {
background-color: #336e6d;
color: #ffffff;
@@ -17,4 +15,25 @@ class PrimaryButton(QPushButton):
QPushButton:hover {
background-color: #365d5f;
}
- """)
+ """
+
+not_active_primary_button_style_sheet = """
+ QPushButton {
+ background-color: 'lightgrey';
+ color: #ffffff;
+ border-radius: 4px;
+ min-height: 32px;
+ max-width: 160px;
+ font-weight: 400;
+ font-size: 16px;
+ }
+ QPushButton:hover {
+ background-color: 'lightgrey';
+ }
+ """
+
+class PrimaryButton(QPushButton):
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.setStyleSheet(active_primary_button_style_sheet)
+
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 86e67722..0082fabb 100644
--- a/src/freemocap_qt_gui/conference/workflows/available_cameras_list.py
+++ b/src/freemocap_qt_gui/conference/workflows/available_cameras_list.py
@@ -35,6 +35,19 @@ class AvailableCamerasList(QWidget):
self.setLayout(container)
+ self._enable_accept_button_callback = None
+
+ #automatically detect cameras on page load
+ self._detect()
+
+ @property
+ def enable_accept_button_callback(self):
+ return self._enable_accept_button_callback
+
+ @enable_accept_button_callback.setter
+ def enable_accept_button_callback(self, callback):
+ self._enable_accept_button_callback = callback
+
@property
def get_checked_cameras(self):
selected_cameras = []
@@ -57,6 +70,8 @@ class AvailableCamerasList(QWidget):
return
self._worker.start()
+
+
def _create_available_camera_widgets(self, detected: FoundCamerasResponse):
camera_widgets = []
for cam in detected.cameras_found_list:
@@ -66,6 +81,8 @@ class AvailableCamerasList(QWidget):
)
camera_widgets.append(available_cam)
+ self._enable_accept_button_callback()
+
return camera_widgets
def _clear_and_add_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 8bc07556..52d09a39 100644
--- a/src/freemocap_qt_gui/conference/workflows/camera_configuration.py
+++ b/src/freemocap_qt_gui/conference/workflows/camera_configuration.py
@@ -4,7 +4,8 @@ from PyQt6.QtGui import QPixmap
from PyQt6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget
from src.freemocap_qt_gui.conference.shared_widgets.page_title import PageTitle
-from src.freemocap_qt_gui.conference.shared_widgets.primary_button import PrimaryButton
+from src.freemocap_qt_gui.conference.shared_widgets.primary_button import PrimaryButton, \
+ not_active_primary_button_style_sheet, active_primary_button_style_sheet
from src.freemocap_qt_gui.conference.workers.cam_frame_worker import CamFrameWorker
from src.freemocap_qt_gui.conference.workflows.available_cameras_list import AvailableCamerasList
from src.freemocap_qt_gui.refactored_gui.state.app_state import APP_STATE
@@ -15,9 +16,8 @@ class CameraConfiguration(QWidget):
def __init__(self):
super().__init__()
self._worker = self._init_frame_worker()
-
self._accept_button = self._create_accept_button()
- self._accept_button.hide()
+
container = QVBoxLayout()
@@ -50,17 +50,24 @@ class CameraConfiguration(QWidget):
def _init_frame_worker(self):
worker = CamFrameWorker()
worker.ImageUpdate.connect(self._handle_image_update)
+
return worker
def _create_accept_button(self):
accept_button = PrimaryButton("Accept")
accept_button.clicked.connect(self._handle_accept_button_click)
+ accept_button.setEnabled(False)
+ accept_button.setStyleSheet(not_active_primary_button_style_sheet)
return accept_button
+ def _enable_accept_button(self):
+ self._accept_button.setEnabled(True)
+ self._accept_button.setStyleSheet(active_primary_button_style_sheet)
+
def _create_available_cams_widget(self):
list_widget = AvailableCamerasList()
+ list_widget.enable_accept_button_callback = self._enable_accept_button
list_widget.PreviewClicked.connect(self._create_preview_worker)
- list_widget.detect_button.clicked.connect(self._accept_button.show)
return list_widget
def _create_preview_image(self):
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 f680414c..5a0c1ed5 100644
--- a/src/freemocap_qt_gui/conference/workflows/new_recording_session.py
+++ b/src/freemocap_qt_gui/conference/workflows/new_recording_session.py
@@ -1,5 +1,5 @@
from PyQt6.QtWidgets import QHBoxLayout, QLabel, QLineEdit, QPushButton, QVBoxLayout, \
- QWidget
+ QWidget, QCheckBox
from src.config.home_dir import create_session_id
from src.freemocap_qt_gui.conference.shared_widgets.page_title import PageTitle
@@ -13,6 +13,7 @@ class NewRecordingSession(QWidget):
super().__init__()
self._submit_button = PrimaryButton("&Start Session")
+ self._use_previous_calibration_checkbox = self._create_use_previous_calibration_checkbox()
container = QVBoxLayout()
@@ -28,12 +29,20 @@ class NewRecordingSession(QWidget):
container.addLayout(self._create_submit_button_layout())
+ container.addWidget(self._use_previous_calibration_checkbox)
+
self.setLayout(container)
@property
def submit(self):
return self._submit_button
+ def _create_use_previous_calibration_checkbox(self):
+ previous_calibration_checkbox = QCheckBox("Use Previous Calibration")
+ previous_calibration_checkbox.setChecked(False)
+ previous_calibration_checkbox.stateChanged.connect(self._use_previous_calibration_changed)
+ return previous_calibration_checkbox
+
def _create_record_sesion_title(self):
session_title = PageTitle("Name Your Recording Session")
return session_title
@@ -51,3 +60,7 @@ class NewRecordingSession(QWidget):
def _assign_session_id_to_state(self):
APP_STATE.session_id = self._session_input.text()
+
+ def _use_previous_calibration_changed(self):
+ APP_STATE.use_previous_calibration = self._use_previous_calibration_checkbox.isChecked()
+
diff --git a/src/freemocap_qt_gui/conference/workflows/record_videos.py b/src/freemocap_qt_gui/conference/workflows/record_videos.py
index cd139140..257fb24a 100644
--- a/src/freemocap_qt_gui/conference/workflows/record_videos.py
+++ b/src/freemocap_qt_gui/conference/workflows/record_videos.py
@@ -1,4 +1,4 @@
-from PyQt6.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget, QPushButton
+from PyQt6.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget, QPushButton, QCheckBox
from jon_scratch.pupil_calibration_pipeline.qt_gl_laser_skeleton_visualizer import QtGlLaserSkeletonVisualizer
from src.cameras.save_synchronized_videos import save_synchronized_videos
@@ -6,7 +6,7 @@ from src.config.home_dir import get_most_recent_session_id
from src.core_processor.mediapipe_skeleton_detector.mediapipe_skeleton_detector import MediaPipeSkeletonDetector
from src.freemocap_qt_gui.conference.app import get_qt_app
from src.freemocap_qt_gui.conference.workflows.single_camera import SingleCamera
-from src.freemocap_qt_gui.conference.workflows.visualize_session import VisualizeSkeleton
+# from src.freemocap_qt_gui.conference.workflows.visualize_session import VisualizeSkeleton
from src.freemocap_qt_gui.refactored_gui.state.app_state import APP_STATE
from src.pipelines.calibration_pipeline.calibration_pipeline_orchestrator import CalibrationPipelineOrchestrator
from src.pipelines.session_pipeline.session_pipeline_orchestrator import SessionPipelineOrchestrator, \
@@ -41,6 +41,7 @@ class RecordVideos(QWidget):
record_button_layout = QHBoxLayout()
self._start_recording_button = QPushButton('Begin Recording')
self._stop_recording_button = QPushButton('Stop Recording')
+ self._stop_recording_button.setEnabled(False)
self._start_recording_button.clicked.connect(self._start_recording_frames)
self._stop_recording_button.clicked.connect(self._stop_recording_frames)
@@ -55,6 +56,7 @@ class RecordVideos(QWidget):
self._detect_2d_skeletons_button = QPushButton("Detect 2d Skeletons in Videos")
self._reconstruct_3d_skeletons_button = QPushButton("Reconstruct 3d Skeletons")
self._visualize_freemocap_session_button = QPushButton("Visualize Freemocap Session")
+ self._open_in_blender_button = QPushButton("Open Session in Blender")
self._detect_2d_skeletons_button.setEnabled(False)
self._reconstruct_3d_skeletons_button.setEnabled(False)
@@ -63,54 +65,94 @@ class RecordVideos(QWidget):
self._detect_2d_skeletons_button.clicked.connect(self._detect_2d_skeletons)
self._reconstruct_3d_skeletons_button.clicked.connect(self._reconstruct_3d_skeletons)
self._visualize_freemocap_session_button.clicked.connect(self._visualize_freemocap_session)
+ self._open_in_blender_button.clicked.connect(self._open_in_blender)
+ self._process_automatically_checkbox = QCheckBox("Process Videos Automatically")
+ container.addWidget(self._process_automatically_checkbox)
+
+ post_recording_button_layout.addWidget( self._process_automatically_checkbox)
post_recording_button_layout.addWidget( self._detect_2d_skeletons_button)
post_recording_button_layout.addWidget( self._reconstruct_3d_skeletons_button)
post_recording_button_layout.addWidget( self._visualize_freemocap_session_button)
+ post_recording_button_layout.addWidget( self._open_in_blender_button)
container.addLayout(post_recording_button_layout)
self.setLayout(container)
+ def _activate_button(self, button):
+ button.setEnabled(True)
+ button.setStyleSheet("background-color : #d95157")
+
+ def _deactivate_button(self, button):
+ button.setEnabled(False)
+ button.setStyleSheet("background-color : #a4d6d9")
def _start_recording_frames(self):
+ self._start_recording_button.setEnabled(False)
+ self._stop_recording_button.setEnabled(True)
+
for cam in self._cam_widgets:
cam.should_record_frames = True
+
def _stop_recording_frames(self):
+ self._stop_recording_button.setEnabled(False)
+ self._detect_2d_skeletons_button.setEnabled(True)
+
video_recorders = []
for cam in self._cam_widgets:
video_recorders.append(cam.video_recorder)
cam.quit()
- save_synchronized_videos(video_recorders)
- self._detect_2d_skeletons_button.setEnabled(True)
+ save_synchronized_videos(video_recorders, mocap_videos=True)
+
+ if self._process_automatically_checkbox.isChecked():
+ self._detect_2d_skeletons()
def _detect_2d_skeletons(self):
print(f"tracking 2D mediapipe skeletons in videos from session: {APP_STATE.session_id}")
mediapipe_skeleton_detector = MediaPipeSkeletonDetector(APP_STATE.session_id)
mediapipe_skeleton_detector.process_session_folder()
+
+ self._detect_2d_skeletons_button.setEnabled(False)
self._reconstruct_3d_skeletons_button.setEnabled(True)
+ if self._process_automatically_checkbox.isChecked():
+ self._reconstruct_3d_skeletons()
+
+
def _reconstruct_3d_skeletons(self):
print(f"Reconstruct 3D Skeletons : {APP_STATE.session_id}")
- this_session_orchestrator = SessionPipelineOrchestrator(session_id=APP_STATE.session_id)
- this_session_orchestrator.anipose_camera_calibration_object = CalibrationPipelineOrchestrator().load_calibration_from_session_id(
- APP_STATE.session_id)
- this_session_orchestrator.mediapipe2d_numCams_numFrames_numTrackedPoints_XY = load_mediapipe2d_data(APP_STATE.session_id)
- this_session_orchestrator.reconstruct3d_from_2d_data_offline()
- self._visualize_freemocap_session_button.setEnabled(True)
+ session_orchestrator = SessionPipelineOrchestrator(session_id=APP_STATE.session_id)
- def _visualize_freemocap_session(self):
- mediapipe3d_data_payload = load_mediapipe3d_skeleton_data(APP_STATE.session_id)
+ if APP_STATE.use_previous_calibration:
+ session_orchestrator.anipose_camera_calibration_object = CalibrationPipelineOrchestrator().load_most_recent_calibration()
+ else:
+ session_orchestrator.anipose_camera_calibration_object = CalibrationPipelineOrchestrator().load_calibration_from_session_id(
+ APP_STATE.session_id)
- mediapipe3d_skeleton_nFrames_nTrajectories_xyz = mediapipe3d_data_payload.data3d_numFrames_numTrackedPoints_XYZ
- mediapipe3d_skeleton_nFrames_nTrajectories_reprojectionError = mediapipe3d_data_payload.data3d_numFrames_numTrackedPoint_reprojectionError
+ session_orchestrator.mediapipe2d_numCams_numFrames_numTrackedPoints_XY = load_mediapipe2d_data(APP_STATE.session_id)
+ session_orchestrator.reconstruct3d_from_2d_data_offline()
- visualize_skeleton_dialog = VisualizeSkeleton(
- mediapipe_skel_fr_mar_xyz=mediapipe3d_skeleton_nFrames_nTrajectories_xyz)
+ self._reconstruct_3d_skeletons_button.setEnabled(False)
+ self._open_in_blender_button.setEnabled(True)
- get_qt_app().quit()
+ def _visualize_freemocap_session(self):
+ pass
+ # mediapipe3d_data_payload = load_mediapipe3d_skeleton_data(APP_STATE.session_id)
+ #
+ # mediapipe3d_skeleton_nFrames_nTrajectories_xyz = mediapipe3d_data_payload.data3d_numFrames_numTrackedPoints_XYZ
+ # mediapipe3d_skeleton_nFrames_nTrajectories_reprojectionError = mediapipe3d_data_payload.data3d_numFrames_numTrackedPoint_reprojectionError
+ #
+ # visualize_skeleton_dialog = VisualizeSkeleton(
+ # mediapipe_skel_fr_mar_xyz=mediapipe3d_skeleton_nFrames_nTrajectories_xyz)
+ #
+ # get_qt_app().quit()
# visualize_skeleton_dialog.exec()
# visualize_skeleton_dialog.start_animation()
+ def _open_in_blender(self):
+ print(f"Open in Blender : {APP_STATE.session_id}")
+
+ pass
\ No newline at end of file
diff --git a/src/freemocap_qt_gui/conference/workflows/show_cams_charuco.py b/src/freemocap_qt_gui/conference/workflows/show_cams_charuco.py
index 36468215..9a8a5907 100644
--- a/src/freemocap_qt_gui/conference/workflows/show_cams_charuco.py
+++ b/src/freemocap_qt_gui/conference/workflows/show_cams_charuco.py
@@ -1,4 +1,4 @@
-from PyQt6.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget, QPushButton
+from PyQt6.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget, QPushButton, QCheckBox
from src.cameras.save_synchronized_videos import save_synchronized_videos
from src.freemocap_qt_gui.conference.workflows.single_camera import SingleCamera
@@ -14,6 +14,9 @@ class ShowCamsCharuco(QWidget):
self._selected_cams = APP_STATE.selected_cameras
self._continue_button = QPushButton("Continue")
+ self._continue_button.setEnabled(False)
+
+ self._use_previous_calibration_checkbox = self._create_use_previous_calibration_checkbox()
container = QVBoxLayout()
@@ -32,10 +35,13 @@ class ShowCamsCharuco(QWidget):
container.addLayout(title_layout)
container.addLayout(video_stream_layout)
+ container.addWidget(self._use_previous_calibration_checkbox)
+
#start/stop recording button layout
record_button_layout = QHBoxLayout()
self._start_recording_button = QPushButton('Begin Recording')
self._stop_recording_button = QPushButton('Stop Recording')
+ self._stop_recording_button.setEnabled(False)
self._start_recording_button.clicked.connect(self._start_recording_frames)
self._stop_recording_button.clicked.connect(self._stop_recording_frames)
@@ -45,6 +51,7 @@ class ShowCamsCharuco(QWidget):
container.addLayout(record_button_layout)
container.addLayout(self._create_continue_button_container())
+ container.addWidget(self._use_previous_calibration_checkbox)
self.setLayout(container)
@@ -52,16 +59,30 @@ class ShowCamsCharuco(QWidget):
def continue_button(self):
return self._continue_button
+ def _create_use_previous_calibration_checkbox(self):
+ previous_calibration_checkbox = QCheckBox("Use Previous Calibration")
+ previous_calibration_checkbox.setChecked(False)
+ previous_calibration_checkbox.stateChanged.connect(self._use_previous_calibration_changed)
+ return previous_calibration_checkbox
+
def _create_continue_button_container(self):
continue_button_layout = QHBoxLayout()
continue_button_layout.addWidget(self._continue_button)
return continue_button_layout
+ def _use_previous_calibration_changed(self):
+ self._continue_button.setEnabled(self._use_previous_calibration_checkbox.isChecked())
+ APP_STATE.use_previous_calibration = self._use_previous_calibration_checkbox.isChecked()
+
+
def _start_recording_frames(self):
+ self._start_recording_button.setEnabled(False)
+ self._stop_recording_button.setEnabled(True)
for cam in self._cam_widgets:
cam.should_record_frames = True
def _stop_recording_frames(self):
+ self._stop_recording_button.setEnabled(False)
video_recorders = []
for cam in self._cam_widgets:
video_recorders.append(cam.video_recorder)
@@ -70,7 +91,7 @@ class ShowCamsCharuco(QWidget):
save_synchronized_videos(video_recorders, calibration_videos=True)
self._run_anipose_calibration()
print("Multi-camera calibration complete!")
-
+ self._continue_button.setEnabled(True)
def _run_anipose_calibration(self):
print('Beginning Anipose calibration')
diff --git a/src/freemocap_qt_gui/conference/workflows/welcome.py b/src/freemocap_qt_gui/conference/workflows/welcome.py
index d177a670..06b64f5b 100644
--- a/src/freemocap_qt_gui/conference/workflows/welcome.py
+++ b/src/freemocap_qt_gui/conference/workflows/welcome.py
@@ -1,9 +1,10 @@
from PyQt6.QtCore import Qt
from PyQt6.QtGui import QPixmap
-from PyQt6.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget, QGridLayout, QSpacerItem
+from PyQt6.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget, QGridLayout, QSpacerItem, QCheckBox
from src.freemocap_qt_gui.conference.qt_utils.set_font_size import set_font_size
from src.freemocap_qt_gui.conference.shared_widgets.primary_button import PrimaryButton
+from src.freemocap_qt_gui.refactored_gui.state.app_state import APP_STATE
class Welcome(QWidget):
@@ -38,6 +39,7 @@ class Welcome(QWidget):
new_session_container = QHBoxLayout()
new_session_container.addWidget(self._new_session_button)
return new_session_container
+
#
# def _create_logo(self):
# grid = QGridLayout()
diff --git a/src/freemocap_qt_gui/refactored_gui/state/app_state.py b/src/freemocap_qt_gui/refactored_gui/state/app_state.py
index 0ff1d51d..afdcf39f 100644
--- a/src/freemocap_qt_gui/refactored_gui/state/app_state.py
+++ b/src/freemocap_qt_gui/refactored_gui/state/app_state.py
@@ -6,6 +6,8 @@ from pydantic import BaseModel
class AppState(BaseModel):
session_id: str = None
selected_cameras: List[str] = []
+ use_previous_calibration:bool = False
+ number_of_frames_in_the_mocap_videos: int = None
APP_STATE = AppState()