c3d-parser 1.5.1__tar.gz → 1.5.3__tar.gz

{c3d_parser-1.5.1/src/c3d_parser.egg-info → c3d_parser-1.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: c3d-parser
-Version: 1.5.1
+Version: 1.5.3
 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.8.0
+Requires-Dist: opensim-model-creator==0.8.2
 Requires-Dist: PySide6
 Requires-Dist: matplotlib
 Requires-Dist: mplcursors

{c3d_parser-1.5.1 → c3d_parser-1.5.3}/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.8.0
+opensim-model-creator==0.8.2
 PySide6
 matplotlib
 mplcursors

c3d_parser-1.5.3/src/c3d_parser/__init__.py

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

{c3d_parser-1.5.1 → c3d_parser-1.5.3}/src/c3d_parser/core/c3d_parser.py

@@ -1631,13 +1631,13 @@ def add_medial_knee_markers(frame_data, left_knee_width, right_knee_width, marke
     This function takes a pandas.DataFrame of TRC data, extracts a single frame from the data
     and adds the medial knee markers if they are missing. It returns the frame as a pandas.Series.
 
-    The ``padding`` argument should include skin-padding as well as the thickness of the
-    baseplate used to attach the markers.
+    The ``padding`` values are the thickness of the baseplate used to attach the markers. Knee
+    widths are measured over the skin.
     """
     frame = frame_data.iloc[len(frame_data) // 2].copy()
 
-    medial_padding = 6
-    lateral_padding = 4
+    medial_padding = 2
+    lateral_padding = 2
 
     for side in ['L', 'R']:
         medial_label = f'{side}KNEM'
@@ -1651,7 +1651,7 @@ def add_medial_knee_markers(frame_data, left_knee_width, right_knee_width, marke
             magnitude = np.sqrt((np.array(axix_vector) ** 2.0).sum(-1))
             knee_axis = np.divide(axix_vector, magnitude)
 
-            # Adjust knee width to account for marker-radius, skin-padding.
+            # Adjust knee width to account for marker-radius, baseplate.
             knee_width = left_knee_width if side == 'L' else right_knee_width
             knee_width = knee_width + marker_diameter + medial_padding + lateral_padding
             medial_marker = lateral_marker + knee_width * knee_axis
@@ -1668,7 +1668,7 @@ def create_osim_model(static_trc, dynamic_trc, static_marker_data, marker_diamet
     rotation_matrix = np.array([[1, 0, 0], [0, 0, 1], [0, -1, 0]])
     static_marker_data = {k: np.dot(rotation_matrix, v) for k, v in static_marker_data.items()}
     subject_info = get_subject_info(static_data)
-    marker_radius = marker_diameter / 2
+    marker_radius = marker_diameter / 2 + 2  # Include the 2mm marker baseplate.
 
     model_path = create_model(static_trc, dynamic_trc, output_directory, static_marker_data, subject_info,
                               marker_radius, left_foot_flat, right_foot_flat,

{c3d_parser-1.5.1 → c3d_parser-1.5.3}/src/c3d_parser/core/osim_resources/ik_task_set.xml

@@ -74,6 +74,12 @@
 				<!--Weight given to the task when solving inverse kinematics problems, default is 0.-->
 				<weight>1</weight>
 			</IKMarkerTask>
+			<IKMarkerTask name="SACR">
+				<!--Whether or not this task will be used during inverse kinematics solve, default is true.-->
+				<apply>true</apply>
+				<!--Weight given to the task when solving inverse kinematics problems, default is 0.-->
+				<weight>2</weight>
+			</IKMarkerTask>
 			<IKMarkerTask name="RHEE">
 				<!--Whether or not this task will be used during inverse kinematics solve, default is true.-->
 				<apply>true</apply>

{c3d_parser-1.5.1 → c3d_parser-1.5.3/src/c3d_parser.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: c3d-parser
-Version: 1.5.1
+Version: 1.5.3
 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.8.0
+Requires-Dist: opensim-model-creator==0.8.2
 Requires-Dist: PySide6
 Requires-Dist: matplotlib
 Requires-Dist: mplcursors

{c3d_parser-1.5.1 → c3d_parser-1.5.3}/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.8.0
+opensim-model-creator==0.8.2
 PySide6
 matplotlib
 mplcursors

c3d_parser-1.5.1/src/c3d_parser/__init__.py

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