Free Motion Capture for Everyone πβ¨
TypeScript
Working parameter tree (#366)
philipqueen870593de1982
diff --git a/freemocap/core_processes/post_process_skeleton_data/gap_fill_filter_and_origin_align_skeleton_data.py b/freemocap/core_processes/post_process_skeleton_data/gap_fill_filter_and_origin_align_skeleton_data.pyindex d5876157..b2305aad 100644--- a/freemocap/core_processes/post_process_skeleton_data/gap_fill_filter_and_origin_align_skeleton_data.py+++ b/freemocap/core_processes/post_process_skeleton_data/gap_fill_filter_and_origin_align_skeleton_data.py@@ -1029,7 +1029,8 @@ def are_there_feet_in_this_mediapipe_skeleton_data(skeleton3d_frame_landmark_xyzdef gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass(raw_skel3d_frame_marker_xyz: np.ndarray,skeleton_reprojection_error_fr_mar: np.ndarray,- path_to_folder_where_we_will_save_this_data: [str, Path],+ path_to_folder_where_we_will_save_this_data: Union[str, Path],+ skip_butterworth_filter: bool,# Filter the data, set the filtering options heresampling_rate: Union[float, int],cut_off: Union[float, int],@@ -1043,51 +1044,15 @@ def gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass(# Interpolate the dataprocessed_skel3d_frame_marker_xyz = fill_gaps_in_freemocap_data(raw_skel3d_frame_marker_xyz, )- logger.info(- f"Filtering data at with a {order}th order, zero-lag, low-pass Butterworth filter with a cut-off frequency of {cut_off} Hz..."- )- processed_skel3d_frame_marker_xyz = butterworth_filter_skeleton(- processed_skel3d_frame_marker_xyz, cut_off, sampling_rate, order- )-- # # pin skeleton to origin (set to mean positin of skeletonin this recording)- # zeroed_skeleton_data = butterworth_filtered_skeleton_data.copy()- # zeroed_skeleton_data[:, :, 0] -= np.nanmean(zeroed_skeleton_data[:, :, 0])- # zeroed_skeleton_data[:, :, 1] -= np.nanmean(zeroed_skeleton_data[:, :, 1])- # zeroed_skeleton_data[:, :, 2] -= np.nanmean(zeroed_skeleton_data[:, :, 2])- #- # # TODO - align skeleton so feet are at Z-plane and head is facing up- # origin_aligned_freemocap_marker_data = zeroed_skeleton_data.copy()- # logger.info("Aligning data to the origin...")-- # reference_frame_number = find_good_clean_frame_reprojection_error_method(- # skeleton_3d_fr_mar_xyz=freemocap_filtered_marker_data,- # skeleton_reprojection_error_fr_mar=skeleton_reprojection_error_fr_mar,- # )-- # has_feet = are_there_feet_in_this_mediapipe_skeleton_data(- # butterworth_filtered_skeleton_data, mediapipe_landmark_names- # )- # if has_feet:- # reference_frame_number = find_good_frame_recursive_guess_method(- # butterworth_filtered_skeleton_data, mediapipe_landmark_names, 0.3- # )- #- # logger.info("Using the foot/spine method of alignment...")- # origin_aligned_freemocap_marker_data = (- # align_skeleton_with_origin_foot_spine_method(- # butterworth_filtered_skeleton_data,- # mediapipe_landmark_names,- # reference_frame_number,- # )- # )- # else: # no feet- # logger.info("Using the skelly blob method of alignment...")- # origin_aligned_freemocap_marker_data = (- # align_skeleton_with_origin_mean_blob_method(- # butterworth_filtered_skeleton_data- # )- # )+ if skip_butterworth_filter:+ logger.info("Skipping butterworth filter...")+ else:+ logger.info(+ f"Filtering data at with a {order}th order, zero-lag, low-pass Butterworth filter with a cut-off frequency of {cut_off} Hz..."+ )+ processed_skel3d_frame_marker_xyz = butterworth_filter_skeleton(+ processed_skel3d_frame_marker_xyz, cut_off, sampling_rate, order+ )logger.info("Saving Origin Aligned Data")Path(path_to_folder_where_we_will_save_this_data).mkdir(parents=True, exist_ok=True)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 50c4f94f..99bbb084 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@@ -1,4 +1,5 @@import logging+import numpy as npimport multiprocessingfrom pathlib import Path@@ -64,17 +65,25 @@ 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...")- # 2d skeleton detection- mediapipe_skeleton_detector = MediaPipeSkeletonDetector(- parameter_model=rec.mediapipe_parameters_model,- )+ 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)+ except Exception as e:+ logger.error("Failed to load 2D data, cannot continue processing")+ return+ else:+ # 2d skeleton detection+ mediapipe_skeleton_detector = MediaPipeSkeletonDetector(+ parameter_model=rec.mediapipe_parameters_model,+ )- mediapipe_image_data_numCams_numFrames_numTrackedPts_XYZ = mediapipe_skeleton_detector.process_folder_full_of_videos(- rec.recording_info_model.synchronized_videos_folder_path,- Path(rec.recording_info_model.output_data_folder_path) / RAW_DATA_FOLDER_NAME,- kill_event=kill_event,- )+ mediapipe_image_data_numCams_numFrames_numTrackedPts_XYZ = mediapipe_skeleton_detector.process_folder_full_of_videos(+ rec.recording_info_model.synchronized_videos_folder_path,+ Path(rec.recording_info_model.output_data_folder_path) / RAW_DATA_FOLDER_NAME,+ kill_event=kill_event,+ )if kill_event is not None and kill_event.is_set():return@@ -92,48 +101,54 @@ def process_recording_folder(raw_data_folder_path=Path(rec.recording_info_model.raw_data_folder_path))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)+ else:+ logger.info("Triangulating 3d skeletons...")++ assert rec.recording_info_model.calibration_toml_check, f"No calibration file found at: {rec.recording_info_model.calibration_toml_path}"+ assert rec.recording_info_model.data2d_status_check, f"No mediapipe 2d data found at: {rec.recording_info_model.mediapipe_2d_data_npy_file_path}"++ anipose_calibration_object = load_anipose_calibration_toml_from_path(+ camera_calibration_data_toml_path=rec.recording_info_model.calibration_toml_path,+ save_copy_of_calibration_to_this_path=rec.recording_info_model.path,+ )+ (raw_skel3d_frame_marker_xyz, skeleton_reprojection_error_fr_mar,) = triangulate_3d_data(+ anipose_calibration_object=anipose_calibration_object,+ mediapipe_2d_data=mediapipe_image_data_numCams_numFrames_numTrackedPts_XYZ[:, :, :, :2],+ output_data_folder_path=rec.recording_info_model.raw_data_folder_path,+ mediapipe_confidence_cutoff_threshold=rec.anipose_triangulate_3d_parameters_model.confidence_threshold_cutoff,+ use_triangulate_ransac=rec.anipose_triangulate_3d_parameters_model.use_triangulate_ransac_method,+ kill_event=kill_event,+ )- logger.info("Triangulating 3d skeletons...")-- assert rec.recording_info_model.calibration_toml_check, f"No calibration file found at: {rec.recording_info_model.calibration_toml_path}"- assert rec.recording_info_model.data2d_status_check, f"No mediapipe 2d data found at: {rec.recording_info_model.mediapipe_2d_data_npy_file_path}"-- anipose_calibration_object = load_anipose_calibration_toml_from_path(- camera_calibration_data_toml_path=rec.recording_info_model.calibration_toml_path,- save_copy_of_calibration_to_this_path=rec.recording_info_model.path,- )- (raw_skel3d_frame_marker_xyz, skeleton_reprojection_error_fr_mar,) = triangulate_3d_data(- anipose_calibration_object=anipose_calibration_object,- mediapipe_2d_data=mediapipe_image_data_numCams_numFrames_numTrackedPts_XYZ[:, :, :, :2],- output_data_folder_path=rec.recording_info_model.raw_data_folder_path,- mediapipe_confidence_cutoff_threshold=rec.anipose_triangulate_3d_parameters_model.confidence_threshold_cutoff,- use_triangulate_ransac=rec.anipose_triangulate_3d_parameters_model.use_triangulate_ransac_method,- kill_event=kill_event,- )-- if kill_event is not None and kill_event.is_set():- return+ if kill_event is not None and kill_event.is_set():+ return- assert test_mediapipe_3d_data_shape(- synchronized_videos_folder=rec.recording_info_model.synchronized_videos_folder_path,- mediapipe_3d_data_npy_path=rec.recording_info_model.raw_mediapipe_3d_data_npy_file_path,- medipipe_reprojection_error_data_npy_path=rec.recording_info_model.mediapipe_reprojection_error_data_npy_file_path,- )+ assert test_mediapipe_3d_data_shape(+ synchronized_videos_folder=rec.recording_info_model.synchronized_videos_folder_path,+ mediapipe_3d_data_npy_path=rec.recording_info_model.raw_mediapipe_3d_data_npy_file_path,+ medipipe_reprojection_error_data_npy_path=rec.recording_info_model.mediapipe_reprojection_error_data_npy_file_path,+ )#rotate so skeleton is closer to 'vertical' in a z-up reference framerotated_raw_skel3d_frame_marker_xyz = rotate_by_90_degrees_around_x_axis(raw_skel3d_frame_marker_xyz)+logger.info("Gap-filling, butterworth filtering, origin aligning 3d skeletons, then calculating center of mass ...")skel3d_frame_marker_xyz = gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass(raw_skel3d_frame_marker_xyz=rotated_raw_skel3d_frame_marker_xyz,skeleton_reprojection_error_fr_mar=skeleton_reprojection_error_fr_mar,path_to_folder_where_we_will_save_this_data=rec.recording_info_model.output_data_folder_path,+ skip_butterworth_filter=rec.post_processing_parameters_model.skip_butterworth_filter,sampling_rate=rec.post_processing_parameters_model.framerate,cut_off=rec.post_processing_parameters_model.butterworth_filter_parameters.cutoff_frequency,order=rec.post_processing_parameters_model.butterworth_filter_parameters.order,reference_frame_number=None,)+assert test_mediapipe_3d_data_shape(synchronized_videos_folder=rec.recording_info_model.synchronized_videos_folder_path,mediapipe_3d_data_npy_path=rec.recording_info_model.mediapipe_3d_data_npy_file_path,diff --git a/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/create_parameter_groups.py b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/create_parameter_groups.pyindex a36d5e5d..340d5095 100644--- a/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/create_parameter_groups.py+++ b/freemocap/gui/qt/widgets/control_panel/process_mocap_data_panel/parameter_groups/create_parameter_groups.py@@ -28,6 +28,12 @@ MODEL_COMPLEXITY = "Model Complexity"MEDIAPIPE_TREE_NAME = "Mediapipe"+SKIP_2D_IMAGE_TRACKING_NAME = "Skip 2d image tracking?"++SKIP_3D_TRIANGULATION_NAME = "Skip 3d triangulation?"++SKIP_BUTTERWORTH_FILTER_NAME = "Skip butterworth filter?"+def create_mediapipe_parameter_group(parameter_model: MediapipeParametersModel = MediapipeParametersModel(),@@ -137,31 +143,52 @@ def create_post_processing_parameter_group()-def extract_mediapipe_parameter_model_from_parameter_tree(- parameter_tree: ParameterTree,+def extract_parameter_model_from_parameter_tree(+ parameter_object: Parameter,) -> RecordingProcessingParameterModel:+ parameter_values_dictionary = extract_processing_parameter_model_from_tree(parameter_object=parameter_object)++ model_complexity_integer = get_integer_from_model_complexity(parameter_values_dictionary[MODEL_COMPLEXITY])+return RecordingProcessingParameterModel(mediapipe_parameters_model=MediapipeParametersModel(- model_complexity=parameter_tree.param(MEDIAPIPE_TREE_NAME).param(MODEL_COMPLEXITY).value(),- min_detection_confidence=parameter_tree.param(MEDIAPIPE_TREE_NAME).param(- MINIMUM_DETECTION_CONFIDENCE).value(),- min_tracking_confidence=parameter_tree.param(MEDIAPIPE_TREE_NAME).param(- MINIUMUM_TRACKING_CONFIDENCE).value(),- static_image_mode=parameter_tree.param(MEDIAPIPE_TREE_NAME).param(STATIC_IMAGE_MODE).value(), ),+ model_complexity=model_complexity_integer,+ min_detection_confidence=parameter_values_dictionary[MINIMUM_DETECTION_CONFIDENCE],+ min_tracking_confidence=parameter_values_dictionary[MINIUMUM_TRACKING_CONFIDENCE],+ static_image_mode=parameter_values_dictionary[STATIC_IMAGE_MODE],+ skip_2d_image_tracking=parameter_values_dictionary[SKIP_2D_IMAGE_TRACKING_NAME], ),anipose_triangulate_3d_parameters_model=AniposeTriangulate3DParametersModel(- confidence_threshold_cutoff=parameter_tree.param(ANIPOSE_TREE_NAME).param(- ANIPOSE_CONFIDENCE_CUTOFF).value(),- use_triangulate_ransac_method=parameter_tree.param(ANIPOSE_TREE_NAME).param(USE_RANSAC_METHOD).value(),+ confidence_threshold_cutoff=parameter_values_dictionary[ANIPOSE_CONFIDENCE_CUTOFF],+ use_triangulate_ransac_method=parameter_values_dictionary[USE_RANSAC_METHOD],+ skip_3d_triangulation=parameter_values_dictionary[SKIP_3D_TRIANGULATION_NAME]),post_processing_parameters_model=PostProcessingParametersModel(- framerate=parameter_tree.param(BUTTERWORTH_FILTER_TREE_NAME).param(POST_PROCESSING_FRAME_RATE).value(),+ framerate=parameter_values_dictionary[POST_PROCESSING_FRAME_RATE],butterworth_filter_parameters=ButterworthFilterParametersModel(- sampling_rate=parameter_tree.param(BUTTERWORTH_FILTER_TREE_NAME).param(- POST_PROCESSING_FRAME_RATE).value(),- cutoff_frequency=parameter_tree.param(BUTTERWORTH_FILTER_TREE_NAME).param(- BUTTERWORTH_CUTOFF_FREQUENCY).value(),- order=parameter_tree.param(BUTTERWORTH_FILTER_TREE_NAME).param(BUTTERWORTH_ORDER).value(),+ sampling_rate=parameter_values_dictionary[POST_PROCESSING_FRAME_RATE],+ cutoff_frequency=parameter_values_dictionary[BUTTERWORTH_CUTOFF_FREQUENCY],+ order=parameter_values_dictionary[BUTTERWORTH_ORDER],),+ skip_butterworth_filter=parameter_values_dictionary[SKIP_BUTTERWORTH_FILTER_NAME],)- ) #thanks github co-pilot lol+ )++def get_integer_from_model_complexity(model_complexity_value: str):+ model_complexity_dictionary = {+ "0 (Fastest/Least accurate)": 0,+ "1 (Middle ground)": 1,+ "2 (Slowest/Most accurate)": 2,+ }+ return model_complexity_dictionary[model_complexity_value]++def extract_processing_parameter_model_from_tree(parameter_object, value_dictionary: dict=None):+ if value_dictionary is None:+ value_dictionary = {}++ for child in parameter_object.children():+ if child.hasChildren():+ extract_processing_parameter_model_from_tree(child, value_dictionary)+ else:+ value_dictionary[child.name()] = child.value()+ return value_dictionary\ No newline at end of filediff --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 3cf74d50..025dd541 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@@ -10,7 +10,13 @@ from pyqtgraph.parametertree import Parameter, ParameterTreefrom freemocap.gui.qt.widgets.control_panel.calibration_control_panel import CalibrationControlPanelfrom freemocap.gui.qt.widgets.control_panel.process_mocap_data_panel.parameter_groups.create_parameter_groups import (- create_mediapipe_parameter_group, create_3d_triangulation_prarameter_group, create_post_processing_parameter_group,+ create_mediapipe_parameter_group,+ create_3d_triangulation_prarameter_group,+ create_post_processing_parameter_group,+ extract_parameter_model_from_parameter_tree,+ SKIP_2D_IMAGE_TRACKING_NAME,+ SKIP_3D_TRIANGULATION_NAME,+ SKIP_BUTTERWORTH_FILTER_NAME,)from freemocap.gui.qt.workers.process_motion_capture_data_thread_worker import (ProcessMotionCaptureDataThreadWorker,@@ -66,7 +72,7 @@ class ProcessMotionCaptureDataPanel(QWidget):self._parameter_tree_widget = ParameterTree(parent=self, showHeader=False)self._layout.addWidget(self._parameter_tree_widget)- self._add_parameters_to_parameter_tree_widget(+ self._parameter_group = self._add_parameters_to_parameter_tree_widget(self._parameter_tree_widget,session_processing_parameter_model=self._recording_processing_parameter_model,)@@ -109,16 +115,16 @@ class ProcessMotionCaptureDataPanel(QWidget):name="2d Image Trackers",type="group",children=[- self._create_new_skip_this_step_parameter(),+ self._create_new_skip_this_step_parameter(skip_step_name=SKIP_2D_IMAGE_TRACKING_NAME),create_mediapipe_parameter_group(session_processing_parameter_model.mediapipe_parameters_model),],tip="Methods for tracking 2d points in images (e.g. mediapipe, deeplabcut(TODO), openpose(TODO), etc ...)",),dict(- name="3d triangulation methods",+ name="3d Triangulation Methods",type="group",children=[- self._create_new_skip_this_step_parameter(),+ self._create_new_skip_this_step_parameter(skip_step_name=SKIP_3D_TRIANGULATION_NAME),create_3d_triangulation_prarameter_group(session_processing_parameter_model.anipose_triangulate_3d_parameters_model),@@ -129,7 +135,7 @@ class ProcessMotionCaptureDataPanel(QWidget):name="Post Processing (data cleaning)",type="group",children=[- self._create_new_skip_this_step_parameter(),+ self._create_new_skip_this_step_parameter(skip_step_name=SKIP_BUTTERWORTH_FILTER_NAME),create_post_processing_parameter_group(session_processing_parameter_model.post_processing_parameters_model),@@ -140,28 +146,27 @@ class ProcessMotionCaptureDataPanel(QWidget):],)- def _extract_session_parameter_model_from_parameter_tree(+ def _create_session_parameter_model(self,) -> RecordingProcessingParameterModel:- # rec = extract_mediapipe_parameter_model_from_parameter_tree(self._parameter_tree_widget)- logger.debug("TODO - extract session parameter model from parameter tree")- rec = self._recording_processing_parameter_model- rec.recording_info_model = self._get_active_recording_info()+ recording_processing_parameter_model = extract_parameter_model_from_parameter_tree(parameter_object=self._parameter_group)+ recording_processing_parameter_model.recording_info_model = self._get_active_recording_info()if self._calibration_control_panel.calibration_toml_path:- rec.recording_info_model.calibration_toml_path = self._calibration_control_panel.calibration_toml_path+ recording_processing_parameter_model.recording_info_model.calibration_toml_path = self._calibration_control_panel.calibration_toml_pathelse:- rec.recording_info_model.calibration_toml_path = self._calibration_control_panel.open_load_camera_calibration_toml_dialog()+ recording_processing_parameter_model.recording_info_model.calibration_toml_path = self._calibration_control_panel.open_load_camera_calibration_toml_dialog()- if not rec.recording_info_model.calibration_toml_path:+ if not recording_processing_parameter_model.recording_info_model.calibration_toml_path:logger.error("No calibration TOML selected - Processing will fail at the '3d triangulation' step (but it will get through the 'Tracking things in 2d images' step).")- return rec+ return recording_processing_parameter_model- def _create_new_skip_this_step_parameter(self):++ def _create_new_skip_this_step_parameter(self, skip_step_name: str):parameter = Parameter.create(- name="Skip this step?",+ name=skip_step_name,type="bool",value=False,tip="If you have already run this step, you can skip it." "re-running it will overwrite the existing data.",@@ -170,19 +175,23 @@ class ProcessMotionCaptureDataPanel(QWidget):return parameter- def disable_this_parameter_group(self, parameter, changes):- logger.debug(f"TODO - disable parameter group when 'skip this step?' is checked")- pass- # skip_this_step_bool = parameter.value()- # parameter_group = parameter.parent()- # for child in parameter_group.children():- # if child.name() != "Skip this step?":- # logger.debug(f"Disabling {child.name()}")- # child.setOpts(enabled=not skip_this_step_bool)+ def disable_this_parameter_group(self, parameter):+ skip_this_step_bool = parameter.value()+ parameter_group = parameter.parent()+ for child in parameter_group.children():+ if child.name().split(" ")[0] != "Skip":+ logger.debug(f"{'Enabling' if not skip_this_step_bool else 'Disabling'} {child.name()} in processing pipeline")+ self.set_parameter_enabled(child, not skip_this_step_bool)++ def set_parameter_enabled(self, parameter, enabled_bool):+ parameter.setOpts(enabled=enabled_bool)+ if parameter.hasChildren():+ for child in parameter.children():+ self.set_parameter_enabled(child, enabled_bool)def _launch_process_motion_capture_data_thread_worker(self):logger.debug("Launching process motion capture data process")- session_parameter_model = self._extract_session_parameter_model_from_parameter_tree()+ session_parameter_model = self._create_session_parameter_model()session_parameter_model.recording_info_model = self._get_active_recording_info()if session_parameter_model.recording_info_model is None:diff --git a/freemocap/parameter_info_models/recording_processing_parameter_models.py b/freemocap/parameter_info_models/recording_processing_parameter_models.pyindex 5882350c..78477753 100644--- a/freemocap/parameter_info_models/recording_processing_parameter_models.py+++ b/freemocap/parameter_info_models/recording_processing_parameter_models.py@@ -14,11 +14,13 @@ class MediapipeParametersModel(BaseModel):min_detection_confidence: float = 0.5min_tracking_confidence: float = 0.5static_image_mode: bool = False+ skip_2d_image_tracking: bool = Falseclass AniposeTriangulate3DParametersModel(BaseModel):- confidence_threshold_cutoff: float = 0.7+ confidence_threshold_cutoff: float = 0.3use_triangulate_ransac_method: bool = False+ skip_3d_triangulation: bool = Falseclass ButterworthFilterParametersModel(BaseModel):@@ -31,6 +33,7 @@ class PostProcessingParametersModel(BaseModel):framerate: float = 30.0butterworth_filter_parameters = ButterworthFilterParametersModel()max_gap_to_fill: int = 10+ skip_butterworth_filter: bool = Falseclass RecordingProcessingParameterModel(BaseModel):