Free Motion Capture for Everyone πβ¨
TypeScript
adding the .join command
aaroncheriand36e70c04bea
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 26afcde2..397fe470 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@@ -30,16 +30,16 @@ class PostProcessedDataHandler:self.origin_aligned_skeleton_data = origin_aligned_skeleton_data-def handle_post_process_results(task_results: dict, data_handler: PostProcessedDataHandler, save_path: str):+def handle_post_process_results(task_results: dict, save_path: str):filtered_skeleton_data = task_results[TASK_FILTERING]['result']origin_aligned_skeleton_data = task_results[TASK_SKELETON_ROTATION]['result']# set the data- data_handler.set_filtered_data(filtered_skeleton_data=filtered_skeleton_data)- data_handler.set_origin_aligned_data(origin_aligned_skeleton_data=origin_aligned_skeleton_data)+ # data_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,+ save_post_processed_data(processed_skel3d_frame_marker_xyz=origin_aligned_skeleton_data,path_to_folder_where_we_will_save_this_data=save_path)@@ -63,16 +63,23 @@ 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, save_path: str):+def run_post_processing_worker(raw_skel3d_frame_marker_xyz: np.ndarray, settings_dictionary: dict, save_path: str, on_done_function):++ def handle_thread_finished(results,save_path):+ handle_post_process_results(results, save_path)+ on_done_function(results[TASK_SKELETON_ROTATION]['result'])++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=lambda results: handle_post_process_results(results, post_processed_data_handler, save_path)+ all_tasks_finished_callback=lambda results: handle_thread_finished(results, save_path))worker_thread.start()+ worker_thread.join()return post_processed_data_handler@@ -86,13 +93,14 @@ def save_post_processed_data(processed_skel3d_frame_marker_xyz: np.ndarray,def post_process_data(recording_processing_parameter_model, raw_skel3d_frame_marker_xyz: np.ndarray,- path_to_folder_where_we_will_save_this_data):+ path_to_folder_where_we_will_save_this_data, on_done_function=None):filter_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,- save_path=path_to_folder_where_we_will_save_this_data+ save_path=path_to_folder_where_we_will_save_this_data,+ on_done_function = on_done_function)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 605eeebd..53a475ef 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@@ -141,11 +141,23 @@ def process_recording_folder(except AssertionError as error_message:logger.error(error_message)+ class PostProcessedDataHandler:+ def __init__(self):+ self.processed_data = None++ def data_callback(self, processed_data):+ self.processed_data = processed_data+ # You can also call any method or perform any action here with the processed_data++ post_processed_data_handler = PostProcessedDataHandler()+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)+ path_to_folder_where_we_will_save_this_data=rec.recording_info_model.output_data_folder_path,+ on_done_function=post_processed_data_handler.data_callback)+ skel3d_frame_marker_xyz = post_processed_data_handler.processed_data# #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)#