sports2d 0.8.5__py3-none-any.whl → 0.8.7__py3-none-any.whl

Sports2D/Demo/Config_demo.toml

@@ -151,6 +151,7 @@ filter_type = 'butterworth'   # butterworth, gaussian, LOESS, median
 [kinematics]
 do_ik = false # Do scaling and inverse kinematics?
 use_augmentation = false  # true or false (lowercase) # Set to true if you want to use the model with augmented markers
+feet_on_floor = false # true or false (lowercase) # Set to false if you want to use the model with feet not on the floor (e.g. running, jumping, etc.)
 use_contacts_muscles = true # true or false (lowercase) # If true, contact spheres and muscles are added to the model
 participant_mass = [55.0, 67.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)

Sports2D/Sports2D.py

@@ -205,6 +205,7 @@ DEFAULT_CONFIG =   {'base': {'video_input': ['demo.mp4'],
                                         },
                     'kinematics':{'do_ik': False,
                                           'use_augmentation': False,
+                                          'feet_on_floor': False,
                                           'use_contacts_muscles': True,
                                           'participant_mass': [55.0, 67.0], 
                                           'right_left_symmetry': True,
@@ -244,7 +245,7 @@ CONFIG_HELP =   {'config': ["C", "path to a toml configuration file"],
                 'calculate_angles': ["c", "calculate joint and segment angles. true if not specified"],
                 'save_angles': ["A", "save angles as mot files. true if not specified"],
                 'slowmo_factor': ["", "slow-motion factor. For a video recorded at 240 fps and exported to 30 fps, it would be 240/30 = 8. 1 if not specified"],
-                'pose_model': ["p", "only body_with_feet is available for now. body_with_feet if not specified"],
+                'pose_model': ["p", "body_with_feet, whole_body_wrist, whole_body, or body. body_with_feet if not specified"],
                 'mode': ["m", 'light, balanced, performance, or a """{dictionary within triple quote}""". balanced if not specified. Use a dictionary to specify your own detection and/or pose estimation models (more about in the documentation).'],
                 'det_frequency': ["f", "run person detection only every N frames, and inbetween track previously detected bounding boxes. keypoint detection is still run on all frames.\n\
                                  Equal to or greater than 1, can be as high as you want in simple uncrowded cases. Much faster, but might be less accurate. 1 if not specified: detection runs on all frames"],
@@ -258,6 +259,7 @@ CONFIG_HELP =   {'config': ["C", "path to a toml configuration file"],
                 'save_calib': ["", "save calibration file. true if not specified"],
                 'do_ik': ["", "do inverse kinematics. false if not specified"],
                 'use_augmentation': ["", "Use LSTM marker augmentation. false if not specified"],
+                'feet_on_floor': ["", "offset marker augmentation results so that feet are at floor level. true 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"], 

Sports2D/process.py

@@ -66,6 +66,7 @@ import itertools as it
 from tqdm import tqdm
 from collections import defaultdict
 from anytree import RenderTree
+from anytree.importer import DictImporter
 
 import numpy as np
 import pandas as pd
@@ -986,7 +987,6 @@ def select_persons_on_vid(frames, all_pose_coords):
                 bbox=dict(facecolor=UNSELECTED_COLOR, edgecolor=LINE_UNSELECTED_COLOR, boxstyle='square,pad=0.3', path_effects=[patheffects.withSimplePatchShadow()]), zorder=3
             )
             rects.append(rect)
-            annotations.append(annotation)
     img_plot = ax_video.imshow(frame_rgb)
 
     # Slider
@@ -1043,6 +1043,10 @@ def select_persons_on_vid(frames, all_pose_coords):
                     bbox=dict(facecolor=UNSELECTED_COLOR, edgecolor=LINE_UNSELECTED_COLOR, boxstyle='square,pad=0.3'), path_effects=[patheffects.withSimplePatchShadow()], zorder=3
                 )
                 annotations.append(annotation)
+            else:
+                rect = plt.Rectangle((np.nan, np.nan), np.nan, np.nan)
+                ax_video.add_patch(rect)
+                rects.append(rect)
 
         # Update plot
         img_plot.set_data(frame_rgb)
@@ -1377,6 +1381,7 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
     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]
+    feet_on_floor = config_dict.get('kinematics').get('feet_on_floor')
     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')
@@ -1423,15 +1428,12 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
         cv2.setWindowProperty(f'{video_file} Sports2D', cv2.WND_PROP_ASPECT_RATIO, cv2.WINDOW_FULLSCREEN)
 
     # Select the appropriate model based on the model_type
+    logging.info('\nEstimating pose...')
     if pose_model.upper() in ('HALPE_26', 'BODY_WITH_FEET'):
         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() == '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'):
