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

Merge tag 'v5.42' into develop

Browse Source 
bug fix
This commit is contained in:
Sander Roosendaal
2018-01-03 13:12:11 +01:00
parent a49be1edb9 4e9ac1b63b
commit cb033d01a7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/dataprep.py
View File

@@ -1557,7 +1557,11 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True):
if extracols and len(ids)==1: if extracols and len(ids)==1:
w = Workout.objects.get(id=ids[0]) w = Workout.objects.get(id=ids[0])
row = rdata(w.csvfilename) row = rdata(w.csvfilename)
try:
f = row.df['TimeStamp (sec)'].diff().mean() f = row.df['TimeStamp (sec)'].diff().mean()
except AttributeError:
f = 0
if f != 0 and not np.isnan(f): if f != 0 and not np.isnan(f):
windowsize = 2 * (int(10. / (f))) + 1 windowsize = 2 * (int(10. / (f))) + 1
else: else: