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

Merge tag 'v3.00' into develop

Browse Source 
catch workouts without time
This commit is contained in:
Sander Roosendaal
2017-05-23 09:21:38 +02:00
parent cb41e1c9ee 83c6cecdd9
commit 4b4d726a34
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/interactiveplots.py
View File

@@ -1438,6 +1438,11 @@ def interactive_flex_chart2(id=0,promember=0,
except KeyError:
pass
try:
tseconds = rowdata.ix[:,'time']
except KeyError:
return '','No time data - cannot make flex plot','',''
try:
rowdata['x1'] = rowdata.ix[:,xparam]
except KeyError:
@@ -1447,9 +1452,7 @@ def interactive_flex_chart2(id=0,promember=0,
rowdata['y1'] = rowdata.ix[:,yparam1]
except KeyError:
rowdata['y1'] = 0*rowdata.ix[:,'time']
tseconds = rowdata.ix[:,'time']
if yparam2 != 'None':
try:
rowdata['y2'] = rowdata.ix[:,yparam2]