sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

adding rpe based

Browse Source
This commit is contained in:
Sander Roosendaal
2023-05-22 20:45:07 +02:00
parent 9cf0b20143
commit 9365b03c9c
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/interactiveplots.py
View File

@@ -1506,6 +1506,10 @@ def weightfromrecord(row,metricchoice):
if vv == 0: if vv == 0:
if metricchoice == 'rscore' and row['hrtss'] > 0: # pragma: no cover if metricchoice == 'rscore' and row['hrtss'] > 0: # pragma: no cover
return row['hrtss'] return row['hrtss']
else:
dd = 3600*row['duration'].hour+60*row['duration'].minute+row['duration'].second
dd = dd/3600
return rpetotss[row['rpe']]*dd
if vv < 0: if vv < 0:
w = Workout.objects.get(id=row['id']) w = Workout.objects.get(id=row['id'])
trimp, hrtss = dataprep.workout_trimp(w) trimp, hrtss = dataprep.workout_trimp(w)
@@ -4955,7 +4959,7 @@ def interactive_multiflex(datadf, xparam, yparam, groupby, extratitle='',
text_color='black', text_font_size='10pt', text_color='black', text_font_size='10pt',
) )
slidertext = 'SPM: {:.0f}-{:.0f}, WpS: {:.0f}-{:.0f}'.format( slidertext = "SPM: {:.0f}-{:.0f}, WpS: {:.0f}-{:.0f}".format(
spmmin, spmmax, workmin, workmax spmmin, spmmax, workmin, workmax
) )
sliderlabel = Label(x=50, y=20, x_units='screen', y_units='screen', sliderlabel = Label(x=50, y=20, x_units='screen', y_units='screen',

BIN
rowers/tests/testdata/testdata.tcx.gz vendored
View File

Binary file not shown.