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

Merge tag 'comparisonchart' into develop

Browse Source 
comparison chart hotfix attempt
This commit is contained in:
Sander Roosendaal
2017-02-15 19:42:32 +01:00
parent 2110b6e7b1 b9e95f5426
commit feb755908c
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
rowers/interactiveplots.py
View File

@@ -1584,30 +1584,31 @@ def interactive_comparison_chart(id1=0,id2=0,xparam='distance',yparam='spm',
axlabels = {
'time': 'Time',
'distance': 'Distance (m)',
'hr': 'Heart Rate (bpm)',
'spm': 'Stroke Rate (spm)',
'pace': 'Pace (/500m)',
'power': 'Power (Watt)',
'averageforce': 'Average Drive Force (lbs)',
'drivelength': 'Drive Length (m)',
'peakforce': 'Peak Drive Force (lbs)',
'forceratio': 'Average/Peak Drive Force Ratio',
'driveenergy': 'Work per Stroke (J)',
'drivespeed': 'Drive Speed (m/s)',
}
columns = [xparam,yparam,
'ftime','distance','fpace',
'power','hr','spm',
'time','pace','workoutstate']
# check if valid ID exists (workout exists) # check if valid ID exists (workout exists)
rowdata1,row1 = dataprep.getrowdata_db(id=id1) #rowdata1,row1 = dataprep.getrowdata_db(id=id1)
rowdata2,row2 = dataprep.getrowdata_db(id=id2) #rowdata2,row2 = dataprep.getrowdata_db(id=id2)
rowdata1 = dataprep.getsmallrowdata_db(columns,ids=[id1])
rowdata2 = dataprep.getsmallrowdata_db(columns,ids=[id2])
row1 = Workout.objects.get(id=id1)
row2 = Workout.objects.get(id=id2)
if rowdata1.empty: if rowdata1.empty:
return "","CSV Data File Not Found" return "","CSV Data File Not Found"
else:
rowdata1.sort_values(by='time',ascending=True,inplace=True)
if rowdata2.empty: if rowdata2.empty:
return "","CSV Data File Not Found" return "","CSV Data File Not Found"
else:
rowdata2.sort_values(by='time',ascending=True,inplace=True)
x1 = rowdata1.ix[:,xparam] x1 = rowdata1.ix[:,xparam]
x2 = rowdata2.ix[:,xparam] x2 = rowdata2.ix[:,xparam]