sports2d 0.6.3__py3-none-any.whl → 0.7.2__py3-none-any.whl

Sports2D/Demo/Config_demo.toml

@@ -18,10 +18,10 @@ video_input = 'demo.mp4'   # 'webcam' or '<video_path.ext>', or ['video1_path.mp
 px_to_m_from_person_id = 2    # Person to use for pixels to meters conversion (not used if a calibration file is provided)
 px_to_m_person_height = 1.65  # Height of the reference person in meters (for pixels -> meters conversion). 
 visible_side = ['front', 'none', 'auto']  # Choose visible side among ['right', 'left', 'front', 'back', 'auto', 'none']. String or list of strings.
-               # if 'auto', will be either 'left', 'right', or 'front' depending on the direction of the motion
-               # if 'none', no processing will be performed on the corresponding person
+                  # if 'auto', will be either 'left', 'right', or 'front' depending on the direction of the motion
+                  # if 'none', coordinates will be left in 2D rather than 3D
 load_trc_px = ''  # If you do not want to recalculate pose, load it from a trc file (in px, not in m)
-compare = false      # Not implemented yet
+compare = false   # Not implemented yet
 
 # Video parameters
 time_range = []   # [] for the whole video, or [start_time, end_time] (in seconds), or [[start_time1, end_time1], [start_time2, end_time2], ...]
@@ -53,7 +53,16 @@ result_dir = '' # If empty, project dir is current dir
 slowmo_factor = 1       # 1 for normal speed. For a video recorded at 240 fps and exported to 30 fps, it would be 240/30 = 8
 
 # Pose detection parameters
-pose_model = 'Body_with_feet'  #With RTMLib: Body_with_feet (default HALPE_26 model), Whole_body (COCO_133: body + feet + hands), Body (COCO_17), CUSTOM (see example at the end of the file), or any from skeletons.py
+pose_model = 'Body_with_feet'  #With RTMLib: 
+                         # - Body_with_feet (default HALPE_26 model), 
+                         # - Whole_body_wrist (COCO_133_WRIST: body + feet + 2 hand_points), 
+                         # - Whole_body (COCO_133: body + feet + hands), 
+                         # - Body (COCO_17). Marker augmentation won't work, Kinematic analysis will work,
+                         # - Hand (HAND_21, only lightweight mode. Potentially better results with Whole_body), 
+                         # - Face (FACE_106), 
+                         # - Animal (ANIMAL2D_17)
+                         # /!\ Only RTMPose is natively embeded in Pose2Sim. For all other pose estimation methods, you will have to run them yourself, and then refer to the documentation to convert the output files if needed
+                         # /!\ For Face and Animal, use mode="""{dictionary}""", and find the corresponding .onnx model there https://github.com/open-mmlab/mmpose/tree/main/projects/rtmpose
 mode = 'balanced' # 'lightweight', 'balanced', 'performance', or """{dictionary}""" (see below)
 
 # A dictionary (WITHIN THREE DOUBLE QUOTES) allows you to manually select the person detection (if top_down approach) and/or pose estimation models (see https://github.com/Tau-J/rtmlib). 
@@ -81,7 +90,7 @@ det_frequency = 4       # Run person detection only every N frames, and inbetwee
 device = 'auto' # 'auto', 'CPU', 'CUDA', 'MPS', 'ROCM'
 backend = 'auto' # 'auto', 'openvino', 'onnxruntime', 'opencv'
 tracking_mode = 'sports2d' # 'sports2d' or 'deepsort'. 'deepsort' is slower but more robust in difficult configurations
-deepsort_params = """{'max_age':30, 'n_init':3, 'max_cosine_distance':0.3, 'max_iou_distance':0.8, 'embedder_gpu': True, embedder':'torchreid'}""" # """{dictionary between 3 double quotes}"""
+# deepsort_params = """{'max_age':30, 'n_init':3, 'max_cosine_distance':0.3, 'max_iou_distance':0.8, 'embedder_gpu': True, embedder':'torchreid'}""" # """{dictionary between 3 double quotes}"""
                   # More robust in crowded scenes but tricky to parametrize. More information there: https://github.com/levan92/deep_sort_realtime/blob/master/deep_sort_realtime/deepsort_tracker.py#L51
                   # Requires `pip install torch torchvision torchreid gdown tensorboard`
 
@@ -105,11 +114,6 @@ xy_origin = ['auto']    # ['auto'] or [px_x,px_y]. N.B.: px_y points downwards.
 # If conversion from a calibration file
 calib_file = ''         # Calibration in the Pose2Sim format. 'calib_demo.toml', or '' if not available
 
-fastest_frames_to_remove_percent = 0.1 # Frames with high speed are considered as outliers
-close_to_zero_speed_px = 50 # Sum for all keypoints: about 50 px/frame or 0.2 m/frame
-large_hip_knee_angles = 45 # Hip and knee angles below this value are considered as imprecise
-trimmed_extrema_percent = 0.5 # Proportion of the most extreme segment values to remove before calculating their mean)
-
 
 [angles]
 display_angle_values_on = ['body', 'list'] # 'body', 'list', ['body', 'list'], 'none'. Display angle values on the body, as a list in the upper left of the image, both, or do not display them.
@@ -147,19 +151,21 @@ filter_type = 'butterworth'   # butterworth, gaussian, LOESS, median
 
 
 [kinematics]
-do_ik = false # Do scaling and inverse kinematics?
+do_ik = true # Do scaling and inverse kinematics?
 use_augmentation = true  # true or false (lowercase) # Set to true if you want to use the model with augmented markers
 use_contacts_muscles = true # true or false (lowercase) # If true, contact spheres and muscles are added to the model
-
-osim_setup_path = '../OpenSim_setup' # Path to the OpenSim setup folder
+participant_mass = [67.0, 55.0] # kg # defaults to 70 if not provided. No influence on kinematics (motion), only on kinetics (forces)
 right_left_symmetry = true # true or false (lowercase) # Set to false only if you have good reasons to think the participant is not symmetrical (e.g. prosthetic limb)
-# default_height = 1.7 # meters # If automatic height calculation did not work, this value is used to scale the model
-remove_individual_scaling_setup = true # true or false (lowercase) # If true, the individual scaling setup files are removed to avoid cluttering
-remove_individual_ik_setup = true # true or false (lowercase) # If true, the individual IK setup files are removed to avoid cluttering
+
+# Choosing best frames to scale the model
+default_height = 1.7 # meters # If automatic height calculation did not work, this value is used to scale the model
 fastest_frames_to_remove_percent = 0.1 # Frames with high speed are considered as outliers
-close_to_zero_speed_m = 0.2 # Sum for all keypoints: about 50 px/frame or 0.2 m/frame
+close_to_zero_speed_px = 50 # Sum for all keypoints: about 50 px/frame
+close_to_zero_speed_m = 0.2 # Sum for all keypoints: 0.2 m/frame
 large_hip_knee_angles = 45 # Hip and knee angles below this value are considered as imprecise
 trimmed_extrema_percent = 0.5 # Proportion of the most extreme segment values to remove before calculating their mean)
+remove_individual_scaling_setup = true # true or false (lowercase) # If true, the individual scaling setup files are removed to avoid cluttering
+remove_individual_ik_setup = true # true or false (lowercase) # If true, the individual IK setup files are removed to avoid cluttering
 
 
 [logging]

Sports2D/Sports2D.py

