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

Merge branch 'release/v5.24'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-12-01 17:12:30 +01:00
parent 1f39a05c08 21b8f9b22f
commit c95285fdf8
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/dataprep.py
+1
View File
@@ -1558,6 +1558,7 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True):
cdata2 = savgol_filter(cdata.values,windowsize,3) cdata2 = savgol_filter(cdata.values,windowsize,3)
data[c] = cdata2 data[c] = cdata2
except KeyError: except KeyError:
data[c] = 0 data[c] = 0
rowers/interactiveplots.py
+6
View File
@@ -2088,6 +2088,7 @@ def interactive_flex_chart2(id=0,promember=0,
except KeyError: except KeyError:
rowdata['power'] = 50. rowdata['power'] = 50.
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if rowdata.empty: if rowdata.empty:
return "","No valid data" return "","No valid data"
@@ -2115,19 +2116,24 @@ def interactive_flex_chart2(id=0,promember=0,
try: try:
rowdata['x1'] = rowdata.ix[:,xparam] rowdata['x1'] = rowdata.ix[:,xparam]
rowmin = rowdata[xparam].min()
except KeyError: except KeyError:
rowdata['x1'] = 0*rowdata.ix[:,'time'] rowdata['x1'] = 0*rowdata.ix[:,'time']
try: try:
rowdata['y1'] = rowdata.ix[:,yparam1] rowdata['y1'] = rowdata.ix[:,yparam1]
rowmin = rowdata[yparam1].min()
except KeyError: except KeyError:
rowdata['y1'] = 0*rowdata.ix[:,'time'] rowdata['y1'] = 0*rowdata.ix[:,'time']
rowdata[yparam1] = rowdata['y1']
if yparam2 != 'None': if yparam2 != 'None':
try: try:
rowdata['y2'] = rowdata.ix[:,yparam2] rowdata['y2'] = rowdata.ix[:,yparam2]
rowmin = rowdata[yparam2].min()
except KeyError: except KeyError:
rowdata['y2'] = 0*rowdata.ix[:,'time'] rowdata['y2'] = 0*rowdata.ix[:,'time']
rowdata[yparam2] = rowdata['y2']
else: else:
rowdata['y2'] = rowdata['y1'] rowdata['y2'] = rowdata['y1']