Search form and pagination

rowers/interactiveplots.py

@@ -5,6 +5,8 @@ from rowingdata import cumcpdata,histodata
 
 from rowingdata import rowingdata as rrdata
 
+from django.utils import timezone
+
 from bokeh.plotting import figure, ColumnDataSource, Figure,curdoc
 from bokeh.models import CustomJS,Slider
 from bokeh.charts import Histogram,HeatMap
@@ -570,7 +572,6 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
 
     datadf = dataprep.smalldataprep(theworkouts,xparam,yparam1,yparam2)
 
-
     axlabels = {
 	'time': 'Time',
 	'distance': 'Distance (m)',
@@ -631,11 +632,16 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
 	return ['','<p>No non-zero data in selection</p>','','']
 
  
-    datadf['x1'] = datadf.ix[:,xparam]
-
-    datadf['y1'] = datadf.ix[:,yparam1]
+    # datadf['x1'] = datadf.ix[:,xparam]
+    datadf = datadf.rename(columns={
+        xparam:'x1',
+        yparam1:'y1',
+    })
+    
+    # datadf['y1'] = datadf.ix[:,yparam1]
     if yparam2 != 'None':
-	datadf['y2'] = datadf.ix[:,yparam2]
+	# datadf['y2'] = datadf.ix[:,yparam2]
+        datadf = datadf.rename(columns={yparam2:'y2'})
     else:
 	datadf['y2'] = datadf['y1']
 
@@ -674,6 +680,8 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
 	datadf.copy()
 	)
 
+    print "jet",timezone.now()
+    
     # Add hover to this comma-separated string and see what changes
     if (promember==1):
 	TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,resize,crosshair'