From 42578702ba3a1164b3e557586290772cfadfb95c Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 10 Jul 2017 18:43:16 +0200 Subject: [PATCH] color scheme exploration --- rowers/.#views.py | 1 + rowers/interactiveplots.py | 4 ++-- rowers/views.py | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 rowers/.#views.py diff --git a/rowers/.#views.py b/rowers/.#views.py new file mode 100644 index 00000000..b090c519 --- /dev/null +++ b/rowers/.#views.py @@ -0,0 +1 @@ +E408191@CZ27LT9RCGN72.22500:1499438870 \ No newline at end of file diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 47d446cd..7c9b1e26 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -70,7 +70,7 @@ watermarkh = 35 watermarkanchor = 'bottom_right' def errorbar(fig, x, y, source=ColumnDataSource(), - xerr=False, yerr=False, color='red', + xerr=False, yerr=False, color='black', point_kwargs={}, error_kwargs={}): fig.circle(x, y, source=source, name='data',color=color, @@ -1292,7 +1292,7 @@ def interactive_multiflex(datadf,xparam,yparam,groupby,extratitle='', xerr=ploterrorbars, yerr=ploterrorbars, point_kwargs={ - 'line_color':None, + 'line_color':"black", 'size':"groupsize", 'fill_color':"color", }, diff --git a/rowers/views.py b/rowers/views.py index c0e1d69f..9bbf5ae4 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -3606,6 +3606,8 @@ def multiflex_view(request,userid=0, groupcols *= 100. rgb = [colorsys.hsv_to_rgb(float(x/100.), 1.0, 1.0) for x in groupcols] + rgb = [colorsys.hsv_to_rgb(0.6-0.3*float(x/100.), 0.4+0.4*float(x/100.), 1.0) for x in groupcols] +# rgb = [colorsys.hsv_to_rgb(0.1+0.8*float(x/100.), 0.5, 0.5-0.2*float(x/100.)) for x in groupcols] RGB = [(int(255.*r),int(255.*g),int(255.*b)) for (r, g, b) in rgb] colors = ["#%02x%02x%02x" % (r, g, b) for (r, g, b) in RGB] df['color'] = colors