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

some small improvements on multiflex

Browse Source
This commit is contained in:
Sander Roosendaal
2017-07-07 09:51:51 +02:00
parent 69d0addc71
commit d8a4ddf976
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/.#interactiveplots.py Normal file
View File

@@ -0,0 +1 @@
E408191@CZ27LT9RCGN72.21108:1499200053

9
rowers/views.py
View File

@@ -3458,6 +3458,8 @@ def multiflex_view(request,userid=0,
binsize = chartform.cleaned_data['binsize'] binsize = chartform.cleaned_data['binsize']
if binsize <= 0: if binsize <= 0:
binsize = 1 binsize = 1
if groupby == 'pace':
binsize *= 1000
spmmin = chartform.cleaned_data['spmmin'] spmmin = chartform.cleaned_data['spmmin']
spmmax = chartform.cleaned_data['spmmax'] spmmax = chartform.cleaned_data['spmmax']
@@ -3573,6 +3575,8 @@ def multiflex_view(request,userid=0,
binsize = chartform.cleaned_data['binsize'] binsize = chartform.cleaned_data['binsize']
if binsize <= 0: if binsize <= 0:
binsize = 1 binsize = 1
if groupby == 'pace':
binsize *= 1000.
spmmin = chartform.cleaned_data['spmmin'] spmmin = chartform.cleaned_data['spmmin']
spmmax = chartform.cleaned_data['spmmax'] spmmax = chartform.cleaned_data['spmmax']
@@ -3658,7 +3662,10 @@ def multiflex_view(request,userid=0,
'yerror':yerror, 'yerror':yerror,
}) })
if groupby != 'date':
if groupby == 'pace':
df['groupval'] = groups.mean()[groupby].fillna(value=0)/1000.
elif groupby != 'date':
try: try:
df['groupval'] = groups.mean()[groupby], df['groupval'] = groups.mean()[groupby],
except ValueError: except ValueError: