diff --git a/db.sqlite3 b/db.sqlite3 index c7bffb54..40af5aaa 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 1a7861d7..accc3d4b 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -21,6 +21,7 @@ from bokeh.models import ( GMapPlot, GMapOptions, ColumnDataSource, Circle, DataRange1d, PanTool, WheelZoomTool, BoxSelectTool, SaveTool, ResizeTool, ResetTool, TapTool,CrosshairTool,BoxZoomTool, + Span, ) #from bokeh.models.widgets import Slider, Select, TextInput from bokeh.core.properties import value @@ -1394,29 +1395,26 @@ def interactive_flex_chart2(id=0,promember=0, xaxmax = get_datetimes([xaxmax],tzinfo=1)[0] xaxmin = get_datetimes([xaxmin],tzinfo=1)[0] x1 = get_datetimes(x1,tzinfo=1) - - if xparam=='distance': + elif xparam=='distance': xaxmax = x1.max() xaxmin = x1.min() + else: + xaxmax = yaxmaxima[xparam] + xaxmin = yaxminima[xparam] # average values - y1mean = y1.mean()+0.0*np.arange(100) - y2mean = y2.mean()+0.0*np.arange(100) if xparam != 'time': - x1mean = x1.mean()+0.0*np.arange(100) + x1mean = x1.mean() else: - x1mean = 0+0.0*np.arange(100) + x1mean = 0 + + y1mean = y1.mean() + y2mean = y2.mean() - - - if xparam != 'time' and xparam != 'distance' and yparam1 != 'pace': - xvals = yaxminima[xparam]+np.arange(100)*(yaxmaxima[xparam]-yaxminima[xparam])/100. - y1vals = yaxminima[yparam1]+np.arange(100)*(yaxmaxima[yparam1]-yaxminima[yparam1])/100. + if xparam != 'time': + xvals = xaxmin+np.arange(100)*(xaxmax-xaxmin)/100. else: xvals = np.arange(100) - y1vals = np.arange(100) - - # constant power plot if yparam1 == 'driveenergy': @@ -1466,11 +1464,10 @@ def interactive_flex_chart2(id=0,promember=0, spmc=np.rint(10*spm)/10., distance=distance, power=power, - xvals=xvals, - y1mean=y1mean, - y2mean=y2mean, - x1mean=x1mean, - y1vals=y1vals, +# xvals=xvals, + y1mean=[y1mean,y1mean], + y2mean=[y2mean,y2mean], + x1mean=[x1mean,x1mean], ) ) @@ -1487,11 +1484,10 @@ def interactive_flex_chart2(id=0,promember=0, spmc=np.rint(10*spm)/10., distance=distance, power=power, - xvals=xvals, - y1mean=y1mean, - y2mean=y2mean, - x1mean=x1mean, - y1vals=y1vals, +# xvals=xvals, + y1mean=[y1mean,y1mean], + y2mean=[y2mean,y2mean], + x1mean=[x1mean,x1mean], ) ) @@ -1510,9 +1506,109 @@ def interactive_flex_chart2(id=0,promember=0, toolbar_sticky=False, # plot_width=900, ) + x1means = Span(location=x1mean,dimension='height',line_color='green', + line_dash=[6,6], line_width=2) + + y1means = Span(location=y1mean,dimension='width',line_color='blue', + line_dash=[6,6],line_width=2) + y2means = y1means + + if (xparam != 'time') and (xparam != 'distance'): + plot.add_layout(x1means) + + plot.add_layout(y1means) - callback = CustomJS(args = dict(source=source,source2=source2), code=""" + + # average values + if yparam1 == 'driveenergy': + if xparam == 'spm': + plot.line(xvals,yconstantpower,color="green",legend="Constant Power") + + if plottype=='line': + plot.line('x1','y1',source=source2,legend=axlabels[yparam1]) + elif plottype=='scatter': +# plot.circle('x1','y1',source=source2,legend=yparam1,size=3) + plot.scatter('x1','y1',source=source2,legend=axlabels[yparam1],fill_alpha=0.4, + line_color=None) + + plot.title.text = row.name + plot.title.text_font_size=value("1.0em") + plot.xaxis.axis_label = axlabels[xparam] + plot.yaxis.axis_label = axlabels[yparam1] + + + + yrange1 = Range1d(start=yaxminima[yparam1],end=yaxmaxima[yparam1]) + plot.y_range = yrange1 + + if (xparam != 'time') and (xparam != 'distance'): + xrange1 = Range1d(start=yaxminima[xparam],end=yaxmaxima[xparam]) + plot.x_range = xrange1 + + if xparam == 'time': + xrange1 = Range1d(start=xaxmin,end=xaxmax) + plot.x_range = xrange1 + plot.xaxis[0].formatter = DatetimeTickFormatter( + hours = ["%H"], + minutes = ["%M"], + seconds = ["%S"], + days = ["0"], + months = [""], + years = [""] + ) + + + if yparam1 == 'pace': + plot.y_range = Range1d(ymin,ymax) + plot.yaxis[0].formatter = DatetimeTickFormatter( + seconds = ["%S"], + minutes = ["%M"] + ) + + if yparam2 != 'None': + yrange2 = Range1d(start=yaxminima[yparam2],end=yaxmaxima[yparam2]) + plot.extra_y_ranges = {"yax2": yrange2} + + if plottype=='line': + plot.line('x1','y2',color="red",y_range_name="yax2", + legend=axlabels[yparam2], + source=source2) + + elif plottype=='scatter': +# plot.circle(x1,y2,color="red",y_range_name="yax2",legend=yparam2, +# source=source,size=3) + plot.scatter('x1','y2',source=source2,legend=axlabels[yparam2] + ,fill_alpha=0.4, + line_color=None,color="red",y_range_name="yax2") + + plot.add_layout(LinearAxis(y_range_name="yax2", + axis_label=axlabels[yparam2]),'right') + + y2means = Span(location=y2mean,dimension='width',line_color='red', + line_dash=[6,6],line_width=2,y_range_name="yax2") + + + plot.add_layout(y2means) + + hover = plot.select(dict(type=HoverTool)) + + + hover.tooltips = OrderedDict([ + ('Time','@time'), + ('Distance','@distance'), + ('Pace','@pace'), + ('HR','@hr'), + ('SPM','@spmc{1.1}'), + ('Power','@power{int}'), + ]) + + hover.mode = 'mouse' + + callback = CustomJS(args = dict(source=source,source2=source2, + x1means=x1means, + y1means=y1means, + y2means=y2means), code=""" var data = source.data var data2 = source2.data var x1 = data['x1'] @@ -1568,6 +1664,7 @@ def interactive_flex_chart2(id=0,promember=0, xm += x1[i] ym1 += y1[i] ym2 += y2[i] + } } } @@ -1579,10 +1676,9 @@ def interactive_flex_chart2(id=0,promember=0, data2['x1mean'] = [xm,xm] data2['y1mean'] = [ym1,ym1] data2['y2mean'] = [ym2,ym2] - - data2['xvals'] = [0,3e4] - data2['y1vals'] = [0,3e4] - data2['y2vals'] = [0,3e4] + x1means.location = xm + y1means.location = ym1 + y2means.location = ym2 source2.trigger('change'); """) @@ -1606,89 +1702,6 @@ def interactive_flex_chart2(id=0,promember=0, step=1, title="Max Distance",callback=callback) callback.args["maxdist"] = slider_dist_max - - # average values - plot.line('xvals','y1mean',color="black",source=source2) - plot.line('x1mean','y1vals',color="black",source=source2) - if yparam1 == 'driveenergy': - if xparam == 'spm': - plot.line(xvals,yconstantpower,color="green",legend="Constant Power") - - if plottype=='line': - plot.line('x1','y1',source=source2,legend=axlabels[yparam1]) - elif plottype=='scatter': -# plot.circle('x1','y1',source=source2,legend=yparam1,size=3) - plot.scatter('x1','y1',source=source2,legend=axlabels[yparam1],fill_alpha=0.4, - line_color=None) - - plot.title.text = row.name - plot.title.text_font_size=value("1.0em") - plot.xaxis.axis_label = axlabels[xparam] - plot.yaxis.axis_label = axlabels[yparam1] - - - yrange1 = Range1d(start=yaxminima[yparam1],end=yaxmaxima[yparam1]) - plot.y_range = yrange1 - - if (xparam != 'time') and (xparam != 'distance'): - xrange1 = Range1d(start=yaxminima[xparam],end=yaxmaxima[xparam]) - plot.x_range = xrange1 - - if xparam == 'time': - xrange1 = Range1d(start=xaxmin,end=xaxmax) - plot.x_range = xrange1 - plot.xaxis[0].formatter = DatetimeTickFormatter( - hours = ["%H"], - minutes = ["%M"], - seconds = ["%S"], - days = ["0"], - months = [""], - years = [""] - ) - - - if yparam1 == 'pace': - plot.y_range = Range1d(ymin,ymax) - plot.yaxis[0].formatter = DatetimeTickFormatter( - seconds = ["%S"], - minutes = ["%M"] - ) - - if yparam2 != 'None': - yrange2 = Range1d(start=yaxminima[yparam2],end=yaxmaxima[yparam2]) - plot.extra_y_ranges = {"yax2": yrange2} - plot.line('xvals','y2mean',color="black",y_range_name="yax2", - source=source2) - - if plottype=='line': - plot.line('x1','y2',color="red",y_range_name="yax2", - legend=axlabels[yparam2], - source=source2) - - elif plottype=='scatter': -# plot.circle(x1,y2,color="red",y_range_name="yax2",legend=yparam2, -# source=source,size=3) - plot.scatter('x1','y2',source=source2,legend=axlabels[yparam2] - ,fill_alpha=0.4, - line_color=None,color="red",y_range_name="yax2") - - plot.add_layout(LinearAxis(y_range_name="yax2", - axis_label=axlabels[yparam2]),'right') - - - hover = plot.select(dict(type=HoverTool)) - - - hover.tooltips = OrderedDict([ - ('Time','@time'), - ('Distance','@distance'), - ('Pace','@pace'), - ('HR','@hr'), - ('SPM','@spmc{1.1}'), - ('Power','@power{int}'), - ]) - - hover.mode = 'mouse' layout = layoutrow([layoutcolumn([slider_spm_min, slider_spm_max, diff --git a/rowers/interactiveplots.pyc b/rowers/interactiveplots.pyc index 59f58692..94bec1a7 100644 Binary files a/rowers/interactiveplots.pyc and b/rowers/interactiveplots.pyc differ diff --git a/rowers/interactiveplots.py~ b/rowers/interactiveplots.py~ index b48f6343..1a7861d7 100644 --- a/rowers/interactiveplots.py~ +++ b/rowers/interactiveplots.py~ @@ -1580,9 +1580,9 @@ def interactive_flex_chart2(id=0,promember=0, data2['y1mean'] = [ym1,ym1] data2['y2mean'] = [ym2,ym2] - data2['xvals'] = [0,1e6] - data2['y1vals'] = [0,1e6] - data2['y2vals'] = [0,1e6] + data2['xvals'] = [0,3e4] + data2['y1vals'] = [0,3e4] + data2['y2vals'] = [0,3e4] source2.trigger('change'); """) @@ -1681,6 +1681,7 @@ def interactive_flex_chart2(id=0,promember=0, hover.tooltips = OrderedDict([ ('Time','@time'), + ('Distance','@distance'), ('Pace','@pace'), ('HR','@hr'), ('SPM','@spmc{1.1}'), diff --git a/rowers/templates/flexchart3.html b/rowers/templates/flexchart3.html index 46ab7e73..21e53bdd 100644 --- a/rowers/templates/flexchart3.html +++ b/rowers/templates/flexchart3.html @@ -51,17 +51,17 @@
- Time - Distance + Time + Distance {% if promember %} - Power - HR - SPM - Peak Force - Average Force - Drive Length - Work per Stroke - Drive Speed + Power + HR + SPM + Peak Force + Average Force + Drive Length + Work per Stroke + Drive Speed {% else %} Power (Pro) HR (Pro) @@ -79,16 +79,16 @@
- Pace - HR - SPM - Power + Pace + HR + SPM + Power {% if promember %} - Peak Force - Average Force - Drive Length - Work per Stroke - Drive Speed + Peak Force + Average Force + Drive Length + Work per Stroke + Drive Speed {% else %} Peak Force (Pro) Average Force (Pro) @@ -103,15 +103,15 @@
- HR - SPM - Power + HR + SPM + Power {% if promember %} - Peak Force - Average Force - Drive Length - Work per Stroke - Drive Speed + Peak Force + Average Force + Drive Length + Work per Stroke + Drive Speed {% else %} Peak Force (Pro) Average Force (Pro) @@ -120,7 +120,7 @@ Drive Speed (Pro) {% endif %} - None + None
@@ -141,10 +141,10 @@ If your data source allows, this will show or hide strokes taken during rest intervals.
- Line Plot + Line Plot
- Scatter Plot + Scatter Plot
diff --git a/rowers/templates/flexchart3.html~ b/rowers/templates/flexchart3.html~ index 21e53bdd..46ab7e73 100644 --- a/rowers/templates/flexchart3.html~ +++ b/rowers/templates/flexchart3.html~ @@ -51,17 +51,17 @@
- Time - Distance + Time + Distance {% if promember %} - Power - HR - SPM - Peak Force - Average Force - Drive Length - Work per Stroke - Drive Speed + Power + HR + SPM + Peak Force + Average Force + Drive Length + Work per Stroke + Drive Speed {% else %} Power (Pro) HR (Pro) @@ -79,16 +79,16 @@
- Pace - HR - SPM - Power + Pace + HR + SPM + Power {% if promember %} - Peak Force - Average Force - Drive Length - Work per Stroke - Drive Speed + Peak Force + Average Force + Drive Length + Work per Stroke + Drive Speed {% else %} Peak Force (Pro) Average Force (Pro) @@ -103,15 +103,15 @@
- HR - SPM - Power + HR + SPM + Power {% if promember %} - Peak Force - Average Force - Drive Length - Work per Stroke - Drive Speed + Peak Force + Average Force + Drive Length + Work per Stroke + Drive Speed {% else %} Peak Force (Pro) Average Force (Pro) @@ -120,7 +120,7 @@ Drive Speed (Pro) {% endif %} - None + None
@@ -141,10 +141,10 @@ If your data source allows, this will show or hide strokes taken during rest intervals.
- Line Plot + Line Plot
- Scatter Plot + Scatter Plot
diff --git a/rowers/urls.py b/rowers/urls.py index 1eac2682..6004c7ab 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -125,14 +125,14 @@ urlpatterns = [ url(r'^legal', TemplateView.as_view(template_name='legal.html'),name='legal'), url(r'^register$',views.rower_register_view), url(r'^register/thankyou/$', TemplateView.as_view(template_name='registerthankyou.html'), name='registerthankyou'), - url(r'^workout/(?P\d+)/flexchart/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\w+)/$',views.workout_flexchart2_view), - url(r'^workout/(?P\d+)/flexchart/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)$',views.workout_flexchart2_view), + url(r'^workout/(?P\d+)/flexchart/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\w+)/$',views.workout_flexchart3_view), + url(r'^workout/(?P\d+)/flexchart/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)$',views.workout_flexchart3_view), url(r'^workout/(?P\d+)/flexchart/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)$',views.workout_flexchart2_view), - url(r'^workout/(?P\d+)/flexchart$',views.workout_flexchart2_view), - url(r'^workout/(?P\d+)/flexchart2/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\w+)/$',views.workout_flexchart3_view), - url(r'^workout/(?P\d+)/flexchart2/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)$',views.workout_flexchart3_view), + url(r'^workout/(?P\d+)/flexchart$',views.workout_flexchart3_view), + url(r'^workout/(?P\d+)/flexchart2/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\w+)/$',views.workout_flexchart2_view), + url(r'^workout/(?P\d+)/flexchart2/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)$',views.workout_flexchart2_view), url(r'^workout/(?P\d+)/flexchart2/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)$',views.workout_flexchart3_view), - url(r'^workout/(?P\d+)/flexchart2$',views.workout_flexchart3_view), + url(r'^workout/(?P\d+)/flexchart2$',views.workout_flexchart2_view), url(r'^workout/compare/(?P\d+)/(?P\d+)/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)$',views.workout_comparison_view2), url(r'^workout/compare/(?P\d+)/(?P\d+)/(?P\w+.*)/(?P\w+.*)/$',views.workout_comparison_view2), ] diff --git a/rowers/urls.pyc b/rowers/urls.pyc index 3b7ecb0c..620e4b76 100644 Binary files a/rowers/urls.pyc and b/rowers/urls.pyc differ diff --git a/rowers/urls.py~ b/rowers/urls.py~ index e732d37e..1eac2682 100644 --- a/rowers/urls.py~ +++ b/rowers/urls.py~ @@ -16,6 +16,7 @@ handler403 = 'views.error403_view' urlpatterns = [ # url(r'^password_change/$',auth_views.password_change), # url(r'^password_change_done/$',auth_views.password_change_done), + url(r'^testbokeh$',views.testbokeh), url(r'^500/$', TemplateView.as_view(template_name='500.html'),name='500'), url(r'^404/$', TemplateView.as_view(template_name='404.html'),name='404'), url(r'^400/$', TemplateView.as_view(template_name='400.html'),name='400'), diff --git a/rowers/views.pyc b/rowers/views.pyc index a5f103a4..faa9087c 100644 Binary files a/rowers/views.pyc and b/rowers/views.pyc differ diff --git a/rowers/views.py~ b/rowers/views.py~ index 45a80d4d..6d84ceb3 100644 --- a/rowers/views.py~ +++ b/rowers/views.py~ @@ -354,10 +354,10 @@ def add_workout_from_strokedata(user,importid,data,strokedata,source='c2'): pace = strokedata.ix[:,'p']/10. velo = 500./pace - if (source=='c2'): - power = 2.8*velo**3 - else: - power = 0.0*velo +# if (source=='c2' or source=='strava'): + power = 2.8*velo**3 +# else: +# power = 0.0*velo # save csv # Create data frame with all necessary data to write to csv @@ -2457,15 +2457,15 @@ def workout_flexchart3_view(request,id=0,xparam='distance',yparam1='pace', workstrokesonly=workstrokesonly) script = res[0] div = res[1] - widgetscript = res[2] - widgetdiv1 = res[3] - widgetdiv2 = res[4] - - + js_resources = res[2] + css_resources = res[3] + return render(request, - 'flexchart2.html', - {'interactiveplot':script, + 'flexchart3.html', + {'the_script':script, 'the_div':div, + 'js_res': js_resources, + 'css_res':css_resources, 'id':id, 'xparam':xparam, 'yparam1':yparam1, @@ -2474,9 +2474,6 @@ def workout_flexchart3_view(request,id=0,xparam='distance',yparam1='pace', 'mayedit':mayedit, 'promember':promember, 'workstrokesonly': not workstrokesonly, - 'widgetscript': widgetscript, - 'widgetdiv1': widgetdiv1, - 'widgetdiv2': widgetdiv2, }) def testbokeh(request): @@ -2557,7 +2554,7 @@ def testbokeh(request): hover.mode = 'mouse' - layout = row([column([s1,s2,s3,s4]),plot]) + layout = layoutrow([layoutcolumn([s1,s2,s3,s4]),plot]) # widgetbox(s) script, div = components(layout) js_resources = INLINE.render_js() @@ -4040,10 +4037,10 @@ def workout_summary_edit_view(request,id,message="",successmessage="" savebutton = 'nosavebutton' + # We have submitted the mini language interpreter if request.method == 'POST' and "intervalstring" in request.POST: form = SummaryStringForm(request.POST) if form.is_valid(): - #something cd = form.cleaned_data s = cd["intervalstring"] rowdata.updateinterval_string(s) @@ -4052,6 +4049,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" nrintervals = len(idist) savebutton = 'savestringform' + # we are saving the results obtained from the mini language interpreter elif request.method == 'POST' and "savestringform" in request.POST: s = request.POST["savestringform"] rowdata.updateinterval_string(s) @@ -4059,7 +4057,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" itime,idist,itype = rowdata.intervalstats_values() nrintervals = len(idist) row.summary = intervalstats - intervalstats = rowdata.allstats() + #intervalstats = rowdata.allstats() row.notes += "\n"+s row.save() rowdata.write_csv(f1) @@ -4067,6 +4065,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" form = SummaryStringForm(initial=data) savebutton = 'savestringform' + # we are saving the results obtained from the detailed form elif request.method == 'POST' and "savedetailform" in request.POST: savebutton = 'savedetailform' form = SummaryStringForm() @@ -4117,6 +4116,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" form = SummaryStringForm() + # we are processing the details form elif request.method == 'POST' and "nrintervals" in request.POST: savebutton = 'savedetailform' nrintervals = int(request.POST['nrintervals'])