Free Motion Capture for Everyone πβ¨
TypeScript
Save parameter state (#404)
philipqueenf5df3b3ba124
diff --git a/experimental/batch_process/batch_process.py b/experimental/batch_process/batch_process.pyindex ea927345..c32cd13a 100644--- a/experimental/batch_process/batch_process.py+++ b/experimental/batch_process/batch_process.py@@ -6,7 +6,8 @@ from freemocap.core_processes.process_motion_capture_videos.process_recording_fofrom freemocap.export_data.blender_stuff.export_to_blender import export_to_blenderfrom freemocap.parameter_info_models.recording_info_model import RecordingInfoModelfrom freemocap.parameter_info_models.recording_processing_parameter_models import RecordingProcessingParameterModel-from freemocap.system.paths_and_files_names import get_blender_file_path+from freemocap.system.paths_and_files_names import RECORDING_PARAMETER_DICT_JSON_FILE_NAME, get_blender_file_path+from freemocap.utilities.save_dictionary_to_json import save_dictionary_to_jsondef process_folder_of_session_folders(path_to_folder_of_session_folders: Union[str, Path],@@ -57,6 +58,14 @@ def process_recording_without_gui(else:logging.warning("No camera calibration toml file provided. May cause an error with multicamera recordings.")+ recording_info_dict = rec.dict(exclude={'recording_info_model'})++ save_dictionary_to_json(+ save_path=rec.recording_info_model.output_data_folder_path,+ file_name=RECORDING_PARAMETER_DICT_JSON_FILE_NAME,+ dictionary=recording_info_dict,+ )+process_recording_folder(recording_processing_parameter_model=rec)if path_to_blender_executable:diff --git a/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py b/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.pyindex 3988f51e..2fa561db 100644--- a/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py+++ b/freemocap/core_processes/process_motion_capture_videos/process_recording_folder.py@@ -13,6 +13,7 @@ from freemocap.core_processes.post_process_skeleton_data.process_single_camera_sfrom freemocap.system.paths_and_files_names import (MEDIAPIPE_BODY_3D_DATAFRAME_CSV_FILE_NAME,RAW_DATA_FOLDER_NAME,+ RECORDING_PARAMETER_DICT_JSON_FILE_NAME,)from freemocap.core_processes.capture_volume_calibration.anipose_camera_calibration.get_anipose_calibration_object import (load_anipose_calibration_toml_from_path,@@ -129,14 +130,14 @@ def process_recording_folder(if kill_event is not None and kill_event.is_set():return- try:- assert test_mediapipe_skeleton_data_shape(- synchronized_video_folder_path=rec.recording_info_model.synchronized_videos_folder_path,- raw_skeleton_npy_file_path=rec.recording_info_model.raw_mediapipe_3d_data_npy_file_path,- reprojection_error_file_name=rec.recording_info_model.mediapipe_reprojection_error_data_npy_file_path,- )- except AssertionError as error_message:- logger.error(error_message)+ try:+ assert test_mediapipe_skeleton_data_shape(+ synchronized_video_folder_path=rec.recording_info_model.synchronized_videos_folder_path,+ raw_skeleton_npy_file_path=rec.recording_info_model.raw_mediapipe_3d_data_npy_file_path,+ reprojection_error_file_name=rec.recording_info_model.mediapipe_reprojection_error_data_npy_file_path,+ )+ except AssertionError as error_message:+ logger.error(error_message)#rotate so skeleton is closer to 'vertical' in a z-up reference framediff --git a/freemocap/gui/qt/workers/process_motion_capture_data_thread_worker.py b/freemocap/gui/qt/workers/process_motion_capture_data_thread_worker.pyindex 14d406b0..9b81611e 100644--- a/freemocap/gui/qt/workers/process_motion_capture_data_thread_worker.py+++ b/freemocap/gui/qt/workers/process_motion_capture_data_thread_worker.py@@ -7,6 +7,8 @@ from freemocap.core_processes.process_motion_capture_videos.process_recording_foprocess_recording_folder,)from freemocap.parameter_info_models.recording_processing_parameter_models import RecordingProcessingParameterModel+from freemocap.system.paths_and_files_names import RECORDING_PARAMETER_DICT_JSON_FILE_NAME+from freemocap.utilities.save_dictionary_to_json import save_dictionary_to_jsonlogger = logging.getLogger(__name__)@@ -20,21 +22,30 @@ class ProcessMotionCaptureDataThreadWorker(QThread):super().__init__()self._session_processing_parameters = session_processing_parametersself._kill_event = kill_event+self._process = multiprocessing.Process(target=process_recording_folder, args=(self._session_processing_parameters, self._kill_event))+def run(self):logger.info(f"Beginning processing of motion capture data with parameters: {self._session_processing_parameters.__dict__}")self._kill_event.clear()+ recording_info_dict = self._session_processing_parameters.dict(exclude={'recording_info_model'})++ save_dictionary_to_json(+ save_path=self._session_processing_parameters.recording_info_model.output_data_folder_path,+ file_name=RECORDING_PARAMETER_DICT_JSON_FILE_NAME,+ dictionary=recording_info_dict,+ )+try:self._process.start()self._process.join()except Exception as e:logger.error(f"Error processing motion capture data: {e}")-logger.info("Finished processing session folder!")self.finished.emit()diff --git a/freemocap/system/paths_and_files_names.py b/freemocap/system/paths_and_files_names.pyindex 5081fa5c..3ed11b29 100644--- a/freemocap/system/paths_and_files_names.py+++ b/freemocap/system/paths_and_files_names.py@@ -31,6 +31,7 @@ MEDIAPIPE_3D_NPY_FILE_NAME = "mediaPipeSkel_3d_body_hands_face.npy"RAW_MEDIAPIPE_3D_NPY_FILE_NAME = "mediapipe3dData_numFrames_numTrackedPoints_spatialXYZ.npy"MEDIAPIPE_REPROJECTION_ERROR_NPY_FILE_NAME = "mediapipe3dData_numFrames_numTrackedPoints_reprojectionError.npy"MEDIAPIPE_BODY_3D_DATAFRAME_CSV_FILE_NAME = "mediapipe_body_3d_xyz.csv"+RECORDING_PARAMETER_DICT_JSON_FILE_NAME = "recording_parameter_dict.json"SEGMENT_CENTER_OF_MASS_NPY_FILE_NAME = "segmentCOM_frame_joint_xyz.npy"diff --git a/freemocap/tests/utilities/process_recording_headless.py b/freemocap/tests/utilities/process_recording_headless.pyindex 9f9924e9..7ab97f05 100644--- a/freemocap/tests/utilities/process_recording_headless.py+++ b/freemocap/tests/utilities/process_recording_headless.py@@ -7,9 +7,11 @@ from freemocap.export_data.blender_stuff.export_to_blender import export_to_blenfrom freemocap.export_data.generate_jupyter_notebook.generate_jupyter_notebook import generate_jupyter_notebookfrom freemocap.parameter_info_models.recording_info_model import RecordingInfoModelfrom freemocap.parameter_info_models.recording_processing_parameter_models import RecordingProcessingParameterModel-from freemocap.system.paths_and_files_names import get_blender_file_path+from freemocap.system.paths_and_files_names import RECORDING_PARAMETER_DICT_JSON_FILE_NAME, get_blender_file_path+from freemocap.utilities.save_dictionary_to_json import save_dictionary_to_jsonfrom freemocap.utilities.get_video_paths import get_video_paths+logger = logging.getLogger(__name__)@@ -38,7 +40,19 @@ def process_recording_headless(raise ValueError(f"There are {number_of_videos} videos. Must provide a calibration toml file for multicamera recordings.")++ recording_info_dict = rec.dict(exclude={'recording_info_model'})++ Path(rec.recording_info_model.output_data_folder_path).mkdir(parents=True, exist_ok=True)++ save_dictionary_to_json(+ save_path=rec.recording_info_model.output_data_folder_path,+ file_name=RECORDING_PARAMETER_DICT_JSON_FILE_NAME,+ dictionary=recording_info_dict,+ )+logger.info("Starting core processing pipeline...")+process_recording_folder(recording_processing_parameter_model=rec)logger.info("Generating jupyter notebook...")