+    elif pose_model.upper() in ('COCO_133', 'WHOLE_BODY', 'WHOLE_BODY_WRIST'):
         model_name = 'COCO_133'
         ModelClass = Wholebody
         logging.info(f"Using COCO_133 model (body, feet, hands, and face) for pose estimation.")
@@ -1439,10 +1441,32 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
         model_name = 'COCO_17'
         ModelClass = Body
         logging.info(f"Using COCO_17 model (body) for pose estimation.")
+    elif pose_model.upper() =='HAND':
+        model_name = 'HAND_21'
+        ModelClass = Hand
+        logging.info(f"Using HAND_21 model for pose estimation.")
+    elif pose_model.upper() =='FACE':
+        model_name = 'FACE_106'
+        logging.info(f"Using FACE_106 model for pose estimation.")
+    elif pose_model.upper() =='ANIMAL':
+        model_name = 'ANIMAL2D_17'
+        logging.info(f"Using ANIMAL2D_17 model for pose estimation.")
     else:
-        raise ValueError(f"Invalid model_type: {model_name}. Must be 'HALPE_26', 'COCO_133', or 'COCO_17'. Use another network (MMPose, DeepLabCut, OpenPose, AlphaPose, BlazePose...) and convert the output files if you need another model. See documentation.")
+        model_name = pose_model.upper()
+        logging.info(f"Using model {model_name} for pose estimation.")
     pose_model_name = pose_model
-    pose_model = eval(model_name)
+    try:
+        pose_model = eval(model_name)
+    except:
+        try: # from Config.toml
+            pose_model = DictImporter().import_(config_dict.get('pose').get(pose_model))
+            if pose_model.id == 'None':
+                pose_model.id = None
+        except:
+            raise NameError(f'{pose_model} not found in skeletons.py nor in Config.toml')
+
+    # Select device and backend
+    backend, device = setup_backend_device(backend=backend, device=device)
 
     # Manually select the models if mode is a dictionary rather than 'lightweight', 'balanced', or 'performance'
     if not mode in ['lightweight', 'balanced', 'performance']:
@@ -2124,7 +2148,7 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
 
                 # 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)
+                all_frames_X_person = pd.DataFrame(all_frames_X_homog[:,i,:], columns=new_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)
@@ -2147,8 +2171,8 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                 
             Pose2Sim_config_dict['project']['participant_height'] = heights_m
             Pose2Sim_config_dict['project']['participant_mass'] = masses
-            Pose2Sim_config_dict['project']['frame_range'] = []
-            Pose2Sim_config_dict['markerAugmentation']['feet_on_floor'] = False
+            Pose2Sim_config_dict['project']['frame_range'] = 'all'
+            Pose2Sim_config_dict['markerAugmentation']['feet_on_floor'] = feet_on_floor
             Pose2Sim_config_dict['pose']['pose_model'] = pose_model_name.upper()
             Pose2Sim_config_dict = to_dict(Pose2Sim_config_dict)
 

