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

comparison chart

Browse Source
This commit is contained in:
Sander Roosendaal
2017-03-04 20:27:00 +01:00
parent 4ea452c2cb
commit 1b8e43b13c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/interactiveplots.py
View File

@@ -1165,7 +1165,7 @@ def interactive_flex_chart2(id=0,promember=0,
columns = [xparam,yparam1,yparam2, columns = [xparam,yparam1,yparam2,
'ftime','distance','fpace', 'ftime','distance','fpace',
'power','hr','spm','driveenergy', 'power','hr','spm','driveenergy',
'time','pace','workoutstate'] 'time','pace','workoutstate','time']
rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True) rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True)
@@ -1191,7 +1191,7 @@ def interactive_flex_chart2(id=0,promember=0,
try: try:
rowdata['x1'] = rowdata.ix[:,xparam] rowdata['x1'] = rowdata.ix[:,xparam]
except KeyError: except KeyError:
rowdata['x1'] = 0*rowdata.ix[:'time'] rowdata['x1'] = 0*rowdata.ix[:,1]
try: try:
rowdata['y1'] = rowdata.ix[:,yparam1] rowdata['y1'] = rowdata.ix[:,yparam1]
@@ -1220,7 +1220,10 @@ def interactive_flex_chart2(id=0,promember=0,
# average values # average values
if xparam != 'time': if xparam != 'time':
try:
x1mean = rowdata['x1'].mean() x1mean = rowdata['x1'].mean()
except TypeError:
x1mean = 0
else: else:
x1mean = 0 x1mean = 0