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

changed palette

Browse Source
This commit is contained in:
Sander Roosendaal
2020-11-07 12:40:53 +01:00
parent aed169f9be
commit 9bc89fb1a8
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/interactiveplots.py
View File

@@ -18,6 +18,7 @@ from django.utils import timezone
from rowingdata import make_cumvalues from rowingdata import make_cumvalues
from bokeh.palettes import Dark2_8 as palette from bokeh.palettes import Dark2_8 as palette
from bokeh.palettes import Set1_4 as palette2
from bokeh.models.glyphs import MultiLine from bokeh.models.glyphs import MultiLine
import itertools import itertools
from bokeh.plotting import figure, ColumnDataSource, Figure,curdoc from bokeh.plotting import figure, ColumnDataSource, Figure,curdoc
@@ -4789,10 +4790,10 @@ def interactive_flexchart_stacked(id,r,xparam='time',
) )
plot4.y_range = Range1d(y4min,y4max) plot4.y_range = Range1d(y4min,y4max)
plot1.line('x1','y1',source=source,color="cyan") plot1.line('x1','y1',source=source,color=palette2[1])
plot2.line('x1','y2',source=source,color="red") plot2.line('x1','y2',source=source,color=palette2[3])
plot3.line('x1','y3',source=source,color="green") plot3.line('x1','y3',source=source,color=palette2[0])
plot4.line('x1','y4',source=source,color="blue") plot4.line('x1','y4',source=source,color=palette2[3])
layout = layoutcolumn([ layout = layoutcolumn([
plot1, plot1,

7
rowers/templates/list_workouts.html
View File

@@ -249,6 +249,13 @@
<i class="fas {{ user.rower.fav_analysis|icon }} fa-fw"></i> <i class="fas {{ user.rower.fav_analysis|icon }} fa-fw"></i>
</a> </a>
</td> </td>
<td>
<a class="small"
href="/rowers/workout/{{ workout.id|encode }}/flexchartstacked/"
title="Chart Stack">
<i class="fas fa-align-justify fa-fw"></i>
</a>
</td>
<td> <td>
<a class="small" <a class="small"
href="/rowers/workout/{{ workout.id|encode }}/flexchart/" href="/rowers/workout/{{ workout.id|encode }}/flexchart/"