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

Fixed dataprep

Browse Source
This commit is contained in:
Sander Roosendaal
2016-11-27 20:18:11 +01:00
parent b2267ca524
commit 75ddb92349
3 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rowers/interactiveplots.py
View File

@@ -929,10 +929,9 @@ def interactive_flex_chart2(id=0,promember=0,
pass
rowdata['x1'] = rowdata.ix[:,xparam]
rowdata['y1'] = rowdata.ix[:,yparam1]
tseconds = rowdata.ix[:,'timesecs']
tseconds = rowdata.ix[:,'time']
if yparam2 != 'None':
rowdata['y2'] = rowdata.ix[:,yparam2]
@@ -940,8 +939,8 @@ def interactive_flex_chart2(id=0,promember=0,
rowdata['y2'] = rowdata['y1']
if xparam=='time':
xaxmax = 1.0e3*tseconds.max()
xaxmin = 1.0e3*tseconds.min()
xaxmax = tseconds.max()
xaxmin = tseconds.min()
elif xparam=='distance':
xaxmax = rowdata['x1'].max()
xaxmin = rowdata['x1'].min()
@@ -975,7 +974,7 @@ def interactive_flex_chart2(id=0,promember=0,
if yparam1 == 'pace':
y_axis_type = 'datetime'
y1mean = rowdata.ix[:,'pseconds'].mean()
y1mean = rowdata.ix[:,'pace'].mean()
rowdata['xname'] = xparam