sports2d 0.8.14__py3-none-any.whl → 0.8.16__py3-none-any.whl

Sports2D/Utilities/tests.py

@@ -37,6 +37,7 @@ def test_workflow():
     Test the workflow of Sports2D.
     '''
 
+    from Sports2D import Sports2D
     root_dir = os.path.dirname(os.path.abspath(__file__))
     os.chdir(root_dir)
 
@@ -53,7 +54,6 @@ def test_workflow():
     config_dict.get("base").update({"show_realtime_results":False})
     config_dict.get("post-processing").update({"show_graphs":False})
     
-    from Sports2D import Sports2D
     Sports2D.process(config_dict)
 
 
@@ -82,7 +82,7 @@ def test_workflow():
                  "--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, encoding='utf-8')
     
-    # With a time range, inverse kinematics, marker augmentation, body pose_model and custom RTMO mode
+    # With a time range, inverse kinematics, marker augmentation
     demo_cmd4 = ["sports2d", "--person_ordering_method", "greatest_displacement", "--show_realtime_results", "False", "--show_graphs", "False",
                  "--time_range", "1.2", "2.7",
                  "--do_ik", "True", "--use_augmentation", "True", 

Sports2D/process.py

@@ -1653,7 +1653,7 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
             
             # Process coordinates and compute angles
             valid_X, valid_Y, valid_scores = [], [], []
-            valid_X_flipped, valid_angles = [], []
+            valid_X_flipped, valid_angles_flipped, valid_angles = [], [], []
             for person_idx in range(len(keypoints)):
                 if load_trc_px:
                     person_X = keypoints[person_idx][:,0]
@@ -1699,7 +1699,17 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                         else:
                             ang = np.nan
                         person_angles.append(ang)
+                    
+                    # flip angles on the left side if flip_left_right false
+                    if len(visible_side) <= person_idx:
+                        visible_side += ['auto'] # set to 'auto' if list too short
+                    if visible_side[person_idx] == 'left' and not flip_left_right:
+                        person_angles_flipped = list(-np.array(person_angles))
+                    else:
+                        person_angles_flipped = person_angles.copy()
+
                     valid_angles.append(person_angles)
+                    valid_angles_flipped.append(person_angles_flipped)
                     valid_X_flipped.append(person_X_flipped)
                 valid_X.append(person_X)
                 valid_Y.append(person_Y)
@@ -1714,7 +1724,8 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                 img = draw_keypts(img, valid_X, valid_Y, valid_scores, cmap_str='RdYlGn')
                 img = draw_skel(img, valid_X, valid_Y, pose_model)
                 if calculate_angles:
-                    img = draw_angles(img, valid_X, valid_Y, valid_angles, valid_X_flipped, new_keypoints_ids, new_keypoints_names, angle_names, display_angle_values_on=display_angle_values_on, colors=colors, fontSize=fontSize, thickness=thickness)
+
+                    img = draw_angles(img, valid_X, valid_Y, valid_angles_flipped, valid_X_flipped, new_keypoints_ids, new_keypoints_names, angle_names, display_angle_values_on=display_angle_values_on, colors=colors, fontSize=fontSize, thickness=thickness)
                 cv2.imshow(f'{video_file} Sports2D', img)
                 if (cv2.waitKey(1) & 0xFF) == ord('q') or (cv2.waitKey(1) & 0xFF) == 27:
                     break
@@ -1936,6 +1947,7 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                              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
+            new_visible_side = []
             for i in range(len(trc_data)):
                 if not np.array(trc_data[i].iloc[:,1:] ==0).all():
                     # Automatically determine visible side
@@ -1984,7 +1996,11 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                     if make_c3d:
                         c3d_path = convert_to_c3d(str(pose_path_person_m_i))
                     logging.info(f'Pose in meters saved to {pose_path_person_m_i.resolve()}. {"Also saved in c3d format." if make_c3d else ""}')
-                    
+                else:
+                    visible_side_i = 'none'
+                new_visible_side += [visible_side_i]
+        else:
+            new_visible_side = visible_side.copy()
                 
             
 
@@ -2049,7 +2065,11 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
         for i, idx_person in enumerate(selected_persons):
             angles_path_person = angles_output_path.parent / (angles_output_path.stem + f'_person{i:02d}.mot')
             all_frames_angles_person = pd.DataFrame(all_frames_angles_homog[:,idx_person,:], columns=angle_names)
-            
+
+            # Flip angles for left side when flip_left_right false
+            if new_visible_side[i] == 'left' and not flip_left_right: 
+                all_frames_angles_homog[:, idx_person, :] = -all_frames_angles_homog[:, idx_person, :]
+
             # 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 - frame_range[0] - angle_nan_count <= 4:
@@ -2151,19 +2171,22 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
         new_keypoints_ids = list(range(len(new_keypoints_ids)))
 
         # Draw pose and angles
+        if 'first_trim' not in locals():
+            first_trim, last_trim = 0, frame_count-1
         for frame_count, (frame, valid_X, valid_X_flipped, valid_Y, valid_scores, valid_angles) in enumerate(zip(frames, all_frames_X_processed, all_frames_X_flipped_processed, all_frames_Y_processed, all_frames_scores_processed, all_frames_angles_processed)):
-            img = frame.copy()
-            img = draw_bounding_box(img, valid_X, valid_Y, colors=colors, fontSize=fontSize, thickness=thickness)
-            img = draw_keypts(img, valid_X, valid_Y, valid_scores, cmap_str='RdYlGn')
-            img = draw_skel(img, valid_X, valid_Y, pose_model_with_new_ids)
-            if calculate_angles:
-                img = draw_angles(img, valid_X, valid_Y, valid_angles, valid_X_flipped, new_keypoints_ids, new_keypoints_names, angle_names, display_angle_values_on=display_angle_values_on, colors=colors, fontSize=fontSize, thickness=thickness)
-
-            # Save video or images
-            if save_vid:
-                out_vid.write(img)
-            if save_img:
-                cv2.imwrite(str((img_output_dir / f'{output_dir_name}_{(frame_count):06d}.png')), img)
+            if frame_count >= first_trim and frame_count <= last_trim:
+                img = frame.copy()
+                img = draw_bounding_box(img, valid_X, valid_Y, colors=colors, fontSize=fontSize, thickness=thickness)
+                img = draw_keypts(img, valid_X, valid_Y, valid_scores, cmap_str='RdYlGn')
+                img = draw_skel(img, valid_X, valid_Y, pose_model_with_new_ids)
+                if calculate_angles:
+                    img = draw_angles(img, valid_X, valid_Y, valid_angles, valid_X_flipped, new_keypoints_ids, new_keypoints_names, angle_names, display_angle_values_on=display_angle_values_on, colors=colors, fontSize=fontSize, thickness=thickness)
+
+                # Save video or images
+                if save_vid:
+                    out_vid.write(img)
+                if save_img:
+                    cv2.imwrite(str((img_output_dir / f'{output_dir_name}_{(frame_count+frame_range[0]):06d}.png')), img)
 
         if save_vid:
             out_vid.release()
@@ -2215,7 +2238,7 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                     # masses.append(DEFAULT_MASS)
                     logging.info(f'Less than 4 valid frames. Deleting person.')
                 else:
-                    if visible_side[i] == 'none':
+                    if new_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)

{sports2d-0.8.14.dist-info → sports2d-0.8.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sports2d
-Version: 0.8.14
+Version: 0.8.16
 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>

{sports2d-0.8.14.dist-info → sports2d-0.8.16.dist-info}/RECORD

@@ -11,16 +11,16 @@ Content/sports2d_opensim.gif,sha256=XP1AcjqhbGcJknXUoNJjPWAwaM9ahZafbDgLWvzKJs4,
 Sports2D/Sports2D.ipynb,sha256=VnOVjIl6ndnCJTT13L4W5qTw4T-TQDF3jt3-wxnXDqM,2427047
 Sports2D/Sports2D.py,sha256=Cq8UEKtwyNGWyaWjHAaVUTU8nwbmPuohAWmGbXb-hZM,33815
 Sports2D/__init__.py,sha256=BuUkPEdItxlkeqz4dmoiPwZLkgAfABJK3KWQ1ujTGwE,153
-Sports2D/process.py,sha256=6Qd6IHIMbuAa78NcJuknzUK0YthozMDodYi1QXDOSKI,114495
+Sports2D/process.py,sha256=_9rFaPP6eRiRYlrQ99hjtBPNrDktHL38bXDveyAJPzk,115750
 Sports2D/Demo/Config_demo.toml,sha256=skeMUqEyfWSrCF8Va8O0eiHsZRBLZooTZ1w-4-gm6Zc,14265
 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=3-slY2teKd78q0NzfJ2H84xRFSNXvGyDwew27oHJfrY,4740
-sports2d-0.8.14.dist-info/licenses/LICENSE,sha256=f4qe3nE0Y7ltJho5w-xAR0jI5PUox5Xl-MsYiY7ZRM8,1521
-sports2d-0.8.14.dist-info/METADATA,sha256=6BMWYq533iLi5MGk7M7pcZrSogPcfrJ13X-BvzC5wYs,39189
-sports2d-0.8.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sports2d-0.8.14.dist-info/entry_points.txt,sha256=V8dFDIXatz9VvoGgoHzb2wE71C9-f85K6_OjnEQlxww,108
-sports2d-0.8.14.dist-info/top_level.txt,sha256=cWWBiDD2WbQXMoIoN6-9et9U2t2c_ZKo2JtBqO5uN-k,17
-sports2d-0.8.14.dist-info/RECORD,,
+Sports2D/Utilities/tests.py,sha256=Ec504-4iuAvw5TDNT7upyoPRcs09EIe4Dteph3ybFJA,4702
+sports2d-0.8.16.dist-info/licenses/LICENSE,sha256=f4qe3nE0Y7ltJho5w-xAR0jI5PUox5Xl-MsYiY7ZRM8,1521
+sports2d-0.8.16.dist-info/METADATA,sha256=uA1npoK1Uqbi_Bn7oeMVFX2F44VaXhWLJUGsCzbXc7U,39189
+sports2d-0.8.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sports2d-0.8.16.dist-info/entry_points.txt,sha256=V8dFDIXatz9VvoGgoHzb2wE71C9-f85K6_OjnEQlxww,108
+sports2d-0.8.16.dist-info/top_level.txt,sha256=cWWBiDD2WbQXMoIoN6-9et9U2t2c_ZKo2JtBqO5uN-k,17
+sports2d-0.8.16.dist-info/RECORD,,