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

Merge branch 'hotfix/cumflexplot'

Browse Source
This commit is contained in:
Sander Roosendaal
2016-11-24 13:51:25 +01:00
parent e0f3dcb014 ef345cce39
commit c693c1eaba
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/interactiveplots.py
View File

@@ -632,16 +632,10 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
return ['','<p>No non-zero data in selection</p>','',''] return ['','<p>No non-zero data in selection</p>','','']
# datadf['x1'] = datadf.ix[:,xparam] datadf['x1'] = datadf.ix[:,xparam]
datadf = datadf.rename(columns={ datadf['y1'] = datadf.ix[:,yparam1]
xparam:'x1',
yparam1:'y1',
})
# datadf['y1'] = datadf.ix[:,yparam1]
if yparam2 != 'None': if yparam2 != 'None':
# datadf['y2'] = datadf.ix[:,yparam2] datadf['y2'] = datadf.ix[:,yparam2]
datadf = datadf.rename(columns={yparam2:'y2'})
else: else:
datadf['y2'] = datadf['y1'] datadf['y2'] = datadf['y1']
@@ -680,8 +674,6 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
datadf.copy() datadf.copy()
) )
print "jet",timezone.now()
# Add hover to this comma-separated string and see what changes # Add hover to this comma-separated string and see what changes
if (promember==1): if (promember==1):
TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,resize,crosshair' TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,resize,crosshair'