c3d-parser 1.6.0__tar.gz → 1.6.2__tar.gz

{c3d_parser-1.6.0/src/c3d_parser.egg-info → c3d_parser-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: c3d-parser
-Version: 1.6.0
+Version: 1.6.2
 Summary: C3D parser for gait data harmonisation.
 Author-email: Timothy Salemink <tim.nicolas@outlook.com>, Sally Jack <sallyjaack@gmail.com>
 License-Expression: Apache-2.0
@@ -12,7 +12,7 @@ Requires-Dist: numpy==1.26.4
 Requires-Dist: pandas
 Requires-Dist: c3d==0.5.2
 Requires-Dist: trc-data-reader>=0.4.1
-Requires-Dist: opensim-model-creator==0.10.0
+Requires-Dist: opensim-model-creator==0.10.1
 Requires-Dist: PySide6
 Requires-Dist: matplotlib
 Requires-Dist: mplcursors
@@ -81,7 +81,7 @@ these classifications by right-clicking on the item in question. You can exclude
 from the analysis by using the check-boxes provided.
 
 <p align="center">
-  <img src="res/images/Inputs.png" alt="Inputs Screenshot"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Inputs.png" alt="Inputs Screenshot"/>
 </p>
 
 You can also specify an "Output" directory if you wish. By default, an output structure will be
@@ -94,7 +94,7 @@ filled using the metadata in your static C3D file. Confirm these values are accu
 any gaps.
 
 <p align="center">
-  <img src="res/images/Anthropometrics.png" alt="Anthropometrics Screenshot"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Anthropometrics.png" alt="Anthropometrics Screenshot"/>
 </p>
 
 
@@ -107,7 +107,7 @@ The visualisation tab displays the generated model and the predicted landmark po
 these against the (skin-padding adjusted) experimental marker positions.
 
 <p align="center">
-  <img src="res/images/Visualiser.png" alt="Visualiser Screenshot"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Visualiser.png" alt="Visualiser Screenshot"/>
 </p>
 
 
@@ -127,12 +127,12 @@ select "Exclude Selected Cycles". Similarly, it is also possible to exclude/incl
 sections of data for specific trials by right-clicking on the trial name in the list of trials.
 
 <p align="center">
-  <img src="res/images/Exclusion_01.png" alt="Exclusion 01"/>
-  <img src="res/images/Exclusion_02.png" alt="Exclusion 02"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Exclusion_01.png" alt="Exclusion 01"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Exclusion_02.png" alt="Exclusion 02"/>
 </p>
 <p align="center">
-  <img src="res/images/Exclusion_03.png" alt="Exclusion 03"/>
-  <img src="res/images/Exclusion_04.png" alt="Exclusion 04"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Exclusion_03.png" alt="Exclusion 03"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Exclusion_04.png" alt="Exclusion 04"/>
 </p>
 
 The "Spatio-temporal" tab supports exclusions in the same manner.
@@ -146,7 +146,7 @@ User settings are available under _View_ -> _Options_.
 All settings are retained after you close the application.
 
 <p align="center">
-  <img src="res/images/Options.png" alt="Options Screenshot"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Options.png" alt="Options Screenshot"/>
 </p>
 
 **File**  
@@ -172,7 +172,7 @@ please deselect these options.
 **Inverse Kinematics**  
 If you wish to define custom marker weights, you may do so by providing your own IK task set file.
 Please follow the format used in the C3D-Parser
-[default IK task set](src/c3d_parser/core/osim_resources/ik_task_set.xml).
+[default IK task set](https://github.com/musculoskeletal/c3d-parser/blob/main/src/c3d_parser/core/osim_resources/ik_task_set.xml).
 
 
 ## Custom Marker Sets
@@ -182,7 +182,7 @@ not fit your needs you can adjust one of the existing marker sets or create a ne
 using the custom marker set dialog under "Marker" -> "Custom Marker Set".
 
 <p align="center">
-  <img src="res/images/Custom_Marker_Set.png" alt="Custom Marker Set Screenshot"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Custom_Marker_Set.png" alt="Custom Marker Set Screenshot"/>
 </p>
 
 You can import an initial mapping from one of the existing marker sets using the "Import" button.

{c3d_parser-1.6.0 → c3d_parser-1.6.2}/README.md

@@ -59,7 +59,7 @@ these classifications by right-clicking on the item in question. You can exclude
 from the analysis by using the check-boxes provided.
 
 <p align="center">
-  <img src="res/images/Inputs.png" alt="Inputs Screenshot"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Inputs.png" alt="Inputs Screenshot"/>
 </p>
 
 You can also specify an "Output" directory if you wish. By default, an output structure will be
@@ -72,7 +72,7 @@ filled using the metadata in your static C3D file. Confirm these values are accu
 any gaps.
 
 <p align="center">
-  <img src="res/images/Anthropometrics.png" alt="Anthropometrics Screenshot"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Anthropometrics.png" alt="Anthropometrics Screenshot"/>
 </p>
 
 
@@ -85,7 +85,7 @@ The visualisation tab displays the generated model and the predicted landmark po
 these against the (skin-padding adjusted) experimental marker positions.
 
 <p align="center">
-  <img src="res/images/Visualiser.png" alt="Visualiser Screenshot"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Visualiser.png" alt="Visualiser Screenshot"/>
 </p>
 
 
@@ -105,12 +105,12 @@ select "Exclude Selected Cycles". Similarly, it is also possible to exclude/incl
 sections of data for specific trials by right-clicking on the trial name in the list of trials.
 
 <p align="center">
-  <img src="res/images/Exclusion_01.png" alt="Exclusion 01"/>
-  <img src="res/images/Exclusion_02.png" alt="Exclusion 02"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Exclusion_01.png" alt="Exclusion 01"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Exclusion_02.png" alt="Exclusion 02"/>
 </p>
 <p align="center">
-  <img src="res/images/Exclusion_03.png" alt="Exclusion 03"/>
-  <img src="res/images/Exclusion_04.png" alt="Exclusion 04"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Exclusion_03.png" alt="Exclusion 03"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Exclusion_04.png" alt="Exclusion 04"/>
 </p>
 
 The "Spatio-temporal" tab supports exclusions in the same manner.
@@ -124,7 +124,7 @@ User settings are available under _View_ -> _Options_.
 All settings are retained after you close the application.
 
 <p align="center">
-  <img src="res/images/Options.png" alt="Options Screenshot"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Options.png" alt="Options Screenshot"/>
 </p>
 
 **File**  
@@ -150,7 +150,7 @@ please deselect these options.
 **Inverse Kinematics**  
 If you wish to define custom marker weights, you may do so by providing your own IK task set file.
 Please follow the format used in the C3D-Parser
-[default IK task set](src/c3d_parser/core/osim_resources/ik_task_set.xml).
+[default IK task set](https://github.com/musculoskeletal/c3d-parser/blob/main/src/c3d_parser/core/osim_resources/ik_task_set.xml).
 
 
 ## Custom Marker Sets
@@ -160,7 +160,7 @@ not fit your needs you can adjust one of the existing marker sets or create a ne
 using the custom marker set dialog under "Marker" -> "Custom Marker Set".
 
 <p align="center">
-  <img src="res/images/Custom_Marker_Set.png" alt="Custom Marker Set Screenshot"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Custom_Marker_Set.png" alt="Custom Marker Set Screenshot"/>
 </p>
 
 You can import an initial mapping from one of the existing marker sets using the "Import" button.

{c3d_parser-1.6.0 → c3d_parser-1.6.2}/requirements.txt

@@ -3,7 +3,7 @@ numpy==1.26.4
 pandas
 c3d==0.5.2
 trc-data-reader>=0.4.1
-opensim-model-creator==0.10.0
+opensim-model-creator==0.10.1
 PySide6
 matplotlib
 mplcursors

c3d_parser-1.6.2/src/c3d_parser/__init__.py

@@ -0,0 +1,2 @@
+
+__version__ = "1.6.2"

{c3d_parser-1.6.0 → c3d_parser-1.6.2}/src/c3d_parser/core/c3d_parser.py

@@ -92,7 +92,8 @@ def parse_session(static_trial, dynamic_trials, input_directory, output_director
                                    output_directory, left_foot_flat, right_foot_flat, toe_marker_proximal,
                                    optimise_knee_axis, progress_tracker)
 
-    write_c3d_parser_history(input_directory, output_directory, static_trial, deidentified_file_names, static_data)
+    write_c3d_parser_history(input_directory, output_directory, lab, static_trial, deidentified_file_names, static_data,
+                             left_foot_flat, right_foot_flat, toe_marker_proximal)
 
     if not trc_file_paths:
         raise CancelException("No dynamic trials found.")
@@ -251,15 +252,18 @@ def parse_dynamic_trial(c3d_file, lab, output_directory, trial_index, marker_dat
     return analog_data, events, s_t_data, trc_file_path, grf_file_path
 
 
-def write_c3d_parser_history(input_directory, output_directory, static_trial, deidentified_file_names, static_data):
+def write_c3d_parser_history(input_directory, output_directory, lab, static_trial, deidentified_file_names, static_data,
+                             left_foot_flat, right_foot_flat, toe_marker_proximal):
     log_path = os.path.join(input_directory, "c3d_parser_history.log")
     timestamp = datetime.now().strftime("%Y-%m-%d %H:%M")
 
     try:
         with open(log_path, "w", encoding="utf-8") as f:
             f.write("C3D-Parser History\n")
-            f.write(f"Last Run: {timestamp}\n\n")
+            f.write(f"Last Run: {timestamp}\n")
+            f.write(f"C3D-Parser Version: {VERSION}\n\n")
 
+            f.write(f"Lab: {lab}\n")
             f.write(f"Static trial: {static_trial}\n\n")
 
             if deidentified_file_names:
@@ -286,6 +290,12 @@ def write_c3d_parser_history(input_directory, output_directory, static_trial, de
                     unit = f" {units[key]}" if key in units else ""
                     f.write(f"{label}: {value}{unit}\n")
 
+            f.write("\n")
+            f.write("Foot Settings:\n")
+            f.write(f"Toe Marker: {'Proximal' if toe_marker_proximal else '2nd/3rd Met'}\n")
+            f.write(f"Left Foot Flat: {left_foot_flat}\n")
+            f.write(f"Right Foot Flat: {right_foot_flat}\n")
+
             metrics, measurements = define_metrics_and_measurements(output_directory)
             if metrics:
                 f.write("\n")

{c3d_parser-1.6.0 → c3d_parser-1.6.2/src/c3d_parser.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: c3d-parser
-Version: 1.6.0
+Version: 1.6.2
 Summary: C3D parser for gait data harmonisation.
 Author-email: Timothy Salemink <tim.nicolas@outlook.com>, Sally Jack <sallyjaack@gmail.com>
 License-Expression: Apache-2.0
@@ -12,7 +12,7 @@ Requires-Dist: numpy==1.26.4
 Requires-Dist: pandas
 Requires-Dist: c3d==0.5.2
 Requires-Dist: trc-data-reader>=0.4.1
-Requires-Dist: opensim-model-creator==0.10.0
+Requires-Dist: opensim-model-creator==0.10.1
 Requires-Dist: PySide6
 Requires-Dist: matplotlib
 Requires-Dist: mplcursors
@@ -81,7 +81,7 @@ these classifications by right-clicking on the item in question. You can exclude
 from the analysis by using the check-boxes provided.
 
 <p align="center">
-  <img src="res/images/Inputs.png" alt="Inputs Screenshot"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Inputs.png" alt="Inputs Screenshot"/>
 </p>
 
 You can also specify an "Output" directory if you wish. By default, an output structure will be
@@ -94,7 +94,7 @@ filled using the metadata in your static C3D file. Confirm these values are accu
 any gaps.
 
 <p align="center">
-  <img src="res/images/Anthropometrics.png" alt="Anthropometrics Screenshot"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Anthropometrics.png" alt="Anthropometrics Screenshot"/>
 </p>
 
 
@@ -107,7 +107,7 @@ The visualisation tab displays the generated model and the predicted landmark po
 these against the (skin-padding adjusted) experimental marker positions.
 
 <p align="center">
-  <img src="res/images/Visualiser.png" alt="Visualiser Screenshot"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Visualiser.png" alt="Visualiser Screenshot"/>
 </p>
 
 
@@ -127,12 +127,12 @@ select "Exclude Selected Cycles". Similarly, it is also possible to exclude/incl
 sections of data for specific trials by right-clicking on the trial name in the list of trials.
 
 <p align="center">
-  <img src="res/images/Exclusion_01.png" alt="Exclusion 01"/>
-  <img src="res/images/Exclusion_02.png" alt="Exclusion 02"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Exclusion_01.png" alt="Exclusion 01"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Exclusion_02.png" alt="Exclusion 02"/>
 </p>
 <p align="center">
-  <img src="res/images/Exclusion_03.png" alt="Exclusion 03"/>
-  <img src="res/images/Exclusion_04.png" alt="Exclusion 04"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Exclusion_03.png" alt="Exclusion 03"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Exclusion_04.png" alt="Exclusion 04"/>
 </p>
 
 The "Spatio-temporal" tab supports exclusions in the same manner.
@@ -146,7 +146,7 @@ User settings are available under _View_ -> _Options_.
 All settings are retained after you close the application.
 
 <p align="center">
-  <img src="res/images/Options.png" alt="Options Screenshot"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Options.png" alt="Options Screenshot"/>
 </p>
 
 **File**  
@@ -172,7 +172,7 @@ please deselect these options.
 **Inverse Kinematics**  
 If you wish to define custom marker weights, you may do so by providing your own IK task set file.
 Please follow the format used in the C3D-Parser
-[default IK task set](src/c3d_parser/core/osim_resources/ik_task_set.xml).
+[default IK task set](https://github.com/musculoskeletal/c3d-parser/blob/main/src/c3d_parser/core/osim_resources/ik_task_set.xml).
 
 
 ## Custom Marker Sets
@@ -182,7 +182,7 @@ not fit your needs you can adjust one of the existing marker sets or create a ne
 using the custom marker set dialog under "Marker" -> "Custom Marker Set".
 
 <p align="center">
-  <img src="res/images/Custom_Marker_Set.png" alt="Custom Marker Set Screenshot"/>
+  <img src="https://raw.githubusercontent.com/musculoskeletal/c3d-parser/main/res/images/Custom_Marker_Set.png" alt="Custom Marker Set Screenshot"/>
 </p>
 
 You can import an initial mapping from one of the existing marker sets using the "Import" button.

{c3d_parser-1.6.0 → c3d_parser-1.6.2}/src/c3d_parser.egg-info/requires.txt

@@ -3,7 +3,7 @@ numpy==1.26.4
 pandas
 c3d==0.5.2
 trc-data-reader>=0.4.1
-opensim-model-creator==0.10.0
+opensim-model-creator==0.10.1
 PySide6
 matplotlib
 mplcursors

c3d_parser-1.6.0/src/c3d_parser/__init__.py

@@ -1,2 +0,0 @@
-
-__version__ = "1.6.0"