diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py index 953fbd15..1acccf44 100644 --- a/rowers/dataprepnodjango.py +++ b/rowers/dataprepnodjango.py @@ -35,6 +35,24 @@ database_url = 'mysql://{user}:{password}@{host}:{port}/{database_name}'.format( database_url_debug = 'sqlite:///'+database_name +# mapping the DB column names to the CSV file column names +columndict = { + 'time':'TimeStamp (sec)', + 'hr':' HRCur (bpm)', + 'pace':' Stroke500mPace (sec/500m)', + 'spm':' Cadence (stokes/min)', + 'power':' Power (watts)', + 'averageforce':' AverageDriveForce (lbs)', + 'drivelength':' DriveLength (meters)', + 'peakforce':' PeakDriveForce (lbs)', + 'distance':' Horizontal (meters)', + 'catch':'catch', + 'finish':'finish', + 'peakforceangle':'peakforceangle', + 'wash':'wash', + 'slip':'wash', + 'workoutstate':' WorkoutState', + } from scipy.signal import savgol_filter @@ -563,6 +581,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True, cumdist = rowdatadf.ix[:,'cum_dist'] power = rowdatadf.ix[:,' Power (watts)'] + averageforce = rowdatadf.ix[:,' AverageDriveForce (lbs)'] drivelength = rowdatadf.ix[:,' DriveLength (meters)'] try: diff --git a/rowers/tasks.py b/rowers/tasks.py index 81d13ca1..39ed253f 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -173,7 +173,7 @@ def handle_otwsetpower(f1,boattype,weightvalue, powermeasured=powermeasured) # save data - rowdata.write_csv(f1) + rowdata.write_csv(f1,gzip=True) update_strokedata(workoutid,rowdata.df,debug=debug) # send email diff --git a/rowsanda_107501 b/rowsanda_107501 index 5ccda6a8..667f3fdf 100644 Binary files a/rowsanda_107501 and b/rowsanda_107501 differ