sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Improved Smoothing

Browse Source
This commit is contained in:
Sander Roosendaal
2016-11-13 11:55:15 +01:00
parent 780c1f9611
commit ae0d95ecb5
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rowers/templates/videos.html
View File

@@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}About us{% endblock title %} {% block title %}About us{% endblock title %}
{% block content %} {% block content %}
@@ -14,7 +15,15 @@
<h3>Integration with Strava, SportTracks or Concept2 logbook</h3> <h3>Integration with Strava, SportTracks or Concept2 logbook</h3>
<p>Coming Soon</p> <p><iframe width="560" height="315" src="https://www.youtube.com/embed/wF_P6x0uSL4" frameborder="0" allowfullscreen></iframe></p>
<p><iframe width="560" height="315" src="https://www.youtube.com/embed/rjNwXCh7jKg" frameborder="0" allowfullscreen></iframe></p>
<p><iframe width="560" height="315" src="https://www.youtube.com/embed/WfccMz3SbAc" frameborder="0" allowfullscreen></iframe></p>
<p><iframe width="560" height="315" src="https://www.youtube.com/embed/90AXO4dppT4" frameborder="0" allowfullscreen></iframe></p>
<h3>Basic charts</h3> <h3>Basic charts</h3>
@@ -38,4 +47,4 @@
</div> </div>
{% endblock content %} {% endblock content %}

21
rowers/views.py
View File

@@ -402,8 +402,12 @@ def add_workout_from_strokedata(user,importid,data,strokedata,source='c2'):
velo2 = savgol_filter(velo,windowsize,3) velo2 = savgol_filter(velo,windowsize,3)
else: else:
velo2=velo velo2=velo
velo3 = pd.Series(velo2)
velo3 = velo3.replace([-np.inf,np.inf],np.nan)
velo3 = velo3.fillna(method='ffill')
pace2 = 500./abs(velo2) pace2 = 500./abs(velo3)
df[' Stroke500mPace (sec/500m)'] = pace2 df[' Stroke500mPace (sec/500m)'] = pace2
df = df.fillna(0) df = df.fillna(0)
@@ -630,8 +634,12 @@ def add_workout_from_stdata(user,importid,data):
velo2 = savgol_filter(velo,windowsize,3) velo2 = savgol_filter(velo,windowsize,3)
else: else:
velo2 = velo velo2 = velo
velo3 = pd.Series(velo2)
velo3 = velo3.replace([-np.inf,np.inf],np.nan)
velo3 = velo3.fillna(method='ffill')
pace2 = 500./abs(velo2) pace2 = 500./abs(velo3)
df[' Stroke500mPace (sec/500m)'] = pace2 df[' Stroke500mPace (sec/500m)'] = pace2
df = df.fillna(0) df = df.fillna(0)
@@ -3404,7 +3412,12 @@ def workout_upload_view(request,message=""):
else: else:
velo2 = velo velo2 = velo
pace2 = 500./abs(velo2) velo3 = pd.Series(velo2)
velo3 = velo3.replace([-np.inf,np.inf],np.nan)
velo3 = velo3.fillna(method='ffill')
pace2 = 500./abs(velo3)
row.df[' Stroke500mPace (sec/500m)'] = pace2 row.df[' Stroke500mPace (sec/500m)'] = pace2
row.df = row.df.fillna(0) row.df = row.df.fillna(0)
@@ -3613,8 +3626,6 @@ def workout_upload_view_debug(request,message=""):
f2 = res[1] # file name incl media directory f2 = res[1] # file name incl media directory
print fileformat
# handle non-Painsled # handle non-Painsled
if (fileformat != 'csv'): if (fileformat != 'csv'):
# handle RowPro: # handle RowPro: