Free Motion Capture for Everyone πβ¨
TypeScript
moving the saving into the task thread
aaroncherian39c839f38a7b
diff --git a/freemocap/core_processes/post_process_skeleton_data/post_process_skeleton.py b/freemocap/core_processes/post_process_skeleton_data/post_process_skeleton.pyindex f9eedb75..26afcde2 100644--- a/freemocap/core_processes/post_process_skeleton_data/post_process_skeleton.py+++ b/freemocap/core_processes/post_process_skeleton_data/post_process_skeleton.py@@ -1,5 +1,7 @@import numpy as np+from pathlib import Path+from freemocap.core_processes.post_process_skeleton_data.freemocap_utils.postprocessing_widgets.task_worker_thread \import TaskWorkerThreadfrom freemocap.core_processes.post_process_skeleton_data.freemocap_utils.config import default_settings@@ -28,13 +30,18 @@ class PostProcessedDataHandler:self.origin_aligned_skeleton_data = origin_aligned_skeleton_data-def handle_post_process_results(task_results: dict, data_handler: PostProcessedDataHandler):+def handle_post_process_results(task_results: dict, data_handler: PostProcessedDataHandler, save_path: str):filtered_skeleton_data = task_results[TASK_FILTERING]['result']origin_aligned_skeleton_data = task_results[TASK_SKELETON_ROTATION]['result']+ # set the datadata_handler.set_filtered_data(filtered_skeleton_data=filtered_skeleton_data)data_handler.set_origin_aligned_data(origin_aligned_skeleton_data=origin_aligned_skeleton_data)+ # save the data+ save_post_processed_data(processed_skel3d_frame_marker_xyz=data_handler.origin_aligned_skeleton_data,+ path_to_folder_where_we_will_save_this_data=save_path)+def get_settings_from_parameter_tree(recording_processing_parameter_model):rec = recording_processing_parameter_model@@ -56,22 +63,24 @@ def adjust_default_settings(filter_sampling_rate, filter_cutoff_frequency, filtereturn adjusted_settings-def run_post_processing_worker(raw_skel3d_frame_marker_xyz: np.ndarray, settings_dictionary: dict):+def run_post_processing_worker(raw_skel3d_frame_marker_xyz: np.ndarray, settings_dictionary: dict, save_path: str):task_list = [TASK_INTERPOLATION, TASK_FILTERING, TASK_FINDING_GOOD_FRAME, TASK_SKELETON_ROTATION]post_processed_data_handler = PostProcessedDataHandler()- worker_thread = TaskWorkerThread(raw_skeleton_data=raw_skel3d_frame_marker_xyz, task_list=task_list,- settings=settings_dictionary,- all_tasks_finished_callback=handle_post_process_results)+ worker_thread = TaskWorkerThread(+ raw_skeleton_data=raw_skel3d_frame_marker_xyz,+ task_list=task_list,+ settings=settings_dictionary,+ all_tasks_finished_callback=lambda results: handle_post_process_results(results, post_processed_data_handler, save_path)+ )worker_thread.start()return post_processed_data_handler-def save_post_processed_data(processed_skel3d_frame_marker_xyz: np.ndarray,path_to_folder_where_we_will_save_this_data):Path(path_to_folder_where_we_will_save_this_data).mkdir(parents=True, exist_ok=True)np.save(- str(path_to_folder_where_we_will_save_this_data / "mediaPipeSkel_3d_body_hands_face.npy"),+ str(Path(path_to_folder_where_we_will_save_this_data) / "mediaPipeSkel_3d_body_hands_face.npy"),processed_skel3d_frame_marker_xyz,)@@ -81,9 +90,9 @@ def post_process_data(recording_processing_parameter_model, raw_skel3d_frame_marfilter_sampling_rate, filter_cutoff_frequency, filter_order = get_settings_from_parameter_tree(recording_processing_parameter_model)adjusted_settings = adjust_default_settings(filter_sampling_rate, filter_cutoff_frequency, filter_order)- post_processed_data_handler = run_post_processing_worker(raw_skel3d_frame_marker_xyz=raw_skel3d_frame_marker_xyz,- settings_dictionary=adjusted_settings)- processed_skeleton_data = post_processed_data_handler.origin_aligned_skeleton_data- save_post_processed_data(processed_skel3d_frame_marker_xyz=processed_skeleton_data,- path_to_folder_where_we_will_save_this_data=path_to_folder_where_we_will_save_this_data)-#+ post_processed_data_handler = run_post_processing_worker(+ raw_skel3d_frame_marker_xyz=raw_skel3d_frame_marker_xyz,+ settings_dictionary=adjusted_settings,+ save_path=path_to_folder_where_we_will_save_this_data+ )+ return post_processed_data_handler.origin_aligned_skeleton_datadiff --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 0e54c2c8..605eeebd 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@@ -67,11 +67,11 @@ def process_recording_folder(f"Could not find synchronized_videos folder at {rec.recording_info_model.synchronized_videos_folder_path}")-logger.info("Detecting 2d skeletons...")if rec.mediapipe_parameters_model.skip_2d_image_tracking:- try:- mediapipe_image_data_numCams_numFrames_numTrackedPts_XYZ = np.load(rec.recording_info_model.mediapipe_2d_data_npy_file_path)+ try:+ mediapipe_image_data_numCams_numFrames_numTrackedPts_XYZ = np.load(+ rec.recording_info_model.mediapipe_2d_data_npy_file_path)except Exception as e:logger.error("Failed to load 2D data, cannot continue processing")return@@ -96,7 +96,7 @@ def process_recording_folder(image_tracking_data_file_name=rec.recording_info_model.mediapipe_2d_data_npy_file_path,)except AssertionError as error_message:- logger.error(error_message)+ logger.error(error_message)# spoof 3D data if single cameraif mediapipe_image_data_numCams_numFrames_numTrackedPts_XYZ.shape[0] == 1:@@ -108,7 +108,8 @@ def process_recording_folder(else:if rec.anipose_triangulate_3d_parameters_model.skip_3d_triangulation:raw_skel3d_frame_marker_xyz = np.load(rec.recording_info_model.raw_mediapipe_3d_data_npy_file_path)- skeleton_reprojection_error_fr_mar = np.load(rec.recording_info_model.mediapipe_reprojection_error_data_npy_file_path)+ skeleton_reprojection_error_fr_mar = np.load(+ rec.recording_info_model.mediapipe_reprojection_error_data_npy_file_path)else:logger.info("Triangulating 3d skeletons...")@@ -140,9 +141,10 @@ def process_recording_folder(except AssertionError as error_message:logger.error(error_message)- post_process_data(recording_processing_parameter_model = recording_processing_parameter_model,- raw_skel3d_frame_marker_xyz= raw_skel3d_frame_marker_xyz,- path_to_folder_where_we_will_save_this_data=rec.recording_info_model.output_data_folder_path)+ skel3d_frame_marker_xyz = post_process_data(+ recording_processing_parameter_model=recording_processing_parameter_model,+ raw_skel3d_frame_marker_xyz=raw_skel3d_frame_marker_xyz,+ path_to_folder_where_we_will_save_this_data=rec.recording_info_model.output_data_folder_path)# #rotate so skeleton is closer to 'vertical' in a z-up reference frame# rotated_raw_skel3d_frame_marker_xyz = rotate_by_90_degrees_around_x_axis(raw_skel3d_frame_marker_xyz)@@ -170,7 +172,6 @@ def process_recording_folder(except AssertionError as error_message:logger.error(error_message)-logger.info("Breaking up big `npy` into smaller bits and converting to `csv`...")# break up big NPY and save out csv'sconvert_mediapipe_npy_to_csv(