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

better filtering

Browse Source
This commit is contained in:
Sander Roosendaal
2019-11-18 16:55:29 +01:00
parent 4508c75eee
commit 3940b66b50
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/dataprep.py
View File

@@ -136,7 +136,7 @@ def get_video_data(w,groups=['basic'],mode='water'):
df.set_index(pd.to_timedelta(df['time'],unit='s'),inplace=True) df.set_index(pd.to_timedelta(df['time'],unit='s'),inplace=True)
df2 = df.resample('1s').mean().interpolate() df2 = df.resample('1s').first().fillna(method='ffill')
if 'pace' in columns: if 'pace' in columns:
df2['pace'] = df2['pace']/1000. df2['pace'] = df2['pace']/1000.
p = df2['pace'] p = df2['pace']

11
rowers/interactiveplots.py
View File

@@ -2956,15 +2956,12 @@ def interactive_chart_video(videodata):
data = zip(time,spm) data = zip(time,spm)
data2 = [] data2 = "["
for t,s in data: for t,s in data:
data2.append( data2 += "{x: %s, y: %s}, " % (t,s)
{
'x':t, data2 = data2[:-2] + "]"
'y':s,
}
)
markerpoint = { markerpoint = {
'x': time[0], 'x': time[0],