From 21b8f9b22f23abe46844157f435d2d1e6931f2f8 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 1 Dec 2017 17:07:28 +0100 Subject: [PATCH] bug fix --- rowers/dataprep.py | 1 + rowers/interactiveplots.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index e729e183..7f7fac93 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1558,6 +1558,7 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True): cdata2 = savgol_filter(cdata.values,windowsize,3) data[c] = cdata2 + except KeyError: data[c] = 0 diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 9549a05a..8f8715e1 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -2087,6 +2087,7 @@ def interactive_flex_chart2(id=0,promember=0, nopower = 0 except KeyError: rowdata['power'] = 50. + row = Workout.objects.get(id=id) if rowdata.empty: @@ -2115,19 +2116,24 @@ def interactive_flex_chart2(id=0,promember=0, try: rowdata['x1'] = rowdata.ix[:,xparam] + rowmin = rowdata[xparam].min() except KeyError: rowdata['x1'] = 0*rowdata.ix[:,'time'] try: rowdata['y1'] = rowdata.ix[:,yparam1] + rowmin = rowdata[yparam1].min() except KeyError: rowdata['y1'] = 0*rowdata.ix[:,'time'] - + rowdata[yparam1] = rowdata['y1'] + if yparam2 != 'None': try: rowdata['y2'] = rowdata.ix[:,yparam2] + rowmin = rowdata[yparam2].min() except KeyError: rowdata['y2'] = 0*rowdata.ix[:,'time'] + rowdata[yparam2] = rowdata['y2'] else: rowdata['y2'] = rowdata['y1']