From 8a9576c55a23f28bcb866fe2a29265a68350f9db Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 8 Jun 2017 08:34:35 -0700
Subject: [PATCH] debugging

---
 rowers/interactiveplots.py |  2 +-
 rowers/views.py            | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 0e2e4d23..6f6a5c4a 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -671,7 +671,7 @@ def interactive_otwcpchart(powerdf,promember=0):
                    y_range_name = "watermark",
                    )
 
-    plot.circle('Delta','CP',source=source,fill_color='red',size=15,
+    plot.line('Delta','CP',source=source,color='red',line_width=5,
 		legend='Power Data')
     plot.xaxis.axis_label = "Duration (seconds)"
     plot.yaxis.axis_label = "Power (W)"
diff --git a/rowers/views.py b/rowers/views.py
index 7adcad14..44a06fd7 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -2897,18 +2897,23 @@ def otwrankings_view(request,theuser=0,
 	
 	thesecs.append(timesecs)
 
+
     if len(thesecs) != 0:
-        maxt = pd.Series(thesecs).max()
+        maxt = 2*pd.Series(thesecs).max()
     else:
         maxt = 1000.
 
+        
     maxlog10 = np.log10(maxt)
-    logarr = np.arange(100)*maxlog10/100.
+    logarr = np.arange(500)*maxlog10/500.
     logarr = [int(10.**(la)) for la in logarr]
     logarr = pd.Series(logarr)
     logarr.drop_duplicates(keep='first',inplace=True)
+
     logarr = logarr.values
 
+    
+    
     delta = []
     cpvalue = []
     avgpower = {}
@@ -2934,32 +2939,35 @@ def otwrankings_view(request,theuser=0,
                     t_1 = tt.ix[indexmax-i-2]
                     deltat = 1.0e-3*(t_0-t_1)
                     wmax = w_roll.ix[indexmax]
-                    dt.append(deltat)
-                    cpw.append(wmax)
+                    if not np.isnan(deltat) and not np.isnan(wmax):
+                        dt.append(deltat)
+                        cpw.append(wmax)
                 except KeyError:
                     pass
 
+            
             dt = pd.Series(dt)
             cpw = pd.Series(cpw)
+
             cpvalues = griddata(dt.values,
                                 cpw.values,
-                                logarr,method='linear',fill_value=0)
+                                logarr,method='linear',
+                                rescale=True)
 
             for cpv in cpvalues:
                 cpvalue.append(cpv)
             for d in logarr:
                 delta.append(d)
             
-    print avgpower
-    dt = pd.Series(delta,name='Delta')
+    delta = pd.Series(delta,name='Delta')
     cpvalue = pd.Series(cpvalue,name='CP')
 
-            
     powerdf = pd.DataFrame({
         'Delta':delta,
         'CP':cpvalue,
         })
 
+    
     powerdf = powerdf[powerdf['CP']>0]
     powerdf.dropna(axis=0,inplace=True)
     powerdf.sort_values(['Delta','CP'],ascending=[1,0],inplace=True)