From 3940b66b508f4a9fec72c9e196a36e6d352c52a1 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 18 Nov 2019 16:55:29 +0100 Subject: [PATCH] better filtering --- rowers/dataprep.py | 2 +- rowers/interactiveplots.py | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 3f9734e7..d846312a 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -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) - df2 = df.resample('1s').mean().interpolate() + df2 = df.resample('1s').first().fillna(method='ffill') if 'pace' in columns: df2['pace'] = df2['pace']/1000. p = df2['pace'] diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 46ae99da..9e8c2657 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -2956,15 +2956,12 @@ def interactive_chart_video(videodata): data = zip(time,spm) - data2 = [] + data2 = "[" for t,s in data: - data2.append( - { - 'x':t, - 'y':s, - } - ) + data2 += "{x: %s, y: %s}, " % (t,s) + + data2 = data2[:-2] + "]" markerpoint = { 'x': time[0],