Dataprep for Empower data

rowers/interactiveplots.py

@@ -885,6 +885,11 @@ def interactive_flex_chart2(id=0,promember=0,
         'forceratio': 'Average/Peak Drive Force Ratio',
 	'driveenergy': 'Work per Stroke (J)',
 	'drivespeed': 'Drive Speed (m/s)',
+        'slip': 'Slip (degrees)',
+        'catch': 'Catch (degrees)',
+        'finish': 'Finish (degrees)',
+        'wash': 'Wash (degrees)',
+        'peakforceangle': 'Peak Force Angle (degrees)',
 	'None': '',
 	}
 
@@ -899,12 +904,17 @@ def interactive_flex_chart2(id=0,promember=0,
 	'drivelength':0.5,
 	'driveenergy': 0,
 	'drivespeed': 0,
+        'slip': 0,
+        'catch': -70,
+        'finish': 30,
+        'wash': 0,
+        'peakforceangle': -20,
 	}
 
     yaxmaxima = {
 	'hr':200,
 	'spm':45,
-	'pace': 1.0e3*90,
+	'pace': 1.0e3*75,
 	'power': 600,
 	'averageforce':200,
 	'peakforce':400,
@@ -912,9 +922,20 @@ def interactive_flex_chart2(id=0,promember=0,
 	'drivelength':2.0,
 	'driveenergy': 1000,
 	'drivespeed':4,
+        'slip': 30,
+        'catch': -30,
+        'finish': 70,
+        'wash': 30,
+        'peakforceangle': 20,
 	}
     
     rowdata,row = dataprep.getrowdata_db(id=id)
+    #columns = [xparam,yparam1,yparam2,
+    #           'ftime','distance','fpace',
+    #           'power','hr','spm',
+    #           'time','pace']
+    #rowdata = dataprep.getsmallrowdata_db(columns,ids=[id])
+    #row = Workout.objects.get(id=id)
     if rowdata.empty:
 	return "","CSV Data File Not Found"