sports2d 0.7.0__tar.gz → 0.7.2__tar.gz

{sports2d-0.7.0 → sports2d-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sports2d
-Version: 0.7.0
+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

{sports2d-0.7.0 → sports2d-0.7.2}/Sports2D/Utilities/tests.py

@@ -58,12 +58,14 @@ 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
+    # 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", 
-                 "--time_range", "1.2", "2.7",  "--slowmo_factor", "4"]
+                 "--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 a time range, inverse kinematics, marker augmentation, body pose_model and custom RTMO mode
@@ -71,9 +73,8 @@ def test_workflow():
                  "--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", "left", "front", "--participant_mass", "55.0", "67.0",
-                 "--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_cmd3, check=True, capture_output=True, text=True)
+                 "--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'

{sports2d-0.7.0 → sports2d-0.7.2}/Sports2D/process.py

@@ -625,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
 
@@ -928,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
@@ -1127,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(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
@@ -1336,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]
@@ -1475,7 +1485,6 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                 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:
@@ -1648,7 +1657,11 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
             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
-            for trc_file in output_dir.glob('*_m_*.trc'):
+            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)

{sports2d-0.7.0 → sports2d-0.7.2}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = sports2d
-version = 0.7.0
+version = 0.7.2
 author = David Pagnon
 author_email = contact@david-pagnon.com
 description = Detect pose and compute 2D joint angles from a video.

{sports2d-0.7.0 → sports2d-0.7.2}/sports2d.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sports2d
-Version: 0.7.0
+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