Private
Public Access
1
0

added OTE split

This commit is contained in:
Sander Roosendaal
2017-08-23 10:57:27 +02:00
parent 31b65a26dc
commit 0af56b6e2f
3 changed files with 31 additions and 11 deletions

View File

@@ -91,7 +91,7 @@ columndict = {
'finish':'finish',
'peakforceangle':'peakforceangle',
'wash':'wash',
'slip':'wash',
'slip':'slip',
'workoutstate':' WorkoutState',
}
@@ -107,13 +107,17 @@ def get_latlon(id):
rowdata = rdata(w.csvfilename)
try:
latitude = rowdata.df.ix[:,' latitude']
longitude = rowdata.df.ix[:,' longitude']
except KeyError:
latitude = 0*rowdata.df.ix[:,'TimeStamp (sec)']
latitude = 0*rowdata.df.ix[:,'TimeStamp (sec)']
return [latitude,longitude]
try:
latitude = rowdata.df.ix[:,' latitude']
longitude = rowdata.df.ix[:,' longitude']
except KeyError:
latitude = 0*rowdata.df.ix[:,'TimeStamp (sec)']
longitude = 0*rowdata.df.ix[:,'TimeStamp (sec)']
return [latitude,longitude]
except AttributeError:
return [pd.Series([]),pd.Series([])]
return [pd.Series([]),pd.Series([])]
def get_workouts(ids,userid):
goodids = []
@@ -822,6 +826,10 @@ def new_workout_from_file(r,f2,
def split_workout(r,parent,splitsecond,splitmode):
data,row = getrowdata_db(id=parent.id)
latitude,longitude = get_latlon(parent.id)
if not latitude.empty and not longitude.empty:
data[' latitude'] = latitude
data[' longitude'] = longitude
data['time'] = data['time']/1000.