adding rpe based
This commit is contained in:
@@ -1506,6 +1506,10 @@ def weightfromrecord(row,metricchoice):
|
||||
if vv == 0:
|
||||
if metricchoice == 'rscore' and row['hrtss'] > 0: # pragma: no cover
|
||||
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:
|
||||
w = Workout.objects.get(id=row['id'])
|
||||
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',
|
||||
)
|
||||
|
||||
slidertext = 'SPM: {:.0f}-{:.0f}, WpS: {:.0f}-{:.0f}'.format(
|
||||
slidertext = "SPM: {:.0f}-{:.0f}, WpS: {:.0f}-{:.0f}".format(
|
||||
spmmin, spmmax, workmin, workmax
|
||||
)
|
||||
sliderlabel = Label(x=50, y=20, x_units='screen', y_units='screen',
|
||||
|
||||
Reference in New Issue
Block a user