watermark v3

rowers/interactiveplots.py

@@ -56,6 +56,19 @@ from rowers.metrics import axes,axlabels,yaxminima,yaxmaxima
 
 from utils import lbstoN
 
+watermarkurl = "/static/img/logo7.png"
+watermarksource = ColumnDataSource(dict(
+    url = [watermarkurl],))
+
+watermarkrange = Range1d(start=0,end=1)
+watermarkalpha = 0.6
+watermarkx = 0.99
+watermarky = 0.01
+watermarkw = 184
+watermarkh = 35
+watermarkanchor = 'bottom_right'
+
+
 def tailwind(bearing,vwind,winddir):
     """ Calculates head-on head/tailwind in direction of rowing
 
@@ -1327,24 +1340,19 @@ def interactive_flex_chart2(id=0,promember=0,
 		  tools=TOOLS,
 		  toolbar_sticky=False
 		  )
+                                   
 
 
-    url = "/static/img/logo7.png"
+    # add watermark
-    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.99,0.01,184,35,
+    plot.image_url([watermarkurl],watermarkx,watermarky,
-                   global_alpha=0.6,
+                   watermarkw,watermarkh,
+                   global_alpha=watermarkalpha,
                    w_units='screen',
                    h_units='screen',
-                   anchor='bottom_right',
+                   anchor=watermarkanchor,
                    dilate=True,
                    x_range_name = "watermark",
                    y_range_name = "watermark",