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

updated dataprepnodjango

Browse Source
This commit is contained in:
Sander Roosendaal
2018-05-15 17:15:23 +02:00
parent c2f1df0c87
commit ce603d343f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/dataprepnodjango.py
View File

@@ -59,6 +59,7 @@ database_url_debug = 'sqlite:///'+database_name_dev
columndict = { columndict = {
'time':'TimeStamp (sec)', 'time':'TimeStamp (sec)',
'hr':' HRCur (bpm)', 'hr':' HRCur (bpm)',
'velo': ' AverageBoatSpeed (m/s)',
'pace':' Stroke500mPace (sec/500m)', 'pace':' Stroke500mPace (sec/500m)',
'spm':' Cadence (stokes/min)', 'spm':' Cadence (stokes/min)',
'power':' Power (watts)', 'power':' Power (watts)',
@@ -977,6 +978,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
rowdatadf.loc[row_index,' Stroke500mPace (sec/500m)'] = 3000. rowdatadf.loc[row_index,' Stroke500mPace (sec/500m)'] = 3000.
p = rowdatadf.ix[:,' Stroke500mPace (sec/500m)'] p = rowdatadf.ix[:,' Stroke500mPace (sec/500m)']
velo = rowdatadf.ix[:,' AverageBoatSpeed (m/s)']
hr = rowdatadf.ix[:,' HRCur (bpm)'] hr = rowdatadf.ix[:,' HRCur (bpm)']
spm = rowdatadf.ix[:,' Cadence (stokes/min)'] spm = rowdatadf.ix[:,' Cadence (stokes/min)']
cumdist = rowdatadf.ix[:,'cum_dist'] cumdist = rowdatadf.ix[:,'cum_dist']
@@ -1060,6 +1062,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
cumdist = cumdist, cumdist = cumdist,
ftime = niceformat(t2), ftime = niceformat(t2),
fpace = nicepaceformat(p2), fpace = nicepaceformat(p2),
velo=velo,
driveenergy=driveenergy, driveenergy=driveenergy,
distanceperstroke=distanceperstroke, distanceperstroke=distanceperstroke,
power=power, power=power,