From 97189ef02be7adba4f84dce1e78b73839658dccc Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 24 Feb 2017 15:57:20 +0100 Subject: [PATCH 01/16] dataprep routine fusing two dataframes --- rowers/dataprep.py | 22 +++++++++++++++++++++- rowers/views.py | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 71e6d585..d7497a78 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -772,7 +772,27 @@ def smalldataprep(therows,xparam,yparam1,yparam2): pass return df - + +# data fusion +def datafusion(id1,id2,column,offset): + df1 = getrowdata_db(id=id1) + columns = ['time',column] + df2 = getsmallrowdata_db(columns,ids=[id2]) + + keep1 = set(df1.columns) + keep1.pop(column) + + for c in df1.columns: + if not c in keep1: + df1 = df1.drop(c,1,errors='ignore') + + df = pd.concat([df1,df2],ignore_index=True) + df = df.sort_value(['time']) + df.interpolate(method='linear',axis=0,limit_direction='both') + df.fillna(method='bfill',inplace=True) + + return df + # This is the main routine. # it reindexes, sorts, filters, and smooths the data, then # saves it to the stroke_data table in the database diff --git a/rowers/views.py b/rowers/views.py index 26ad82c9..dbf7f9d8 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -3601,7 +3601,7 @@ def workout_unsubscribe_view(request,id=0): user=request.user).order_by("created") for c in comments: - c.notify = False + c.notification = False c.save() form = WorkoutCommentForm() From 0db945ee396a3a575de7b05a98074b419990e6cd Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 24 Feb 2017 15:59:51 +0100 Subject: [PATCH 02/16] dataprep --- rowers/dataprep.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index d7497a78..33827e10 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -774,13 +774,14 @@ def smalldataprep(therows,xparam,yparam1,yparam2): return df # data fusion -def datafusion(id1,id2,column,offset): +def datafusion(id1,id2,columns,offset): df1 = getrowdata_db(id=id1) - columns = ['time',column] + columns = ['time']+columns df2 = getsmallrowdata_db(columns,ids=[id2]) keep1 = set(df1.columns) - keep1.pop(column) + for c in columns: + keep1.pop(c) for c in df1.columns: if not c in keep1: From 866a4123b427e0410554d456a19c20d0917f136c Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 2 Mar 2017 20:52:10 +0100 Subject: [PATCH 03/16] images on comment page --- rowers/views.py | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/rowers/views.py b/rowers/views.py index a025f86e..67715fb1 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -3692,13 +3692,27 @@ def workout_comment_view(request,id=0): return HttpResponseRedirect(url) form = WorkoutCommentForm() - - return render(request, - 'workout_comments.html', - {'workout':w, - 'comments':comments, - 'form':form, - }) + + g = GraphImage.objects.filter(workout=row).order_by("-creationdatetime") + + if (len(g)<=3): + return render(request, + 'workout_comments.html', + {'workout':w, + 'graphs1':g[0:3], + 'comments':comments, + 'form':form, + }) + else: + return render(request, + 'workout_comments.html', + {'workout':w, + 'graphs1':g[0:3], + 'graphs1':g[3:6], + 'comments':comments, + 'form':form, + }) + # The basic edit page @login_required() From 5e5cc36da06b940ee3453d2d87aff6258afd2165 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 3 Mar 2017 15:41:51 +0100 Subject: [PATCH 04/16] added effective drive length --- rowers/dataprep.py | 5 ++ rowers/forms.py | 2 +- rowers/interactiveplots.py | 93 +++++++------------ rowers/models.py | 4 +- rowers/templates/developers.html | 8 +- rowers/templates/flexchart3otw.html | 134 +++++++++------------------- rowers/views.py | 27 ++++-- 7 files changed, 109 insertions(+), 164 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 6d9a5cf3..1e36ace9 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1020,7 +1020,10 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True, drivelength = arclength else: drivelength = driveenergy/(averageforce*4.44822) + slip = rowdatadf.ix[:,'slip'] + totalangle = finish-catch + effectiveangle = finish-wash-catch-slip if windowsize > 3 and windowsize
  • Advantages
      -
    • It may take up to five minutes for the workout to show up - on the site.
      • +
    • It's a simple process, which can be automated.
  • Disadvantages
      -
    • It's a simple process, which can be automated.
      • +
    • It may take up to five minutes for the workout to show up + on the site.
    • @@ -86,7 +86,7 @@
  • The API is not stable and not fully tested yet.
  • You need to register your app with us. We can revoke your permissions if you misuse them.
    • -
  • The first time user must grant permissions to your app.
    • +
  • The user user must grant permissions to your app.
  • You need to manage authorization tokens.
    • diff --git a/rowers/templates/flexchart3otw.html b/rowers/templates/flexchart3otw.html index 4697f3a7..923edcbb 100644 --- a/rowers/templates/flexchart3otw.html +++ b/rowers/templates/flexchart3otw.html @@ -51,41 +51,19 @@
    - Time - Distance + {% for key, value in axchoicesbasic.items %} + {% if key != 'None' %} + {{ value }} + {% endif %} + {% endfor %} {% if promember %} - Power - HR - SPM - Peak Force - Average Force - Average/Peak force ratio - Drive Length - Work per Stroke - Drive Speed - - Catch Angle - Finish Angle - Slip - Wash - Peak Force Angle + {% for key, value in axchoicespro.items %} + {{ value }} + {% endfor %} {% else %} - Power (Pro) - HR (Pro) - SPM (Pro) - Peak Force (Pro) - Average Force (Pro) - Average/Peak Force Ratio (Pro) - Drive Length (Pro) - Work per Stroke (Pro) - Drive Speed (Pro) - - Catch Angle (Pro) - Finish Angle (Pro) - Slip (Pro) - Wash (Pro) - Peak Force Angle (Pro) - + {% for key, value in axchoicespro.items %} + {{ value }} + {% endfor %} {% endif %}
    @@ -93,38 +71,23 @@
    - Pace - HR - SPM - Power + {% for key, value in axchoicesbasic.items %} + {% if key not in noylist %} + {{ value }} + {% endif %} + {% endfor %} {% if promember %} - Peak Force - Average Force - Average/Peak Force Ratio - Drive Length - Work per Stroke - Drive Speed - Drive Rhythm - - Catch Angle - Finish Angle - Slip - Wash - Peak Force Angle + {% for key, value in axchoicespro.items %} + {% if key not in noylist %} + {{ value }} + {% endif %} + {% endfor %} {% else %} - Peak Force (Pro) - Average Force (Pro) - Average/Peak Force Ratio (Pro) - Drive Length (Pro) - Work per Stroke (Pro) - Drive Speed (Pro) - Drive Rhythm (Pro) - - Catch Angle (Pro) - Finish Angle(Pro) - Wash (Pro) - Slip (Pro) - Peak Force Angle (Pro) + {% for key, value in axchoicespro.items %} + {% if key not in noylist %} + {{ value }} (Pro) + {% endif %} + {% endfor %} {% endif %}
    @@ -133,40 +96,25 @@
    - HR - SPM - Power + {% for key, value in axchoicesbasic.items %} + {% if key not in noylist %} + {{ value }} + {% endif %} + {% endfor %} {% if promember %} - Peak Force - Average Force - Average/Peak Force Ratio - Drive Length - Work per Stroke - Drive Speed - Drive Rhythm - - Catch Angle - Finish Angle - Slip - Wash - Peak Force Angle + {% for key, value in axchoicespro.items %} + {% if key not in noylist %} + {{ value }} + {% endif %} + {% endfor %} {% else %} - Peak Force (Pro) - Average Force (Pro) - Average/Peak Force Ratio (Pro) - Drive Length (Pro) - Work per Stroke (Pro) - Drive Speed (Pro) - Drive Rhythm (Pro) - Catch Angle (Pro) - Finish Angle (Pro) - Slip (Pro) - Wash (Pro) - Peak Force Angle (Pro) + {% for key, value in axchoicespro.items %} + {% if key not in noylist %} + {{ value }} (Pro) + {% endif %} + {% endfor %} {% endif %} - None -
    diff --git a/rowers/views.py b/rowers/views.py index 67715fb1..f61540cb 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -3154,10 +3154,6 @@ def workout_stats_view(request,id=0,message="",successmessage=""): fieldlist,fielddict = dataprep.getstatsfields() fielddict.pop('workoutstate') - print "aap" - print datadf['catch'].mean() - print "noot" - for field,verbosename in fielddict.iteritems(): thedict = { 'mean':datadf[field].mean(), @@ -3433,6 +3429,12 @@ def workout_flexchart3_view(request,*args,**kwargs): # js_resources = res[2] # css_resources = res[3] + + axchoicesbasic = {ax[0]:ax[1] for ax in axes if ax[4]=='basic'} + axchoicespro = {ax[0]:ax[1] for ax in axes if ax[4]=='pro'} + noylist = ["time","distance"] + axchoicesbasic.pop("cumdist") + if row.workouttype == 'water': return render(request, 'flexchart3otw.html', @@ -3447,13 +3449,25 @@ def workout_flexchart3_view(request,*args,**kwargs): 'plottype':plottype, 'mayedit':mayedit, 'promember':promember, + 'axchoicesbasic':axchoicesbasic, + 'axchoicespro':axchoicespro, + 'noylist':noylist, 'workstrokesonly': not workstrokesonly, 'favoritenr':favoritenr, 'maxfav':maxfav, }) else: + axchoicespro.pop('slip') + axchoicespro.pop('wash') + axchoicespro.pop('catch') + axchoicespro.pop('finish') + axchoicespro.pop('totalangle') + axchoicespro.pop('effectiveangle') + axchoicespro.pop('peakforceangle') + + return render(request, - 'flexchart3.html', + 'flexchart3otw.html', {'the_script':script, 'the_div':div, 'js_res': js_resources, @@ -3463,6 +3477,9 @@ def workout_flexchart3_view(request,*args,**kwargs): 'yparam1':yparam1, 'yparam2':yparam2, 'plottype':plottype, + 'axchoicesbasic':axchoicesbasic, + 'axchoicespro':axchoicespro, + 'noylist':noylist, 'mayedit':mayedit, 'promember':promember, 'workstrokesonly': not workstrokesonly, From 82efd308ba9a1133b6629639238ce1266b19b317 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 4 Mar 2017 15:08:01 +0100 Subject: [PATCH 05/16] flex chart - need to do comparison chart --- rowers/dataprep.py | 2 ++ rowers/interactiveplots.py | 20 ++++++++++---------- rowers/templates/flexchart3otw.html | 8 ++++---- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 1e36ace9..d0db4df7 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1032,6 +1032,8 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True, peakforceangle = savgol_filter(peakforceangle,windowsize,3) driveenergy = savgol_filter(driveenergy,windowsize,3) drivelength = savgol_filter(drivelength,windowsize,3) + totalangle = savgol_filter(totalangle,windowsize,3) + effectiveangle = savgol_filter(effectiveangle,windowsize,3) data['wash'] = wash data['catch'] = catch data['slip'] = slip diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 91b12e0b..951c04f8 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -966,7 +966,7 @@ def interactive_cum_flex_chart2(theworkouts,promember=0, line_dash=[6,6],line_width=2) y2means = y1means - xlabel = Label(x=370,y=130,x_units='screen',y_units='screen', + xlabel = Label(x=100,y=130,x_units='screen',y_units='screen', text=xparam+": {x1mean:6.2f}".format(x1mean=x1mean), background_fill_alpha=.7, text_color='green', @@ -978,7 +978,7 @@ def interactive_cum_flex_chart2(theworkouts,promember=0, plot.add_layout(y1means) - y1label = Label(x=370,y=100,x_units='screen',y_units='screen', + y1label = Label(x=100,y=100,x_units='screen',y_units='screen', text=yparam1+": {y1mean:6.2f}".format(y1mean=y1mean), background_fill_alpha=.7, text_color='blue', @@ -1018,8 +1018,8 @@ def interactive_cum_flex_chart2(theworkouts,promember=0, plot.add_layout(y2means) - y2label = Label(x=370,y=70,x_units='screen',y_units='screen', - text=yparam2+": {y2mean:6.2f}".format(y2mean=y2mean), + y2label = Label(x=100,y=70,x_units='screen',y_units='screen', + text=axlabels[yparam2]+": {y2mean:6.2f}".format(y2mean=y2mean), background_fill_alpha=.7, text_color='red', ) @@ -1287,8 +1287,8 @@ def interactive_flex_chart2(id=0,promember=0, line_dash=[6,6],line_width=2) y2means = y1means - xlabel = Label(x=370,y=130,x_units='screen',y_units='screen', - text=xparam+": {x1mean:6.2f}".format(x1mean=x1mean), + xlabel = Label(x=100,y=130,x_units='screen',y_units='screen', + text=axlabels[xparam]+": {x1mean:6.2f}".format(x1mean=x1mean), background_fill_alpha=.7, text_color='green', ) @@ -1300,8 +1300,8 @@ def interactive_flex_chart2(id=0,promember=0, plot.add_layout(y1means) - y1label = Label(x=370,y=100,x_units='screen',y_units='screen', - text=yparam1+": {y1mean:6.2f}".format(y1mean=y1mean), + y1label = Label(x=100,y=100,x_units='screen',y_units='screen', + text=axlabels[yparam1]+": {y1mean:6.2f}".format(y1mean=y1mean), background_fill_alpha=.7, text_color='blue', ) @@ -1375,8 +1375,8 @@ def interactive_flex_chart2(id=0,promember=0, plot.add_layout(y2means) - y2label = Label(x=370,y=70,x_units='screen',y_units='screen', - text=yparam2+": {y2mean:6.2f}".format(y2mean=y2mean), + y2label = Label(x=100,y=70,x_units='screen',y_units='screen', + text=axlabels[yparam2]+": {y2mean:6.2f}".format(y2mean=y2mean), background_fill_alpha=.7, text_color='red', ) diff --git a/rowers/templates/flexchart3otw.html b/rowers/templates/flexchart3otw.html index 923edcbb..52a8eeaa 100644 --- a/rowers/templates/flexchart3otw.html +++ b/rowers/templates/flexchart3otw.html @@ -68,11 +68,11 @@
    -
    + -
    +