From b0ffb38196dede27ef5531a9517d715c15f986a1 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 9 May 2017 13:36:25 +0200 Subject: [PATCH] first draft watermark on flex plot --- rowers/interactiveplots.py | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index e42d37a5..d36492e7 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -25,6 +25,8 @@ from bokeh.models import ( SaveTool, ResizeTool, ResetTool, TapTool,CrosshairTool,BoxZoomTool, Span, Label ) +from bokeh.models.glyphs import ImageURL + #from bokeh.models.widgets import Slider, Select, TextInput from bokeh.core.properties import value @@ -1326,6 +1328,28 @@ def interactive_flex_chart2(id=0,promember=0, toolbar_sticky=False ) + + url = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [url], + x = [x1mean], + y = [y1mean])) + + watermarkrange = Range1d(start=0,end=1) + + plot.extra_y_ranges = {"watermark": watermarkrange} + plot.extra_x_ranges = {"watermark": watermarkrange} + + plot.image_url([url],0.5,0.5,400,74, + global_alpha=0.6, + w_units='screen', + h_units='screen', + anchor='center', + dilate=True, + x_range_name = "watermark", + y_range_name = "watermark", + ) + x1means = Span(location=x1mean,dimension='height',line_color='green', line_dash=[6,6], line_width=2) @@ -1411,9 +1435,11 @@ def interactive_flex_chart2(id=0,promember=0, minutes = ["%M"] ) + if yparam2 != 'None': yrange2 = Range1d(start=yaxminima[yparam2],end=yaxmaxima[yparam2]) - plot.extra_y_ranges = {"yax2": yrange2} + plot.extra_y_ranges["yax2"] = yrange2 + #= {"yax2": yrange2} if plottype=='line': plot.line('x1','y2',color="red",y_range_name="yax2", @@ -1463,7 +1489,8 @@ def interactive_flex_chart2(id=0,promember=0, y2label=y2label, xlabel=xlabel, annolabel=annolabel, - y2means=y2means), code=""" + y2means=y2means, + ), code=""" var data = source.data var data2 = source2.data var x1 = data['x1']