Free Motion Capture for Everyone πβ¨
TypeScript
removing estimate segment lengths (#571)
Aaron Cheriancb72f4b5d878
diff --git a/freemocap/core_processes/post_process_skeleton_data/estimate_skeleton_segment_lengths.py b/freemocap/core_processes/post_process_skeleton_data/estimate_skeleton_segment_lengths.pydeleted file mode 100644index bb220b1e..00000000--- a/freemocap/core_processes/post_process_skeleton_data/estimate_skeleton_segment_lengths.py+++ /dev/null@@ -1,136 +0,0 @@-import logging-from pathlib import Path--import numpy as np-import pandas as pd-from rich import print--logger = logging.getLogger(__name__)--mediapipe_skeleton_segment_definitions = {- "lower_spine": {"proximal": "hips_center", "distal": "chest_center"},- "upper_spine": {"proximal": "chest_center", "distal": "neck_center"},- "head": {"proximal": "neck_center", "distal": "head_center"},- "left_clavicle": {"proximal": "neck_center", "distal": "left_shoulder"},- "left_upper_arm": {"proximal": "left_shoulder", "distal": "left_elbow"},- "left_forearm": {"proximal": "left_elbow", "distal": "left_wrist"},- "left_hand": {"proximal": "left_wrist", "distal": "left_index"},- "right_clavicle": {"proximal": "neck_center", "distal": "right_shoulder"},- "right_upper_arm": {"proximal": "right_shoulder", "distal": "right_elbow"},- "right_forearm": {"proximal": "right_elbow", "distal": "right_wrist"},- "right_hand": {"proximal": "right_wrist", "distal": "right_index"},- "left_pelvis": {"proximal": "hips_center", "distal": "left_hip"},- "left_thigh": {"proximal": "left_hip", "distal": "left_knee"},- "left_calf": {"proximal": "left_knee", "distal": "left_ankle"},- "left_foot": {"proximal": "left_ankle", "distal": "left_foot_index"},- "right_pelvis": {"proximal": "hips_center", "distal": "right_hip"},- "right_thigh": {"proximal": "right_hip", "distal": "right_knee"},- "right_calf": {"proximal": "right_knee", "distal": "right_ankle"},- "right_foot": {"proximal": "right_ankle", "distal": "right_foot_index"},-}---def estimate_skeleton_segment_lengths(skeleton_dataframe: pd.DataFrame, skeleton_segment_definitions: dict) -> dict:- """Estimate the length of each skeleton segment.-- Args:- skeleton_data_dictionary (dict): Dictionary containing the skeleton data.- skeleton_segment_definitions (dict): Dictionary containing the definitions of each segment (i.e. the proximal and distal joints).-- Returns:- dict: Dictionary containing the estimated length of each skeleton segment.- """- logger.debug("Estimating skeleton segment lengths (mm)...")- skeleton_data_dictionary = create_skeleton_dictionary_from_skeleton_body_data_frame(skeleton_dataframe)-- skeleton_segment_lengths_dict = {}- for segment_name, segment_definition_dict in skeleton_segment_definitions.items():- logger.debug(- f"Estimating length of segment '{segment_name}' "- f"based on proximal joint: '{segment_definition_dict['proximal']}' and "- f"distal joint:'{segment_definition_dict['distal']}'"- )- proximal_joint_name = segment_definition_dict["proximal"]- distal_joint_name = segment_definition_dict["distal"]-- proximal_x = skeleton_data_dictionary[f"{proximal_joint_name}_x"]- proximal_y = skeleton_data_dictionary[f"{proximal_joint_name}_y"]- proximal_z = skeleton_data_dictionary[f"{proximal_joint_name}_z"]-- distal_x = skeleton_data_dictionary[f"{distal_joint_name}_x"]- distal_y = skeleton_data_dictionary[f"{distal_joint_name}_y"]- distal_z = skeleton_data_dictionary[f"{distal_joint_name}_z"]-- # logger.debug(f"proximal_x nans: {np.isnan(proximal_x).sum()}")- # logger.debug(f"len proximal_x: {len(proximal_x)}")- # logger.debug(f"distal_x nans: {np.isnan(distal_x).sum()}")- # logger.debug(f"len distal_x: {len(distal_x)}")-- # good ol pythag <3- segment_length_per_frame = np.sqrt(- (proximal_x - distal_x) ** 2 + (proximal_y - distal_y) ** 2 + (proximal_z - distal_z) ** 2- )- skeleton_segment_lengths_dict[segment_name] = {}- skeleton_segment_lengths_dict[segment_name]["median"] = np.nanmedian(segment_length_per_frame)- skeleton_segment_lengths_dict[segment_name]["mean"] = np.nanmean(segment_length_per_frame)- skeleton_segment_lengths_dict[segment_name]["standard_deviation"] = np.nanstd(segment_length_per_frame)-- return skeleton_segment_lengths_dict---def create_virtual_markers(skeleton_data_dictionary, virtual_marker_name: str, marker_name_list: list) -> dict:- # print(- # f"Creating virtual marker '{virtual_marker_name}' from markers: {marker_name_list}"- # )-- x = []- y = []- z = []-- for marker_name in marker_name_list:- x.append(skeleton_data_dictionary[f"{marker_name}_x"])- y.append(skeleton_data_dictionary[f"{marker_name}_y"])- z.append(skeleton_data_dictionary[f"{marker_name}_z"])-- skeleton_data_dictionary[f"{virtual_marker_name}_x"] = np.nanmean(np.asarray(x), axis=0)- skeleton_data_dictionary[f"{virtual_marker_name}_y"] = np.nanmean(np.asarray(y), axis=0)- skeleton_data_dictionary[f"{virtual_marker_name}_z"] = np.nanmean(np.asarray(z), axis=0)-- return skeleton_data_dictionary---def create_skeleton_dictionary_from_skeleton_body_data_frame(- skeleton_body_dataframe: pd.DataFrame,-) -> dict:- skeleton_data_dictionary = skeleton_body_dataframe.to_dict(orient="list")-- for key, value in skeleton_data_dictionary.items():- skeleton_data_dictionary[key] = np.asarray(value)-- skeleton_data_dictionary = create_virtual_markers(- skeleton_data_dictionary, "hips_center", ["left_hip", "right_hip"]- )- skeleton_data_dictionary = create_virtual_markers(- skeleton_data_dictionary, "neck_center", ["left_shoulder", "right_shoulder"]- )- skeleton_data_dictionary = create_virtual_markers(- skeleton_data_dictionary, "head_center", ["left_ear", "right_ear"]- )-- skeleton_data_dictionary = create_virtual_markers(- skeleton_data_dictionary, "chest_center", ["hips_center", "neck_center"]- )- return skeleton_data_dictionary---if __name__ == "__main__":- path_to_skeleton_body_csv = Path(- r"D:\Dropbox\FreeMoCapProject\teddy_animation\FreeMocap_Data\sesh_2022-10-09_13_55_45_calib_and_take_1_alpha\output_data\mediapipe_body_3d_xyz.csv"- )- skeleton_dataframe = pd.read_csv(path_to_skeleton_body_csv)-- skeleton_segment_lengths = estimate_skeleton_segment_lengths(- skeleton_dataframe, mediapipe_skeleton_segment_definitions- )-- print(skeleton_segment_lengths)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 b4859827..04cc5328 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@@ -135,7 +135,6 @@ def process_recording_folder(skel3d_frame_marker_xyz=skel3d_frame_marker_xyz,segment_COM_frame_imgPoint_XYZ=anatomical_data_dict["segment_COM"],totalBodyCOM_frame_XYZ=anatomical_data_dict["total_body_COM"],- skeleton_segment_lengths_dict=anatomical_data_dict["skeleton_segment_lengths"],processing_parameters=recording_processing_parameter_model,queue=logging_queue,)diff --git a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/anatomical_data_pipeline_functions.py b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/anatomical_data_pipeline_functions.pyindex f783e9ba..2bf721bb 100644--- a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/anatomical_data_pipeline_functions.py+++ b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/anatomical_data_pipeline_functions.py@@ -1,21 +1,13 @@import loggingimport multiprocessing-from pathlib import Pathfrom typing import Dictimport numpy as np-import pandas as pdfrom freemocap.core_processes.detecting_things_in_2d_images.mediapipe_stuff.convert_mediapipe_npy_to_csv import (convert_mediapipe_npy_to_csv,)--from freemocap.core_processes.post_process_skeleton_data.estimate_skeleton_segment_lengths import (- estimate_skeleton_segment_lengths,- mediapipe_skeleton_segment_definitions,-)from freemocap.core_processes.post_process_skeleton_data.calculate_center_of_mass import run_center_of_mass_calculationsfrom freemocap.data_layer.recording_models.post_processing_parameter_models import ProcessingParameterModelfrom freemocap.system.logging.queue_logger import DirectQueueHandler-from freemocap.system.paths_and_filenames.file_and_folder_names import MEDIAPIPE_BODY_3D_DATAFRAME_CSV_FILE_NAMEfrom freemocap.system.logging.configure_logging import log_view_logging_format_stringlogger = logging.getLogger(__name__)@@ -41,20 +33,7 @@ def calculate_anatomical_data(output_data_folder_path=processing_parameters.recording_info_model.output_data_folder_path,) # TODO: separate functionality of splitting into CSVs and savings to disk- path_to_skeleton_body_csv = (- Path(processing_parameters.recording_info_model.output_data_folder_path)- / MEDIAPIPE_BODY_3D_DATAFRAME_CSV_FILE_NAME- )- skeleton_dataframe = pd.read_csv(path_to_skeleton_body_csv)-- logger.info("Estimating skeleton segment lengths...")- skeleton_segment_lengths_dict = estimate_skeleton_segment_lengths(- skeleton_dataframe=skeleton_dataframe,- skeleton_segment_definitions=mediapipe_skeleton_segment_definitions,- )-return {"segment_COM": segment_COM_frame_imgPoint_XYZ,"total_body_COM": totalBodyCOM_frame_XYZ,- "skeleton_segment_lengths": skeleton_segment_lengths_dict,}diff --git a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/data_saving_pipeline_functions.py b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/data_saving_pipeline_functions.pyindex 1b835e80..83a1b6f8 100644--- a/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/data_saving_pipeline_functions.py+++ b/freemocap/core_processes/process_motion_capture_videos/processing_pipeline_functions/data_saving_pipeline_functions.py@@ -26,7 +26,6 @@ def save_data(skel3d_frame_marker_xyz: np.ndarray,segment_COM_frame_imgPoint_XYZ: np.ndarray,totalBodyCOM_frame_XYZ: np.ndarray,- skeleton_segment_lengths_dict: dict,processing_parameters: ProcessingParameterModel,queue: multiprocessing.Queue,):@@ -58,12 +57,6 @@ def save_data(save_directory=Path(path_to_folder_where_we_will_save_this_data) / CENTER_OF_MASS_FOLDER_NAME,)- save_dictionary_to_json(- save_path=processing_parameters.recording_info_model.output_data_folder_path,- file_name="mediapipe_skeleton_segment_lengths.json",- dictionary=skeleton_segment_lengths_dict,- )-save_dictionary_to_json(save_path=processing_parameters.recording_info_model.output_data_folder_path,file_name="mediapipe_names_and_connections_dict.json",diff --git a/freemocap/data_layer/data_saver/data_loader.py b/freemocap/data_layer/data_saver/data_loader.pyindex 6e99c611..fc07ed70 100644--- a/freemocap/data_layer/data_saver/data_loader.py+++ b/freemocap/data_layer/data_saver/data_loader.py@@ -49,7 +49,7 @@ class DataLoader:self._load_data_frames()self._load_full_npy_data()self._load_center_of_mass_data()- self._load_segment_lengths()+ # self._load_segment_lengths()self._load_names_and_connections()self._load_skeleton_schema()self._validate_data()@@ -118,9 +118,9 @@ class DataLoader:with open(self._output_folder_path / "mediapipe_names_and_connections_dict.json", "r") as file:self.names_and_connections = json.loads(file.read())- def _load_segment_lengths(self):- with open(self._output_folder_path / "mediapipe_skeleton_segment_lengths.json", "r") as file:- self.segment_lengths = json.loads(file.read())+ # def _load_segment_lengths(self):+ # with open(self._output_folder_path / "mediapipe_skeleton_segment_lengths.json", "r") as file:+ # self.segment_lengths = json.loads(file.read())def load_frame_data(self, frame_number: int) -> FrameData:return FrameData(diff --git a/freemocap/data_layer/data_saver/data_models.py b/freemocap/data_layer/data_saver/data_models.pyindex fe49a402..c17070f7 100644--- a/freemocap/data_layer/data_saver/data_models.py+++ b/freemocap/data_layer/data_saver/data_models.py@@ -113,7 +113,7 @@ class InfoDict(BaseModel):A dictionary of information about this recording, such as the measured segement lengths and the schemas that we can use to interpret the tracked points (i.e./e.g. how to connect the dots of skeleton)"""- segment_lengths: Dict[str, Any] = Field(default_factory=dict, description="The lengths of the segments of the body")+ # segment_lengths: Dict[str, Any] = Field(default_factory=dict, description="The lengths of the segments of the body")schemas: List[BaseModel] = Field(default_factory=list, description="The schemas for the tracked points")diff --git a/freemocap/data_layer/data_saver/data_saver.py b/freemocap/data_layer/data_saver/data_saver.pyindex 7401b09f..1e35cb78 100644--- a/freemocap/data_layer/data_saver/data_saver.py+++ b/freemocap/data_layer/data_saver/data_saver.py@@ -99,7 +99,7 @@ class DataSaver:def _get_info_dict(self):return InfoDict(- segment_lengths=self._data_loader.segment_lengths,+ # segment_lengths=self._data_loader.segment_lengths,schemas=[self._data_loader.skeleton_schema.dict()],)