Private
Public Access
1
0
This commit is contained in:
Sander Roosendaal
2019-03-31 16:29:12 +02:00
parent 0dd446dc1f
commit 0797599be7
2 changed files with 14 additions and 1 deletions

View File

@@ -2752,11 +2752,18 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
text_color='green', text_color='green',
) )
sliderlabel = Label(x=10,y=470,x_units='screen',y_units='screen',
text='',
background_fill_alpha=0.7,
background_fill_color='white',
text_color='black',text_font_size='10pt',
)
plot.add_layout(x1means) plot.add_layout(x1means)
plot.add_layout(xlabel) plot.add_layout(xlabel)
plot.add_layout(y1means) plot.add_layout(y1means)
plot.add_layout(sliderlabel)
y1label = Label(x=50,y=50,x_units='screen',y_units='screen', y1label = Label(x=50,y=50,x_units='screen',y_units='screen',
text=axlabels[yparam1]+": {y1mean:6.2f}".format(y1mean=y1mean), text=axlabels[yparam1]+": {y1mean:6.2f}".format(y1mean=y1mean),
@@ -2820,6 +2827,7 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
y1label=y1label, y1label=y1label,
y2label=y2label, y2label=y2label,
xlabel=xlabel, xlabel=xlabel,
sliderlabel=sliderlabel,
y2means=y2means), code=""" y2means=y2means), code="""
var data = source.data var data = source.data
var data2 = source2.data var data2 = source2.data
@@ -2844,6 +2852,11 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
var maxdist = maxdist.value var maxdist = maxdist.value
var minwork = minwork.value var minwork = minwork.value
var maxwork = maxwork.value var maxwork = maxwork.value
sliderlabel.text = 'SPM: '+minspm.toFixed(0)+'-'+maxspm.toFixed(0)
sliderlabel.text += ', Dist: '+mindist.toFixed(0)+'-'+maxdist.toFixed(0)
sliderlabel.text += ', WpS: '+minwork.toFixed(0)+'-'+maxwork.toFixed(0)
var xm = 0 var xm = 0
var ym1 = 0 var ym1 = 0
var ym2 = 0 var ym2 = 0

Binary file not shown.