diff --git a/cvkbrno/__init__.pyc b/cvkbrno/__init__.pyc index df2c6917..4cc88b3b 100644 Binary files a/cvkbrno/__init__.pyc and b/cvkbrno/__init__.pyc differ diff --git a/cvkbrno/admin.pyc b/cvkbrno/admin.pyc index 509401c6..e674dee8 100644 Binary files a/cvkbrno/admin.pyc and b/cvkbrno/admin.pyc differ diff --git a/cvkbrno/celery.pyc b/cvkbrno/celery.pyc index 514dc851..c05582e5 100644 Binary files a/cvkbrno/celery.pyc and b/cvkbrno/celery.pyc differ diff --git a/cvkbrno/forms.pyc b/cvkbrno/forms.pyc index 10a3115e..8094a3c4 100644 Binary files a/cvkbrno/forms.pyc and b/cvkbrno/forms.pyc differ diff --git a/cvkbrno/migrations/0001_initial.pyc b/cvkbrno/migrations/0001_initial.pyc index ea235833..6e561ee5 100644 Binary files a/cvkbrno/migrations/0001_initial.pyc and b/cvkbrno/migrations/0001_initial.pyc differ diff --git a/cvkbrno/migrations/0002_auto_20160515_0910.pyc b/cvkbrno/migrations/0002_auto_20160515_0910.pyc index 414e2ef8..ef5d4ad5 100644 Binary files a/cvkbrno/migrations/0002_auto_20160515_0910.pyc and b/cvkbrno/migrations/0002_auto_20160515_0910.pyc differ diff --git a/cvkbrno/migrations/0003_member_club.pyc b/cvkbrno/migrations/0003_member_club.pyc index b2e7ab18..1fa508a9 100644 Binary files a/cvkbrno/migrations/0003_member_club.pyc and b/cvkbrno/migrations/0003_member_club.pyc differ diff --git a/cvkbrno/migrations/0004_auto_20160518_2001.pyc b/cvkbrno/migrations/0004_auto_20160518_2001.pyc index 18494e82..96b8485f 100644 Binary files a/cvkbrno/migrations/0004_auto_20160518_2001.pyc and b/cvkbrno/migrations/0004_auto_20160518_2001.pyc differ diff --git a/cvkbrno/migrations/0005_auto_20160519_0750.pyc b/cvkbrno/migrations/0005_auto_20160519_0750.pyc index 79093aab..2f133f77 100644 Binary files a/cvkbrno/migrations/0005_auto_20160519_0750.pyc and b/cvkbrno/migrations/0005_auto_20160519_0750.pyc differ diff --git a/cvkbrno/migrations/0006_auto_20160519_0805.pyc b/cvkbrno/migrations/0006_auto_20160519_0805.pyc index 0cce3013..6881744c 100644 Binary files a/cvkbrno/migrations/0006_auto_20160519_0805.pyc and b/cvkbrno/migrations/0006_auto_20160519_0805.pyc differ diff --git a/cvkbrno/migrations/0007_auto_20160519_1103.pyc b/cvkbrno/migrations/0007_auto_20160519_1103.pyc index 438be52c..bff387a2 100644 Binary files a/cvkbrno/migrations/0007_auto_20160519_1103.pyc and b/cvkbrno/migrations/0007_auto_20160519_1103.pyc differ diff --git a/cvkbrno/migrations/0008_auto_20160519_1204.pyc b/cvkbrno/migrations/0008_auto_20160519_1204.pyc index c8bf7afc..7ae14603 100644 Binary files a/cvkbrno/migrations/0008_auto_20160519_1204.pyc and b/cvkbrno/migrations/0008_auto_20160519_1204.pyc differ diff --git a/cvkbrno/migrations/0009_auto_20160519_1207.pyc b/cvkbrno/migrations/0009_auto_20160519_1207.pyc index 62dfdd18..d8846bdc 100644 Binary files a/cvkbrno/migrations/0009_auto_20160519_1207.pyc and b/cvkbrno/migrations/0009_auto_20160519_1207.pyc differ diff --git a/cvkbrno/migrations/0010_auto_20160608_0811.pyc b/cvkbrno/migrations/0010_auto_20160608_0811.pyc index 103943b3..f3783923 100644 Binary files a/cvkbrno/migrations/0010_auto_20160608_0811.pyc and b/cvkbrno/migrations/0010_auto_20160608_0811.pyc differ diff --git a/cvkbrno/migrations/0011_auto_20160613_1640.pyc b/cvkbrno/migrations/0011_auto_20160613_1640.pyc index f1b6c39b..06e73d5a 100644 Binary files a/cvkbrno/migrations/0011_auto_20160613_1640.pyc and b/cvkbrno/migrations/0011_auto_20160613_1640.pyc differ diff --git a/cvkbrno/migrations/0012_auto_20160719_2240.pyc b/cvkbrno/migrations/0012_auto_20160719_2240.pyc index 2d0be711..f15e71ea 100644 Binary files a/cvkbrno/migrations/0012_auto_20160719_2240.pyc and b/cvkbrno/migrations/0012_auto_20160719_2240.pyc differ diff --git a/cvkbrno/migrations/0013_auto_20160719_2245.pyc b/cvkbrno/migrations/0013_auto_20160719_2245.pyc index 1fa5d8d1..7c2504e6 100644 Binary files a/cvkbrno/migrations/0013_auto_20160719_2245.pyc and b/cvkbrno/migrations/0013_auto_20160719_2245.pyc differ diff --git a/cvkbrno/migrations/0014_auto_20160719_2313.pyc b/cvkbrno/migrations/0014_auto_20160719_2313.pyc index 1b917a3d..cebd63e5 100644 Binary files a/cvkbrno/migrations/0014_auto_20160719_2313.pyc and b/cvkbrno/migrations/0014_auto_20160719_2313.pyc differ diff --git a/cvkbrno/migrations/0015_auto_20160720_1741.pyc b/cvkbrno/migrations/0015_auto_20160720_1741.pyc index e5857661..1a073758 100644 Binary files a/cvkbrno/migrations/0015_auto_20160720_1741.pyc and b/cvkbrno/migrations/0015_auto_20160720_1741.pyc differ diff --git a/cvkbrno/migrations/0016_outing_race.pyc b/cvkbrno/migrations/0016_outing_race.pyc index be0e23a3..48485307 100644 Binary files a/cvkbrno/migrations/0016_outing_race.pyc and b/cvkbrno/migrations/0016_outing_race.pyc differ diff --git a/cvkbrno/migrations/0017_auto_20160721_1621.pyc b/cvkbrno/migrations/0017_auto_20160721_1621.pyc index e8641507..85547a44 100644 Binary files a/cvkbrno/migrations/0017_auto_20160721_1621.pyc and b/cvkbrno/migrations/0017_auto_20160721_1621.pyc differ diff --git a/cvkbrno/migrations/0018_auto_20160722_1043.pyc b/cvkbrno/migrations/0018_auto_20160722_1043.pyc index 2e19723e..f5fa6cc1 100644 Binary files a/cvkbrno/migrations/0018_auto_20160722_1043.pyc and b/cvkbrno/migrations/0018_auto_20160722_1043.pyc differ diff --git a/cvkbrno/migrations/0019_boatcategory_club.pyc b/cvkbrno/migrations/0019_boatcategory_club.pyc index 7c69e9ed..1b68d381 100644 Binary files a/cvkbrno/migrations/0019_boatcategory_club.pyc and b/cvkbrno/migrations/0019_boatcategory_club.pyc differ diff --git a/cvkbrno/migrations/0020_remove_member_club.pyc b/cvkbrno/migrations/0020_remove_member_club.pyc index 759bb1f2..414fef5f 100644 Binary files a/cvkbrno/migrations/0020_remove_member_club.pyc and b/cvkbrno/migrations/0020_remove_member_club.pyc differ diff --git a/cvkbrno/migrations/0021_member_club.pyc b/cvkbrno/migrations/0021_member_club.pyc index 7b422278..3172a6bd 100644 Binary files a/cvkbrno/migrations/0021_member_club.pyc and b/cvkbrno/migrations/0021_member_club.pyc differ diff --git a/cvkbrno/migrations/0022_auto_20160723_1502.pyc b/cvkbrno/migrations/0022_auto_20160723_1502.pyc index 730456f6..5c0e5252 100644 Binary files a/cvkbrno/migrations/0022_auto_20160723_1502.pyc and b/cvkbrno/migrations/0022_auto_20160723_1502.pyc differ diff --git a/cvkbrno/migrations/0023_memberwork_comment.pyc b/cvkbrno/migrations/0023_memberwork_comment.pyc index 702cf965..bb61dae6 100644 Binary files a/cvkbrno/migrations/0023_memberwork_comment.pyc and b/cvkbrno/migrations/0023_memberwork_comment.pyc differ diff --git a/cvkbrno/migrations/__init__.pyc b/cvkbrno/migrations/__init__.pyc index 54618219..1e3d53c1 100644 Binary files a/cvkbrno/migrations/__init__.pyc and b/cvkbrno/migrations/__init__.pyc differ diff --git a/cvkbrno/models.pyc b/cvkbrno/models.pyc index f7d4ab48..13ac628e 100644 Binary files a/cvkbrno/models.pyc and b/cvkbrno/models.pyc differ diff --git a/cvkbrno/tasks.pyc b/cvkbrno/tasks.pyc index dc62d047..d5332688 100644 Binary files a/cvkbrno/tasks.pyc and b/cvkbrno/tasks.pyc differ diff --git a/cvkbrno/templatetags/__init__.pyc b/cvkbrno/templatetags/__init__.pyc index a5bb8868..dab59a3b 100644 Binary files a/cvkbrno/templatetags/__init__.pyc and b/cvkbrno/templatetags/__init__.pyc differ diff --git a/cvkbrno/templatetags/filter.pyc b/cvkbrno/templatetags/filter.pyc index 034a1958..0dd10c1f 100644 Binary files a/cvkbrno/templatetags/filter.pyc and b/cvkbrno/templatetags/filter.pyc differ diff --git a/cvkbrno/urls.pyc b/cvkbrno/urls.pyc index 64274715..f5b35e28 100644 Binary files a/cvkbrno/urls.pyc and b/cvkbrno/urls.pyc differ diff --git a/cvkbrno/views.pyc b/cvkbrno/views.pyc index e38fc5d4..be4e03a7 100644 Binary files a/cvkbrno/views.pyc and b/cvkbrno/views.pyc differ diff --git a/db.sqlite3 b/db.sqlite3 index 18ac5b90..131469d5 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/rowers/__init__.pyc b/rowers/__init__.pyc index 14d6c99c..442ccdd8 100644 Binary files a/rowers/__init__.pyc and b/rowers/__init__.pyc differ diff --git a/rowers/admin.pyc b/rowers/admin.pyc index b02b38fc..a32b49f6 100644 Binary files a/rowers/admin.pyc and b/rowers/admin.pyc differ diff --git a/rowers/c2stuff.pyc b/rowers/c2stuff.pyc index 6076b94d..156297f3 100644 Binary files a/rowers/c2stuff.pyc and b/rowers/c2stuff.pyc differ diff --git a/rowers/celery.pyc b/rowers/celery.pyc index 7acc9359..b805df7a 100644 Binary files a/rowers/celery.pyc and b/rowers/celery.pyc differ diff --git a/rowers/forms.pyc b/rowers/forms.pyc index 7bff226e..fd2c0560 100644 Binary files a/rowers/forms.pyc and b/rowers/forms.pyc 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 f1d7d8b9..1e1fc1d3 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/mailprocessing.pyc b/rowers/mailprocessing.pyc index 9a13d0bd..628c8af6 100644 Binary files a/rowers/mailprocessing.pyc and b/rowers/mailprocessing.pyc differ diff --git a/rowers/management/__init__.pyc b/rowers/management/__init__.pyc index e6d4d470..51120049 100644 Binary files a/rowers/management/__init__.pyc and b/rowers/management/__init__.pyc differ diff --git a/rowers/migrations/0001_initial.pyc b/rowers/migrations/0001_initial.pyc index b41f52d2..46e5d13b 100644 Binary files a/rowers/migrations/0001_initial.pyc and b/rowers/migrations/0001_initial.pyc differ diff --git a/rowers/migrations/0002_auto_20160426_1043.pyc b/rowers/migrations/0002_auto_20160426_1043.pyc index b4f4552a..10dd9065 100644 Binary files a/rowers/migrations/0002_auto_20160426_1043.pyc and b/rowers/migrations/0002_auto_20160426_1043.pyc differ diff --git a/rowers/migrations/0003_auto_20160426_1048.pyc b/rowers/migrations/0003_auto_20160426_1048.pyc index e3425ceb..c0abc97e 100644 Binary files a/rowers/migrations/0003_auto_20160426_1048.pyc and b/rowers/migrations/0003_auto_20160426_1048.pyc differ diff --git a/rowers/migrations/0004_auto_20160426_1441.pyc b/rowers/migrations/0004_auto_20160426_1441.pyc index 1c40d48a..8de2554e 100644 Binary files a/rowers/migrations/0004_auto_20160426_1441.pyc and b/rowers/migrations/0004_auto_20160426_1441.pyc differ diff --git a/rowers/migrations/0005_auto_20160426_1446.pyc b/rowers/migrations/0005_auto_20160426_1446.pyc index 1c391f0b..8394ecf7 100644 Binary files a/rowers/migrations/0005_auto_20160426_1446.pyc and b/rowers/migrations/0005_auto_20160426_1446.pyc differ diff --git a/rowers/migrations/0006_auto_20160427_1350.pyc b/rowers/migrations/0006_auto_20160427_1350.pyc index a6121054..fa3e7c4d 100644 Binary files a/rowers/migrations/0006_auto_20160427_1350.pyc and b/rowers/migrations/0006_auto_20160427_1350.pyc differ diff --git a/rowers/migrations/0007_auto_20160428_1153.pyc b/rowers/migrations/0007_auto_20160428_1153.pyc index 8da40815..3886d3b2 100644 Binary files a/rowers/migrations/0007_auto_20160428_1153.pyc and b/rowers/migrations/0007_auto_20160428_1153.pyc differ diff --git a/rowers/migrations/0008_auto_20160428_1154.pyc b/rowers/migrations/0008_auto_20160428_1154.pyc index 483da98c..1dd08499 100644 Binary files a/rowers/migrations/0008_auto_20160428_1154.pyc and b/rowers/migrations/0008_auto_20160428_1154.pyc differ diff --git a/rowers/migrations/0009_auto_20160428_1955.pyc b/rowers/migrations/0009_auto_20160428_1955.pyc index cc3f7686..e01b2e5e 100644 Binary files a/rowers/migrations/0009_auto_20160428_1955.pyc and b/rowers/migrations/0009_auto_20160428_1955.pyc differ diff --git a/rowers/migrations/0010_workout_distance.pyc b/rowers/migrations/0010_workout_distance.pyc index 801f9694..8404dc7e 100644 Binary files a/rowers/migrations/0010_workout_distance.pyc and b/rowers/migrations/0010_workout_distance.pyc differ diff --git a/rowers/migrations/0011_auto_20160428_2009.pyc b/rowers/migrations/0011_auto_20160428_2009.pyc index c9c79a4f..15a51bae 100644 Binary files a/rowers/migrations/0011_auto_20160428_2009.pyc and b/rowers/migrations/0011_auto_20160428_2009.pyc differ diff --git a/rowers/migrations/0012_auto_20160428_2010.pyc b/rowers/migrations/0012_auto_20160428_2010.pyc index 3a5f4db8..ad6f21c3 100644 Binary files a/rowers/migrations/0012_auto_20160428_2010.pyc and b/rowers/migrations/0012_auto_20160428_2010.pyc differ diff --git a/rowers/migrations/0013_auto_20160428_2021.pyc b/rowers/migrations/0013_auto_20160428_2021.pyc index 4f6164fe..88f611c7 100644 Binary files a/rowers/migrations/0013_auto_20160428_2021.pyc and b/rowers/migrations/0013_auto_20160428_2021.pyc differ diff --git a/rowers/migrations/0014_auto_20160428_2251.pyc b/rowers/migrations/0014_auto_20160428_2251.pyc index e7a2bd0d..b9cd5787 100644 Binary files a/rowers/migrations/0014_auto_20160428_2251.pyc and b/rowers/migrations/0014_auto_20160428_2251.pyc differ diff --git a/rowers/migrations/0015_auto_20160429_2038.pyc b/rowers/migrations/0015_auto_20160429_2038.pyc index d21f9a73..2971c08d 100644 Binary files a/rowers/migrations/0015_auto_20160429_2038.pyc and b/rowers/migrations/0015_auto_20160429_2038.pyc differ diff --git a/rowers/migrations/0016_auto_20160501_1119.pyc b/rowers/migrations/0016_auto_20160501_1119.pyc index 9838e4bd..e6c556e3 100644 Binary files a/rowers/migrations/0016_auto_20160501_1119.pyc and b/rowers/migrations/0016_auto_20160501_1119.pyc differ diff --git a/rowers/migrations/0017_auto_20160501_1126.pyc b/rowers/migrations/0017_auto_20160501_1126.pyc index 09e261f1..e69b67fb 100644 Binary files a/rowers/migrations/0017_auto_20160501_1126.pyc and b/rowers/migrations/0017_auto_20160501_1126.pyc differ diff --git a/rowers/migrations/0018_auto_20160501_1944.pyc b/rowers/migrations/0018_auto_20160501_1944.pyc index 725b2630..ca8002a6 100644 Binary files a/rowers/migrations/0018_auto_20160501_1944.pyc and b/rowers/migrations/0018_auto_20160501_1944.pyc differ diff --git a/rowers/migrations/0019_auto_20160522_1659.pyc b/rowers/migrations/0019_auto_20160522_1659.pyc index 328f1d76..90afe19a 100644 Binary files a/rowers/migrations/0019_auto_20160522_1659.pyc and b/rowers/migrations/0019_auto_20160522_1659.pyc differ diff --git a/rowers/migrations/0020_auto_20160522_1726.pyc b/rowers/migrations/0020_auto_20160522_1726.pyc index 5a81253b..0b706ffa 100644 Binary files a/rowers/migrations/0020_auto_20160522_1726.pyc and b/rowers/migrations/0020_auto_20160522_1726.pyc differ diff --git a/rowers/migrations/0021_rower_rowerplan.pyc b/rowers/migrations/0021_rower_rowerplan.pyc index 8b0fc0cf..1d656773 100644 Binary files a/rowers/migrations/0021_rower_rowerplan.pyc and b/rowers/migrations/0021_rower_rowerplan.pyc differ diff --git a/rowers/migrations/0022_auto_20160529_2115.pyc b/rowers/migrations/0022_auto_20160529_2115.pyc index cbdc7860..9625c498 100644 Binary files a/rowers/migrations/0022_auto_20160529_2115.pyc and b/rowers/migrations/0022_auto_20160529_2115.pyc differ diff --git a/rowers/migrations/0023_auto_20160530_0914.pyc b/rowers/migrations/0023_auto_20160530_0914.pyc index a17cbf0c..7f3f4d26 100644 Binary files a/rowers/migrations/0023_auto_20160530_0914.pyc and b/rowers/migrations/0023_auto_20160530_0914.pyc differ diff --git a/rowers/migrations/0024_workout_uploadedtostrava.pyc b/rowers/migrations/0024_workout_uploadedtostrava.pyc index 9e0e9c3c..14194594 100644 Binary files a/rowers/migrations/0024_workout_uploadedtostrava.pyc and b/rowers/migrations/0024_workout_uploadedtostrava.pyc differ diff --git a/rowers/migrations/0025_workout_summary.pyc b/rowers/migrations/0025_workout_summary.pyc index 67a5844c..f78d2706 100644 Binary files a/rowers/migrations/0025_workout_summary.pyc and b/rowers/migrations/0025_workout_summary.pyc differ diff --git a/rowers/migrations/0026_auto_20160608_2137.pyc b/rowers/migrations/0026_auto_20160608_2137.pyc index 4dc001d2..64d1fe6c 100644 Binary files a/rowers/migrations/0026_auto_20160608_2137.pyc and b/rowers/migrations/0026_auto_20160608_2137.pyc differ diff --git a/rowers/migrations/0027_workout_uploadedtosporttracks.pyc b/rowers/migrations/0027_workout_uploadedtosporttracks.pyc index bc6ee81b..50b24abb 100644 Binary files a/rowers/migrations/0027_workout_uploadedtosporttracks.pyc and b/rowers/migrations/0027_workout_uploadedtosporttracks.pyc differ diff --git a/rowers/migrations/0028_rower_sporttrackstoken.pyc b/rowers/migrations/0028_rower_sporttrackstoken.pyc index e507dfd1..1b85e5ba 100644 Binary files a/rowers/migrations/0028_rower_sporttrackstoken.pyc and b/rowers/migrations/0028_rower_sporttrackstoken.pyc differ diff --git a/rowers/migrations/0029_auto_20160610_0825.pyc b/rowers/migrations/0029_auto_20160610_0825.pyc index 2956f437..f094d4f8 100644 Binary files a/rowers/migrations/0029_auto_20160610_0825.pyc and b/rowers/migrations/0029_auto_20160610_0825.pyc differ diff --git a/rowers/migrations/0030_auto_20160610_0826.pyc b/rowers/migrations/0030_auto_20160610_0826.pyc index bf45a90e..2e4a5470 100644 Binary files a/rowers/migrations/0030_auto_20160610_0826.pyc and b/rowers/migrations/0030_auto_20160610_0826.pyc differ diff --git a/rowers/migrations/0031_auto_20160610_0843.pyc b/rowers/migrations/0031_auto_20160610_0843.pyc index 32074e26..e737df1c 100644 Binary files a/rowers/migrations/0031_auto_20160610_0843.pyc and b/rowers/migrations/0031_auto_20160610_0843.pyc differ diff --git a/rowers/migrations/0032_auto_20160615_1332.pyc b/rowers/migrations/0032_auto_20160615_1332.pyc index 61bd9af1..28f0c678 100644 Binary files a/rowers/migrations/0032_auto_20160615_1332.pyc and b/rowers/migrations/0032_auto_20160615_1332.pyc differ diff --git a/rowers/migrations/0033_auto_20160617_0927.pyc b/rowers/migrations/0033_auto_20160617_0927.pyc index f2762e9e..90e839b8 100644 Binary files a/rowers/migrations/0033_auto_20160617_0927.pyc and b/rowers/migrations/0033_auto_20160617_0927.pyc differ diff --git a/rowers/migrations/0034_auto_20160617_0929.pyc b/rowers/migrations/0034_auto_20160617_0929.pyc index 90c39700..f3ccd9e7 100644 Binary files a/rowers/migrations/0034_auto_20160617_0929.pyc and b/rowers/migrations/0034_auto_20160617_0929.pyc differ diff --git a/rowers/migrations/0035_auto_20160623_0815.pyc b/rowers/migrations/0035_auto_20160623_0815.pyc index 9a7c2382..9c0f47fc 100644 Binary files a/rowers/migrations/0035_auto_20160623_0815.pyc and b/rowers/migrations/0035_auto_20160623_0815.pyc differ diff --git a/rowers/migrations/0036_rower_team.pyc b/rowers/migrations/0036_rower_team.pyc index 4d5aa822..0ea77bd3 100644 Binary files a/rowers/migrations/0036_rower_team.pyc and b/rowers/migrations/0036_rower_team.pyc differ diff --git a/rowers/migrations/0037_auto_20160629_1014.pyc b/rowers/migrations/0037_auto_20160629_1014.pyc index ec06442b..892a89c2 100644 Binary files a/rowers/migrations/0037_auto_20160629_1014.pyc and b/rowers/migrations/0037_auto_20160629_1014.pyc differ diff --git a/rowers/migrations/0038_auto_20160629_1023.pyc b/rowers/migrations/0038_auto_20160629_1023.pyc index 6a01beb9..99cc565c 100644 Binary files a/rowers/migrations/0038_auto_20160629_1023.pyc and b/rowers/migrations/0038_auto_20160629_1023.pyc differ diff --git a/rowers/migrations/0039_auto_20160719_2240.pyc b/rowers/migrations/0039_auto_20160719_2240.pyc index 35df4dc2..7d6b9238 100644 Binary files a/rowers/migrations/0039_auto_20160719_2240.pyc and b/rowers/migrations/0039_auto_20160719_2240.pyc differ diff --git a/rowers/migrations/0040_workout_startdatetime.pyc b/rowers/migrations/0040_workout_startdatetime.pyc index 59c522c5..3939afae 100644 Binary files a/rowers/migrations/0040_workout_startdatetime.pyc and b/rowers/migrations/0040_workout_startdatetime.pyc differ diff --git a/rowers/migrations/0041_rower_friends.pyc b/rowers/migrations/0041_rower_friends.pyc index eb3b8016..fd14121e 100644 Binary files a/rowers/migrations/0041_rower_friends.pyc and b/rowers/migrations/0041_rower_friends.pyc differ diff --git a/rowers/migrations/__init__.pyc b/rowers/migrations/__init__.pyc index 6e93f570..749ae9a7 100644 Binary files a/rowers/migrations/__init__.pyc and b/rowers/migrations/__init__.pyc differ diff --git a/rowers/models.pyc b/rowers/models.pyc index 6be7321f..b65aa8dc 100644 Binary files a/rowers/models.pyc and b/rowers/models.pyc differ diff --git a/rowers/plots.pyc b/rowers/plots.pyc index 5211b8b3..8e00daea 100644 Binary files a/rowers/plots.pyc and b/rowers/plots.pyc differ diff --git a/rowers/sporttracksstuff.pyc b/rowers/sporttracksstuff.pyc index a5f88ddd..30d37184 100644 Binary files a/rowers/sporttracksstuff.pyc and b/rowers/sporttracksstuff.pyc differ diff --git a/rowers/stravastuff.pyc b/rowers/stravastuff.pyc index 39fe11e5..cc3e8ed5 100644 Binary files a/rowers/stravastuff.pyc and b/rowers/stravastuff.pyc differ diff --git a/rowers/tasks.pyc b/rowers/tasks.pyc index fa9fa1d7..c2ac47c9 100644 Binary files a/rowers/tasks.pyc and b/rowers/tasks.pyc differ 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/templatetags/__init__.pyc b/rowers/templatetags/__init__.pyc index 683d0bb9..2338838d 100644 Binary files a/rowers/templatetags/__init__.pyc and b/rowers/templatetags/__init__.pyc differ diff --git a/rowers/templatetags/rowerfilters.pyc b/rowers/templatetags/rowerfilters.pyc index 61871954..e434f2c2 100644 Binary files a/rowers/templatetags/rowerfilters.pyc and b/rowers/templatetags/rowerfilters.pyc differ diff --git a/rowers/tests.pyc b/rowers/tests.pyc index 53d56865..e0d5eb6d 100644 Binary files a/rowers/tests.pyc and b/rowers/tests.pyc differ 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 aecb240b..806bef9b 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 7e6bf137..a5f103a4 100644 Binary files a/rowers/views.pyc and b/rowers/views.pyc differ diff --git a/rowers/weather.pyc b/rowers/weather.pyc index fbe4c491..987a65a3 100644 Binary files a/rowers/weather.pyc and b/rowers/weather.pyc differ diff --git a/rowsandall_app/__init__.pyc b/rowsandall_app/__init__.pyc index f0b543cf..b156a277 100644 Binary files a/rowsandall_app/__init__.pyc and b/rowsandall_app/__init__.pyc differ diff --git a/rowsandall_app/forms.pyc b/rowsandall_app/forms.pyc index c94dea79..8e07993e 100644 Binary files a/rowsandall_app/forms.pyc and b/rowsandall_app/forms.pyc differ diff --git a/rowsandall_app/rctasks.pyc b/rowsandall_app/rctasks.pyc index 3e74aa87..800a31ac 100644 Binary files a/rowsandall_app/rctasks.pyc and b/rowsandall_app/rctasks.pyc differ diff --git a/rowsandall_app/rows.pyc b/rowsandall_app/rows.pyc index 7f38eec1..530d47e7 100644 Binary files a/rowsandall_app/rows.pyc and b/rowsandall_app/rows.pyc differ diff --git a/rowsandall_app/settings.pyc b/rowsandall_app/settings.pyc index ebeae2fd..e356dbc8 100644 Binary files a/rowsandall_app/settings.pyc and b/rowsandall_app/settings.pyc differ diff --git a/rowsandall_app/settings_dev.pyc b/rowsandall_app/settings_dev.pyc index f01ed8fa..2dd9bca2 100644 Binary files a/rowsandall_app/settings_dev.pyc and b/rowsandall_app/settings_dev.pyc differ diff --git a/rowsandall_app/urls.pyc b/rowsandall_app/urls.pyc index 67fb9672..b3b06517 100644 Binary files a/rowsandall_app/urls.pyc and b/rowsandall_app/urls.pyc differ diff --git a/rowsandall_app/views.pyc b/rowsandall_app/views.pyc index 35677b62..a9390336 100644 Binary files a/rowsandall_app/views.pyc and b/rowsandall_app/views.pyc differ diff --git a/rowsandall_app/wsgi.pyc b/rowsandall_app/wsgi.pyc index 829fe979..8aecfe67 100644 Binary files a/rowsandall_app/wsgi.pyc and b/rowsandall_app/wsgi.pyc differ