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

Merge tag 'v1.55' into develop

Browse Source 
fixed flex chart bug
This commit is contained in:
Sander Roosendaal
2017-03-12 22:21:26 +01:00
parent 245d6597c0 a188e90d8d
commit d670cdf0f7
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

@@ -1192,12 +1192,12 @@ def interactive_flex_chart2(id=0,promember=0,
try: try:
rowdata['x1'] = rowdata.ix[:,xparam] rowdata['x1'] = rowdata.ix[:,xparam]
except KeyError: except KeyError:
rowdata['x1'] = 0*rowdata.ix[:,1] rowdata['x1'] = 0*rowdata.ix[:,'time']
try: try:
rowdata['y1'] = rowdata.ix[:,yparam1] rowdata['y1'] = rowdata.ix[:,yparam1]
except KeyError: except KeyError:
rowdata['y1'] = 0*rowdata.ix[:,xparam] rowdata['y1'] = 0*rowdata.ix[:,'time']
tseconds = rowdata.ix[:,'time'] tseconds = rowdata.ix[:,'time']
@@ -1205,7 +1205,7 @@ def interactive_flex_chart2(id=0,promember=0,
try: try:
rowdata['y2'] = rowdata.ix[:,yparam2] rowdata['y2'] = rowdata.ix[:,yparam2]
except KeyError: except KeyError:
rowdata['y2'] = rowdata.ix[:,yparam1] rowdata['y2'] = 0*rowdata.ix[:,'time']
else: else:
rowdata['y2'] = rowdata['y1'] rowdata['y2'] = rowdata['y1']