From c27e67a1665fd7a30149ced2d304d57e80de5e9c Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 27 Nov 2016 19:14:07 +0100 Subject: [PATCH] quick fix data --- rowers/dataprep.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 86573376..663abb26 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -104,10 +104,12 @@ def testdata(time,distance,pace,spm): def getrowdata_db(id=0): data = read_df_sql(id) - data['pace'] = data['pace']/1.0e6 - data['ergpace'] = data['ergpace']/1.0e6 - data['nowindpace'] = data['nowindpace']/1.0e6 - data['time'] = data['time']/1.0e6 + # data['pace'] = data['pace']/1.0e6 + # data['ergpace'] = data['ergpace']/1.0e6 + # data['nowindpace'] = data['nowindpace']/1.0e6 + # data['time'] = data['time']/1.0e6 + data['pace'] = data['pseconds']*1.0e3 + data['time'] = data['timesecs']*1.0e3 data['x_right'] = data['x_right']/1.0e6 if data.empty: rowdata,row = getrowdata(id=id) @@ -123,13 +125,14 @@ def getrowdata_db(id=0): def getsmallrowdata_db(columns,ids=[]): prepmultipledata(ids) data = read_cols_df_sql(ids,columns) + print columns for column in columns: if column == 'time': - data['time'] = data['time']/1.0e6 + data['time'] = data['timesecs']*1.0e3 + # data['time'] = data['time']/1.0e6 if column == 'pace': - data['pace'] = data['pace']/1.0e6 - if column == 'pace': - data['pace'] = data['pace']/1.0e6 + # data['pace'] = data['pace']/1.0e6 + data['pace'] = data['pseconds']*1.0e3 return data