rowingdata 3.8.1__tar.gz → 3.8.3__tar.gz

{rowingdata-3.8.1/rowingdata.egg-info → rowingdata-3.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rowingdata
-Version: 3.8.1
+Version: 3.8.3
 Summary: The rowingdata library to create colorful plots from CrewNerd, Painsled and other rowing data tools
 Home-page: https://github.com/sanderroosendaal/rowingdata
 Author: Sander Roosendaal
@@ -9,6 +9,28 @@ License: MIT
 Keywords: rowing ergometer concept2
 Classifier: Programming Language :: Python :: 3
 License-File: LICENSE
+Requires-Dist: Cython
+Requires-Dist: numpy
+Requires-Dist: scipy
+Requires-Dist: matplotlib
+Requires-Dist: pandas
+Requires-Dist: fitparse
+Requires-Dist: fit-tool>=0.9.14
+Requires-Dist: arrow>=1.0.2
+Requires-Dist: python-dateutil
+Requires-Dist: docopt
+Requires-Dist: tqdm
+Requires-Dist: rowingphysics>=0.2.3
+Requires-Dist: iso8601
+Requires-Dist: lxml>=6.1.0
+Requires-Dist: xmltodict
+Requires-Dist: nose_parameterized
+Requires-Dist: timezonefinder
+Requires-Dist: pycairo
+Requires-Dist: tk
+Requires-Dist: requests
+Requires-Dist: polars
+Requires-Dist: pytz
 
 **************
 Rowingdata
@@ -533,7 +555,7 @@ The available data fields are
 * 'cum_dist'
 
 Oarlock parsers (NK Logbook) may add: ``catch``, ``finish``,
-``slip``, ``wash``, ``peakforceangle``, ``effectiveLength``.
+``slip``, ``wash``, ``peakforceangle``, ``effectiveArc``.
 
 If imported from TCX, Rowpro, or other tools, some data fields may not contain
 useful information. 
@@ -545,7 +567,7 @@ rowingdata CSV Columns
 This section describes the dataframe schema used by the ``rowingdata`` class.
 It is this package's own column layout, not a vendor-neutral standard. For a
 cross-vendor interchange format, see the Rowing Data Standard at
-https://github.com/MoveLab-Studio/rowing-data-standard, which rowingdata
+https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard, which rowingdata
 targets when exporting FIT.
 
 Any parser implementation feeding the ``rowingdata`` class should produce at
@@ -578,12 +600,12 @@ The standard field names are:
 * ' ElapsedTime (sec)'
 
 Optional (Oarlock/NK Logbook): ``catch``/``catchAngle``, ``finish``/``finishAngle``,
-``slip``, ``wash``, ``peakforceangle``, ``effectiveLength``.
+``slip``, ``wash``, ``peakforceangle``, ``effectiveArc``.
 
 Planned for dual oarlock (port/starboard symmetry): ``catch_port``, ``catch_starboard``,
 ``finish_port``, ``finish_starboard``, ``slip_port``, ``slip_starboard``, ``wash_port``,
 ``wash_starboard``, ``peakforceangle_port``, ``peakforceangle_starboard``,
-``effectiveLength_port``, ``effectiveLength_starboard``. See *Dual oarlock
+``effectiveArc_port``, ``effectiveArc_starboard``. See *Dual oarlock
 (port/starboard)* below. **Note:** rowingdata does not yet implement parsing or
 export for these per-side columns.
 
@@ -826,10 +848,9 @@ Oarlock scalars (OTW rigging)
 -----------------------------
 
 Field names: 'catch' / 'catchAngle', 'finish' / 'finishAngle', 'slip',
-'wash', 'peakforceangle', 'effectiveLength'
+'wash', 'peakforceangle', 'effectiveArc'
 
-Units: degrees for angles; meter for effectiveLength (scale may vary by
-source: NK Logbook uses these columns).
+Units: degrees for angles and for effectiveArc.
 
 These fields come from NK Logbook (Oarlock) and similar OTW
 measurement systems. They describe rigging geometry and blade angles:
@@ -842,12 +863,11 @@ measurement systems. They describe rigging geometry and blade angles:
 * **slip** – blade slip angle.
 * **wash** – wash/backwash angle.
 * **peakforceangle** – oar angle at peak force (same 0° = perpendicular convention).
-* **effectiveLength** – effective lever length (rigging geometry). *Not*
-  the same as Drive Length: Effective Length is the horizontal component
-  from pin to handle (a rigging/setup measure, often in cm), whereas
-  Drive Length is the *actual distance the handle traveled* during the
-  stroke (typically 1.2–1.5 m). Both may appear in the same dataset;
-  they serve different purposes.
+* **effectiveArc** – the part of the stroke arc that is effective: catch to
+  finish, less slip and wash (degrees). The Rowing Data Standard replaced the
+  earlier effective *length* (a lever length in mm) with this arc. Files written
+  against earlier drafts carry ``EffectiveLength``; it is read into the
+  ``effectiveLength`` column (metres) and is not converted into an arc.
 
 Dual oarlock (port/starboard)
 ..............................
@@ -951,12 +971,16 @@ Unreleased
 ----------
 
 - **Breaking change to exported FIT file contents.** FIT export now follows the
-  Rowing Data Standard (https://github.com/MoveLab-Studio/rowing-data-standard,
-  Draft v0.1). The ``exporttofit`` API is unchanged, but the bytes it writes are
-  not: the developer application ID is now the standard UUID, ``DriveLength``
-  and ``EffectiveLength`` are encoded in millimetres rather than metres,
-  ``AverageBoatSpeed`` uses scale 255, stroke rate moves to field ID 93, and
-  stroke work to field ID 19. Consumers that hardcoded the previous rowingdata
+  Rowing Data Standard (https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard,
+  current ``main``). The ``exporttofit`` API is unchanged, but the bytes it
+  writes are not: the developer application ID is now the standard UUID,
+  ``DriveLength`` is encoded in millimetres rather than metres,
+  ``AverageBoatSpeed`` uses scale 100, ``EffectiveLength`` is replaced by
+  ``EffectiveArc`` in degrees (IDs 16, 210, 211; the ``effectiveLength*``
+  columns are no longer exported, use ``effectiveArc*``), the force fields are
+  named ``AverageDriveForce`` and ``PeakDriveForce``, stroke rate is written as
+  native ``cadence256``, stroke work uses field ID 19, and no value is written
+  as the FIT invalid value (255 / 65535 / 32767): measurements clip one below it. Consumers that hardcoded the previous rowingdata
   application ID or the old metre-based scales must be updated. ``FITParser``
   still reads files written by rowingdata 3.7.3 and earlier.
 - In-stroke curve fields are emitted under a separate, private application ID,
@@ -964,7 +988,7 @@ Unreleased
   carry no interoperable meaning.
 - Removed ``docs/FIT_STANDARD.md`` and ``docs/FIT_STANDARD.pdf``. The standard is
   maintained by a committee at
-  https://github.com/MoveLab-Studio/rowing-data-standard, which is the single
+  https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard, which is the single
   source of truth; this repository no longer ships a copy.
 
 0.97.x

{rowingdata-3.8.1 → rowingdata-3.8.3}/README.rst

@@ -521,7 +521,7 @@ The available data fields are
 * 'cum_dist'
 
 Oarlock parsers (NK Logbook) may add: ``catch``, ``finish``,
-``slip``, ``wash``, ``peakforceangle``, ``effectiveLength``.
+``slip``, ``wash``, ``peakforceangle``, ``effectiveArc``.
 
 If imported from TCX, Rowpro, or other tools, some data fields may not contain
 useful information. 
@@ -533,7 +533,7 @@ rowingdata CSV Columns
 This section describes the dataframe schema used by the ``rowingdata`` class.
 It is this package's own column layout, not a vendor-neutral standard. For a
 cross-vendor interchange format, see the Rowing Data Standard at
-https://github.com/MoveLab-Studio/rowing-data-standard, which rowingdata
+https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard, which rowingdata
 targets when exporting FIT.
 
 Any parser implementation feeding the ``rowingdata`` class should produce at
@@ -566,12 +566,12 @@ The standard field names are:
 * ' ElapsedTime (sec)'
 
 Optional (Oarlock/NK Logbook): ``catch``/``catchAngle``, ``finish``/``finishAngle``,
-``slip``, ``wash``, ``peakforceangle``, ``effectiveLength``.
+``slip``, ``wash``, ``peakforceangle``, ``effectiveArc``.
 
 Planned for dual oarlock (port/starboard symmetry): ``catch_port``, ``catch_starboard``,
 ``finish_port``, ``finish_starboard``, ``slip_port``, ``slip_starboard``, ``wash_port``,
 ``wash_starboard``, ``peakforceangle_port``, ``peakforceangle_starboard``,
-``effectiveLength_port``, ``effectiveLength_starboard``. See *Dual oarlock
+``effectiveArc_port``, ``effectiveArc_starboard``. See *Dual oarlock
 (port/starboard)* below. **Note:** rowingdata does not yet implement parsing or
 export for these per-side columns.
 
@@ -814,10 +814,9 @@ Oarlock scalars (OTW rigging)
 -----------------------------
 
 Field names: 'catch' / 'catchAngle', 'finish' / 'finishAngle', 'slip',
-'wash', 'peakforceangle', 'effectiveLength'
+'wash', 'peakforceangle', 'effectiveArc'
 
-Units: degrees for angles; meter for effectiveLength (scale may vary by
-source: NK Logbook uses these columns).
+Units: degrees for angles and for effectiveArc.
 
 These fields come from NK Logbook (Oarlock) and similar OTW
 measurement systems. They describe rigging geometry and blade angles:
@@ -830,12 +829,11 @@ measurement systems. They describe rigging geometry and blade angles:
 * **slip** – blade slip angle.
 * **wash** – wash/backwash angle.
 * **peakforceangle** – oar angle at peak force (same 0° = perpendicular convention).
-* **effectiveLength** – effective lever length (rigging geometry). *Not*
-  the same as Drive Length: Effective Length is the horizontal component
-  from pin to handle (a rigging/setup measure, often in cm), whereas
-  Drive Length is the *actual distance the handle traveled* during the
-  stroke (typically 1.2–1.5 m). Both may appear in the same dataset;
-  they serve different purposes.
+* **effectiveArc** – the part of the stroke arc that is effective: catch to
+  finish, less slip and wash (degrees). The Rowing Data Standard replaced the
+  earlier effective *length* (a lever length in mm) with this arc. Files written
+  against earlier drafts carry ``EffectiveLength``; it is read into the
+  ``effectiveLength`` column (metres) and is not converted into an arc.
 
 Dual oarlock (port/starboard)
 ..............................
@@ -939,12 +937,16 @@ Unreleased
 ----------
 
 - **Breaking change to exported FIT file contents.** FIT export now follows the
-  Rowing Data Standard (https://github.com/MoveLab-Studio/rowing-data-standard,
-  Draft v0.1). The ``exporttofit`` API is unchanged, but the bytes it writes are
-  not: the developer application ID is now the standard UUID, ``DriveLength``
-  and ``EffectiveLength`` are encoded in millimetres rather than metres,
-  ``AverageBoatSpeed`` uses scale 255, stroke rate moves to field ID 93, and
-  stroke work to field ID 19. Consumers that hardcoded the previous rowingdata
+  Rowing Data Standard (https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard,
+  current ``main``). The ``exporttofit`` API is unchanged, but the bytes it
+  writes are not: the developer application ID is now the standard UUID,
+  ``DriveLength`` is encoded in millimetres rather than metres,
+  ``AverageBoatSpeed`` uses scale 100, ``EffectiveLength`` is replaced by
+  ``EffectiveArc`` in degrees (IDs 16, 210, 211; the ``effectiveLength*``
+  columns are no longer exported, use ``effectiveArc*``), the force fields are
+  named ``AverageDriveForce`` and ``PeakDriveForce``, stroke rate is written as
+  native ``cadence256``, stroke work uses field ID 19, and no value is written
+  as the FIT invalid value (255 / 65535 / 32767): measurements clip one below it. Consumers that hardcoded the previous rowingdata
   application ID or the old metre-based scales must be updated. ``FITParser``
   still reads files written by rowingdata 3.7.3 and earlier.
 - In-stroke curve fields are emitted under a separate, private application ID,
@@ -952,7 +954,7 @@ Unreleased
   carry no interoperable meaning.
 - Removed ``docs/FIT_STANDARD.md`` and ``docs/FIT_STANDARD.pdf``. The standard is
   maintained by a committee at
-  https://github.com/MoveLab-Studio/rowing-data-standard, which is the single
+  https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard, which is the single
   source of truth; this repository no longer ships a copy.
 
 0.97.x

{rowingdata-3.8.1 → rowingdata-3.8.3}/rowingdata/data/fit_export_spec.json

@@ -1,6 +1,8 @@
 {
-  "version": 2,
-  "_comment": "Authoritative FIT developer field definitions for rowingdata fitwrite. Field IDs, scales and units must match the Rowing Data Standard registry at https://github.com/MoveLab-Studio/rowing-data-standard (registry/field-ids.md); that repository is the source of truth, this file is only rowingdata's machine-readable copy of the subset it emits. v2: mm precision for DriveLength/PeakForcePositionAbs (scale 1000); StrokeRate dev field (93); instroke curve Y-scale registry.",
+  "version": 4,
+  "protocol_version": 1,
+  "handle_force_curve_field_id": 60,
+  "_comment": "Authoritative FIT developer field definitions for rowingdata fitwrite. Field IDs, scales and units must match the Rowing Data Standard registry at https://github.com/Rowing-Industry-Trade-Association/rowing-data-standard (registry/field-ids.md); that repository is the source of truth, this file is only rowingdata's machine-readable copy of the subset it emits. v2: mm precision for DriveLength/PeakForcePositionAbs (scale 1000); StrokeRate dev field (93); instroke curve Y-scale registry. v4: main of 2026-10-31: AverageBoatSpeed scale 100; EffectiveLength -> EffectiveArc (deg, scale 10; 16, 210, 211); force fields named without the N suffix. v3: standard draft 0.1: WorkoutState holds FIT intensity values; StrokeState (96); SlipThreshold/WashThreshold (94/95); HandleForceCurve fixed at 60; fields 4, 5 and 93 are not in the standard and are read-only (group legacy).",
   "instroke_dynamic": {
     "summary_start": 20,
     "summary_id_padding": "ceil_to_10",
@@ -48,22 +50,25 @@
     {"field_id": 1, "group": "rowing", "fit_name": "StrokeDriveTime", "base_type": "UINT16", "size": 2, "scale": 1, "units": "ms", "df_columns": [" DriveTime (ms)"]},
     {"field_id": 2, "group": "rowing", "fit_name": "DragFactor", "base_type": "UINT16", "size": 2, "scale": 1, "units": "", "df_columns": [" DragFactor"]},
     {"field_id": 3, "group": "rowing", "fit_name": "StrokeRecoveryTime", "base_type": "UINT16", "size": 2, "scale": 1, "units": "ms", "df_columns": [" StrokeRecoveryTime (ms)"]},
-    {"field_id": 4, "group": "rowing", "fit_name": "AverageDriveForceLbs", "base_type": "UINT16", "size": 2, "scale": 10, "units": "lbs", "df_columns": [" AverageDriveForce (lbs)"]},
-    {"field_id": 5, "group": "rowing", "fit_name": "PeakDriveForceLbs", "base_type": "UINT16", "size": 2, "scale": 10, "units": "lbs", "df_columns": [" PeakDriveForce (lbs)"]},
-    {"field_id": 6, "group": "rowing", "fit_name": "AverageDriveForceN", "base_type": "UINT16", "size": 2, "scale": 10, "units": "N", "df_columns": [" AverageDriveForce (N)"]},
-    {"field_id": 7, "group": "rowing", "fit_name": "PeakDriveForceN", "base_type": "UINT16", "size": 2, "scale": 10, "units": "N", "df_columns": [" PeakDriveForce (N)"]},
-    {"field_id": 8, "group": "rowing", "fit_name": "AverageBoatSpeed", "base_type": "UINT16", "size": 2, "scale": 255, "units": "m/s", "df_columns": [" AverageBoatSpeed (m/s)"]},
+    {"field_id": 4, "group": "legacy", "fit_name": "AverageDriveForceLbs", "base_type": "UINT16", "size": 2, "scale": 10, "units": "lbs", "df_columns": [" AverageDriveForce (lbs)"]},
+    {"field_id": 5, "group": "legacy", "fit_name": "PeakDriveForceLbs", "base_type": "UINT16", "size": 2, "scale": 10, "units": "lbs", "df_columns": [" PeakDriveForce (lbs)"]},
+    {"field_id": 6, "group": "rowing", "fit_name": "AverageDriveForce", "base_type": "UINT16", "size": 2, "scale": 10, "units": "N", "df_columns": [" AverageDriveForce (N)"]},
+    {"field_id": 7, "group": "rowing", "fit_name": "PeakDriveForce", "base_type": "UINT16", "size": 2, "scale": 10, "units": "N", "df_columns": [" PeakDriveForce (N)"]},
+    {"field_id": 8, "group": "rowing", "fit_name": "AverageBoatSpeed", "base_type": "UINT16", "size": 2, "scale": 100, "units": "m/s", "df_columns": [" AverageBoatSpeed (m/s)"]},
     {"field_id": 9, "group": "rowing", "fit_name": "WorkoutState", "base_type": "UINT8", "size": 1, "scale": 1, "units": "", "df_columns": [" WorkoutState"]},
     {"field_id": 10, "group": "metadata", "fit_name": "RecordingStrategy", "base_type": "UINT8", "size": 1, "scale": 1, "units": "", "df_columns": [], "message_type": "session"},
+    {"field_id": 94, "group": "metadata", "fit_name": "SlipThreshold", "base_type": "UINT16", "size": 2, "scale": 1, "units": "N", "df_columns": [], "message_type": "session"},
+    {"field_id": 95, "group": "metadata", "fit_name": "WashThreshold", "base_type": "UINT16", "size": 2, "scale": 1, "units": "N", "df_columns": [], "message_type": "session"},
     {"field_id": 19, "group": "rowing", "fit_name": "StrokeWork", "base_type": "UINT16", "size": 2, "scale": 1, "units": "J", "df_columns": [" WorkPerStroke (joules)", "driveenergy"]},
-    {"field_id": 93, "group": "rowing", "fit_name": "StrokeRate", "base_type": "UINT16", "size": 2, "scale": 100, "units": "spm", "df_columns": [" Cadence (stokes/min)"]},
+    {"field_id": 96, "group": "rowing", "fit_name": "StrokeState", "base_type": "UINT8", "size": 1, "scale": 1, "units": "", "df_columns": [" StrokeState"]},
+    {"field_id": 93, "group": "legacy", "fit_name": "StrokeRate", "base_type": "UINT16", "size": 2, "scale": 100, "units": "spm", "df_columns": [" Cadence (stokes/min)"]},
 
     {"field_id": 11, "group": "oarlock", "fit_name": "Catch", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["catch", " catch", "catchAngle"]},
     {"field_id": 12, "group": "oarlock", "fit_name": "Finish", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["finish", " finish", "finishAngle"]},
     {"field_id": 13, "group": "oarlock", "fit_name": "Slip", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["slip", " slip"]},
     {"field_id": 14, "group": "oarlock", "fit_name": "Wash", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["wash", " wash"]},
     {"field_id": 15, "group": "oarlock", "fit_name": "PeakForceAngle", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["peakforceangle", " peakforceangle"]},
-    {"field_id": 16, "group": "oarlock", "fit_name": "EffectiveLength", "base_type": "UINT16", "size": 2, "scale": 1, "units": "mm", "df_columns": ["effectiveLength", " effectiveLength", "effective length"]},
+    {"field_id": 16, "group": "oarlock", "fit_name": "EffectiveArc", "base_type": "UINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["effectiveArc", " effectiveArc", "effective arc"]},
 
     {"field_id": 200, "group": "oarlock_dual", "dual_pair": "catch", "side": "port", "fit_name": "CatchPort", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["catch_port", "catchAngle_port"]},
     {"field_id": 201, "group": "oarlock_dual", "dual_pair": "catch", "side": "starboard", "fit_name": "CatchStarboard", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["catch_starboard", "catchAngle_starboard"]},
@@ -75,8 +80,8 @@
     {"field_id": 207, "group": "oarlock_dual", "dual_pair": "wash", "side": "starboard", "fit_name": "WashStarboard", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["wash_starboard"]},
     {"field_id": 208, "group": "oarlock_dual", "dual_pair": "peakforceangle", "side": "port", "fit_name": "PeakForceAnglePort", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["peakforceangle_port"]},
     {"field_id": 209, "group": "oarlock_dual", "dual_pair": "peakforceangle", "side": "starboard", "fit_name": "PeakForceAngleStarboard", "base_type": "SINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["peakforceangle_starboard"]},
-    {"field_id": 210, "group": "oarlock_dual", "dual_pair": "effectiveLength", "side": "port", "fit_name": "EffectiveLengthPort", "base_type": "UINT16", "size": 2, "scale": 1, "units": "mm", "df_columns": ["effectiveLength_port"]},
-    {"field_id": 211, "group": "oarlock_dual", "dual_pair": "effectiveLength", "side": "starboard", "fit_name": "EffectiveLengthStarboard", "base_type": "UINT16", "size": 2, "scale": 1, "units": "mm", "df_columns": ["effectiveLength_starboard"]},
+    {"field_id": 210, "group": "oarlock_dual", "dual_pair": "effectiveArc", "side": "port", "fit_name": "EffectiveArcPort", "base_type": "UINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["effectiveArc_port"]},
+    {"field_id": 211, "group": "oarlock_dual", "dual_pair": "effectiveArc", "side": "starboard", "fit_name": "EffectiveArcStarboard", "base_type": "UINT16", "size": 2, "scale": 10, "units": "deg", "df_columns": ["effectiveArc_starboard"]},
 
     {"field_id": 17, "group": "peak_position", "fit_name": "PeakForcePositionNorm", "base_type": "UINT16", "size": 2, "scale": 1, "units": "", "df_columns": ["rel_peak_force_pos", "PeakForcePositionNorm", "% of Stroke Complete When Peak Force Is Reached"], "transformer": "peak_norm", "clip_uint16_max": 10000},
     {"field_id": 18, "group": "peak_position", "fit_name": "PeakForcePositionAbs", "base_type": "UINT16", "size": 2, "scale": 1, "units": "mm", "df_columns": ["peak_force_pos", "PeakForcePositionAbs"], "transformer": "peak_abs"},