Private
Public Access
1
0

Merge tag 'v3.17' into develop

reverse averages
This commit is contained in:
Sander Roosendaal
2017-06-18 10:46:42 +02:00

View File

@@ -2061,6 +2061,8 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
datadf.dropna(axis=1,how='all',inplace=True)
datadf.dropna(axis=0,how='any',inplace=True)
nrworkouts = len(ids)
tseconds = datadf.ix[:,'time']
yparamname = axlabels[yparam]
@@ -2150,7 +2152,7 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
group['y'] = 0.0*group['x']
ymean = group['y'].mean()
ylabel = Label(x=100,y=70+20*cntr,
ylabel = Label(x=100,y=60+nrworkouts*20-20*cntr,
x_units='screen',y_units='screen',
text=axlabels[yparam]+": {ymean:6.2f}".format(ymean=ymean),
background_fill_alpha=.7,