first holoview chart

rowers/interactiveplots.py

@@ -20,11 +20,6 @@ from bokeh.palettes import Dark2_8 as palette
 import itertools
 from bokeh.plotting import figure, ColumnDataSource, Figure,curdoc
 from bokeh.models import CustomJS,Slider, TextInput,BoxAnnotation
-try:
-    from bokeh.charts import Histogram,HeatMap,Area,BoxPlot,Bar
-    from bokeh.charts.attributes import CatAttr
-except:
-    pass
     
 from bokeh.resources import CDN,INLINE
 from bokeh.embed import components
@@ -60,6 +55,7 @@ import math
 import numpy as np
 import pandas as pd
 import holoviews as hv
+from holoviews import opts
 from pytz import timezone as tz,utc
 from django.utils.timezone import get_current_timezone
 from django.utils.timezone import activate
@@ -85,17 +81,6 @@ from rowers.utils import lbstoN
 from rowers.datautils import p0
 import rowers.datautils as datautils
 
-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 errorbar(fig, x, y, source=ColumnDataSource(),
              xerr=False, yerr=False, color='black', 
@@ -204,6 +189,17 @@ def interactive_boxchart(datadf,fieldname,extratitle=''):
 
 
     # add watermark
+    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'
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
 
@@ -320,21 +316,43 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'):
 
     df.sort_values('date_sorting',inplace=True)
 
-    df.to_csv('~/s/data.csv')
-    
-    p = hv.Bars(df,values='duration',
-#            label = CatAttr(columns=['date'], sort=False),
-            xlabel='Date',
-            ylabel='Time',
-            title='Activity {d1} to {d2}'.format(
+    hv.extension('bokeh')
+
+    table = hv.Table(df,[('date','Date'),('type','Workout Type')],[('duration','Duration')])
+
+    bars=table.to.bars(['date','type'],['duration'])
+    bars.opts(
+        opts.Bars(color=hv.Cycle('Category20'), show_legend=True, stacked=True, 
+                  tools=['hover'], width=600, xrotation=90))
+
+
+    p = hv.render(bars)
+
+    p.title.text = 'Activity {d1} to {d2}'.format(
                 d1 = startdate.strftime("%Y-%m-%d"),
                 d2 = enddate.strftime("%Y-%m-%d"),
-                ),
-            stack=stack,
-            plot_width=350,
-            plot_height=250,
-            toolbar_location = None, 
-    )
+                )
+    p.plot_width=350
+    p.plot_height=250
+    p.toolbar_location = None
+
+    
+#    p = hv.Bars(df,values='duration',
+#            label = CatAttr(columns=['date'], sort=False),
+#            xlabel='Date',
+#            ylabel='Time',
+#            title='Activity {d1} to {d2}'.format(
+#                d1 = startdate.strftime("%Y-%m-%d"),
+#                d2 = enddate.strftime("%Y-%m-%d"),
+#                ),
+#            stack=stack,
+#            plot_width=350,
+#            plot_height=250,
+#            toolbar_location = None, 
+#    )
+
+
+
 
 
    # for legend in p.legend:
@@ -354,13 +372,7 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'):
 
     #p.yaxis.axis_label = 'Minutes'
 
-    try:
-        p = renderer.get_plot(p).state
-        script, div = components(p)
-    except:
-        script = ''
-        div = ''
-
+    script,div = components(p)
     return script,div
 
 def interactive_forcecurve(theworkouts,workstrokesonly=False):
@@ -454,6 +466,17 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
                   toolbar_sticky=False)
 
     # add watermark
+    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'
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
     plot.sizing_mode = 'scale_width'
@@ -764,6 +787,17 @@ def fitnessmetric_chart(fitnessmetrics,user,workoutmode='rower'):
                   x_axis_type='datetime')
 
     # add watermark
+    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'
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
 
@@ -850,6 +884,17 @@ def interactive_histoall(theworkouts):
                   )
 
     # add watermark
+    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'
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
 
@@ -1599,6 +1644,17 @@ def interactive_otwcpchart(powerdf,promember=0,rowername=""):
                   toolbar_sticky=False)
 
     # add watermark
+    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'
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.sizing_mode = 'scale_width'
 
@@ -1888,6 +1944,17 @@ def interactive_cpchart(rower,thedistances,thesecs,theavpower,
                   toolbar_sticky=False)
 
     # add watermark
+    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'
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.sizing_mode = 'scale_width'
 
@@ -2195,6 +2262,17 @@ def interactive_chart(id=0,promember=0,intervaldata = {}):
                   tools=TOOLS)
 
     # add watermark
+    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'
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
 
@@ -2388,6 +2466,17 @@ def interactive_multiflex(datadf,xparam,yparam,groupby,extratitle='',
                   toolbar_sticky=False,plot_width=920)
 
     # add watermark
+    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'
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
 
@@ -2617,6 +2706,17 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
                   toolbar_sticky=False)
 
     # add watermark
+    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'
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
     plot.sizing_mode = 'scale_width'
@@ -2847,6 +2947,19 @@ def interactive_flex_chart2(id=0,promember=0,
                            plottype='line',
                            workstrokesonly=False):
 
+    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'
+
+    
     #rowdata,row = dataprep.getrowdata_db(id=id)
     columns = [xparam,yparam1,yparam2,
                'ftime','distance','fpace',
@@ -3036,6 +3149,17 @@ def interactive_flex_chart2(id=0,promember=0,
 
 
     # add watermark
+    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'
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
     plot.sizing_mode = 'scale_width'
@@ -3647,6 +3771,17 @@ def interactive_bar_chart(id=0,promember=0):
                   tools=TOOLS)
 
     # add watermark
+    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'
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
     plot.sizing_mode = 'scale_width'
@@ -3816,6 +3951,17 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
                   toolbar_sticky=False)
 
     # add watermark
+    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'
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
     plot.sizing_mode = 'scale_width'
@@ -4068,6 +4214,17 @@ def interactive_comparison_chart(id1=0,id2=0,xparam='distance',yparam='spm',
                   toolbar_sticky=False)
 
     # add watermark
+    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'
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
     plot.sizing_mode = 'scale_width'
@@ -4199,6 +4356,17 @@ def interactive_otw_advanced_pace_chart(id=0,promember=0):
                   toolbar_sticky=False)
 
     # add watermark
+    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'
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
     plot.sizing_mode = 'scale_width'