@@ -124,7 +124,7 @@ from Sports2D import Sports2D
 DEFAULT_CONFIG =   {'project': {'video_input': ['demo.mp4'],
                                 'px_to_m_from_person_id': 2,
                                 'px_to_m_person_height': 1.65,
-                                'visible_side': ['front', 'auto'],
+                                'visible_side': ['front', 'none', 'auto'],
                                 'load_trc_px': '',
                                 'compare': False,
                                 'time_range': [],
@@ -159,11 +159,7 @@ DEFAULT_CONFIG =   {'project': {'video_input': ['demo.mp4'],
                                 'calib_file': '',
                                 'floor_angle': 'auto',
                                 'xy_origin': ['auto'],
-                                'save_calib': True,
-                                'fastest_frames_to_remove_percent': 0.1,
-                                'close_to_zero_speed_px': 50,
-                                'large_hip_knee_angles': 45,
-                                'trimmed_extrema_percent': 0.5
+                                'save_calib': True
                                 },
                     'angles':   {'display_angle_values_on': ['body', 'list'],
                                 'fontSize': 0.3,
@@ -209,12 +205,14 @@ DEFAULT_CONFIG =   {'project': {'video_input': ['demo.mp4'],
                                         },
                     'kinematics':{'do_ik': False,
                                           'use_augmentation': False,
-                                          'use_contacts_muscles': False,
+                                          'use_contacts_muscles': True,
+                                          'participant_mass': [67.0, 55.0], 
                                           'right_left_symmetry': True,
                                           'default_height': 1.70,
                                           'remove_individual_scaling_setup': True,
                                           'remove_individual_ik_setup': True,
                                           'fastest_frames_to_remove_percent': 0.1,
+                                          'close_to_zero_speed_px': 50,
                                           'close_to_zero_speed_m': 0.2,
                                           'large_hip_knee_angles': 45,
                                           'trimmed_extrema_percent': 0.5,
@@ -226,7 +224,7 @@ DEFAULT_CONFIG =   {'project': {'video_input': ['demo.mp4'],
 CONFIG_HELP =   {'config': ["C", "path to a toml configuration file"],
                 'video_input': ["i", "webcam, or video_path.mp4, or video1_path.avi video2_path.mp4 ... Beware that images won't be saved if paths contain non ASCII characters"],
                 'px_to_m_person_height': ["H", "height of the person in meters. 1.70 if not specified"],
-                'visible_side': ["", "front, back, left, right, auto, or none. 'front auto' if not specified. If 'auto', will be either left or right depending on the direction of the motion. If 'none', no IK for this person"],
+                'visible_side': ["", "front, back, left, right, auto, or none. 'front none auto' if not specified. If 'auto', will be either left or right depending on the direction of the motion. If 'none', no IK for this person"],
                 'load_trc_px': ["", "load trc file to avaid running pose estimation again. false if not specified"],
                 'compare': ["", "visually compare motion with trc file. false if not specified"],
                 'webcam_id': ["w", "webcam ID. 0 if not specified"],
@@ -260,6 +258,7 @@ CONFIG_HELP =   {'config': ["C", "path to a toml configuration file"],
                 'do_ik': ["", "do inverse kinematics. false if not specified"],
                 'use_augmentation': ["", "Use LSTM marker augmentation. false if not specified"],
                 'use_contacts_muscles': ["", "Use model with contact spheres and muscles. false if not specified"],
+                'participant_mass': ["", "mass of the participant in kg or none. Defaults to 70 if not provided. No influence on kinematics (motion), only on kinetics (forces)"],
                 'close_to_zero_speed_m': ["","Sum for all keypoints: about 50 px/frame or 0.2 m/frame"], 
                 'multiperson': ["", "multiperson involves tracking: will be faster if set to false. true if not specified"],
                 'tracking_mode': ["", "sports2d or rtmlib. sports2d is generally much more accurate and comparable in speed. sports2d if not specified"],
@@ -270,10 +269,6 @@ CONFIG_HELP =   {'config': ["C", "path to a toml configuration file"],
                 'keypoint_likelihood_threshold': ["", "detected keypoints are not retained if likelihood is below this threshold. 0.3 if not specified"],
                 'average_likelihood_threshold': ["", "detected persons are not retained if average keypoint likelihood is below this threshold. 0.5 if not specified"],
                 'keypoint_number_threshold': ["", "detected persons are not retained if number of detected keypoints is below this threshold. 0.3 if not specified, i.e., i.e., 30 percent"],
-                'fastest_frames_to_remove_percent': ["", "Frames with high speed are considered as outliers. Defaults to 0.1"],
-                'close_to_zero_speed_px': ["", "Sum for all keypoints: about 50 px/frame or 0.2 m/frame. Defaults to 50"],
-                'large_hip_knee_angles': ["", "Hip and knee angles below this value are considered as imprecise. Defaults to 45"],
-                'trimmed_extrema_percent': ["", "Proportion of the most extreme segment values to remove before calculating their mean. Defaults to 50"],
                 'fontSize': ["", "font size for angle values. 0.3 if not specified"],
                 'flip_left_right': ["", "true or false. true to get consistent angles with people facing both left and right sides. Set it to false if you want timeseries to be continuous even when the participent switches their stance. true if not specified"],
                 'correct_segment_angles_with_floor_angle': ["", "true or false. If the camera is tilted, corrects segment angles as regards to the floor angle. Set to false is the floor is tilted instead. True if not specified"],
@@ -293,7 +288,8 @@ CONFIG_HELP =   {'config': ["C", "path to a toml configuration file"],
                 'remove_individual_scaling_setup': ["", "remove individual scaling setup files generated during scaling. true if not specified"],
                 'remove_individual_ik_setup': ["", "remove individual IK setup files generated during IK. true if not specified"],
                 'fastest_frames_to_remove_percent': ["", "Frames with high speed are considered as outliers. Defaults to 0.1"],
-                'close_to_zero_speed_m': ["","Sum for all keypoints: about 50 px/frame or 0.2 m/frame"],
+                'close_to_zero_speed_m': ["","Sum for all keypoints: about 0.2 m/frame. Defaults to 0.2"],
+                'close_to_zero_speed_px': ["", "Sum for all keypoints: about 50 px/frame. Defaults to 50"],
                 'large_hip_knee_angles': ["", "Hip and knee angles below this value are considered as imprecise and ignored. Defaults to 45"],
                 'trimmed_extrema_percent': ["", "Proportion of the most extreme segment values to remove before calculating their mean. Defaults to 50"],
                 'use_custom_logging': ["", "use custom logging. false if not specified"]

Sports2D/Utilities/common.py

@@ -22,6 +22,7 @@ import subprocess
 from pathlib import Path
 import itertools as it
 import logging
+from collections import defaultdict
 from anytree import PreOrderIter
 
 import numpy as np
@@ -32,9 +33,9 @@ import cv2
 import c3d
 
 import matplotlib.pyplot as plt
-from PyQt5.QtWidgets import QMainWindow, QApplication, QWidget, QTabWidget, QVBoxLayout
 from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
 from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as NavigationToolbar
+from PyQt5.QtWidgets import QMainWindow, QApplication, QWidget, QTabWidget, QVBoxLayout
 
 
 ## AUTHORSHIP INFORMATION
@@ -64,7 +65,7 @@ angle_dict = { # lowercase!
     'right elbow': [['RWrist', 'RElbow', 'RShoulder'], 'flexion', 180, -1],
     'left elbow': [['LWrist', 'LElbow', 'LShoulder'], 'flexion', 180, -1],
     'right wrist': [['RElbow', 'RWrist', 'RIndex'], 'flexion', -180, 1],
-    'left wrist': [['LElbow', 'LIndex', 'LWrist'], 'flexion', -180, 1],
+    'left wrist': [['LElbow', 'LWrist', 'LIndex'], 'flexion', -180, 1],
 
     # segment angles
     'right foot': [['RBigToe', 'RHeel'], 'horizontal', 0, -1],
@@ -97,18 +98,18 @@ marker_Z_positions = {'right':
                         "LHip": 0.105, "LKnee": 0.0886, "LAnkle": 0.0972, "LBigToe":0.0766, "LHeel":0.0883, "LSmallToe": 0.1200, 
                         "LShoulder": 0.2016, "LElbow": 0.1613, "LWrist": 0.120, "LThumb": 0.1625, "LIndex": 0.1735, "LPinky": 0.1740, "LEye": 0.0311, 
                         "Hip": 0.0, "Neck": 0.0, "Head":0.0, "Nose": 0.0},
-                    'front':
-                        {"RHip": 0.0301, "RKnee": 0.0179, "RAnkle": 0.0230, "RBigToe": 0.2179, "RHeel": -0.0119, "RSmallToe": 0.1804, 
-                        "RShoulder": -0.01275, "RElbow": 0.0119, "RWrist": 0.0002, "RThumb": 0.0106, "RIndex": -0.0004, "RPinky": -0.0009, "REye": 0.0702, 
-                        "LHip": -0.0301, "LKnee": -0.0179, "LAnkle": 0.0230, "LBigToe": 0.2179, "LHeel": -0.0119, "LSmallToe": 0.1804, 
-                        "LShoulder": 0.01275, "LElbow": -0.0119, "LWrist": -0.0002, "LThumb": -0.0106, "LIndex": 0.0004, "LPinky": 0.0009, "LEye": -0.0702, 
-                        "Hip": 0.0301, "Neck": -0.0008, "Head": 0.0655, "Nose": 0.1076},
+                    'front': # original knee:0.0179
+                        {"RHip": 0.0301, "RKnee": 0.129, "RAnkle": 0.0230, "RBigToe": 0.2179, "RHeel": -0.0119, "RSmallToe": 0.1804, 
+                        "RShoulder": -0.01275, "RElbow": 0.0702, "RWrist": 0.1076, "RThumb": 0.0106, "RIndex": -0.0004, "RPinky": -0.0009, "REye": 0.0702, 
+                        "LHip": 0.0301, "LKnee": 0.129, "LAnkle": 0.0230, "LBigToe": 0.2179, "LHeel": -0.0119, "LSmallToe": 0.1804, 
+                        "LShoulder": -0.01275, "LElbow": 0.0702, "LWrist": 0.1076, "LThumb": 0.0106, "LIndex": -0.0004, "LPinky": -0.0009, "LEye": 0.0702, 
+                        "Hip": 0.0301, "Neck": 0.0008, "Head": 0.0655, "Nose": 0.1076},
                     'back':
-                        {"RHip": -0.0301, "RKnee": -0.0179, "RAnkle": -0.0230, "RBigToe": -0.2179, "RHeel": 0.0119, "RSmallToe": -0.1804, 
-                        "RShoulder": 0.01275, "RElbow": -0.0119, "RWrist": -0.0002, "RThumb": -0.0106, "RIndex": 0.0004, "RPinky": 0.0009, "REye": -0.0702, 
-                        "LHip": 0.0301, "LKnee": 0.0179, "LAnkle": -0.0230, "LBigToe": -0.2179, "LHeel": 0.0119, "LSmallToe": -0.1804, 
-                        "LShoulder": -0.01275, "LElbow": 0.0119, "LWrist": 0.0002, "LThumb": 0.0106, "LIndex": -0.0004, "LPinky": -0.0009, "LEye": 0.0702, 
-                        "Hip": 0.0301, "Neck": -0.0008, "Head": -0.0655, "Nose": 0.1076},
+                        {"RHip": -0.0301, "RKnee": -0.129, "RAnkle": -0.0230, "RBigToe": -0.2179, "RHeel": 0.0119, "RSmallToe": -0.1804, 
+                        "RShoulder": 0.01275, "RElbow": 0.0702, "RWrist": -1076.0002, "RThumb": -0.0106, "RIndex": 0.0004, "RPinky": 0.0009, "REye": -0.0702, 
+                        "LHip": -0.0301, "LKnee": -0.129, "LAnkle": -0.0230, "LBigToe": -0.2179, "LHeel": 0.0119, "LSmallToe": -0.1804, 
+                        "LShoulder": 0.01275, "LElbow": 0.0702, "LWrist": -0.1076, "LThumb": -0.0106, "LIndex": 0.0004, "LPinky": 0.0009, "LEye": -0.0702, 
+                        "Hip": -0.0301, "Neck": -0.0008, "Head": -0.0655, "Nose": -0.1076},
             }
 
 colors = [(255, 0, 0), (0, 0, 255), (255, 255, 0), (255, 0, 255), (0, 255, 255), (0, 0, 0), (255, 255, 255),
@@ -170,6 +171,15 @@ class plotWindow():
         self.app.exec_()
         
 ## FUNCTIONS
+def to_dict(d):
+    '''
+    Convert a defaultdict to a dict.
+    '''
+    if isinstance(d, defaultdict):
+        return {k: to_dict(v) for k, v in d.items()}
+    return d
+
+
 def read_trc(trc_path):
     '''
     Read a TRC file and extract its contents.
@@ -575,7 +585,7 @@ def add_neck_hip_coords(kpt_name, p_X, p_Y, p_scores, kpt_ids, kpt_names):
     return p_X, p_Y, p_scores
 
 
-def best_coords_for_measurements(Q_coords, keypoints_names, fastest_frames_to_remove_percent=0.2, close_to_zero_speed=0.2, large_hip_knee_angles=45):
+def best_coords_for_measurements(Q_coords, keypoints_names, beginning_frames_to_remove_percent=0.2, end_frames_to_remove_percent=0.2, fastest_frames_to_remove_percent=0.2, close_to_zero_speed=0.2, large_hip_knee_angles=45):
     '''
     Compute the best coordinates for measurements, after removing:
     - 20% fastest frames (may be outliers)
@@ -585,6 +595,8 @@ def best_coords_for_measurements(Q_coords, keypoints_names, fastest_frames_to_re
     INPUTS:
     - Q_coords: pd.DataFrame. The XYZ coordinates of each marker
     - keypoints_names: list. The list of marker names
+    - beginning_frames_to_remove_percent: float
+    - end_frames_to_remove_percent: float
     - fastest_frames_to_remove_percent: float
     - close_to_zero_speed: float (sum for all keypoints: about 50 px/frame or 0.2 m/frame)
     - large_hip_knee_angles: int
@@ -607,6 +619,9 @@ def best_coords_for_measurements(Q_coords, keypoints_names, fastest_frames_to_re
         Q_coords = pd.concat((Q_coords.reset_index(drop=True), df_Hip), axis=1)
     n_markers = len(keypoints_names)
 
+    # Removing first and last frames
+    # Q_coords = Q_coords.iloc[int(len(Q_coords) * beginning_frames_to_remove_percent):int(len(Q_coords) * (1-end_frames_to_remove_percent))]
+
     # Using 80% slowest frames
     sum_speeds = pd.Series(np.nansum([np.linalg.norm(Q_coords.iloc[:,kpt:kpt+3].diff(), axis=1) for kpt in range(n_markers)], axis=0))
     sum_speeds = sum_speeds[sum_speeds>close_to_zero_speed] # Removing when speeds close to zero (out of frame)

Sports2D/Utilities/skeletons.py

@@ -643,7 +643,6 @@ FACE_106 = Node("root", id=None, children=[
     ]),
 ])
 
-
 '''ANIMAL2D_17 (full-body animal)
 https://github.com/AlexTheBad/AP-10K/'''
 ANIMAL2D_17 = Node("Hip", id=4, children=[

Sports2D/Utilities/tests.py

@@ -58,13 +58,23 @@ def test_workflow():
     demo_cmd = ["sports2d", "--show_realtime_results", "False", "--show_graphs", "False"]
     subprocess.run(demo_cmd, check=True, capture_output=True, text=True, encoding='utf-8')
 
-    # With no pixels to meters conversion, no multiperson, lightweight mode, detection frequency, time range and slowmo factor
-    demo_cmd2 = ["sports2d", "--to_meters", "False", "--multiperson", "False", "--mode", "lightweight", "--det_frequency", "50", "--time_range", "1.2", "2.7",  "--slowmo_factor", "4", "--show_realtime_results", "False", "--show_graphs", "False"]
+    # With no pixels to meters conversion, no multiperson, lightweight mode, detection frequency, slowmo factor, gaussian filter, RTMO body pose model
+    demo_cmd2 = ["sports2d", "--show_realtime_results", "False", "--show_graphs", "False", 
+                 "--to_meters", "False", 
+                 "--multiperson", "False", 
+                 "--mode", "lightweight", "--det_frequency", "50", 
+                 "--slowmo_factor", "4",
+                 "--filter_type", "gaussian",
+                 "--pose_model", "body", "--mode", """{'pose_class':'RTMO', 'pose_model':'https://download.openmmlab.com/mmpose/v1/projects/rtmo/onnx_sdk/rtmo-m_16xb16-600e_body7-640x640-39e78cc4_20231211.zip', 'pose_input_size':[640, 640]}"""]
     subprocess.run(demo_cmd2, check=True, capture_output=True, text=True, encoding='utf-8')
     
-    # With inverse kinematics, body pose_model and custom RTMO mode
-    # demo_cmd3 = ["sports2d", "--do_ik", "--person_orientation", "front none left", "--pose_model", "body", "--mode", "{'pose_class':'RTMO', 'pose_model':'https://download.openmmlab.com/mmpose/v1/projects/rtmo/onnx_sdk/rtmo-m_16xb16-600e_body7-640x640-39e78cc4_20231211.zip', 'pose_input_size':[640, 640]}", "--show_realtime_results", "False", "--show_graphs", "False"]
-    # subprocess.run(demo_cmd3, check=True, capture_output=True, text=True)
+    # With a time range, inverse kinematics, marker augmentation, body pose_model and custom RTMO mode
+    demo_cmd3 = ["sports2d", "--show_realtime_results", "False", "--show_graphs", "False",
+                 "--time_range", "1.2", "2.7",
+                 "--do_ik", "True", "--use_augmentation", "True", 
+                 "--px_to_m_from_person_id", "1", "--px_to_m_person_height", "1.65",
+                 "--visible_side", "front", "auto", "--participant_mass", "55.0", "67.0"]
+    subprocess.run(demo_cmd3, check=True, capture_output=True, text=True, encoding='utf-8')
     
     # From config file
     cli_config_path = Path(__file__).resolve().parent.parent / 'Demo' / 'Config_demo.toml'
@@ -72,6 +82,5 @@ def test_workflow():
     cli_video_dir = Path(__file__).resolve().parent.parent / 'Demo'
     config_dict.get("project").update({"video_dir": str(cli_video_dir)})
     with open(cli_config_path, 'w') as f: toml.dump(config_dict, f)
-
     demo_cmd4 = ["sports2d", "--config", str(cli_config_path), "--show_realtime_results", "False", "--show_graphs", "False"]
     subprocess.run(demo_cmd4, check=True, capture_output=True, text=True, encoding='utf-8')

Sports2D/process.py

@@ -56,10 +56,13 @@ import sys
 import logging
 import json
 import ast
+import shutil
+import os
 from functools import partial
 from datetime import datetime
 import itertools as it
 from tqdm import tqdm
+from collections import defaultdict
 from anytree import RenderTree
 
 import numpy as np
@@ -69,11 +72,14 @@ import matplotlib as mpl
 import matplotlib.pyplot as plt
 from rtmlib import PoseTracker, BodyWithFeet, Wholebody, Body, Custom
 from deep_sort_realtime.deepsort_tracker import DeepSort
+import opensim as osim
 
 from Sports2D.Utilities import filter
 from Sports2D.Utilities.common import *
 from Sports2D.Utilities.skeletons import *
 
+DEFAULT_MASS = 70
+DEFAULT_HEIGHT = 1.7
 
 ## AUTHORSHIP INFORMATION
 __author__ = "David Pagnon, HunMin Kim"
@@ -592,8 +598,8 @@ def load_pose_file(Q_coords):
     - scores_all: np.array. The scores in the format (Nframes, 1, Nmarkers)
     '''
 
-    Z_cols = [3*i+2 for i in range(len(Q_coords.columns)//3)]
-    Q_coords_xy = Q_coords.drop(Q_coords.columns[Z_cols], axis=1)
+    Z_cols = np.array([[3*i,3*i+1] for i in range(len(Q_coords.columns)//3)]).ravel()
+    Q_coords_xy = Q_coords.iloc[:,Z_cols]
     kpt_number = len(Q_coords_xy.columns)//2
 
     # shape (Nframes, 2*Nmarkers) --> (Nframes, 1, Nmarkers, 2)
@@ -619,7 +625,7 @@ def trc_data_from_XYZtime(X, Y, Z, time):
     '''
 
     trc_data = pd.concat([pd.concat([X.iloc[:,kpt], Y.iloc[:,kpt], Z.iloc[:,kpt]], axis=1) for kpt in range(len(X.columns))], axis=1)
-    trc_data.insert(0, 't', time)
+    trc_data.insert(0, 'time', time)
 
     return trc_data
 
@@ -922,6 +928,7 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
     px_to_m_from_person_id = int(config_dict.get('project').get('px_to_m_from_person_id'))
     px_to_m_person_height_m = config_dict.get('project').get('px_to_m_person_height')
     visible_side = config_dict.get('project').get('visible_side')
+    if isinstance(visible_side, str): visible_side = [visible_side]
     # Pose from file
     load_trc_px = config_dict.get('project').get('load_trc_px')
     if load_trc_px == '': load_trc_px = None
@@ -973,11 +980,6 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
     xy_origin = config_dict.get('px_to_meters_conversion').get('xy_origin') # ['auto'] or [x, y]    
     xy_origin = [float(o) for o in xy_origin] if xy_origin != ['auto'] else 'auto'
 
-    fastest_frames_to_remove_percent = config_dict.get('px_to_meters_conversion').get('fastest_frames_to_remove_percent')
-    large_hip_knee_angles = config_dict.get('px_to_meters_conversion').get('large_hip_knee_angles')
-    trimmed_extrema_percent = config_dict.get('px_to_meters_conversion').get('trimmed_extrema_percent')
-    close_to_zero_speed_px = config_dict.get('px_to_meters_conversion').get('close_to_zero_speed_px')
-
     keypoint_likelihood_threshold = config_dict.get('pose').get('keypoint_likelihood_threshold')
     average_likelihood_threshold = config_dict.get('pose').get('average_likelihood_threshold')
     keypoint_number_threshold = config_dict.get('pose').get('keypoint_number_threshold')
@@ -1010,23 +1012,6 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                            butterworth_filter_order, butterworth_filter_cutoff, frame_rate,
                            gaussian_filter_kernel, loess_filter_kernel, median_filter_kernel]
 
-    # Inverse kinematics settings
-    do_ik = config_dict.get('kinematics').get('do_ik')
-    use_augmentation = config_dict.get('kinematics').get('use_augmentation')
-    use_contacts_muscles = config_dict.get('kinematics').get('use_contacts_muscles')
-    
-    osim_setup_path = config_dict.get('kinematics').get('osim_setup_path')
-    right_left_symmetry = config_dict.get('kinematics').get('right_left_symmetry')
-    default_height = config_dict.get('kinematics').get('default_height')
-    remove_scaling_setup = config_dict.get('kinematics').get('remove_individual_scaling_setup')
-    remove_ik_setup = config_dict.get('kinematics').get('remove_individual_ik_setup')
-    fastest_frames_to_remove_percent = config_dict.get('kinematics').get('fastest_frames_to_remove_percent')
-    large_hip_knee_angles = config_dict.get('kinematics').get('large_hip_knee_angles')
-    trimmed_extrema_percent = config_dict.get('kinematics').get('trimmed_extrema_percent')
-    close_to_zero_speed = config_dict.get('kinematics').get('close_to_zero_speed_m')
-
-    if do_ik: from Pose2Sim import Pose2Sim
-
     # Create output directories
     if video_file == "webcam":
         current_date = datetime.now().strftime("%Y%m%d_%H%M%S")
@@ -1045,6 +1030,32 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
     if save_img:
         img_output_dir.mkdir(parents=True, exist_ok=True)
 
+    # Inverse kinematics settings
+    do_ik = config_dict.get('kinematics').get('do_ik')
+    use_augmentation = config_dict.get('kinematics').get('use_augmentation')
+    participant_masses = config_dict.get('kinematics').get('participant_mass')
+    participant_masses = participant_masses if isinstance(participant_masses, list) else [participant_masses]
+    fastest_frames_to_remove_percent = config_dict.get('kinematics').get('fastest_frames_to_remove_percent')
+    large_hip_knee_angles = config_dict.get('kinematics').get('large_hip_knee_angles')
+    trimmed_extrema_percent = config_dict.get('kinematics').get('trimmed_extrema_percent')
+    close_to_zero_speed_px = config_dict.get('kinematics').get('close_to_zero_speed_px')
+    close_to_zero_speed_m = config_dict.get('kinematics').get('close_to_zero_speed_m')
+    if do_ik:
+        from Pose2Sim.markerAugmentation import augment_markers_all
+        from Pose2Sim.kinematics import kinematics_all
+        # Create a Pose2Sim dictionary and fill in missing keys
+        recursivedict = lambda: defaultdict(recursivedict)
+        Pose2Sim_config_dict = recursivedict()
+        # Fill Pose2Sim dictionary (height and mass will be filled later)
+        Pose2Sim_config_dict['project']['project_dir'] = str(output_dir)
+        Pose2Sim_config_dict['markerAugmentation']['make_c3d'] = make_c3d
+        Pose2Sim_config_dict['kinematics'] = config_dict.get('kinematics')
+        # Temporarily recreate Pose2Sim file hierarchy
+        pose3d_dir = Path(output_dir) / 'pose-3d'
+        pose3d_dir.mkdir(parents=True, exist_ok=True)
+        kinematics_dir = Path(output_dir) / 'kinematics'
+        kinematics_dir.mkdir(parents=True, exist_ok=True)
+
 
     # Set up video capture
     if video_file == "webcam":
@@ -1067,7 +1078,11 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
         model_name = 'HALPE_26'
         ModelClass = BodyWithFeet # 26 keypoints(halpe26)
         logging.info(f"Using HALPE_26 model (body and feet) for pose estimation.")
-    elif pose_model.upper() in ('COCO_133', 'WHOLE_BODY', 'WHOLE_BODY_WRIST'):
+    elif pose_model.upper() == 'WHOLE_BODY_WRIST':
+        model_name = 'COCO_133_WRIST'
+        ModelClass = Wholebody
+        logging.info(f"Using COCO_133 model (body, feet, 2 hand points) for pose estimation.")
+    elif pose_model.upper() in ('COCO_133', 'WHOLE_BODY'):
         model_name = 'COCO_133'
         ModelClass = Wholebody
         logging.info(f"Using COCO_133 model (body, feet, hands, and face) for pose estimation.")
@@ -1113,12 +1128,18 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
             logging.error(f'\n{load_trc_px} file needs to be in px, not in meters.')
         logging.info(f'\nUsing a pose file instead of running pose estimation and tracking: {load_trc_px}.')
         # Load pose file in px
-        Q_coords, _, _, keypoints_names, _ = read_trc(load_trc_px)
+        Q_coords, _, time_col, keypoints_names, _ = read_trc(load_trc_px)
+
         keypoints_ids = [i for i in range(len(keypoints_names))]
         keypoints_all, scores_all = load_pose_file(Q_coords)
-        for pre, _, node in RenderTree(model_name):
+        for pre, _, node in RenderTree(pose_model):
             if node.name in keypoints_names:
                 node.id = keypoints_names.index(node.name)
+        if time_range:
+            frame_range = [abs(time_col - time_range[0]).idxmin(), abs(time_col - time_range[1]).idxmin()+1]
+        else:
+            frame_range = [0, len(Q_coords)]
+        frame_iterator = tqdm(range(*frame_range))
     
     else:
         # Retrieve keypoint names from model
@@ -1241,7 +1262,7 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                         person_X_flipped = flip_left_right_direction(person_X, L_R_direction_idx, keypoints_names, keypoints_ids)
                     else:
                         person_X_flipped = person_X.copy()
-                        
+                    
                     # Compute angles
                     person_angles = []
                     # Add Neck and Hip if not provided
@@ -1322,7 +1343,10 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
     all_frames_scores = make_homogeneous(all_frames_scores)
 
     frame_range = [0,frame_count] if video_file == 'webcam' else frame_range
-    all_frames_time = pd.Series(np.linspace(frame_range[0]/fps, frame_range[1]/fps, frame_count+1), name='time')
+    if not load_trc_px:
+        all_frames_time = pd.Series(np.linspace(frame_range[0]/fps, frame_range[1]/fps, frame_count-frame_range[0]+1), name='time')
+    else:
+        all_frames_time = time_col
     if not multiperson:
         px_to_m_from_person_id = get_personID_with_highest_scores(all_frames_scores)
         detected_persons = [px_to_m_from_person_id]
@@ -1343,7 +1367,7 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
 
             # Delete person if less than 4 valid frames
             pose_nan_count = len(np.where(all_frames_X_person.sum(axis=1)==0)[0])
-            if frame_count - pose_nan_count <= 4:
+            if frame_count - frame_range[0] - pose_nan_count <= 4:
                 trc_data_i = pd.DataFrame(0, index=all_frames_X_person.index, columns=np.array([[c]*3 for c in all_frames_X_person.columns]).flatten())
                 trc_data_i.insert(0, 't', all_frames_time)
                 trc_data.append(trc_data_i)
@@ -1411,6 +1435,7 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
             
 
         # Convert px to meters
+        trc_data_m = []
         if to_meters:
             logging.info('\nConverting pose to meters:')
             if px_to_m_from_person_id>=len(trc_data):
@@ -1444,7 +1469,7 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                     except:
                         floor_angle_estim = 0
                         xy_origin_estim = cam_width/2, cam_height/2
-                        logging.warning(f'Could not estimate the floor angle and xy_origin for person {px_to_m_from_person_id}. Make sure that the full body is visible. Using floor angle = 0° and xy_origin = [{cam_width/2}, {cam_height/2}].')
+                        logging.warning(f'Could not estimate the floor angle and xy_origin for person {px_to_m_from_person_id}. Make sure that the full body is visible. Using floor angle = 0° and xy_origin = [{cam_width/2}, {cam_height/2}] px.')
                 if not floor_angle == 'auto':
                     floor_angle_estim = floor_angle
                 if xy_origin == 'auto':
@@ -1453,15 +1478,13 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                     cx, cy = xy_origin
                 logging.info(f'Using height of person #{px_to_m_from_person_id} ({px_to_m_person_height_m}m) to convert coordinates in meters. '
                              f'Floor angle: {np.degrees(floor_angle_estim) if not floor_angle=="auto" else f"auto (estimation: {round(np.degrees(floor_angle_estim),2)}°)"}, '
-                             f'xy_origin: {xy_origin if not xy_origin=="auto" else f"auto (estimation: {[round(c) for c in xy_origin_estim]})"}.')
+                             f'xy_origin: {xy_origin if not xy_origin=="auto" else f"auto (estimation: {[round(c) for c in xy_origin_estim]})"} px.')
 
             # Coordinates in m
             for i in range(len(trc_data)):
-                # print(i)
                 if not np.array(trc_data[i].iloc[:,1:] ==0).all():
                     # Automatically determine visible side
                     visible_side_i = visible_side[i] if len(visible_side)>i else 'auto' # set to 'auto' if list too short
-                    
                     # Set to 'front' if slope of X values between [-5,5]
                     if visible_side_i == 'auto':
                         try:
@@ -1473,14 +1496,15 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                             visible_side_i = 'right' if gait_direction > 0.6 \
                                                 else 'left' if gait_direction < -0.6 \
                                                 else 'front'
+                            logging.info(f'- Person {i}: Seen from the {visible_side_i}.')
                         except:
                             visible_side_i = 'none'
-                            logging.warning(f'Could not automatically find gait direction for person {i}. Please set visible_side to "front", "back", "left", or "right" for this person. Setting to "none".')
-
+                            logging.warning(f'- Person {i}: Could not automatically find gait direction. Please set visible_side to "front", "back", "left", or "right" for this person. Setting to "none".')
                     # skip if none
-                    if visible_side_i == 'none':
-                        logging.info(f'Skipping because "visible_side" is set to none for person {i}.')
-                        continue
+                    elif visible_side_i == 'none':
+                        logging.info(f'- Person {i}: Keeping output in 2D because "visible_side" is set to "none" for person {i}.')
+                    else:
+                        logging.info(f'- Person {i}: Seen from the {visible_side_i}.')
                     
                     # Convert to meters
                     trc_data_m_i = pd.concat([convert_px_to_meters(trc_data[i][kpt_name], px_to_m_person_height_m, height_px, cx, cy, -floor_angle_estim, visible_side=visible_side_i) for kpt_name in keypoints_names], axis=1)
@@ -1492,12 +1516,13 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                         pose_plots(trc_data_unfiltered_m_i, trc_data_m_i, i)
                     
                     # Write to trc file
+                    trc_data_m.append(trc_data_m_i)
                     idx_path = selected_person_id if not multiperson and not calib_file else i
                     pose_path_person_m_i = (pose_output_path.parent / (pose_output_path_m.stem + f'_person{idx_path:02d}.trc'))
                     make_trc_with_trc_data(trc_data_m_i, pose_path_person_m_i, fps=fps)
                     if make_c3d:
                         c3d_path = convert_to_c3d(pose_path_person_m_i)
-                    logging.info(f'Person {idx_path}: Pose in meters saved to {pose_path_person_m_i.resolve()}. {"Also saved in c3d format." if make_c3d else ""}')
+                    logging.info(f'Pose in meters saved to {pose_path_person_m_i.resolve()}. {"Also saved in c3d format." if make_c3d else ""}')
                     
                 
             
@@ -1505,9 +1530,6 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
 
 
 
-
-
-
                 # # plt.plot(trc_data_m.iloc[:,0], trc_data_m.iloc[:,1])
                 # # plt.ylim([0,2])
                 # # plt.show()
@@ -1542,7 +1564,7 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
 
 
 
-                
+
 
 
 
@@ -1566,7 +1588,7 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
             
             # Delete person if less than 4 valid frames
             angle_nan_count = len(np.where(all_frames_angles_person.sum(axis=1)==0)[0])
-            if frame_count - angle_nan_count <= 4:
+            if frame_count - frame_range[0] - angle_nan_count <= 4:
                 logging.info(f'- Person {i}: Less than 4 valid frames. Deleting person.')
 
             else:
@@ -1628,16 +1650,83 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                     angle_plots(all_frames_angles_person, angle_data, i) # i = current person
 
 
-    # # Run scaling and inverse kinematics
-    # if save_angles and calculate_angles and do_ik:
-    #     logging.info('\nPost-processing angles (with inverse kinematics):')
-    #     if not to_meters:
-    #         logging.error('IK requires positions in meters rather than in pixels. Set to_meters to True.')
-    #         raise ValueError('IK requires positions in meters rather than in pixels. Set to_meters to True.')
-        
-
-    #     marker_Z_positions
-    #     if 'none': No IK possible. 
-    #     visible_side=='auto'
-
-    #     convert_to_c3d(trc_path)
+    # OpenSim inverse kinematics (and optional marker augmentation)
+    if do_ik or use_augmentation:
+        logging.info('\nPost-processing angles (with inverse kinematics):')
+        if not to_meters:
+            logging.warning('Skipping marker augmentation and inverse kinematics as to_meters was set to False.')
+        else:
+            # move all trc files containing _m_ string to pose3d_dir
+            if not load_trc_px: 
+                trc_list = output_dir.glob('*_m_*.trc')
+            else:
+                trc_list = [pose_path_person_m_i]
+            for trc_file in trc_list:
+                if (pose3d_dir/trc_file.name).exists():
+                    os.remove(pose3d_dir/trc_file.name)
+                shutil.move(trc_file, pose3d_dir)
+
+            heights_m, masses = [], []
+            for i in range(len(trc_data_m)):
+                if do_ik and not use_augmentation:
+                    logging.info(f'- Person {i}: Running scaling and inverse kinematics without marker augmentation. Set use_augmentation to True if you need it.') 
+                elif not do_ik and use_augmentation:
+                    logging.info(f'- Person {i}: Running marker augmentation without inverse kinematics. Set do_ik to True if you need it.')
+                else:
+                    logging.info(f'- Person {i}: Running marker augmentation and inverse kinematics.')
+
+                # Delete person if less than 4 valid frames
+                pose_path_person = pose_output_path.parent / (pose_output_path.stem + f'_person{i:02d}.trc')
+                all_frames_X_person = pd.DataFrame(all_frames_X_homog[:,i,:], columns=keypoints_names)
+                pose_nan_count = len(np.where(all_frames_X_person.sum(axis=1)==0)[0])
+                if frame_count - frame_range[0] - pose_nan_count <= 4:
+                    # heights_m.append(DEFAULT_HEIGHT)
+                    # masses.append(DEFAULT_MASS)
+                    logging.info(f'Less than 4 valid frames. Deleting person.')
+                else:
+                    if visible_side[i] == 'none':
+                        logging.info(f'Skipping marker augmentation and inverse kinematics because visible_side is "none".')
+                        # heights_m.append(DEFAULT_HEIGHT)
+                        # masses.append(DEFAULT_MASS)
+                    else:
+                        # Provide missing data to Pose2Sim_config_dict
+                        height_m_i = compute_height(trc_data_m_i.iloc[:,1:], keypoints_names,
+                            fastest_frames_to_remove_percent=fastest_frames_to_remove_percent, close_to_zero_speed=close_to_zero_speed_m, large_hip_knee_angles=large_hip_knee_angles, trimmed_extrema_percent=trimmed_extrema_percent)
+                        mass_i = participant_masses[i] if len(participant_masses)>i else 70
+                        if len(participant_masses)<=i:
+                            logging.warning(f'No mass provided. Using 70 kg as default.')
+                        heights_m.append(height_m_i)
+                        masses.append(mass_i)
+                
+            Pose2Sim_config_dict['project']['participant_height'] = heights_m
+            Pose2Sim_config_dict['project']['participant_mass'] = masses
+            Pose2Sim_config_dict['pose']['pose_model'] = pose_model_name.upper()
+            Pose2Sim_config_dict = to_dict(Pose2Sim_config_dict)
+
+            # Marker augmentation
+            if use_augmentation:
+                logging.info('Running marker augmentation...')
+                augment_markers_all(Pose2Sim_config_dict)
+                logging.info(f'Augmented trc results saved to {pose3d_dir.resolve()}.\n')
+
+            if do_ik:
+                if not save_angles or not calculate_angles:
+                    logging.warning(f'Skipping inverse kinematics because save_angles or calculate_angles is set to False.')
+                else:
+                    logging.info('Running inverse kinematics...')
+                    kinematics_all(Pose2Sim_config_dict)
+                    for mot_file in kinematics_dir.glob('*.mot'):
+                        if (mot_file.parent/(mot_file.stem+'_ik.mot')).exists():
+                            os.remove(mot_file.parent/(mot_file.stem+'_ik.mot'))
+                        os.rename(mot_file, mot_file.parent/(mot_file.stem+'_ik.mot'))
+                    logging.info(f'.osim model and .mot motion file results saved to {kinematics_dir.resolve()}.\n')
+                            
+            # Move all files in pose-3d and kinematics to the output_dir
+            osim.Logger.removeFileSink()
+            for directory in [pose3d_dir, kinematics_dir]:
+                for file in directory.glob('*'):
+                    if (output_dir/file.name).exists():
+                        os.remove(output_dir/file.name)
+                    shutil.move(file, output_dir)
+            pose3d_dir.rmdir()
+            kinematics_dir.rmdir()

{sports2d-0.6.3.dist-info → sports2d-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sports2d
-Version: 0.6.3
+Version: 0.7.2
 Summary: Detect pose and compute 2D joint angles from a video.
 Home-page: https://github.com/davidpagnon/Sports2D
 Author: David Pagnon
@@ -39,6 +39,7 @@ Requires-Dist: openvino
 Requires-Dist: tqdm
 Requires-Dist: imageio_ffmpeg
 Requires-Dist: deep-sort-realtime
+Requires-Dist: Pose2Sim
 
 
 [![Continuous integration](https://github.com/davidpagnon/sports2d/actions/workflows/continuous-integration.yml/badge.svg?branch=main)](https://github.com/davidpagnon/sports2d/actions/workflows/continuous-integration.yml)
@@ -64,14 +65,13 @@ Requires-Dist: deep-sort-realtime
 
 > **`Announcement:`\
 > Complete rewriting of the code!** Run `pip install sports2d -U` to get the latest version.
+> - MarkerAugmentation and Inverse Kinematics for accurate 3D motion with OpenSim. **New in v0.7!** 
+> - Any detector and pose estimation model can be used. **New in v0.6!**
+> - Results in meters rather than pixels. **New in v0.5!**
 > - Faster, more accurate
 > - Works from a webcam
-> - Results in meters rather than pixels. **New in v0.5!**
 > - Better visualization output 
 > - More flexible, easier to run
-> - Batch process multiple videos at once
-> 
-> Note: Colab version broken for now. I'll fix it in the next few weeks.
 
 ***N.B.:*** As always, I am more than happy to welcome contributions (see [How to contribute](#how-to-contribute-and-to-do-list))!
 <!--User-friendly Colab version released! (and latest issues fixed, too)\
@@ -220,10 +220,7 @@ The Demo video is voluntarily challenging to demonstrate the robustness of the p
 
    The OpenSim skeleton is not rigged yet. **[Feel free to contribute!](https://github.com/perfanalytics/pose2sim/issues/40)**
 
-<!-- IMAGE ICI
--->
-
- 
+<img src="Content/sports2d_blender.gif" width="760">
 
 <br>
 
@@ -238,10 +235,9 @@ The Demo video is voluntarily challenging to demonstrate the robustness of the p
    - **File -> Open Model:** Open your scaled model (e.g., `Model_Pose2Sim_LSTM.osim`).
    - **File -> Load Motion:** Open your motion file (e.g., `angles.mot`).
 
-<br>
+<img src="Content/sports2d_opensim.gif" width="760">
 
-<!-- IMAGE ICI
--->
+<br>
 
 
 
@@ -273,21 +269,26 @@ sports2d --time_range 1.2 2.7
 
 
 #### Get coordinates in meters: 
+> **N.B.:** Depth is estimated from a neutral pose. 
 
 <!-- You either need to provide a calibration file, or simply the height of a person (Note that the latter will not take distortions into account, and that it will be less accurate for motion in the frontal plane).\-->
 You may need to convert pixel coordinates to meters.\
-Just provide the height of the reference person (and their ID in case of multiple person detection).\
-The floor angle and the origin of the xy axis are computed automatically from gait. If you analyze another type of motion, you can manually specify them.\
-Note that it does not take distortions into account, and that it will be less accurate for motions in the frontal plane.
+Just provide the height of the reference person (and their ID in case of multiple person detection).
 
-``` cmd
+You can also specify whether the visible side of the person is left, right, front, or back. Set it to 'auto' if you do not want to find it automatically (only works for motion in the sagittal plane), or to 'none' if you want to keep 2D instead of 3D coordinates (if the person goes right, and then left for example).
+
+The floor angle and the origin of the xy axis are computed automatically from gait. If you analyze another type of motion, you can manually specify them. Note that `y` points down.\
+Also note that distortions are not taken into account, and that results will be less accurate for motions in the frontal plane.
+
+<!-- ``` cmd
 sports2d --to_meters True --calib_file calib_demo.toml
-```
+``` -->
 ``` cmd
 sports2d --to_meters True --px_to_m_person_height 1.65 --px_to_m_from_person_id 2
 ```
 ``` cmd
-sports2d --to_meters True --px_to_m_person_height 1.65 --px_to_m_from_person_id 2 --floor_angle 0 --xy_origin 0 940
+sports2d --to_meters True --px_to_m_person_height 1.65 --px_to_m_from_person_id 2 `
+         --visible_side front none auto --floor_angle 0 --xy_origin 0 940
 ```
 
 <br>
@@ -296,24 +297,28 @@ sports2d --to_meters True --px_to_m_person_height 1.65 --px_to_m_from_person_id
 #### Run inverse kinematics:
 > N.B.: [Full install](#full-install) required.
 
-> N.B.: The person needs to be moving on a single plane for the whole selected time range. 
-
-Analyzed persons can be showing their left, right, front, or back side. If you want to ignore a certain person, set `--visible_side none`. 
-
-
-
-
-              Why IK?
-              Add section in how it works
+> **N.B.:** The person needs to be moving on a single plane for the whole selected time range.
 
+OpenSim inverse kinematics allows you to set joint constraints, joint angle limits, to constrain the bones to keep the same length all along the motion and potentially to have equal sizes on left and right side. Most generally, it gives more biomechanically accurate results. It can also give you the opportunity to compute joint torques, muscle forces, ground reaction forces, and more, [with MoCo](https://opensim-org.github.io/opensim-moco-site/) for example.
 
+This is done via [Pose2Sim](https://github.com/perfanalytics/pose2sim).\
+Model scaling is done according to the mean of the segment lengths, across a subset of frames. We remove the 10% fastest frames (potential outliers), the frames where the speed is 0 (person probably out of frame), the frames where the average knee and hip flexion angles are above 45° (pose estimation is not precise when the person is crouching) and the 20% most extreme segment values after the previous operations (potential outliers). All these parameters can be edited in your Config.toml file.
 
 ```cmd
-sports2d --time_range 1.2 2.7 --do_ik true --visible_side front left
+sports2d --time_range 1.2 2.7 `
+         --do_ik true `
+         --px_to_m_from_person_id 1 --px_to_m_person_height 1.65 `
+         --visible_side front auto 
 ```
 
+You can optionally use the LSTM marker augmentation to improve the quality of the output motion.\
+You can also optionally give the participants proper masses. Mass has no influence on motion, only on forces (if you decide to further pursue kinetics analysis).
+
 ```cmd
-sports2d --time_range 1.2 2.7 --do_ik true --visible_side front left --use_augmentation True
+sports2d --time_range 1.2 2.7 `
+         --do_ik true --use_augmentation True `
+         --px_to_m_from_person_id 1 --px_to_m_person_height 1.65 `
+         --visible_side front left --participant_mass 67.0 55.0
 ```
 
 <br>
@@ -379,7 +384,9 @@ sports2d --video_input demo.mp4 other_video.mp4 --time_range 1.2 2.7 0 3.5
   ```
 - Choose whether you want video, images, trc pose file, angle mot file, real-time display, and plots:
   ```cmd
-  sports2d --save_vid false --save_img true --save_pose false --save_angles true --show_realtime_results false --show_graphs false
+  sports2d --save_vid false --save_img true `
+           --save_pose false --save_angles true `
+           --show_realtime_results false --show_graphs false
   ```
 - Save results to a custom directory, specify the slow-motion factor:
   ``` cmd
@@ -396,12 +403,12 @@ sports2d --video_input demo.mp4 other_video.mp4 --time_range 1.2 2.7 0 3.5
   ```
 - Use any custom (deployed) MMPose model
   ``` cmd
-  sports2d --pose_model BodyWithFeet :
-           --mode """{'det_class':'YOLOX',
-                  'det_model':'https://download.openmmlab.com/mmpose/v1/projects/rtmposev1/onnx_sdk/yolox_m_8xb8-300e_humanart-c2c7a14a.zip',
-                  'det_input_size':[640, 640],
-                  'pose_class':'RTMPose',
-                  'pose_model':'https://download.openmmlab.com/mmpose/v1/projects/rtmposev1/onnx_sdk/rtmpose-m_simcc-body7_pt-body7-halpe26_700e-256x192-4d3e73dd_20230605.zip',
+  sports2d --pose_model BodyWithFeet : `
+           --mode """{'det_class':'YOLOX', `
+                  'det_model':'https://download.openmmlab.com/mmpose/v1/projects/rtmposev1/onnx_sdk/yolox_m_8xb8-300e_humanart-c2c7a14a.zip', `
+                  'det_input_size':[640, 640], `
+                  'pose_class':'RTMPose', `
+                  'pose_model':'https://download.openmmlab.com/mmpose/v1/projects/rtmposev1/onnx_sdk/rtmpose-m_simcc-body7_pt-body7-halpe26_700e-256x192-4d3e73dd_20230605.zip', `
                   'pose_input_size':[192,256]}"""
   ```
 
@@ -418,9 +425,10 @@ sports2d --help
 
 ``` 
 'config': ["C", "path to a toml configuration file"],
+
 'video_input': ["i", "webcam, or video_path.mp4, or video1_path.avi video2_path.mp4 ... Beware that images won't be saved if paths contain non ASCII characters"],
 'px_to_m_person_height': ["H", "height of the person in meters. 1.70 if not specified"],
-'visible_side': ["", "front, back, left, right, auto, or none. 'front auto' if not specified. If 'auto', will be either left or right depending on the direction of the motion. If 'none', no IK for this person"],
+'visible_side': ["", "front, back, left, right, auto, or none. 'front none auto' if not specified. If 'auto', will be either left or right depending on the direction of the motion. If 'none', no IK for this person"],
 'load_trc_px': ["", "load trc file to avaid running pose estimation again. false if not specified"],
 'compare': ["", "visually compare motion with trc file. false if not specified"],
 'webcam_id': ["w", "webcam ID. 0 if not specified"],
@@ -454,6 +462,7 @@ sports2d --help
 'do_ik': ["", "do inverse kinematics. false if not specified"],
 'use_augmentation': ["", "Use LSTM marker augmentation. false if not specified"],
 'use_contacts_muscles': ["", "Use model with contact spheres and muscles. false if not specified"],
+'participant_mass': ["", "mass of the participant in kg or none. Defaults to 70 if not provided. No influence on kinematics (motion), only on kinetics (forces)"],
 'close_to_zero_speed_m': ["","Sum for all keypoints: about 50 px/frame or 0.2 m/frame"], 
 'multiperson': ["", "multiperson involves tracking: will be faster if set to false. true if not specified"],
 'tracking_mode': ["", "sports2d or rtmlib. sports2d is generally much more accurate and comparable in speed. sports2d if not specified"],
@@ -586,7 +595,7 @@ Sports2D:
 
 4. **Chooses the right persons to keep.** In single-person mode, only keeps the person with the highest average scores over the sequence. In multi-person mode, only retrieves the keypoints with high enough confidence, and only keeps the persons with high enough average confidence over each frame.
 
-4. **Converts the pixel coordinates to meters.** The user can provide a calibration file, or simply the size of a specified person. The floor angle and the coordinate origin can either be detected automatically from the gait sequence, or be manually specified.
+4. **Converts the pixel coordinates to meters.** The user can provide a calibration file, or simply the size of a specified person. The floor angle and the coordinate origin can either be detected automatically from the gait sequence, or be manually specified. The depth coordinates are set to normative values, depending on whether the person is going left, right, facing the camera, or looking away.
 
 5. **Computes the selected joint and segment angles**, and flips them on the left/right side if the respective foot is pointing to the left/right. 
 

sports2d-0.7.2.dist-info/RECORD

@@ -0,0 +1,16 @@
+Sports2D/Sports2D.py,sha256=eWOz-7HQiwRu7Xl0_bPTlg9meOW635x197WL9QrKfoU,29719
+Sports2D/__init__.py,sha256=TyCP7Uuuy6CNklhPf8W84MbYoO1_-1dxowSYAJyk_OI,102
+Sports2D/process.py,sha256=4Ce22jOTutlGZoPEz5vMp2g4RQUGQSByKQj_QV3UHzo,87916
+Sports2D/Demo/Config_demo.toml,sha256=S7cBtdob9zxA6deicPY1ZEQicTYeaByet5gSvRmkG00,13854
+Sports2D/Demo/demo.mp4,sha256=2aZkFxhWR7ESMEtXCT8MGA83p2jmoU2sp1ylQfO3gDk,3968304
+Sports2D/Utilities/__init__.py,sha256=TyCP7Uuuy6CNklhPf8W84MbYoO1_-1dxowSYAJyk_OI,102
+Sports2D/Utilities/common.py,sha256=OKyjBuXoZK0O34vuGeXzVrWpsyx6DI219L-yuS-iQTU,48254
+Sports2D/Utilities/filter.py,sha256=8mVefMjDzxmh9a30eNtIrUuK_mUKoOJ2Nr-OzcQKkKM,4922
+Sports2D/Utilities/skeletons.py,sha256=WObRPHpCj5Q2WpspzFRy1gvAX-EZD9WyA9K-kqL4YRo,40076
+Sports2D/Utilities/tests.py,sha256=mzs69p5ZIGiOX6co2qwQmO09LhJLex3yujcUWC6p4Bw,3573
+sports2d-0.7.2.dist-info/LICENSE,sha256=f4qe3nE0Y7ltJho5w-xAR0jI5PUox5Xl-MsYiY7ZRM8,1521
+sports2d-0.7.2.dist-info/METADATA,sha256=YoQQ1p6p0fOEk12nVhaVvnkjo0dleyG46L-vsLTpxJw,38518
+sports2d-0.7.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+sports2d-0.7.2.dist-info/entry_points.txt,sha256=h2CJTuydtNf8JyaLoWxWl5HTSIxx5Ra_FSiSGQsf7Sk,52
+sports2d-0.7.2.dist-info/top_level.txt,sha256=DoURf9UDB8lQ_9lMUPQMQqhXCvWPFFjJco9NzPlHJ6I,9
+sports2d-0.7.2.dist-info/RECORD,,

{sports2d-0.6.3.dist-info → sports2d-0.7.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

sports2d-0.6.3.dist-info/RECORD

@@ -1,16 +0,0 @@
-Sports2D/Sports2D.py,sha256=VWlQiv2tE926mEp2hdDp86G4iymykBNKCNZLJ0jdGPQ,30065
-Sports2D/__init__.py,sha256=TyCP7Uuuy6CNklhPf8W84MbYoO1_-1dxowSYAJyk_OI,102
-Sports2D/process.py,sha256=WvCkYl4Bz3NbTzNPns7k0TCB-QqpNnnDxVhMDaLZs-I,82432
-Sports2D/Demo/Config_demo.toml,sha256=v03yDYkSUqfqPo6jgvMgFNLKrfxSZqmnyu9W7eEAq-Q,13301
-Sports2D/Demo/demo.mp4,sha256=2aZkFxhWR7ESMEtXCT8MGA83p2jmoU2sp1ylQfO3gDk,3968304
-Sports2D/Utilities/__init__.py,sha256=TyCP7Uuuy6CNklhPf8W84MbYoO1_-1dxowSYAJyk_OI,102
-Sports2D/Utilities/common.py,sha256=UxL5ztrEkvTXlRyRFzi7FlG7IeUMH9EpKvEd0Gzg2d8,47681
-Sports2D/Utilities/filter.py,sha256=8mVefMjDzxmh9a30eNtIrUuK_mUKoOJ2Nr-OzcQKkKM,4922
-Sports2D/Utilities/skeletons.py,sha256=ljCaXrkbI2m_xp_hXxcRBzhL6rPgcmib9xixWuIt624,40077
-Sports2D/Utilities/tests.py,sha256=yG8CNPB7AJPhVSuiCCeKtQsgdys9GHntUlzF4ECq838,3158
-sports2d-0.6.3.dist-info/LICENSE,sha256=f4qe3nE0Y7ltJho5w-xAR0jI5PUox5Xl-MsYiY7ZRM8,1521
-sports2d-0.6.3.dist-info/METADATA,sha256=9P1TAELNlLldoOA-sWUf3Q8xS42RXGQwkDhCNVldw_s,36269
-sports2d-0.6.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-sports2d-0.6.3.dist-info/entry_points.txt,sha256=h2CJTuydtNf8JyaLoWxWl5HTSIxx5Ra_FSiSGQsf7Sk,52
-sports2d-0.6.3.dist-info/top_level.txt,sha256=DoURf9UDB8lQ_9lMUPQMQqhXCvWPFFjJco9NzPlHJ6I,9
-sports2d-0.6.3.dist-info/RECORD,,