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

Added slider and improved behavior of video analysis

Browse Source
This commit is contained in:
Sander Roosendaal
2019-11-07 17:55:02 +01:00
parent 8fdca8a1f6
commit e35b3fd7b1
5 changed files with 110 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rowers/views/workoutviews.py
View File

@@ -69,6 +69,10 @@ def workout_video_view(request,id=''):
form = VideoAnalysisCreateForm(request.POST)
if form.is_valid():
video_id = form.cleaned_data['url']
try:
video_id = get_video_id(form.cleaned_data['url'])
except (TypeError,ValueError):
pass
delay = form.cleaned_data['delay']
if 'save_button' in request.POST:
analysis.name = form.cleaned_data['name']
@@ -101,8 +105,8 @@ def workout_video_view(request,id=''):
df2 = df.resample('1s').mean().interpolate()
mask = df2['time'] < delay
df2 = df2.mask(mask).dropna()
#mask = df2['time'] < delay
#df2 = df2.mask(mask).dropna()
df2['time'] = (df2['time']-df2['time'].min())
boatspeed = (100*df2['velo']).astype(int)/100.
@@ -112,8 +116,8 @@ def workout_video_view(request,id=''):
coordinates.set_index(pd.to_timedelta(coordinates['time'],unit='s'),inplace=True)
coordinates = coordinates.resample('1s').mean().interpolate()
mask = coordinates['time'] < delay
coordinates = coordinates.mask(mask).dropna()
#mask = coordinates['time'] < delay
#coordinates = coordinates.mask(mask).dropna()
coordinates['time'] = coordinates['time']-coordinates['time'].min()
latitude = coordinates['latitude']
longitude = coordinates['longitude']
@@ -158,6 +162,7 @@ def workout_video_view(request,id=''):
'form':form,
'breadcrumbs':breadcrumbs,
'analysis':analysis,
'maxtime':coordinates['time'].max(),
})
@@ -206,8 +211,8 @@ def workout_video_create_view(request,id=0):
df2 = df.resample('1s').mean().interpolate()
mask = df2['time'] < delay
df2 = df2.mask(mask).dropna()
#mask = df2['time'] < delay
#df2 = df2.mask(mask).dropna()
df2['time'] = (df2['time']-df2['time'].min())
boatspeed = (100*df2['velo']).astype(int)/100.
@@ -217,8 +222,8 @@ def workout_video_create_view(request,id=0):
coordinates.set_index(pd.to_timedelta(coordinates['time'],unit='s'),inplace=True)
coordinates = coordinates.resample('1s').mean().interpolate()
mask = coordinates['time'] < delay
coordinates = coordinates.mask(mask).dropna()
#mask = coordinates['time'] < delay
#coordinates = coordinates.mask(mask).dropna()
coordinates['time'] = coordinates['time']-coordinates['time'].min()
latitude = coordinates['latitude']
longitude = coordinates['longitude']
@@ -251,6 +256,8 @@ def workout_video_create_view(request,id=0):
]
analysis = {'delay':delay}
return render(request,
'embedded_video.html',
{
@@ -261,7 +268,9 @@ def workout_video_create_view(request,id=0):
'mapdiv': mapdiv,
'video_id': video_id,
'form':form,
'analysis':analysis,
'breadcrumbs':breadcrumbs,
'maxtime':coordinates['time'].max()
})
# Show the EMpower Oarlock generated Stroke Profile