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

palette picker multiflex

Browse Source
This commit is contained in:
Sander Roosendaal
2017-07-11 15:48:19 +02:00
parent ab8627e311
commit 7b99fe8cb1
4 changed files with 71 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rowers/views.py
View File

@@ -3435,6 +3435,11 @@ def multiflex_view(request,userid=0,
ploterrorbars = options['ploterrorbars']
except KeyError:
ploterrorbars = False
try:
palette = options['palette']
except KeyError:
palette = 'blue_green'
workstrokesonly = not includereststrokes
@@ -3454,7 +3459,9 @@ def multiflex_view(request,userid=0,
request.session['ploterrorbars'] = ploterrorbars
request.session['includereststrokes'] = includereststrokes
workstrokesonly = not includereststrokes
palette = chartform.cleaned_data['palette']
request.session['palette'] = palette
groupby = chartform.cleaned_data['groupby']
binsize = chartform.cleaned_data['binsize']
if binsize <= 0:
@@ -3482,6 +3489,8 @@ def multiflex_view(request,userid=0,
request.session['ploterrorbars'] = ploterrorbars
request.session['includereststrokes'] = includereststrokes
workstrokesonly = not includereststrokes
palette = chartform.cleaned_data['palette']
request.session['palette'] = palette
groupby = chartform.cleaned_data['groupby']
binsize = chartform.cleaned_data['binsize']
@@ -3608,12 +3617,12 @@ def multiflex_view(request,userid=0,
groupcols = np.array([1.])
colors = range_to_color_hex(groupcols)
colors = range_to_color_hex(groupcols,palette=palette)
df['color'] = colors
clegendx = np.arange(0,1.2,.2)
legcolors = range_to_color_hex(clegendx)
legcolors = range_to_color_hex(clegendx,palette=palette)
clegendy = df['groupval'].min()+clegendx*(df['groupval'].max()-df['groupval'].min())