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

Merge branch 'hotfix/v3.38'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-07-06 13:57:23 +02:00
parent af9eb1934f fd545d2ce7
commit 14e523ed4f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/interactiveplots.py
View File

@@ -1165,6 +1165,7 @@ def interactive_chart(id=0,promember=0):
def interactive_multiflex(datadf,xparam,yparam,groupby,extratitle='', def interactive_multiflex(datadf,xparam,yparam,groupby,extratitle='',
ploterrorbars=False): ploterrorbars=False):
if datadf.empty: if datadf.empty:
return ['','<p>No non-zero data in selection</p>'] return ['','<p>No non-zero data in selection</p>']

11
rowers/views.py
View File

@@ -3499,13 +3499,14 @@ def multiflex_view(request,userid=0,
bins = np.arange(datadf[groupby].min()-binsize, bins = np.arange(datadf[groupby].min()-binsize,
datadf[groupby].max()+binsize, datadf[groupby].max()+binsize,
binsize) binsize)
groups = datadf.groupby(pd.cut(datadf[groupby],bins)) groups = datadf.groupby(pd.cut(datadf[groupby],bins,labels=False))
else: else:
bins = np.arange(datadf['days ago'].min()-binsize, bins = np.arange(datadf['days ago'].min()-binsize,
datadf['days ago'].max()+binsize, datadf['days ago'].max()+binsize,
binsize, binsize,
) )
groups = datadf.groupby(pd.cut(datadf['days ago'], bins)) groups = datadf.groupby(pd.cut(datadf['days ago'], bins,
labels=False))
xvalues = groups.mean()[xparam] xvalues = groups.mean()[xparam]
@@ -3628,13 +3629,15 @@ def multiflex_view(request,userid=0,
bins = np.arange(datadf[groupby].min()-binsize, bins = np.arange(datadf[groupby].min()-binsize,
datadf[groupby].max()+binsize, datadf[groupby].max()+binsize,
binsize) binsize)
groups = datadf.groupby(pd.cut(datadf[groupby],bins)) groups = datadf.groupby(pd.cut(datadf[groupby],bins,
labels=False))
else: else:
bins = np.arange(datadf['days ago'].min()-binsize, bins = np.arange(datadf['days ago'].min()-binsize,
datadf['days ago'].max()+binsize, datadf['days ago'].max()+binsize,
binsize, binsize,
) )
groups = datadf.groupby(pd.cut(datadf['days ago'], bins)) groups = datadf.groupby(pd.cut(datadf['days ago'], bins,
labels=False))