From 1b8e43b13c2015fe89f266365e465e6270c8d3cf Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 4 Mar 2017 20:27:00 +0100 Subject: [PATCH] comparison chart --- rowers/interactiveplots.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 5e11a871..6e660d8a 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -1165,7 +1165,7 @@ def interactive_flex_chart2(id=0,promember=0, columns = [xparam,yparam1,yparam2, 'ftime','distance','fpace', 'power','hr','spm','driveenergy', - 'time','pace','workoutstate'] + 'time','pace','workoutstate','time'] rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True) @@ -1191,7 +1191,7 @@ def interactive_flex_chart2(id=0,promember=0, try: rowdata['x1'] = rowdata.ix[:,xparam] except KeyError: - rowdata['x1'] = 0*rowdata.ix[:'time'] + rowdata['x1'] = 0*rowdata.ix[:,1] try: rowdata['y1'] = rowdata.ix[:,yparam1] @@ -1220,7 +1220,10 @@ def interactive_flex_chart2(id=0,promember=0, # average values if xparam != 'time': - x1mean = rowdata['x1'].mean() + try: + x1mean = rowdata['x1'].mean() + except TypeError: + x1mean = 0 else: x1mean = 0