Free Motion Capture for Everyone πβ¨
TypeScript
3d from Single Camera (#618)
philipqueen217451ee31cc
diff --git a/freemocap/core_processes/post_process_skeleton_data/process_single_camera_skeleton_data.py b/freemocap/core_processes/post_process_skeleton_data/process_single_camera_skeleton_data.pyindex be1f3e97..7c7a6fb2 100644--- a/freemocap/core_processes/post_process_skeleton_data/process_single_camera_skeleton_data.py+++ b/freemocap/core_processes/post_process_skeleton_data/process_single_camera_skeleton_data.py@@ -1,6 +1,6 @@import loggingfrom pathlib import Path-from typing import Union+from typing import Tuple, Unionimport numpy as np@@ -16,27 +16,26 @@ def process_single_camera_skeleton_data(input_image_data_frame_marker_xyz: np.ndarray,raw_data_folder_path: Union[str, Path],project_to_z_plane: bool = True,-) -> [np.ndarray, np.ndarray]:+) -> Tuple[np.ndarray, np.ndarray]:+ skeleton_reprojection_error_fr_mar = np.zeros(input_image_data_frame_marker_xyz.shape[0:2])+ skeleton_reprojection_error_cam_fr_mar = np.zeros(+ (1, input_image_data_frame_marker_xyz.shape[0], input_image_data_frame_marker_xyz.shape[1])+ )if project_to_z_plane:- logger.info(- "Altering image-derived 3d data to resemble multi-camera reconstructed data."- )-- skeleton_reprojection_error_fr_mar = np.zeros(input_image_data_frame_marker_xyz.shape[0:2])- skeleton_reprojection_error_cam_fr_mar = np.zeros(- (1, input_image_data_frame_marker_xyz.shape[0], input_image_data_frame_marker_xyz.shape[1])- )+ logger.info("Altering image-derived 3d data to resemble multi-camera reconstructed data.")raw_skel3d_frame_marker_xyz = project_3d_data_to_z_plane(skel3d_frame_marker_xyz=input_image_data_frame_marker_xyz)-- save_mediapipe_3d_data_to_npy(- data3d_numFrames_numTrackedPoints_XYZ=raw_skel3d_frame_marker_xyz,- data3d_numFrames_numTrackedPoints_reprojectionError=skeleton_reprojection_error_fr_mar,- data3d_numCams_numFrames_numTrackedPoints_reprojectionError=skeleton_reprojection_error_cam_fr_mar,- path_to_folder_where_data_will_be_saved=raw_data_folder_path,- processing_level="raw",- )+ else:+ raw_skel3d_frame_marker_xyz = input_image_data_frame_marker_xyz++ save_mediapipe_3d_data_to_npy(+ data3d_numFrames_numTrackedPoints_XYZ=raw_skel3d_frame_marker_xyz,+ data3d_numFrames_numTrackedPoints_reprojectionError=skeleton_reprojection_error_fr_mar,+ data3d_numCams_numFrames_numTrackedPoints_reprojectionError=skeleton_reprojection_error_cam_fr_mar,+ path_to_folder_where_data_will_be_saved=raw_data_folder_path,+ processing_level="raw",+ )return raw_skel3d_frame_marker_xyz, skeleton_reprojection_error_fr_mardiff --git a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/triangulation_pipeline_functions.py b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/triangulation_pipeline_functions.pyindex b23c3a77..652fecb2 100644--- a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/triangulation_pipeline_functions.py+++ b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/triangulation_pipeline_functions.py@@ -43,6 +43,7 @@ def get_triangulated_data(input_image_data_frame_marker_xyz=image_data_numCams_numFrames_numTrackedPts_XYZ[0],raw_data_folder_path=Path(processing_parameters.recording_info_model.raw_data_folder_path),+ project_to_z_plane=processing_parameters.anipose_triangulate_3d_parameters_model.flatten_single_camera_data,)elif not processing_parameters.anipose_triangulate_3d_parameters_model.run_3d_triangulation:logger.info(diff --git a/freemocap/data_layer/recording_models/post_processing_parameter_models.py b/freemocap/data_layer/recording_models/post_processing_parameter_models.pyindex 56d91f90..84fdda2e 100644--- a/freemocap/data_layer/recording_models/post_processing_parameter_models.py+++ b/freemocap/data_layer/recording_models/post_processing_parameter_models.py@@ -18,6 +18,7 @@ class AniposeTriangulate3DParametersModel(BaseModel):minimum_cameras_to_reproject: int = 3use_triangulate_ransac_method: bool = Falserun_3d_triangulation: bool = True+ flatten_single_camera_data: bool = Trueclass ButterworthFilterParametersModel(BaseModel):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 72298f20..52eba4ad 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@@ -30,6 +30,8 @@ REPROJECTION_ERROR_FILTER_THRESHOLD = "Reprojection Error Filter Threshold (%)"MINIMUM_CAMERAS_TO_REPROJECT = "Minimum Cameras to Reproject"+FLATTEN_SINGLE_CAMERA_DATA = "Flatten Single Camera Data (Recommended)"+ANIPOSE_TREE_NAME = "Anipose Triangulation"YOLO_CROP_TREE_NAME = "YOLO Crop"@@ -163,6 +165,12 @@ def create_3d_triangulation_parameter_group(tip="If true, use `anipose`'s `triangulate_ransac` method instead of the default `triangulate_simple` method. ""NOTE - Much slower than the 'simple' method, but might be more accurate and better at rejecting bad camera views. Needs more testing and evaluation to see if it's worth it. ",),+ dict(+ name=FLATTEN_SINGLE_CAMERA_DATA,+ type="bool",+ value=parameter_model.flatten_single_camera_data,+ tip="If true, flatten the data from single camera recordings.",+ ),dict(name=REPROJECTION_ERROR_FILTERING_TREE_NAME,type="group",@@ -252,6 +260,7 @@ def extract_parameter_model_from_parameter_tree(reprojection_error_confidence_cutoff=parameter_values_dictionary[REPROJECTION_ERROR_FILTER_THRESHOLD],minimum_cameras_to_reproject=parameter_values_dictionary[MINIMUM_CAMERAS_TO_REPROJECT],use_triangulate_ransac_method=parameter_values_dictionary[USE_RANSAC_METHOD],+ flatten_single_camera_data=parameter_values_dictionary[FLATTEN_SINGLE_CAMERA_DATA],run_3d_triangulation=parameter_values_dictionary[RUN_3D_TRIANGULATION_NAME],),post_processing_parameters_model=PostProcessingParametersModel(