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

lbs to N misery

Browse Source
This commit is contained in:
Sander Roosendaal
2019-10-31 22:27:23 +01:00
parent f5dd1f370c
commit 6fa6cc92e9
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/dataprep.py
View File

@@ -2351,6 +2351,10 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
else: else:
drivenergy = drivelength * averageforce drivenergy = drivelength * averageforce
if forceunit == 'lbs':
averageforce *= lbstoN
peakforce *= lbstoN
powerhr = 60.*power/hr powerhr = 60.*power/hr
powerhr = powerhr.fillna(value=0) powerhr = powerhr.fillna(value=0)
@@ -2362,6 +2366,7 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
distanceperstroke = 60. * velo / spm distanceperstroke = 60. * velo / spm
data = DataFrame( data = DataFrame(
dict( dict(
time=t * 1e3, time=t * 1e3,

3
rowers/dataprepnodjango.py
View File

@@ -1062,6 +1062,9 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
distanceperstroke = 60.*velo/spm distanceperstroke = 60.*velo/spm
if forceunit == 'lbs':
averageforce *= lbstoN
peakforce *= lbstoN
data = DataFrame( data = DataFrame(

1
rowers/tests/testdata/.~lock.empower.csv# vendored Normal file
View File

@@ -0,0 +1 @@
,sander,sander-pc,31.10.2019 22:19,file:///home/sander/.config/libreoffice/4;