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

bugfix binsize 0

Browse Source
This commit is contained in:
Sander Roosendaal
2017-07-06 17:18:29 +02:00
parent 14e523ed4f
commit c6aba2a7e5
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/interactiveplots.py
View File

@@ -1174,8 +1174,8 @@ def interactive_multiflex(datadf,xparam,yparam,groupby,extratitle='',
yparamname = axlabels[yparam] yparamname = axlabels[yparam]
if xparam=='distance': if xparam=='distance':
xaxmax = datadf['x1'].max() xaxmax = datadf['x'].max()
xaxmin = datadf['x1'].min() xaxmin = datadf['x'].min()
else: else:
xaxmax = yaxmaxima[xparam] xaxmax = yaxmaxima[xparam]
xaxmin = yaxminima[xparam] xaxmin = yaxminima[xparam]

6
rowers/views.py
View File

@@ -3456,6 +3456,8 @@ def multiflex_view(request,userid=0,
groupby = chartform.cleaned_data['groupby'] groupby = chartform.cleaned_data['groupby']
binsize = chartform.cleaned_data['binsize'] binsize = chartform.cleaned_data['binsize']
if binsize <= 0:
binsize = 1
spmmin = chartform.cleaned_data['spmmin'] spmmin = chartform.cleaned_data['spmmin']
spmmax = chartform.cleaned_data['spmmax'] spmmax = chartform.cleaned_data['spmmax']
@@ -3569,6 +3571,8 @@ def multiflex_view(request,userid=0,
groupby = chartform.cleaned_data['groupby'] groupby = chartform.cleaned_data['groupby']
binsize = chartform.cleaned_data['binsize'] binsize = chartform.cleaned_data['binsize']
if binsize <= 0:
binsize = 1
spmmin = chartform.cleaned_data['spmmin'] spmmin = chartform.cleaned_data['spmmin']
spmmax = chartform.cleaned_data['spmmax'] spmmax = chartform.cleaned_data['spmmax']
@@ -3616,7 +3620,7 @@ def multiflex_view(request,userid=0,
datadf.dropna(axis=0,how='any',inplace=True) datadf.dropna(axis=0,how='any',inplace=True)
datemapping = { datemapping = {
w.id:w.date for w in workouts w.id:w.date for w in workouts
} }