sports2d 0.8.11__tar.gz → 0.8.13__tar.gz

{sports2d-0.8.11 → sports2d-0.8.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sports2d
-Version: 0.8.11
+Version: 0.8.13
 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.11 → sports2d-0.8.13}/Sports2D/process.py

@@ -83,6 +83,7 @@ from Sports2D.Utilities import filter
 from Sports2D.Utilities.common import *
 from Pose2Sim.common import *
 from Pose2Sim.skeletons import *
+from Pose2Sim.triangulation import indices_of_first_last_non_nan_chunks
 
 DEFAULT_MASS = 70
 DEFAULT_HEIGHT = 1.7
@@ -495,24 +496,25 @@ def draw_angles(img, valid_X, valid_Y, valid_angles, valid_X_flipped, keypoints_
                             right_angle = True if ang_params[2]==90 else False
                             
                             # Draw angle
-                            if len(ang_coords) == 2: # segment angle
-                                app_point, vec = draw_segment_angle(img, ang_coords, flip)
-                            else: # joint angle
-                                app_point, vec1, vec2 = draw_joint_angle(img, ang_coords, flip, right_angle)
-        
-                            # Write angle on body
-                            if 'body' in display_angle_values_on:
+                            if not np.any(np.isnan(ang_coords)):
                                 if len(ang_coords) == 2: # segment angle
-                                    write_angle_on_body(img, ang, app_point, vec, np.array([1,0]), dist=20, color=(255,255,255), fontSize=fontSize, thickness=thickness)
+                                    app_point, vec = draw_segment_angle(img, ang_coords, flip)
                                 else: # joint angle
-                                    write_angle_on_body(img, ang, app_point, vec1, vec2, dist=40, color=(0,255,0), fontSize=fontSize, thickness=thickness)
-
-                            # Write angle as a list on image with progress bar
-                            if 'list' in display_angle_values_on:
-                                if len(ang_coords) == 2: # segment angle
-                                    ang_label_line = write_angle_as_list(img, ang, ang_name, person_label_position, ang_label_line, color = (255,255,255), fontSize=fontSize, thickness=thickness)
-                                else:
-                                    ang_label_line = write_angle_as_list(img, ang, ang_name, person_label_position, ang_label_line, color = (0,255,0), fontSize=fontSize, thickness=thickness)
+                                    app_point, vec1, vec2 = draw_joint_angle(img, ang_coords, flip, right_angle)
+        
+                                # Write angle on body
+                                if 'body' in display_angle_values_on:
+                                    if len(ang_coords) == 2: # segment angle
+                                        write_angle_on_body(img, ang, app_point, vec, np.array([1,0]), dist=20, color=(255,255,255), fontSize=fontSize, thickness=thickness)
+                                    else: # joint angle
+                                        write_angle_on_body(img, ang, app_point, vec1, vec2, dist=40, color=(0,255,0), fontSize=fontSize, thickness=thickness)
+
+                                # Write angle as a list on image with progress bar
+                                if 'list' in display_angle_values_on:
+                                    if len(ang_coords) == 2: # segment angle
+                                        ang_label_line = write_angle_as_list(img, ang, ang_name, person_label_position, ang_label_line, color = (255,255,255), fontSize=fontSize, thickness=thickness)
+                                    else:
+                                        ang_label_line = write_angle_as_list(img, ang, ang_name, person_label_position, ang_label_line, color = (0,255,0), fontSize=fontSize, thickness=thickness)
 
     return img
 
@@ -789,14 +791,15 @@ def pose_plots(trc_data_unfiltered, trc_data, person_id):
     OUTPUT:
     - matplotlib window with tabbed figures for each keypoint
     '''
-    os_name = platform.system()
 
+    os_name = platform.system()
     if os_name == 'Windows':
         mpl.use('qt5agg') # windows
+
     mpl.rc('figure', max_open_warning=0)
 
     keypoints_names = trc_data.columns[1::3]
-
+    
     pw = plotWindow()
     pw.MainWindow.setWindowTitle('Person'+ str(person_id) + ' coordinates') # Main title
 
@@ -838,16 +841,22 @@ def angle_plots(angle_data_unfiltered, angle_data, person_id):
     - matplotlib window with tabbed figures for each angle
     '''
 
-    mpl.use('qt5agg')
+    os_name = platform.system()
+    if os_name == 'Windows':
+        mpl.use('qt5agg') # windows
     mpl.rc('figure', max_open_warning=0)
 
     angles_names = angle_data.columns[1:]
-
+    
     pw = plotWindow()
     pw.MainWindow.setWindowTitle('Person'+ str(person_id) + ' angles') # Main title
 
     for id, angle in enumerate(angles_names):
         f = plt.figure()
+        if os_name == 'Windows':
+            f.canvas.manager.window.setWindowTitle(angle + ' Plot') # windows
+        elif os_name == 'Darwin':  # macOS
+            f.canvas.manager.set_window_title(angle + ' Plot') # mac
         
         ax = plt.subplot(111)
         plt.plot(angle_data_unfiltered.iloc[:,0], angle_data_unfiltered.iloc[:,id+1], label='unfiltered')
@@ -1817,9 +1826,15 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                     logging.info(f'- Person {i}: Interpolating missing sequences if they are smaller than {interp_gap_smaller_than} frames. Large gaps filled with {fill_large_gaps_with}.')
                     all_frames_X_person_interp = all_frames_X_person.apply(interpolate_zeros_nans, axis=0, args = [interp_gap_smaller_than, 'linear'])
                     all_frames_Y_person_interp = all_frames_Y_person.apply(interpolate_zeros_nans, axis=0, args = [interp_gap_smaller_than, 'linear'])
+
                     if fill_large_gaps_with.lower() == 'last_value':
-                        all_frames_X_person_interp = all_frames_X_person_interp.ffill(axis=0).bfill(axis=0)
-                        all_frames_Y_person_interp = all_frames_Y_person_interp.ffill(axis=0).bfill(axis=0)
+                        for col in all_frames_X_person_interp.columns:
+                            first_run_start, last_run_end = indices_of_first_last_non_nan_chunks(all_frames_Y_person_interp[col])
+                            for coord_df in [all_frames_X_person_interp, all_frames_Y_person_interp, all_frames_Z_homog]:
+                                coord_df.loc[:first_run_start, col] = np.nan
+                                coord_df.loc[last_run_end:, col] = np.nan
+                                coord_df.loc[first_run_start:last_run_end, col] = coord_df.loc[first_run_start:last_run_end, col].ffill().bfill()
+
                     elif fill_large_gaps_with.lower() == 'zeros':
                         all_frames_X_person_interp.replace(np.nan, 0, inplace=True)
                         all_frames_Y_person_interp.replace(np.nan, 0, inplace=True)
@@ -1941,7 +1956,13 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                     # Convert to meters
                     px_to_m_i = [convert_px_to_meters(trc_data[i][kpt_name], first_person_height, height_px, cx, cy, -floor_angle_estim, visible_side=visible_side_i) for kpt_name in new_keypoints_names]
                     trc_data_m_i = pd.concat([all_frames_time.rename('time')]+px_to_m_i, axis=1)
-                    trc_data_m_i = trc_data_m_i.ffill(axis=0).bfill(axis=0)
+                    for c in 3*np.arange(len(trc_data_m_i.columns[3::3]))+1: # only X coordinates
+                        first_run_start, last_run_end = indices_of_first_last_non_nan_chunks(trc_data_m_i.iloc[:,c])
+                        trc_data_m_i.iloc[:first_run_start,c+2] = np.nan
+                        trc_data_m_i.iloc[last_run_end:,c+2] = np.nan
+                        trc_data_m_i.iloc[first_run_start:last_run_end,c+2] = trc_data_m_i.iloc[first_run_start:last_run_end,c+2].ffill().bfill()
+                    first_trim, last_trim = trc_data_m_i.isnull().any(axis=1).idxmin(), trc_data_m_i[::-1].isnull().any(axis=1).idxmin()
+                    trc_data_m_i = trc_data_m_i.iloc[first_trim:last_trim+1,:]
                     px_to_m_unfiltered_i = [convert_px_to_meters(trc_data_unfiltered[i][kpt_name], first_person_height, height_px, cx, cy, -floor_angle_estim) for kpt_name in new_keypoints_names]
                     trc_data_unfiltered_m_i = pd.concat([all_frames_time.rename('time')]+px_to_m_unfiltered_i, axis=1)
 
@@ -2033,7 +2054,11 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
                     logging.info(f'- Person {i}: Interpolating missing sequences if they are smaller than {interp_gap_smaller_than} frames. Large gaps filled with {fill_large_gaps_with}.')
                     all_frames_angles_person_interp = all_frames_angles_person.apply(interpolate_zeros_nans, axis=0, args = [interp_gap_smaller_than, 'linear'])
                     if fill_large_gaps_with == 'last_value':
-                        all_frames_angles_person_interp = all_frames_angles_person_interp.ffill(axis=0).bfill(axis=0)
+                        for col in all_frames_angles_person_interp.columns:
+                            first_run_start, last_run_end = indices_of_first_last_non_nan_chunks(all_frames_angles_person_interp[col])
+                            all_frames_angles_person_interp.loc[:first_run_start, col] = np.nan
+                            all_frames_angles_person_interp.loc[last_run_end:, col] = np.nan
+                            all_frames_angles_person_interp.loc[first_run_start:last_run_end, col] = all_frames_angles_person_interp.loc[first_run_start:last_run_end, col].ffill().bfill()
                     elif fill_large_gaps_with == 'zeros':
                         all_frames_angles_person_interp.replace(np.nan, 0, inplace=True)
                 

{sports2d-0.8.11 → sports2d-0.8.13}/sports2d.egg-info/PKG-INFO

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