From d8a4ddf9768d4964348512b15bfc9904547a31a0 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 7 Jul 2017 09:51:51 +0200 Subject: [PATCH] some small improvements on multiflex --- rowers/.#interactiveplots.py | 1 + rowers/views.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 rowers/.#interactiveplots.py diff --git a/rowers/.#interactiveplots.py b/rowers/.#interactiveplots.py new file mode 100644 index 00000000..ff7b995a --- /dev/null +++ b/rowers/.#interactiveplots.py @@ -0,0 +1 @@ +E408191@CZ27LT9RCGN72.21108:1499200053 \ No newline at end of file diff --git a/rowers/views.py b/rowers/views.py index 0b17d389..6c229c00 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -3458,6 +3458,8 @@ def multiflex_view(request,userid=0, binsize = chartform.cleaned_data['binsize'] if binsize <= 0: binsize = 1 + if groupby == 'pace': + binsize *= 1000 spmmin = chartform.cleaned_data['spmmin'] spmmax = chartform.cleaned_data['spmmax'] @@ -3573,6 +3575,8 @@ def multiflex_view(request,userid=0, binsize = chartform.cleaned_data['binsize'] if binsize <= 0: binsize = 1 + if groupby == 'pace': + binsize *= 1000. spmmin = chartform.cleaned_data['spmmin'] spmmax = chartform.cleaned_data['spmmax'] @@ -3658,7 +3662,10 @@ def multiflex_view(request,userid=0, 'yerror':yerror, }) - if groupby != 'date': + + if groupby == 'pace': + df['groupval'] = groups.mean()[groupby].fillna(value=0)/1000. + elif groupby != 'date': try: df['groupval'] = groups.mean()[groupby], except ValueError: