fixed problems raised by tests

Author: davidpagnon

Sports2D/Utilities/tests.py

@@ -96,17 +96,18 @@ def test_workflow():
 
     # With no pixels to meters conversion, one person to select, lightweight mode, detection frequency, slowmo factor, gaussian filter, RTMO body pose model
     demo_cmd3 = ["sports2d", "--show_realtime_results", "False", "--show_graphs", "False", "--save_graphs", "False",
-                #  "--calib_file", "calib_demo.toml", 
+                 "--floor_angle", "from_calib", "--xy_origin", "from_calib", "--perspective_unit", "from_calib", "--calib_file", os.path.join(root_dir, "demo_Sports2D", "demo_Sports2D_calib.toml"), 
                  "--nb_persons_to_detect", "1", "--person_ordering_method", "greatest_displacement", 
                  "--mode", "lightweight", "--det_frequency", "50", 
                  "--slowmo_factor", "4",
                  "--filter_type", "gaussian", "--use_augmentation", "False",
                  "--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', errors='replace')
 
-    # With a time range, inverse kinematics, marker augmentation
+    # With a time range, inverse kinematics, marker augmentation, perspective value in fov
     demo_cmd4 = ["sports2d", "--person_ordering_method", "greatest_displacement", "--show_realtime_results", "False", "--show_graphs", "False", "--save_graphs", "False",
                  "--time_range", "1.2", "2.7",
+                 "--perspective_value", "40", "--perspective_unit", "fov_deg",
                  "--do_ik", "True", "--use_augmentation", "True", 
                  "--nb_persons_to_detect", "all", "--first_person_height", "1.65",
                  "--visible_side", "auto", "front", "--participant_mass", "55.0", "67.0"]

Sports2D/process.py

@@ -1438,40 +1438,41 @@ def get_floor_params(floor_angle='auto', xy_origin=['auto'],
             xy_origin_calib = [cx, cy]
 
     # Estimate xy_origin from the line formed by the toes when they are on the ground (where speed = 0)
-    if floor_angle in ['auto', 'from_kinematics'] or xy_origin in [['auto'], ['from_kinematics']]:
-        px_per_m = height_px/height_m
-        toe_speed_below_px_frame = toe_speed_below * px_per_m / fps # speed below which the foot is considered to be stationary
-        try:
-            if all(key in trc_data for key in ['LBigToe', 'RBigToe']):
-                floor_angle_kin, xy_origin_kin, gait_direction = compute_floor_line(trc_data, score_data, keypoint_names=['LBigToe', 'RBigToe'], toe_speed_below=toe_speed_below_px_frame, score_threshold=score_threshold)
-            else:
-                floor_angle_kin, xy_origin_estim, gait_direction = compute_floor_line(trc_data, score_data, keypoint_names=['LAnkle', 'RAnkle'], toe_speed_below=toe_speed_below_px_frame, score_threshold=score_threshold)
-                xy_origin_kin[1] = xy_origin_kin[1] + 0.13*px_per_m # approx. height of the ankle above the floor
-                logging.warning(f'The RBigToe and LBigToe are missing from your pose estimation model. Using ankles - 13 cm to compute the floor line.')
-        except:
-            floor_angle_kin = 0
-            xy_origin_kin = cam_width/2, cam_height/2
-            logging.warning(f'Could not estimate the floor angle and xy_origin from person {0}. Make sure that the full body is visible. Using floor angle = 0° and xy_origin = [{cam_width/2}, {cam_height/2}] px.')
+    px_per_m = height_px/height_m
+    toe_speed_below_px_frame = toe_speed_below * px_per_m / fps # speed below which the foot is considered to be stationary
+    try:
+        if all(key in trc_data for key in ['LBigToe', 'RBigToe']):
+            floor_angle_kin, xy_origin_kin, gait_direction = compute_floor_line(trc_data, score_data, keypoint_names=['LBigToe', 'RBigToe'], toe_speed_below=toe_speed_below_px_frame, score_threshold=score_threshold)
+        else:
+            floor_angle_kin, xy_origin_estim, gait_direction = compute_floor_line(trc_data, score_data, keypoint_names=['LAnkle', 'RAnkle'], toe_speed_below=toe_speed_below_px_frame, score_threshold=score_threshold)
+            xy_origin_kin[1] = xy_origin_kin[1] + 0.13*px_per_m # approx. height of the ankle above the floor
+            logging.warning(f'The RBigToe and LBigToe are missing from your pose estimation model. Using ankles - 13 cm to compute the floor line.')
+    except:
+        floor_angle_kin = 0
+        xy_origin_kin = cam_width/2, cam_height/2
+        logging.warning(f'Could not estimate the floor angle and xy_origin from person {0}. Make sure that the full body is visible. Using floor angle = 0° and xy_origin = [{cam_width/2}, {cam_height/2}] px.')
 
     # Determine final floor angle estimation
     if floor_angle == 'from_calib':
         floor_angle_estim = floor_angle_calib
     elif floor_angle in ['auto', 'from_kinematics']:
         floor_angle_estim = floor_angle_kin
-    elif isinstance(floor_angle, (int,float)):
-        floor_angle_estim =  np.radians(floor_angle)
     else:
-        raise ValueError(f'Invalid floor_angle: {floor_angle}. Must be "auto", "from_calib", "from_kinematics", or a numeric value in degrees.')
+        try:
+            floor_angle_estim =  np.radians(float(floor_angle))
+        except:
+            raise ValueError(f'Invalid floor_angle: {floor_angle}. Must be "auto", "from_calib", "from_kinematics", or a numeric value in degrees.')
 
     # Determine final xy_origin estimation
     if xy_origin == ['from_calib']:
         xy_origin_estim = xy_origin_calib
     elif xy_origin in [['auto'], ['from_kinematics']]:
         xy_origin_estim = xy_origin_kin
-    elif all(isinstance(o, (int,float)) for o in xy_origin) and len(xy_origin) == 2:
-        xy_origin_estim = xy_origin
     else:
-        raise ValueError(f'Invalid xy_origin: {xy_origin}. Must be "auto", "from_calib", "from_kinematics", or a list of two numeric values in pixels.')
+        try:
+            xy_origin_estim = [float(v) for v in xy_origin]
+        except:
+            raise ValueError(f'Invalid xy_origin: {xy_origin}. Must be "auto", "from_calib", "from_kinematics", or a list of two numeric values in pixels.')
 
     return floor_angle_estim, xy_origin_estim, gait_direction
 
@@ -1653,7 +1654,7 @@ def process_fun(config_dict, video_file, time_range, frame_rate, result_dir):
     if calib_file == '': 
         calib_file = None
     else: 
-        calib_file = video_dir / calib_file
+        calib_file = Path(calib_file).resolve()
         if not calib_file.is_file():
             raise FileNotFoundError(f'Error: Could not find calibration file {calib_file}. Check that the file exists.')