From fd545d2ce7803430e0c3f8abd8a2fb57a37f3a64 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 6 Jul 2017 13:56:26 +0200 Subject: [PATCH] removed intervals labels --- rowers/interactiveplots.py | 1 + rowers/views.py | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index eb524261..d21c61a2 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -1165,6 +1165,7 @@ def interactive_chart(id=0,promember=0): def interactive_multiflex(datadf,xparam,yparam,groupby,extratitle='', ploterrorbars=False): + if datadf.empty: return ['','

No non-zero data in selection

'] diff --git a/rowers/views.py b/rowers/views.py index 978221a2..7de845ab 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -3499,13 +3499,14 @@ def multiflex_view(request,userid=0, bins = np.arange(datadf[groupby].min()-binsize, datadf[groupby].max()+binsize, binsize) - groups = datadf.groupby(pd.cut(datadf[groupby],bins)) + groups = datadf.groupby(pd.cut(datadf[groupby],bins,labels=False)) else: bins = np.arange(datadf['days ago'].min()-binsize, datadf['days ago'].max()+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] @@ -3628,13 +3629,15 @@ def multiflex_view(request,userid=0, bins = np.arange(datadf[groupby].min()-binsize, datadf[groupby].max()+binsize, binsize) - groups = datadf.groupby(pd.cut(datadf[groupby],bins)) + groups = datadf.groupby(pd.cut(datadf[groupby],bins, + labels=False)) else: bins = np.arange(datadf['days ago'].min()-binsize, datadf['days ago'].max()+binsize, binsize, ) - groups = datadf.groupby(pd.cut(datadf['days ago'], bins)) + groups = datadf.groupby(pd.cut(datadf['days ago'], bins, + labels=False))