Private
Public Access
1
0

small improvement coordinates

This commit is contained in:
Sander Roosendaal
2019-11-05 20:40:15 +01:00
parent dc6c6f4d7a
commit 0d48fae3cf
3 changed files with 11 additions and 5 deletions

View File

@@ -53,7 +53,7 @@ class FlexibleDecimalField(forms.DecimalField):
# Video Analysis creation form # Video Analysis creation form
class VideoAnalysisCreateForm(forms.Form): class VideoAnalysisCreateForm(forms.Form):
name = forms.CharField(max_length=255,label='') name = forms.CharField(max_length=255,label='Analysis Name')
url = forms.CharField(max_length=255,required=True,label='YouTube Video URL') url = forms.CharField(max_length=255,required=True,label='YouTube Video URL')
delay = forms.IntegerField(initial=0,label='Delay (seconds)') delay = forms.IntegerField(initial=0,label='Delay (seconds)')

View File

@@ -74,6 +74,11 @@
<i class="fas fa-map-marked-alt fa-fw"></i>&nbsp;Map <i class="fas fa-map-marked-alt fa-fw"></i>&nbsp;Map
</a> </a>
</li> </li>
<li id="video-analysis">
<a href="/rowers/workout/{{ workout.id|encode }}/video/">
<i class="fas fa-video-plus fa-fw"></i>&nbsp;Video Analysis
</a>
</li>
<li id="chart-empower"> <li id="chart-empower">
<a href="/rowers/workout/{{ workout.id|encode }}/forcecurve/"> <a href="/rowers/workout/{{ workout.id|encode }}/forcecurve/">
<i class="fas fa-dumbbell fa-fw"></i>&nbsp;Force Curve <i class="fas fa-dumbbell fa-fw"></i>&nbsp;Force Curve
@@ -106,7 +111,7 @@
<a href="/rowers/workout/{{ workout.id|encode }}/addstatic/13/"> <a href="/rowers/workout/{{ workout.id|encode }}/addstatic/13/">
<i class="far fa-chart-pie fa-fw"></i>&nbsp;Power (Pie) <i class="far fa-chart-pie fa-fw"></i>&nbsp;Power (Pie)
</a> </a>
</li> </li>
<li id="chart-hrpie"> <li id="chart-hrpie">
<a href="/rowers/workout/{{ workout.id|encode }}/addstatic/3/"> <a href="/rowers/workout/{{ workout.id|encode }}/addstatic/3/">
<i class="fas fa-heartbeat fa-fw"></i>&nbsp;Heart Rate (Pie) <i class="fas fa-heartbeat fa-fw"></i>&nbsp;Heart Rate (Pie)
@@ -266,7 +271,7 @@
<input type="checkbox" name="group-advanced" id="group-advanced"> <input type="checkbox" name="group-advanced" id="group-advanced">
<label for="group-advanced">Advanced</label> <label for="group-advanced">Advanced</label>
<ul> <ul>
{% if workout|water %} {% if workout|water %}
<li id="advanced-wind"> <li id="advanced-wind">
<a href="/rowers/workout/{{ workout.id|encode }}/wind/"> <a href="/rowers/workout/{{ workout.id|encode }}/wind/">
<i class="fas fa-pennant fa-fw"></i>&nbsp;Wind <i class="fas fa-pennant fa-fw"></i>&nbsp;Wind

View File

@@ -88,11 +88,12 @@ def workout_video_view(request,id=0):
spm = (10*df2['spm']).astype(int)/10. spm = (10*df2['spm']).astype(int)/10.
coordinates = dataprep.get_latlon_time(w.id) coordinates = dataprep.get_latlon_time(w.id)
coordinates.set_index(pd.to_timedelta(coordinates['time'],unit='s'),inplace=True)
coordinates = coordinates.resample('1s').mean().interpolate()
mask = coordinates['time'] < delay mask = coordinates['time'] < delay
coordinates = coordinates.mask(mask).dropna() coordinates = coordinates.mask(mask).dropna()
coordinates['time'] = coordinates['time']-coordinates['time'].min() coordinates['time'] = coordinates['time']-coordinates['time'].min()
coordinates.set_index(pd.to_timedelta(coordinates['time'],unit='s'),inplace=True)
coordinates = coordinates.resample('1s').mean().interpolate()
latitude = coordinates['latitude'] latitude = coordinates['latitude']
longitude = coordinates['longitude'] longitude = coordinates['longitude']