sports2d 0.8.20__tar.gz → 0.8.22__tar.gz

{sports2d-0.8.20 → sports2d-0.8.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sports2d
-Version: 0.8.20
+Version: 0.8.22
 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>
@@ -38,7 +38,7 @@ Requires-Dist: openvino
 Requires-Dist: opencv-python<4.12
 Requires-Dist: imageio_ffmpeg
 Requires-Dist: deep-sort-realtime
-Requires-Dist: Pose2Sim>=0.10.36
+Requires-Dist: Pose2Sim>=0.10.38
 Dynamic: license-file
 
 
@@ -67,6 +67,7 @@ Dynamic: license-file
 </br>
 
 > **`Announcements:`**
+> - Generate or import a calibration file, OpenSim skeleton overlay **New in v0.9!** 
 > - Select only the persons you want to analyze **New in v0.8!** 
 > - MarkerAugmentation and Inverse Kinematics for accurate 3D motion with OpenSim. **New in v0.7!** 
 > - Any detector and pose estimation model can be used. **New in v0.6!**
@@ -218,16 +219,19 @@ The Demo video is voluntarily challenging to demonstrate the robustness of the p
 
 1. **Install the Pose2Sim_Blender add-on.**\
    Follow instructions on the [Pose2Sim_Blender](https://github.com/davidpagnon/Pose2Sim_Blender) add-on page.
+2. **Import the camera and video.**
+    - **Cameras -> Import**: Open your `demo_calib.toml` file from your `result_dir` folder.
+    - **Images/Videos -> Show**: open your video file (e.g., `demo_Sports2D.mp4`).\
+    -> **Other tools -> See through camera**
 2. **Open your point coordinates.**\
-   **Add Markers**: open your trc file(e.g., `coords_m.trc`) from your `result_dir` folder.
-   
+   **OpenSim data -> Markers**: Open your trc file(e.g., `demo_Sports2D_m_person00.trc`) from your `result_dir` folder.\
    This will optionally create **an animated rig** based on the motion of the captured person.
 3. **Open your animated skeleton:**\
    Make sure you first set `--do_ik True` ([full install](#full-install) required). See [inverse kinematics](#run-inverse-kinematics) section for more details.
-   - **Add Model**: Open your scaled model (e.g., `Model_Pose2Sim_LSTM.osim`). 
-   - **Add Motion**: Open your motion file (e.g., `angles.mot`). Make sure the skeleton is selected in the outliner.
+   - **OpenSim data -> Model**: Open your scaled model (e.g., `demo_Sports2D_m_person00_LSTM.osim`). 
+   - **OpenSim data -> Motion**: Open your motion file (e.g., `demo_Sports2D_m_person00_LSTM_ik.mot`). 
 
-   The OpenSim skeleton is not rigged yet. **[Feel free to contribute!](https://github.com/perfanalytics/pose2sim/issues/40)**
+   The OpenSim skeleton is not rigged yet. **[Feel free to contribute!](https://github.com/perfanalytics/pose2sim/issues/40)** [![Discord](https://img.shields.io/discord/1183750225471492206?logo=Discord&label=Discord%20community)](https://discord.com/invite/4mXUdSFjmt)
 
 <img src="Content/sports2d_blender.gif" width="760">
 
@@ -284,7 +288,7 @@ If you only want to analyze a subset of the detected persons, you can use the `-
 sports2d --nb_persons_to_detect 2 --person_ordering_method highest_likelihood
 ```
 
-We recommend to use the `on_click` method if you can afford a manual input. This lets the user handle both the person number and their order in the same stage. When prompted, select the persons you are interested in in the desired order. In our case, lets slide to a frame where both people are visible, and select the woman first, then the man.
+We recommend using the `on_click` method if you can afford a manual input. This lets the user handle both the person number and their order in the same stage. When prompted, select the persons you are interested in in the desired order. In our case, lets slide to a frame where both people are visible, and select the woman first, then the man.
 
 Otherwise, if you want to run Sports2D automatically for example, you can choose other ordering methods such as 'highest_likelihood', 'largest_size', 'smallest_size',  'greatest_displacement', 'least_displacement', 'first_detected', or 'last_detected'.
 
@@ -301,28 +305,32 @@ sports2d --person_ordering_method on_click
 
 
 #### Get coordinates in meters: 
-> **N.B.:** Depth is estimated from a neutral pose. 
+> **N.B.:** The Z coordinate (depth) should not be overly trusted. 
 
-<!-- You either need to provide a calibration file, or simply the height of a person (Note that the latter will not take distortions into account, and that it will be less accurate for motion in the frontal plane).\-->
-You may need to convert pixel coordinates to meters.\
-Just provide the height of the reference person (and their ID in case of multiple person detection).
+You may want coordinates in meters rather than pixels. 2 options to do so:
 
-You can also specify whether the visible side of the person is left, right, front, or back. Set it to 'auto' if you do not want to find it automatically (only works for motion in the sagittal plane), or to 'none' if you want to keep 2D instead of 3D coordinates (if the person goes right, and then left for example).
+1. **Just provide the height of a reference person**:
+   - Their height in meters is be compared with their height in pixels to get a pixel-to-meter conversion factor.
+   - To estimate the depth coordinates, specify which side of the person is visible: `left`, `right`, `front`, or `back`. Use `auto` if you want it to be automatically determined (only works for motions in the sagittal plane), or `none` if you want to keep 2D coordinates instead of 3D (if the person turns around, for example).
+   - The floor angle is automatically estimated from gait, as well as the origin of the xy axis. The person trajectory is corrected accordingly. You can use the `--floor_angle` and `--xy_origin` parameters to manually specify them if your subject is not travelling horizontally or if you want the origin not to be under their feet (note that the `y` axis points down).
+   
+   **N.B.: A calibration file will be generated.** By convention, the camera-to-subject distance is set to 10 meters.
 
-The floor angle and the origin of the xy axis are computed automatically from gait. If you analyze another type of motion, you can manually specify them. Note that `y` points down.\
-Also note that distortions are not taken into account, and that results will be less accurate for motions in the frontal plane.
+   ``` cmd
+   sports2d --first_person_height 1.65 --visible_side auto front none
+   ```
+   ``` cmd
+   sports2d --first_person_height 1.65 --visible_side auto front none `
+            --person_ordering_method on_click `
+            --floor_angle 0 --xy_origin 0 940
+   ```
 
-<!-- ``` cmd
-sports2d --to_meters True --calib_file calib_demo.toml
-``` -->
-``` cmd
-sports2d --to_meters True --first_person_height 1.65 --visible_side auto front none
-```
-``` cmd
-sports2d --to_meters True --first_person_height 1.65 --visible_side auto front none `
-         --person_ordering_method on_click `
-         --floor_angle 0 --xy_origin 0 940
-```
+2. **Or use a calibration file**:\
+  It can either be a `.toml` calibration file previously generated by Sports2D, or a more accurate one coming from another system. For example, [Pose2Sim](https://github.com/perfanalytics/pose2sim) can be used to accurately calculate calibration, or to convert calibration files from Qualisys, Vicon, OpenCap, FreeMoCap, etc.
+
+   ``` cmd
+   sports2d --calib_file Calib_demo.toml --visible_side auto front none
+   ```
 
 <br>
 
@@ -337,18 +345,22 @@ OpenSim inverse kinematics allows you to set joint constraints, joint angle limi
 This is done via [Pose2Sim](https://github.com/perfanalytics/pose2sim).\
 Model scaling is done according to the mean of the segment lengths, across a subset of frames. We remove the 10% fastest frames (potential outliers), the frames where the speed is 0 (person probably out of frame), the frames where the average knee and hip flexion angles are above 45° (pose estimation is not precise when the person is crouching) and the 20% most extreme segment values after the previous operations (potential outliers). All these parameters can be edited in your Config.toml file.
 
+**N.B.: This will not work on sections where the person is not moving in a single plane. You can split your video into several time ranges if needed.**
+
 ```cmd
 sports2d --time_range 1.2 2.7 `
          --do_ik true --first_person_height 1.65 --visible_side auto front
 ```
 
 You can optionally use the LSTM marker augmentation to improve the quality of the output motion.\
-You can also optionally give the participants proper masses. Mass has no influence on motion, only on forces (if you decide to further pursue kinetics analysis).
+You can also optionally give the participants proper masses. Mass has no influence on motion, only on forces (if you decide to further pursue kinetics analysis).\
+Optionally again, you can [visualize the overlaid results in Blender](#visualize-in-blender). The automatic calibration won't be accurate with such a small time range, so you need to use the provided calibration file (or one that has been generated from the full walk).
 
 ```cmd
 sports2d --time_range 1.2 2.7 `
          --do_ik true --first_person_height 1.65 --visible_side left front `
-         --use_augmentation True --participant_mass 55.0 67.0
+         --use_augmentation True --participant_mass 55.0 67.0 `
+         --calib_file Calib_demo.toml
 ```
 
 <br>
@@ -376,14 +388,31 @@ sports2d --video_input demo.mp4 other_video.mp4 --time_range 1.2 2.7 0 3.5
   ``` cmd
   sports2d --config Config_demo.toml
   ```
-- Run within Python: 
-  ``` python
-  from Sports2D import Sports2D; Sports2D.process('Config_demo.toml')
-  ```
-- Run within Python with a dictionary (for example, `config_dict = toml.load('Config_demo.toml')`):
-  ``` python
-  from Sports2D import Sports2D; Sports2D.process(config_dict)
-  ```
+- Run within Python, for example:\
+  - Edit `Demo/Config_demo.toml` and run:
+    ```python
+    from Sports2D import Sports2D
+    from pathlib import Path
+    import toml
+
+    config_path = Path(Sports2D.__file__).parent / 'Demo'/'Config_demo.toml'
+    config_dict = toml.load(config_path)
+    Sports2D.process(config_dict)
+    ```
+  - Or you can pass the non default values only: 
+    ```python
+    from Sports2D import Sports2D
+    config_dict = {
+      'base': {
+        'nb_persons_to_detect': 1,
+        'person_ordering_method': 'greatest_displacement'
+        },
+      'pose': {
+        'mode': 'lightweight', 
+        'det_frequency': 50
+        }}
+    Sports2D.process(config_dict)
+    ```
 
 <br>
 
@@ -407,7 +436,7 @@ sports2d --video_input demo.mp4 other_video.mp4 --time_range 1.2 2.7 0 3.5
   ```cmd
   sports2d --flip_left_right true # Default
   ```
-- Correct segment angles according to the estimated camera tild angle.\
+- Correct segment angles according to the estimated camera tilt angle.\
   **N.B.:** *The camera tilt angle is automatically estimated. Set to false if it is actually the floor which is tilted rather than the camera.*
   ```cmd
   sports2d --correct_segment_angles_with_floor_angle true # Default
@@ -477,6 +506,7 @@ sports2d --help
 'show_realtime_results': ["R", "show results in real-time. true if not specified"],
 'display_angle_values_on': ["a", '"body", "list", "body" "list", or "none". body list if not specified'],
 'show_graphs': ["G", "show plots of raw and processed results. true if not specified"],
+'save_graphs': ["", "save position and angle plots of raw and processed results. false if not specified"],
 'joint_angles': ["j", '"Right ankle" "Left ankle" "Right knee" "Left knee" "Right hip" "Left hip" "Right shoulder" "Left shoulder" "Right elbow" "Left elbow" if not specified'],
 'segment_angles': ["s", '"Right foot" "Left foot" "Right shank" "Left shank" "Right thigh" "Left thigh" "Pelvis" "Trunk" "Shoulders" "Head" "Right arm" "Left arm" "Right forearm" "Left forearm" if not specified'],
 'save_vid': ["V", "save processed video. true if not specified"],

{sports2d-0.8.20 → sports2d-0.8.22}/README.md

@@ -24,6 +24,7 @@
 </br>
 
 > **`Announcements:`**
+> - Generate or import a calibration file, OpenSim skeleton overlay **New in v0.9!** 
 > - Select only the persons you want to analyze **New in v0.8!** 
 > - MarkerAugmentation and Inverse Kinematics for accurate 3D motion with OpenSim. **New in v0.7!** 
 > - Any detector and pose estimation model can be used. **New in v0.6!**
@@ -175,16 +176,19 @@ The Demo video is voluntarily challenging to demonstrate the robustness of the p
 
 1. **Install the Pose2Sim_Blender add-on.**\
    Follow instructions on the [Pose2Sim_Blender](https://github.com/davidpagnon/Pose2Sim_Blender) add-on page.
+2. **Import the camera and video.**
+    - **Cameras -> Import**: Open your `demo_calib.toml` file from your `result_dir` folder.
+    - **Images/Videos -> Show**: open your video file (e.g., `demo_Sports2D.mp4`).\
+    -> **Other tools -> See through camera**
 2. **Open your point coordinates.**\
-   **Add Markers**: open your trc file(e.g., `coords_m.trc`) from your `result_dir` folder.
-   
+   **OpenSim data -> Markers**: Open your trc file(e.g., `demo_Sports2D_m_person00.trc`) from your `result_dir` folder.\
    This will optionally create **an animated rig** based on the motion of the captured person.
 3. **Open your animated skeleton:**\
    Make sure you first set `--do_ik True` ([full install](#full-install) required). See [inverse kinematics](#run-inverse-kinematics) section for more details.
-   - **Add Model**: Open your scaled model (e.g., `Model_Pose2Sim_LSTM.osim`). 
-   - **Add Motion**: Open your motion file (e.g., `angles.mot`). Make sure the skeleton is selected in the outliner.
+   - **OpenSim data -> Model**: Open your scaled model (e.g., `demo_Sports2D_m_person00_LSTM.osim`). 
+   - **OpenSim data -> Motion**: Open your motion file (e.g., `demo_Sports2D_m_person00_LSTM_ik.mot`). 
 
-   The OpenSim skeleton is not rigged yet. **[Feel free to contribute!](https://github.com/perfanalytics/pose2sim/issues/40)**
+   The OpenSim skeleton is not rigged yet. **[Feel free to contribute!](https://github.com/perfanalytics/pose2sim/issues/40)** [![Discord](https://img.shields.io/discord/1183750225471492206?logo=Discord&label=Discord%20community)](https://discord.com/invite/4mXUdSFjmt)
 
 <img src="Content/sports2d_blender.gif" width="760">
 
@@ -241,7 +245,7 @@ If you only want to analyze a subset of the detected persons, you can use the `-
 sports2d --nb_persons_to_detect 2 --person_ordering_method highest_likelihood
 ```
 
-We recommend to use the `on_click` method if you can afford a manual input. This lets the user handle both the person number and their order in the same stage. When prompted, select the persons you are interested in in the desired order. In our case, lets slide to a frame where both people are visible, and select the woman first, then the man.
+We recommend using the `on_click` method if you can afford a manual input. This lets the user handle both the person number and their order in the same stage. When prompted, select the persons you are interested in in the desired order. In our case, lets slide to a frame where both people are visible, and select the woman first, then the man.
 
 Otherwise, if you want to run Sports2D automatically for example, you can choose other ordering methods such as 'highest_likelihood', 'largest_size', 'smallest_size',  'greatest_displacement', 'least_displacement', 'first_detected', or 'last_detected'.
 
@@ -258,28 +262,32 @@ sports2d --person_ordering_method on_click
 
 
 #### Get coordinates in meters: 
-> **N.B.:** Depth is estimated from a neutral pose. 
+> **N.B.:** The Z coordinate (depth) should not be overly trusted. 
 
-<!-- You either need to provide a calibration file, or simply the height of a person (Note that the latter will not take distortions into account, and that it will be less accurate for motion in the frontal plane).\-->
-You may need to convert pixel coordinates to meters.\
-Just provide the height of the reference person (and their ID in case of multiple person detection).
+You may want coordinates in meters rather than pixels. 2 options to do so:
 
-You can also specify whether the visible side of the person is left, right, front, or back. Set it to 'auto' if you do not want to find it automatically (only works for motion in the sagittal plane), or to 'none' if you want to keep 2D instead of 3D coordinates (if the person goes right, and then left for example).
+1. **Just provide the height of a reference person**:
+   - Their height in meters is be compared with their height in pixels to get a pixel-to-meter conversion factor.
+   - To estimate the depth coordinates, specify which side of the person is visible: `left`, `right`, `front`, or `back`. Use `auto` if you want it to be automatically determined (only works for motions in the sagittal plane), or `none` if you want to keep 2D coordinates instead of 3D (if the person turns around, for example).
+   - The floor angle is automatically estimated from gait, as well as the origin of the xy axis. The person trajectory is corrected accordingly. You can use the `--floor_angle` and `--xy_origin` parameters to manually specify them if your subject is not travelling horizontally or if you want the origin not to be under their feet (note that the `y` axis points down).
+   
+   **N.B.: A calibration file will be generated.** By convention, the camera-to-subject distance is set to 10 meters.
 
-The floor angle and the origin of the xy axis are computed automatically from gait. If you analyze another type of motion, you can manually specify them. Note that `y` points down.\
-Also note that distortions are not taken into account, and that results will be less accurate for motions in the frontal plane.
+   ``` cmd
+   sports2d --first_person_height 1.65 --visible_side auto front none
+   ```
+   ``` cmd
+   sports2d --first_person_height 1.65 --visible_side auto front none `
+            --person_ordering_method on_click `
+            --floor_angle 0 --xy_origin 0 940
+   ```
 
-<!-- ``` cmd
-sports2d --to_meters True --calib_file calib_demo.toml
-``` -->
-``` cmd
-sports2d --to_meters True --first_person_height 1.65 --visible_side auto front none
-```
-``` cmd
-sports2d --to_meters True --first_person_height 1.65 --visible_side auto front none `
-         --person_ordering_method on_click `
-         --floor_angle 0 --xy_origin 0 940
-```
+2. **Or use a calibration file**:\
+  It can either be a `.toml` calibration file previously generated by Sports2D, or a more accurate one coming from another system. For example, [Pose2Sim](https://github.com/perfanalytics/pose2sim) can be used to accurately calculate calibration, or to convert calibration files from Qualisys, Vicon, OpenCap, FreeMoCap, etc.
+
+   ``` cmd
+   sports2d --calib_file Calib_demo.toml --visible_side auto front none
+   ```
 
 <br>
 
@@ -294,18 +302,22 @@ OpenSim inverse kinematics allows you to set joint constraints, joint angle limi
 This is done via [Pose2Sim](https://github.com/perfanalytics/pose2sim).\
 Model scaling is done according to the mean of the segment lengths, across a subset of frames. We remove the 10% fastest frames (potential outliers), the frames where the speed is 0 (person probably out of frame), the frames where the average knee and hip flexion angles are above 45° (pose estimation is not precise when the person is crouching) and the 20% most extreme segment values after the previous operations (potential outliers). All these parameters can be edited in your Config.toml file.
 
+**N.B.: This will not work on sections where the person is not moving in a single plane. You can split your video into several time ranges if needed.**
+
 ```cmd
 sports2d --time_range 1.2 2.7 `
          --do_ik true --first_person_height 1.65 --visible_side auto front
 ```
 
 You can optionally use the LSTM marker augmentation to improve the quality of the output motion.\
-You can also optionally give the participants proper masses. Mass has no influence on motion, only on forces (if you decide to further pursue kinetics analysis).
+You can also optionally give the participants proper masses. Mass has no influence on motion, only on forces (if you decide to further pursue kinetics analysis).\
+Optionally again, you can [visualize the overlaid results in Blender](#visualize-in-blender). The automatic calibration won't be accurate with such a small time range, so you need to use the provided calibration file (or one that has been generated from the full walk).
 
 ```cmd
 sports2d --time_range 1.2 2.7 `
          --do_ik true --first_person_height 1.65 --visible_side left front `
-         --use_augmentation True --participant_mass 55.0 67.0
+         --use_augmentation True --participant_mass 55.0 67.0 `
+         --calib_file Calib_demo.toml
 ```
 
 <br>
@@ -333,14 +345,31 @@ sports2d --video_input demo.mp4 other_video.mp4 --time_range 1.2 2.7 0 3.5
   ``` cmd
   sports2d --config Config_demo.toml
   ```
-- Run within Python: 
-  ``` python
-  from Sports2D import Sports2D; Sports2D.process('Config_demo.toml')
-  ```
-- Run within Python with a dictionary (for example, `config_dict = toml.load('Config_demo.toml')`):
-  ``` python
-  from Sports2D import Sports2D; Sports2D.process(config_dict)
-  ```
+- Run within Python, for example:\
+  - Edit `Demo/Config_demo.toml` and run:
+    ```python
+    from Sports2D import Sports2D
+    from pathlib import Path
+    import toml
+
+    config_path = Path(Sports2D.__file__).parent / 'Demo'/'Config_demo.toml'
+    config_dict = toml.load(config_path)
+    Sports2D.process(config_dict)
+    ```
+  - Or you can pass the non default values only: 
+    ```python
+    from Sports2D import Sports2D
+    config_dict = {
+      'base': {
+        'nb_persons_to_detect': 1,
+        'person_ordering_method': 'greatest_displacement'
+        },
+      'pose': {
+        'mode': 'lightweight', 
+        'det_frequency': 50
+        }}
+    Sports2D.process(config_dict)
+    ```
 
 <br>
 
@@ -364,7 +393,7 @@ sports2d --video_input demo.mp4 other_video.mp4 --time_range 1.2 2.7 0 3.5
   ```cmd
   sports2d --flip_left_right true # Default
   ```
-- Correct segment angles according to the estimated camera tild angle.\
+- Correct segment angles according to the estimated camera tilt angle.\
   **N.B.:** *The camera tilt angle is automatically estimated. Set to false if it is actually the floor which is tilted rather than the camera.*
   ```cmd
   sports2d --correct_segment_angles_with_floor_angle true # Default
@@ -434,6 +463,7 @@ sports2d --help
 'show_realtime_results': ["R", "show results in real-time. true if not specified"],
 'display_angle_values_on': ["a", '"body", "list", "body" "list", or "none". body list if not specified'],
 'show_graphs': ["G", "show plots of raw and processed results. true if not specified"],
+'save_graphs': ["", "save position and angle plots of raw and processed results. false if not specified"],
 'joint_angles': ["j", '"Right ankle" "Left ankle" "Right knee" "Left knee" "Right hip" "Left hip" "Right shoulder" "Left shoulder" "Right elbow" "Left elbow" if not specified'],
 'segment_angles': ["s", '"Right foot" "Left foot" "Right shank" "Left shank" "Right thigh" "Left thigh" "Pelvis" "Trunk" "Shoulders" "Head" "Right arm" "Left arm" "Right forearm" "Left forearm" if not specified'],
 'save_vid': ["V", "save processed video. true if not specified"],

sports2d-0.8.22/Sports2D/Demo/Calib_demo.toml

@@ -0,0 +1,12 @@
+[demo]
+name = "demo"
+size = [ 1768, 994]
+matrix = [ [ 2520.0897058227038, 0.0, 884.0], [ 0.0, 2520.0897058227038, 497.0], [ 0.0, 0.0, 1.0]]
+distortions = [ 0.0, 0.0, 0.0, 0.0]
+rotation = [ 1.2082126924727719, 1.2098328575850605, -1.2082126924727719]
+translation = [ -3.510103521992233, 1.7079310029359385, 10.0]
+fisheye = false
+
+[metadata]
+adjusted = false
+error = 0.0

{sports2d-0.8.20 → sports2d-0.8.22}/Sports2D/Demo/Config_demo.toml

@@ -97,13 +97,13 @@ tracking_mode = 'sports2d' # 'sports2d' or 'deepsort'. 'deepsort' is slower, har
 keypoint_likelihood_threshold = 0.3 # Keypoints whose likelihood is lower will not be taken into account
 average_likelihood_threshold = 0.5  # Person will be ignored if average likelihood of good keypoints is lower than this value
 keypoint_number_threshold = 0.3     # Person will be ignored if the number of good keypoints (above keypoint_likelihood_threshold) is less than this fraction
-
+max_distance = 100  # in px or None # If a person is detected further than max_distance from its position on the previous frame, it will be considered as a new one
 
 [px_to_meters_conversion]
 # Pixel to meters conversion
 to_meters = true
 make_c3d = true
-save_calib = true # Coming soon!
+save_calib = false
 
 # If conversion from first_person_height
 floor_angle = 'auto'    # 'auto' or a value in degrees, eg 2.3. If 'auto', estimated from the line formed by the toes when they are on the ground (where speed = 0)
@@ -131,15 +131,16 @@ correct_segment_angles_with_floor_angle = true # If the camera is tilted, correc
 
 [post-processing]
 interpolate = true
-interp_gap_smaller_than = 10        # do not interpolate bigger gaps
+interp_gap_smaller_than = 10        # Do not interpolate larger gaps
 fill_large_gaps_with = 'last_value' # 'last_value', 'nan', or 'zeros' 
 sections_to_keep = 'all' # 'all', 'largest', 'first', 'last'
-                        # keep 'all' valid sections even when they are interspersed with undetected chunks, or the 'largest' valid section, or the 'first' one, or the 'last' one
-reject_outliers = true      # Hampel filter for outlier rejection before other filtering methods. Rejects outliers that are outside of a 95% confidence interal from the median in a sliding window of size 7.
+                        # Keep 'all' valid sections even when they are interspersed with undetected chunks, or the 'largest' valid section, or the 'first' one, or the 'last' one
+min_chunk_size = 10     # Minimum number of valid frames in a row to keep a chunk of data for a person
+reject_outliers = true  # Hampel filter for outlier rejection before other filtering methods. Rejects outliers that are outside of a 95% confidence interal from the median in a sliding window of size 7.
 
 filter = true
 show_graphs = true         # Show plots of raw and processed results
-save_graphs = false        # Save position and angle plots of raw and processed results
+save_graphs = true         # Save position and angle plots of raw and processed results
 filter_type = 'butterworth'     # butterworth, kalman, gcv_spline, gaussian, loess, median, butterworth_on_speed
    
    # Most intuitive and standard filter in biomechanics

{sports2d-0.8.20 → sports2d-0.8.22}/Sports2D/Sports2D.py

@@ -152,6 +152,7 @@ DEFAULT_CONFIG =   {'base': {'video_input': ['demo.mp4'],
                                 'keypoint_likelihood_threshold': 0.3,
                                 'average_likelihood_threshold': 0.5,
                                 'keypoint_number_threshold': 0.3,
+                                'max_distance': 100,
                                 'CUSTOM': { 'name': 'Hip',
                                             'id': 19,
                                             'children': [{'name': 'RHip',
@@ -196,7 +197,7 @@ DEFAULT_CONFIG =   {'base': {'video_input': ['demo.mp4'],
                                 'calib_file': '',
                                 'floor_angle': 'auto',
                                 'xy_origin': ['auto'],
-                                'save_calib': True
+                                'save_calib': False
                                 },
                     'angles':   {'display_angle_values_on': ['body', 'list'],
                                 'fontSize': 0.3,
@@ -233,10 +234,11 @@ DEFAULT_CONFIG =   {'base': {'video_input': ['demo.mp4'],
                                         'interp_gap_smaller_than': 10,
                                         'fill_large_gaps_with': 'last_value',
                                         'sections_to_keep':'all',
+                                        'min_chunk_size': 10,
                                         'reject_outliers': True,
                                         'filter': True,
                                         'show_graphs': True,
-                                        'save_graphs': False,
+                                        'save_graphs': True,
                                         'filter_type': 'butterworth',
                                         'butterworth': {'order': 4, 'cut_off_frequency': 6.0},
                                         'kalman': {'trust_ratio': 500.0, 'smooth':True},
@@ -280,7 +282,7 @@ CONFIG_HELP =   {'config': ["C", "path to a toml configuration file"],
                 'show_realtime_results': ["R", "show results in real-time. true if not specified"],
                 'display_angle_values_on': ["a", '"body", "list", "body" "list", or "none". body list if not specified'],
                 'show_graphs': ["G", "show plots of raw and processed results. true if not specified"],
-                'save_graphs': ["", "save position and angle plots of raw and processed results. false if not specified"],
+                'save_graphs': ["", "save position and angle plots of raw and processed results. true if not specified"],
                 'joint_angles': ["j", '"Right ankle" "Left ankle" "Right knee" "Left knee" "Right hip" "Left hip" "Right shoulder" "Left shoulder" "Right elbow" "Left elbow" if not specified'],
                 'segment_angles': ["s", '"Right foot" "Left foot" "Right shank" "Left shank" "Right thigh" "Left thigh" "Pelvis" "Trunk" "Shoulders" "Head" "Right arm" "Left arm" "Right forearm" "Left forearm" if not specified'],
                 'save_vid': ["V", "save processed video. true if not specified"],
@@ -315,6 +317,7 @@ CONFIG_HELP =   {'config': ["C", "path to a toml configuration file"],
                 'keypoint_likelihood_threshold': ["", "detected keypoints are not retained if likelihood is below this threshold. 0.3 if not specified"],
                 'average_likelihood_threshold': ["", "detected persons are not retained if average keypoint likelihood is below this threshold. 0.5 if not specified"],
                 'keypoint_number_threshold': ["", "detected persons are not retained if number of detected keypoints is below this threshold. 0.3 if not specified, i.e., i.e., 30 percent"],
+                'max_distance': ["", "If a person is detected further than max_distance from its position on the previous frame, it will be considered as a new one. in px or None, 100 by default."],
                 'fastest_frames_to_remove_percent': ["", "Frames with high speed are considered as outliers. Defaults to 0.1"],
                 'close_to_zero_speed_px': ["", "Sum for all keypoints: about 50 px/frame or 0.2 m/frame. Defaults to 50"],
                 'large_hip_knee_angles': ["", "Hip and knee angles below this value are considered as imprecise. Defaults to 45"],
@@ -326,6 +329,7 @@ CONFIG_HELP =   {'config': ["C", "path to a toml configuration file"],
                 'interp_gap_smaller_than': ["", "interpolate sequences of missing data if they are less than N frames long. 10 if not specified"],
                 'fill_large_gaps_with': ["", "last_value, nan, or zeros. last_value if not specified"],
                 'sections_to_keep': ["", "all, largest, first, or last.  Keep 'all' valid sections even when they are interspersed with undetected chunks, or the 'largest' valid section, or the 'first' one, or the 'last' one"],
+                'min_chunk_size': ["", "Minimum number of valid frames in a row to keep a chunk of data for a person.  10 if not specified"],
                 'reject_outliers': ["", "reject outliers with Hampel filter before other filtering methods. true if not specified"],
                 'filter': ["", "filter results. true if not specified"],
                 'filter_type': ["", "butterworth, kalman, gcv_spline, gaussian, median, or loess. butterworth if not specified"],
@@ -473,6 +477,14 @@ def set_nested_value(config, flat_key, value):
     d[keys[-1]] = value
 
 
+def merge_dicts(original, overrides):
+    for key, value in overrides.items():
+        if isinstance(value, dict) and isinstance(original.get(key), dict):
+            merge_dicts(original[key], value)
+        else:
+            original[key] = value
+            
+
 def str2bool(v):
     '''
     Convert a string to a boolean value.
@@ -500,7 +512,8 @@ def process(config='Config_demo.toml'):
     from Sports2D.process import process_fun
     
     if type(config) == dict:
-        config_dict = config
+        config_dict = DEFAULT_CONFIG.copy()
+        merge_dicts(config_dict, config)
     else:
         config_dict = read_config_file(config)
     video_dir, video_files, frame_rates, time_ranges, result_dir = base_params(config_dict)

{sports2d-0.8.20 → sports2d-0.8.22}/Sports2D/Utilities/tests.py

@@ -45,7 +45,7 @@ def test_workflow():
     ## From Python             ##
     #############################
 
-    # Default
+    # Default from the demo config file
     config_path = Path(__file__).resolve().parent.parent / 'Demo' / 'Config_demo.toml'
     config_dict = toml.load(config_path)
     video_dir = Path(__file__).resolve().parent.parent / 'Demo'
@@ -53,6 +53,28 @@ def test_workflow():
     config_dict.get("base").update({"person_ordering_method": "highest_likelihood"})
     config_dict.get("base").update({"show_realtime_results":False})
     config_dict.get("post-processing").update({"show_graphs":False})
+    config_dict.get("post-processing").update({"save_graphs":False})
+    
+    Sports2D.process(config_dict)
+
+
+    # Only passing the updated values
+    video_dir = Path(__file__).resolve().parent.parent / 'Demo'
+    config_dict = {
+      'base': {
+        'nb_persons_to_detect': 1,
+        'person_ordering_method': 'greatest_displacement',
+        "show_realtime_results":False
+        },
+      'pose': {
+        'mode': 'lightweight', 
+        'det_frequency': 50
+        },
+      'post-processing': {
+        'show_graphs':False,
+        'save_graphs':False
+        }
+    }
     
     Sports2D.process(config_dict)
 
@@ -62,28 +84,28 @@ def test_workflow():
     #############################
 
     # Default
-    demo_cmd = ["sports2d", "--person_ordering_method", "highest_likelihood", "--show_realtime_results", "False", "--show_graphs", "False"]
+    demo_cmd = ["sports2d", "--person_ordering_method", "highest_likelihood", "--show_realtime_results", "False", "--show_graphs", "False", "--save_graphs", "False"]
     subprocess.run(demo_cmd, check=True, capture_output=True, text=True, encoding='utf-8', errors='replace')
 
     # With loading a trc file, visible_side 'front', first_person_height '1.76", floor_angle 0, xy_origin [0, 928]
-    demo_cmd2 = ["sports2d", "--show_realtime_results", "False", "--show_graphs", "False",
+    demo_cmd2 = ["sports2d", "--show_realtime_results", "False", "--show_graphs", "False", "--save_graphs", "False",
                  "--load_trc_px", os.path.join(root_dir, "demo_Sports2D", "demo_Sports2D_px_person01.trc"),
                  "--visible_side", "front", "--first_person_height", "1.76", "--time_range", "1.2", "2.7",
                  "--floor_angle", "0", "--xy_origin", "0", "928"]
     subprocess.run(demo_cmd2, check=True, capture_output=True, text=True, encoding='utf-8', errors='replace')
 
     # 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", 
-                 "--to_meters", "False", 
+    demo_cmd3 = ["sports2d", "--show_realtime_results", "False", "--show_graphs", "False", "--save_graphs", "False",
+                #  "--calib_file", "calib_demo.toml", 
                  "--nb_persons_to_detect", "1", "--person_ordering_method", "greatest_displacement", 
                  "--mode", "lightweight", "--det_frequency", "50", 
                  "--slowmo_factor", "4",
-                 "--filter_type", "gaussian",
+                 "--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
-    demo_cmd4 = ["sports2d", "--person_ordering_method", "greatest_displacement", "--show_realtime_results", "False", "--show_graphs", "False",
+    demo_cmd4 = ["sports2d", "--person_ordering_method", "greatest_displacement", "--show_realtime_results", "False", "--show_graphs", "False", "--save_graphs", "False",
                  "--time_range", "1.2", "2.7",
                  "--do_ik", "True", "--use_augmentation", "True", 
                  "--nb_persons_to_detect", "all", "--first_person_height", "1.65",
@@ -97,7 +119,7 @@ def test_workflow():
     config_dict.get("base").update({"video_dir": str(video_dir)})
     config_dict.get("base").update({"person_ordering_method": "highest_likelihood"})
     with open(config_path, 'w') as f: toml.dump(config_dict, f)
-    demo_cmd5 = ["sports2d", "--config", str(config_path), "--show_realtime_results", "False", "--show_graphs", "False"]
+    demo_cmd5 = ["sports2d", "--config", str(config_path), "--show_realtime_results", "False", "--show_graphs", "False", "--save_graphs", "False",]
     subprocess.run(demo_cmd5, check=True, capture_output=True, text=True, encoding='utf-8', errors='replace')