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

Merge branch 'release/v10.07'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-07-31 23:26:51 +02:00
parent 38aba9da3e c456372099
commit b2ace1bca6
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/dataprep.py
View File

@@ -2240,7 +2240,7 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
drivespeed=drivespeed, drivespeed=drivespeed,
rhythm=rhythm, rhythm=rhythm,
distanceperstroke=distanceperstroke, distanceperstroke=distanceperstroke,
powerhr=powerhr, # powerhr=powerhr,
) )
) )

16
rowers/metrics.py
View File

@@ -86,14 +86,14 @@ rowingmetrics = (
'mode':'both', 'mode':'both',
'type':'pro'}), 'type':'pro'}),
('powerhr',{ # ('powerhr',{
'numtype':'float', # 'numtype':'float',
'null':True, # 'null':True,
'verbose_name': 'Power Heart Rate Efficiency (J/beat)', # 'verbose_name': 'Power Heart Rate Efficiency (J/beat)',
'ax_min':0, # 'ax_min':0,
'ax_max':300, # 'ax_max':300,
'mode':'both', # 'mode':'both',
'type':'pro'}), # 'type':'pro'}),
('spm',{ ('spm',{
'numtype':'float', 'numtype':'float',

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

Binary file not shown.