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

Merge branch 'hotfix/v1.55'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-03-12 22:19:06 +01:00
parent 4d1863ac81 96cb7f4054
commit a188e90d8d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/interactiveplots.py
View File

@@ -1223,12 +1223,12 @@ 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[:,'time']
try:
rowdata['y1'] = rowdata.ix[:,yparam1]
except KeyError:
rowdata['y1'] = 0*rowdata.ix[:,xparam]
rowdata['y1'] = 0*rowdata.ix[:,'time']
tseconds = rowdata.ix[:,'time']
@@ -1236,7 +1236,7 @@ def interactive_flex_chart2(id=0,promember=0,
try:
rowdata['y2'] = rowdata.ix[:,yparam2]
except KeyError:
rowdata['y2'] = rowdata.ix[:,yparam1]
rowdata['y2'] = 0*rowdata.ix[:,'time']
else:
rowdata['y2'] = rowdata['y1']