{sports2d-0.8.5.dist-info → sports2d-0.8.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sports2d
-Version: 0.8.5
+Version: 0.8.7
 Summary: Compute 2D human pose and angles from a video or a webcam.
 Author-email: David Pagnon <contact@david-pagnon.com>
 Maintainer-email: David Pagnon <contact@david-pagnon.com>
@@ -473,7 +473,7 @@ sports2d --help
 'calculate_angles': ["c", "calculate joint and segment angles. true if not specified"],
 'save_angles': ["A", "save angles as mot files. true if not specified"],
 'slowmo_factor': ["", "slow-motion factor. For a video recorded at 240 fps and exported to 30 fps, it would be 240/30 = 8. 1 if not specified"],
-'pose_model': ["p", "only body_with_feet is available for now. body_with_feet if not specified"],
+'pose_model': ["p", "body_with_feet, whole_body_wrist, whole_body, or body. body_with_feet if not specified"],
 'mode': ["m", 'light, balanced, performance, or a """{dictionary within triple quote}""". balanced if not specified. Use a dictionary to specify your own detection and/or pose estimation models (more about in the documentation).'],
 'det_frequency': ["f", "run person detection only every N frames, and inbetween track previously detected bounding boxes. keypoint detection is still run on all frames.\n\
                   Equal to or greater than 1, can be as high as you want in simple uncrowded cases. Much faster, but might be less accurate. 1 if not specified: detection runs on all frames"],
@@ -487,6 +487,7 @@ sports2d --help
 'save_calib': ["", "save calibration file. true if not specified"],
 'do_ik': ["", "do inverse kinematics. false if not specified"],
 'use_augmentation': ["", "Use LSTM marker augmentation. false if not specified"],
+'feet_on_floor': ["", "offset marker augmentation results so that feet are at floor level. true 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"], 

{sports2d-0.8.5.dist-info → sports2d-0.8.7.dist-info}/RECORD

@@ -9,18 +9,18 @@ Content/paper.md,sha256=8rWSOLrKTysloZv0Fz2lr3nayxtHi7GlFMqwdgDVggY,11333
 Content/sports2d_blender.gif,sha256=wgMuPRxhja3XtQn76_okGXsNnUT9Thp0pnD36GdW5_E,448786
 Content/sports2d_opensim.gif,sha256=XP1AcjqhbGcJknXUoNJjPWAwaM9ahZafbDgLWvzKJs4,376656
 Sports2D/Sports2D.ipynb,sha256=VnOVjIl6ndnCJTT13L4W5qTw4T-TQDF3jt3-wxnXDqM,2427047
-Sports2D/Sports2D.py,sha256=EYsXZ3A3VpnsVQmpBSftbHC_iivVbyzst6--q2OOb74,30581
+Sports2D/Sports2D.py,sha256=dalsLajzjMxhf8A26OSLHGD8az_deheW9u9CsDVb7fk,30792
 Sports2D/__init__.py,sha256=BuUkPEdItxlkeqz4dmoiPwZLkgAfABJK3KWQ1ujTGwE,153
-Sports2D/process.py,sha256=IowxT0gPusVX3B88rwTuluRkH4nV7SfBU7xMjoFE1os,109738
-Sports2D/Demo/Config_demo.toml,sha256=IXrV7URqERHQ6cBJaPq05Yt3i86-u08RnCzC_dn53AM,13852
+Sports2D/process.py,sha256=qmeIhQIEmdpsBEWdjsJJzC_lc6DF11iM8yl0wzHHl_g,110565
+Sports2D/Demo/Config_demo.toml,sha256=S6QTErGIdUvCB3HoBFqlZKtQmbUU-c2cQYJJSW3HXUk,14003
 Sports2D/Demo/demo.mp4,sha256=2aZkFxhWR7ESMEtXCT8MGA83p2jmoU2sp1ylQfO3gDk,3968304
 Sports2D/Utilities/__init__.py,sha256=BuUkPEdItxlkeqz4dmoiPwZLkgAfABJK3KWQ1ujTGwE,153
 Sports2D/Utilities/common.py,sha256=idMRmesFv5BPX-5g3z5dOVa7SpS_8tNgijvGrOZlR-k,11185
 Sports2D/Utilities/filter.py,sha256=rfZcqofjllKI_5ovZTKEAmyjOZpB_PzbAJ0P874T8Ak,4973
 Sports2D/Utilities/tests.py,sha256=XnPNK63AZ_xlJBmFmPJtOMrzssBXIPXFzYd73CPzchI,4740
-sports2d-0.8.5.dist-info/licenses/LICENSE,sha256=f4qe3nE0Y7ltJho5w-xAR0jI5PUox5Xl-MsYiY7ZRM8,1521
-sports2d-0.8.5.dist-info/METADATA,sha256=vv3Z5BoEsyqUJO-8nmxsEbSKtWB-CddqkeytB-OhE68,38116
-sports2d-0.8.5.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-sports2d-0.8.5.dist-info/entry_points.txt,sha256=V8dFDIXatz9VvoGgoHzb2wE71C9-f85K6_OjnEQlxww,108
-sports2d-0.8.5.dist-info/top_level.txt,sha256=cWWBiDD2WbQXMoIoN6-9et9U2t2c_ZKo2JtBqO5uN-k,17
-sports2d-0.8.5.dist-info/RECORD,,
+sports2d-0.8.7.dist-info/licenses/LICENSE,sha256=f4qe3nE0Y7ltJho5w-xAR0jI5PUox5Xl-MsYiY7ZRM8,1521
+sports2d-0.8.7.dist-info/METADATA,sha256=VM20oIZDLU_zQLlnZpjFlNTIU31VLiHIoYv9rsGOyuc,38245
+sports2d-0.8.7.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+sports2d-0.8.7.dist-info/entry_points.txt,sha256=V8dFDIXatz9VvoGgoHzb2wE71C9-f85K6_OjnEQlxww,108
+sports2d-0.8.7.dist-info/top_level.txt,sha256=cWWBiDD2WbQXMoIoN6-9et9U2t2c_ZKo2JtBqO5uN-k,17
+sports2d-0.8.7.dist-info/RECORD,,