From 8462e086dd73db779f272b112bca314118c758fc Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 1 Apr 2019 13:51:01 +0200
Subject: [PATCH 1/5] force curve chart with 5-95 and 25-75 percentile areas

---
 rowers/interactiveplots.py            | 137 ++++++++++++++++++++++++--
 rowers/tests/testdata/testdata.csv.gz | Bin 12534 -> 12557 bytes
 2 files changed, 128 insertions(+), 9 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index d697eba6..3e5a8bf9 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -405,42 +405,91 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
 
     try:
         catchav = rowdata['catch'].mean()
+        catch25 = rowdata['catch'].quantile(q=0.25)
+        catch75 = rowdata['catch'].quantile(q=0.75)
+        catch01 = rowdata['catch'].quantile(q=0.05)
+        catch99 = rowdata['catch'].quantile(q=0.95)
     except KeyError:
         catchav = 0
+        catch25 = 0
+        catch75 = 0
+        catch01 = 0
+        catch99 = 0
 
     try:
         finishav = rowdata['finish'].mean()
+        finish25 = rowdata['finish'].quantile(q=0.25)
+        finish75 = rowdata['finish'].quantile(q=0.75)
+        finish01 = rowdata['finish'].quantile(q=0.05)
+        finish99 = rowdata['finish'].quantile(q=0.95)
     except KeyError:
         finishav = 0
+        finish25 = 0
+        finish75 = 0
+        finish01 = 0
+        finish99 = 0
+        
     try:
-        washav = rowdata['wash'].mean()
+        washav = (rowdata['finish']-rowdata['wash']).mean()
+        wash25 = (rowdata['finish']-rowdata['wash']).quantile(q=0.25)
+        wash75 = (rowdata['finish']-rowdata['wash']).quantile(q=0.75)
+        wash01 = (rowdata['finish']-rowdata['wash']).quantile(q=0.05)
+        wash99 = (rowdata['finish']-rowdata['wash']).quantile(q=0.95)
     except KeyError:
         washav = 0
+        wash25 = 0
+        wash75 = 0
+        wash01 = 0
+        wash99 = 0
 
     try:
-        slipav = rowdata['slip'].mean()
+        slipav = (rowdata['slip']+rowdata['catch']).mean()
+        slip25 = (rowdata['slip']+rowdata['catch']).quantile(q=0.25)
+        slip75 = (rowdata['slip']+rowdata['catch']).quantile(q=0.75)
+        slip01 = (rowdata['slip']+rowdata['catch']).quantile(q=0.05)
+        slip99 = (rowdata['slip']+rowdata['catch']).quantile(q=0.95)
     except KeyError:
         slipav = 0
-
+        slip25 = 0
+        slip75 = 0
+        slip01 = 0
+        slip99 = 0
+        
     try:
         peakforceav = rowdata['peakforce'].mean()
+        peakforce25 = rowdata['peakforce'].quantile(q=0.25)
+        peakforce75 = rowdata['peakforce'].quantile(q=0.75)
+        peakforce01 = rowdata['peakforce'].quantile(q=0.05)
+        peakforce99 = rowdata['peakforce'].quantile(q=0.95)
     except KeyError:
         peakforceav = 0
+        peakforce25 = 0
+        peakforce75 = 0
+        peakforce01 = 0
+        peakforce99 = 0
 
     try:
         averageforceav = rowdata['averageforce'].mean()
     except KeyError:
         averageforceav = 0
-
+        
     try:
         peakforceangleav = rowdata['peakforceangle'].mean()
+        peakforceangle25 = rowdata['peakforceangle'].quantile(q=0.25)
+        peakforceangle75 = rowdata['peakforceangle'].quantile(q=0.75)        
+        peakforceangle01 = rowdata['peakforceangle'].quantile(q=0.05)
+        peakforceangle99 = rowdata['peakforceangle'].quantile(q=0.95)        
     except KeyError:
         peakforceangleav = 0
-
+        peakforceangle25 = 0
+        peakforceangle75 = 0
+        peakforceangle01 = 0
+        peakforceangle99 = 0
+        
     x = [catchav,
-         catchav+slipav,
+         slipav,
          peakforceangleav,
-         finishav-washav,
+         washav,
          finishav]
 
     thresholdforce = 100 if 'x' in boattype else 200
@@ -449,12 +498,70 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
          peakforceav,
          thresholdforce,0]
 
+    x2575 = [catch25,
+           slip25,
+           peakforceangleav,
+           wash75,
+           finish75,
+           finish25,
+           wash25,
+           peakforceangleav,
+           slip75]
+
+    y2575 = [0,
+           thresholdforce,
+           peakforce75,
+           thresholdforce,
+           0,
+           0,
+           thresholdforce,
+           peakforce25,
+           0]
+
+    
+
+    x0199 = [catch01,
+             slip01,
+             peakforceangleav,
+             wash99,
+             finish99,
+             finish01,
+             wash01,
+             peakforceangleav,
+             slip99]
+
+    y0199 = [0,
+           thresholdforce,
+           peakforce99,
+           thresholdforce,
+           0,
+           0,
+           thresholdforce,
+           peakforce01,
+           0]
+
+    
     source = ColumnDataSource(
         data = dict(
             x = x,
             y = y,
         ))
 
+    sourcerange = ColumnDataSource(
+        data = dict(
+            x2575=x2575,
+            y2575=y2575,
+            x0199=x0199,
+            y0199=y0199,
+        ))
+
+    sourceslipwash = ColumnDataSource(
+        data = dict(
+            xslip = [slipav,washav],
+            yslip = [thresholdforce,thresholdforce]
+            )
+        )
+
     
     source2 = ColumnDataSource(
         rowdata
@@ -493,7 +600,10 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
     avf = Span(location=averageforceav,dimension='width',line_color='blue',
                line_dash=[6,6],line_width=2)
     
+    plot.patch('x0199','y0199',source=sourcerange,color="red",alpha=0.05)
+    plot.patch('x2575','y2575',source=sourcerange,color="red",alpha=0.2)
     plot.line('x','y',source=source,color="red")
+    plot.circle('xslip','yslip',source=sourceslipwash,color="red")
 
     plot.add_layout(avf)
     
@@ -533,14 +643,14 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
                        )
 
     sliplabel = Label(x=370,y=280,x_units='screen',y_units='screen',
-                      text="Slip: {slipav:6.2f}".format(slipav=slipav),
+                      text="Slip: {slipav:6.2f}".format(slipav=slipav-catchav),
                       background_fill_alpha=0.7,
                       background_fill_color='white',
                       text_color='red',
                        )
 
     washlabel = Label(x=360,y=250,x_units='screen',y_units='screen',
-                      text="Wash: {washav:6.2f}".format(washav=washav),
+                      text="Wash: {washav:6.2f}".format(washav=finishav-washav),
                       background_fill_alpha=0.7,
                       background_fill_color='white',
                       text_color='red',
@@ -585,6 +695,7 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
     callback = CustomJS(args = dict(
         source=source,
         source2=source2,
+        sourceslipwash=sourceslipwash,
         avf=avf,
         avflabel=avflabel,
         catchlabel=catchlabel,
@@ -598,9 +709,13 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
     ), code="""
        var data = source.data
        var data2 = source2.data
+       var dataslipwash = sourceslipwash.data
                                
        var x = data['x']
        var y = data['y']
+
+       var xslip = dataslipwash['xslip']
+
        var spm1 = data2['spm']
        var distance1 = data2['distance']
        var driveenergy1 = data2['driveenergy']
@@ -665,6 +780,9 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
        data['x'] = [catchav,catchav+slipav,peakforceangleav,finishav-washav,finishav]
        data['y'] = [0,thresholdforce,peakforceav,thresholdforce,0]
 
+       dataslipwash['xslip'] = [catchav+slipav,finishav-washav]
+       dataslipwash['yslip'] = [thresholdforce,thresholdforce]
+
        avf.location = averageforceav
        avflabel.text = 'Favg: '+averageforceav.toFixed(2)
        catchlabel.text = 'Catch: '+catchav.toFixed(2)
@@ -677,6 +795,7 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
  
        // source.trigger('change');
        source.change.emit();
+       sourceslipwash.change.emit()
        """)
 
     annotation = TextInput(title="Type your plot notes here", value="", 
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index 46cdd11e466d4cdd6331711c9be59a2876cac02b..d29dbd37b0f2a98501d6e2578e4ac49c589b1007 100644
GIT binary patch
literal 12557
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

literal 12534
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
M08esmkmG^?0Bb?;oB#j-


From 2f69b34bc11905a47d451fc5022ee01b34d8d8bb Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 2 Apr 2019 13:41:56 +0200
Subject: [PATCH 2/5] force curve improvements

---
 rowers/interactiveplots.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 3e5a8bf9..a960987c 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -499,8 +499,10 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
          thresholdforce,0]
 
     x2575 = [catch25,
-           slip25,
-           peakforceangleav,
+             slip25,
+             peakforceangle25,
+#             peakforceangleav,
+             peakforceangle75,
            wash75,
            finish75,
            finish25,
@@ -510,7 +512,9 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
 
     y2575 = [0,
            thresholdforce,
-           peakforce75,
+             peakforce25,
+#             peakforceav,
+             peakforce75,
            thresholdforce,
            0,
            0,

From e735d98dcfa74eb0b642ff4ffccbefa6c452d857 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 2 Apr 2019 17:31:45 +0200
Subject: [PATCH 3/5] working force plot

---
 rowers/interactiveplots.py | 227 +++++++++++++++++++++----------------
 1 file changed, 131 insertions(+), 96 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index c339fc82..2c499cee 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -64,6 +64,7 @@ activate(settings.TIME_ZONE)
 thetimezone = get_current_timezone()
 
 from scipy.stats import linregress,percentileofscore
+from scipy.spatial import ConvexHull,Delaunay
 from scipy import optimize
 from scipy.signal import savgol_filter
 from scipy.interpolate import griddata
@@ -407,172 +408,207 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
     # quick linear regression
     # peakforce = slope*peakforceangle + intercept
     slope, intercept, r,p,stderr = linregress(rowdata['peakforceangle'],rowdata['peakforce'])
-    theta = np.arctan(slope)
 
-    a = rowdata['peakforceangle']-rowdata['peakforceangle'].mean()
-    F = rowdata['peakforce']-rowdata['peakforce'].mean()
+    covariancematrix = np.cov(rowdata['peakforceangle'],y=rowdata['peakforce'])
+    eig_vals, eig_vecs = np.linalg.eig(covariancematrix)
 
-    R = np.array([[np.cos(theta),np.sin(theta)],
-                  [-np.sin(theta),np.cos(theta)]])
-    Rinv = np.array([[np.cos(theta),np.sin(theta)],
-                     [-np.sin(theta),np.cos(theta)]])
+    a = rowdata['peakforceangle']-rowdata['peakforceangle'].median()
+    F = rowdata['peakforce']-rowdata['peakforce'].median()
+
+    Rinv = eig_vecs
+    R = np.linalg.inv(Rinv)
 
     x = R[0,0]*a+R[0,1]*F
     y = R[1,0]*a+R[1,1]*F
 
 
-    x05 = x.quantile(q=0.05)
-    x25 = x.quantile(q=0.25)
-    x75 = x.quantile(q=0.75)
-    x95 = x.quantile(q=0.95)
+    x05 = x.quantile(q=0.01)
+    x25 = x.quantile(q=0.15)
+    x75 = x.quantile(q=0.85)
+    x95 = x.quantile(q=0.99)
+    
+    y05 = y.quantile(q=0.01)
+    y25 = y.quantile(q=0.15)
+    y75 = y.quantile(q=0.85)
+    y95 = y.quantile(q=0.99)
+
+    a25 = Rinv[0,0]*x25 + rowdata['peakforceangle'].median()
+    F25 = Rinv[1,0]*x25 + rowdata['peakforce'].median()
+
+    a25b = Rinv[0,1]*y25 + rowdata['peakforceangle'].median()
+    F25b = Rinv[1,1]*y25 + rowdata['peakforce'].median()
+
+    a75 = Rinv[0,0]*x75 + rowdata['peakforceangle'].median()
+    F75 = Rinv[1,0]*x75 + rowdata['peakforce'].median()
+
+    a75b = Rinv[0,1]*y75 + rowdata['peakforceangle'].median()
+    F75b = Rinv[1,1]*y75 + rowdata['peakforce'].median()
+
+    
+    a05 = Rinv[0,0]*x05 + rowdata['peakforceangle'].median()
+    F05 = Rinv[1,0]*x05 + rowdata['peakforce'].median()
+
+    a05b = Rinv[0,1]*y05 + rowdata['peakforceangle'].median()
+    F05b = Rinv[1,1]*y05 + rowdata['peakforce'].median()
+
+    a95 = Rinv[0,0]*x95 + rowdata['peakforceangle'].median()
+    F95 = Rinv[1,0]*x95 + rowdata['peakforce'].median()
+
+    a95b = Rinv[0,1]*y95 + rowdata['peakforceangle'].median()
+    F95b = Rinv[1,1]*y95 + rowdata['peakforce'].median()
+
     
-    y05 = y.quantile(q=0.05)
-    y25 = y.quantile(q=0.25)
-    y75 = y.quantile(q=0.75)
-    y95 = y.quantile(q=0.95)
 
     try:
-        catchav = rowdata['catch'].mean()
+        catchav = rowdata['catch'].median()
         catch25 = rowdata['catch'].quantile(q=0.25)
         catch75 = rowdata['catch'].quantile(q=0.75)
         catch05 = rowdata['catch'].quantile(q=0.05)
-        catch99 = rowdata['catch'].quantile(q=0.95)
+        catch95 = rowdata['catch'].quantile(q=0.95)
     except KeyError:
         catchav = 0
         catch25 = 0
         catch75 = 0
         catch05 = 0
-        catch99 = 0
+        catch95 = 0
 
     try:
-        finishav = rowdata['finish'].mean()
+        finishav = rowdata['finish'].median()
         finish25 = rowdata['finish'].quantile(q=0.25)
         finish75 = rowdata['finish'].quantile(q=0.75)
         finish05 = rowdata['finish'].quantile(q=0.05)
-        finish99 = rowdata['finish'].quantile(q=0.95)
+        finish95 = rowdata['finish'].quantile(q=0.95)
     except KeyError:
         finishav = 0
         finish25 = 0
         finish75 = 0
         finish05 = 0
-        finish99 = 0
+        finish95 = 0
         
     try:
-        washav = (rowdata['finish']-rowdata['wash']).mean()
+        washav = (rowdata['finish']-rowdata['wash']).median()
         wash25 = (rowdata['finish']-rowdata['wash']).quantile(q=0.25)
         wash75 = (rowdata['finish']-rowdata['wash']).quantile(q=0.75)
         wash05 = (rowdata['finish']-rowdata['wash']).quantile(q=0.05)
-        wash99 = (rowdata['finish']-rowdata['wash']).quantile(q=0.95)
+        wash95 = (rowdata['finish']-rowdata['wash']).quantile(q=0.95)
     except KeyError:
         washav = 0
         wash25 = 0
         wash75 = 0
         wash05 = 0
-        wash99 = 0
+        wash95 = 0
 
     try:
-        slipav = (rowdata['slip']+rowdata['catch']).mean()
+        slipav = (rowdata['slip']+rowdata['catch']).median()
         slip25 = (rowdata['slip']+rowdata['catch']).quantile(q=0.25)
         slip75 = (rowdata['slip']+rowdata['catch']).quantile(q=0.75)
         slip05 = (rowdata['slip']+rowdata['catch']).quantile(q=0.05)
-        slip99 = (rowdata['slip']+rowdata['catch']).quantile(q=0.95)
+        slip95 = (rowdata['slip']+rowdata['catch']).quantile(q=0.95)
     except KeyError:
         slipav = 0
         slip25 = 0
         slip75 = 0
         slip05 = 0
-        slip99 = 0
+        slip95 = 0
         
     try:
-        peakforceav = rowdata['peakforce'].mean()
+        peakforceav = rowdata['peakforce'].median()
         peakforce25 = rowdata['peakforce'].quantile(q=0.25)
         peakforce75 = rowdata['peakforce'].quantile(q=0.75)
         peakforce05 = rowdata['peakforce'].quantile(q=0.05)
-        peakforce99 = rowdata['peakforce'].quantile(q=0.95)
+        peakforce95 = rowdata['peakforce'].quantile(q=0.95)
     except KeyError:
         peakforceav = 0
         peakforce25 = 0
         peakforce75 = 0
         peakforce05 = 0
-        peakforce99 = 0
+        peakforce95 = 0
 
     
     try:
-        averageforceav = rowdata['averageforce'].mean()
+        averageforceav = rowdata['averageforce'].median()
     except KeyError:
         averageforceav = 0
         
     try:
-        peakforceangleav = rowdata['peakforceangle'].mean()
+        peakforceangleav = rowdata['peakforceangle'].median()
         peakforceangle05 = rowdata['peakforceangle'].quantile(q=0.05)
         peakforceangle25 = rowdata['peakforceangle'].quantile(q=0.25)
         peakforceangle75 = rowdata['peakforceangle'].quantile(q=0.75)        
-        peakforceangle99 = rowdata['peakforceangle'].quantile(q=0.95)        
+        peakforceangle95 = rowdata['peakforceangle'].quantile(q=0.95)        
     except KeyError:
         peakforceangleav = 0
         peakforceangle25 = 0
         peakforceangle75 = 0
         peakforceangle05 = 0
-        peakforceangle99 = 0
+        peakforceangle95 = 0
 
 
+    #thresholdforce /= 4.45 # N to lbs
+    thresholdforce = 100 if 'x' in boattype else 200
+    points2575 = [
+        (catch25,0),  #0
+        (slip25,thresholdforce), #1
+        (a75,F75),#4
+        (a25b,F25b), #9
+        (a25,F25), #2
+        (wash75,thresholdforce), #5
+        (finish75,0), #6
+        (finish25,0), #7
+        (wash25,thresholdforce), #8
+        (a75b,F75b), #3
+        (slip75,thresholdforce), #10
+        (catch75,0), #11
+        ]
+
+    points0595 = [
+        (catch05,0),  #0
+        (slip05,thresholdforce), #1
+        (a95,F95),#4
+        (a05b,F05b), #9
+        (a05,F05), #2
+        (wash95,thresholdforce), #5
+        (finish95,0), #6
+        (finish05,0), #7
+        (wash05,thresholdforce), #8
+        (a95b,F95b), #3
+        (slip95,thresholdforce), #10
+        (catch95,0), #11
+        ]
+
+
+    hull2575 = ConvexHull(points2575)
+
+    
+    angles2575 = []
+    forces2575 = []
+
+    for x,y in points2575:
+        angles2575.append(x)
+        forces2575.append(y)
+
+    
+    angles0595 = []
+    forces0595 = []
+
+    for x,y in points0595:
+        angles0595.append(x)
+        forces0595.append(y)
+
+
+
+    
+        
     x = [catchav,
          slipav,
          peakforceangleav,
          washav,
          finishav]
 
-    thresholdforce = 100 if 'x' in boattype else 200
-    #thresholdforce /= 4.45 # N to lbs
     y = [0,thresholdforce,
          peakforceav,
          thresholdforce,0]
 
-    x2575 = [catch25,
-             slip25,
-             peakforceangle25,
-#             peakforceangleav,
-             peakforceangle75,
-           wash75,
-           finish75,
-           finish25,
-           wash25,
-           peakforceangleav,
-           slip75]
-
-    y2575 = [0,
-           thresholdforce,
-             peakforce25,
-#             peakforceav,
-             peakforce75,
-           thresholdforce,
-           0,
-           0,
-           thresholdforce,
-           peakforce25,
-           0]
-
-    
-
-    x0599 = [catch05,
-             slip05,
-             peakforceangleav,
-             wash99,
-             finish99,
-             finish05,
-             wash05,
-             peakforceangleav,
-             slip99]
-
-    y0599 = [0,
-           thresholdforce,
-           peakforce99,
-           thresholdforce,
-           0,
-           0,
-           thresholdforce,
-           peakforce05,
-           0]
 
     
     source = ColumnDataSource(
@@ -581,21 +617,13 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
             y = y,
         ))
 
-    sourcerange = ColumnDataSource(
-        data = dict(
-            x2575=x2575,
-            y2575=y2575,
-            x0599=x0599,
-            y0599=y0599,
-        ))
-
     sourceslipwash = ColumnDataSource(
         data = dict(
             xslip = [slipav,washav],
             yslip = [thresholdforce,thresholdforce]
             )
         )
-
+    
     sourcetrend = ColumnDataSource(
         data = dict(
             x = [peakforceangle25,peakforceangle75],
@@ -605,8 +633,8 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
 
     sourcefit = ColumnDataSource(
         data = dict(
-            x = rowdata['peakforceangle'],
-            y = slope*rowdata['peakforceangle']+intercept
+            x = np.array([peakforceangle25,peakforceangle75]),
+            y = slope*np.array([peakforceangle25,peakforceangle75])+intercept
             )
         )
     
@@ -621,6 +649,15 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
             )
         )
 
+    sourcerange = ColumnDataSource(
+        data = dict(
+            x2575 = angles2575,
+            y2575 = forces2575,
+            x0595 = angles0595,
+            y0595 = forces0595,
+            )
+        )
+
     plot = Figure(tools=TOOLS,
                   toolbar_sticky=False,toolbar_location="above")
 
@@ -654,15 +691,13 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
     avf = Span(location=averageforceav,dimension='width',line_color='blue',
                line_dash=[6,6],line_width=2)
     
-    plot.patch('x0199','y0199',source=sourcerange,color="red",alpha=0.05)
+    plot.patch('x0595','y0595',source=sourcerange,color="red",alpha=0.05)
     plot.patch('x2575','y2575',source=sourcerange,color="red",alpha=0.2)
     plot.line('x','y',source=source,color="red")
     plot.circle('xslip','yslip',source=sourceslipwash,color="red")
 
-    plot.circle('peakforceangle','peakforce',source=sourcepoints,color='cyan')
+    plot.circle('peakforceangle','peakforce',source=sourcepoints,color='black',alpha=0.1)
     plot.line('x','y',source=source,color="red")
-    plot.line('x','y',source=sourcetrend,color="blue")
-    plot.line('x','y',source=sourcefit,color="green")
 
     plot.add_layout(avf)
     

From d251b1ddd4bba011b914bbcd8c016a22a1f0eb6c Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 2 Apr 2019 19:00:00 +0200
Subject: [PATCH 4/5] force curve with lines

---
 rowers/forms.py                         | 18 ++++-
 rowers/interactiveplots.py              | 88 +++++++++++++++++++++++--
 rowers/templates/forcecurve_single.html | 27 ++++----
 rowers/views/statements.py              |  1 +
 rowers/views/workoutviews.py            | 27 +++++---
 5 files changed, 127 insertions(+), 34 deletions(-)

diff --git a/rowers/forms.py b/rowers/forms.py
index 7387d8fe..ae17b596 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -722,7 +722,8 @@ class TrendFlexModalForm(forms.Form):
                                      label='Only Ranking Pieces',
                                      required=False)
 
-            
+
+    
 # This form sets options for the summary stats page
 class StatsOptionsForm(forms.Form):
     includereststrokes = forms.BooleanField(initial=False,label='Include Rest Strokes',required=False)
@@ -1181,10 +1182,21 @@ class FlexOptionsForm(forms.Form):
         ('line','Line Plot'),
         ('scatter','Scatter Plot'),
         )
-    plottype = forms.ChoiceField(choices=plotchoices,initial='scatter',
+    plottype = forms.ChoiceField(choices=plotchoices,initial='line',
                                  label='Chart Type')
     
-        
+class ForceCurveOptionsForm(forms.Form):
+    includereststrokes = forms.BooleanField(initial=False, required = False,
+                                         label='Include Rest Strokes')
+    plotchoices = (
+        ('line','Force Curve Collection Plot'),
+        ('scatter','Peak Force Scatter Plot'),
+        ('none','Only aggregrate data')
+        )
+    plottype = forms.ChoiceField(choices=plotchoices,initial='scatter',
+                                 label='Individual Stroke Chart Type')
+    
+    
 class FlexAxesForm(forms.Form):
     axchoices = list(
         (ax[0],ax[1]) for ax in axes if ax[0] not in ['cumdist','None']
diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 2c499cee..d601d558 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -17,6 +17,7 @@ from math import pi
 from django.utils import timezone
 
 from bokeh.palettes import Dark2_8 as palette
+from bokeh.models.glyphs import MultiLine
 import itertools
 from bokeh.plotting import figure, ColumnDataSource, Figure,curdoc
 from bokeh.models import CustomJS,Slider, TextInput,BoxAnnotation
@@ -374,7 +375,7 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'):
     script,div = components(p)
     return script,div
 
-def interactive_forcecurve(theworkouts,workstrokesonly=False):
+def interactive_forcecurve(theworkouts,workstrokesonly=True,plottype='scatter'):
     TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,crosshair'
 
     ids = [int(w.id) for w in theworkouts]
@@ -642,12 +643,20 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
         rowdata
         )
 
-    sourcepoints = ColumnDataSource(
-        data = dict(
-            peakforceangle = rowdata['peakforceangle'],
-            peakforce = rowdata['peakforce']
+    if plottype == 'scatter':
+        sourcepoints = ColumnDataSource(
+            data = dict(
+                peakforceangle = rowdata['peakforceangle'],
+                peakforce = rowdata['peakforce']
             )
         )
+    else:
+        sourcepoints = ColumnDataSource(
+            data = dict(
+                peakforceangle = [],
+                peakforce = []
+                ))
+        
 
     sourcerange = ColumnDataSource(
         data = dict(
@@ -697,6 +706,50 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
     plot.circle('xslip','yslip',source=sourceslipwash,color="red")
 
     plot.circle('peakforceangle','peakforce',source=sourcepoints,color='black',alpha=0.1)
+
+    if plottype == 'line':
+        multilinedatax = []
+        multilinedatay = []
+        for i in range(len(rowdata)):
+            x = [
+                rowdata['catch'].values[i],
+                rowdata['slip'].values[i]+rowdata['catch'].values[i],
+                rowdata['peakforceangle'].values[i],
+                rowdata['finish'].values[i]-rowdata['wash'].values[i],
+                rowdata['finish'].values[i]
+                ]
+
+
+            y = [
+                0,
+                thresholdforce,
+                rowdata['peakforce'].values[i],
+                thresholdforce,
+                0]
+
+            multilinedatax.append(x)
+            multilinedatay.append(y)
+
+        sourcemultiline = ColumnDataSource(dict(
+            x=multilinedatax,
+            y=multilinedatay,
+            ))
+            
+        sourcemultiline2 = ColumnDataSource(dict(
+            x=multilinedatax,
+            y=multilinedatay,
+            ))
+            
+        glyph = MultiLine(xs='x',ys='y',line_color='black',line_alpha=0.05)
+        plot.add_glyph(sourcemultiline,glyph)
+    else:
+        sourcemultiline = ColumnDataSource(dict(
+            x=[],y=[]))
+                
+        sourcemultiline2 = ColumnDataSource(dict(
+            x=[],y=[]))
+                
+    
     plot.line('x','y',source=source,color="red")
 
     plot.add_layout(avf)
@@ -801,11 +854,20 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
         peakforceanglelabel=peakforceanglelabel,
         annolabel=annolabel,
         sliderlabel=sliderlabel,
+        plottype=plottype,
+        sourcemultiline=sourcemultiline,
+        sourcemultiline2=sourcemultiline2
     ), code="""
        var data = source.data
        var data2 = source2.data
        var dataslipwash = sourceslipwash.data
        var datapoints = sourcepoints.data
+       var multilines = sourcemultiline.data
+       var multilines2 = sourcemultiline2.data
+       var plottype = plottype
+
+       var multilinesx = multilines['xs']
+       var multilinesy = multilines['ys']
                                
        var x = data['x']
        var y = data['y']
@@ -826,6 +888,9 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
        var peakforce = data2['peakforce']
        var averageforce = data2['averageforce']
 
+       var peakforcepoints = datapoints['peakforce']
+       var peakforceanglepoints = datapoints['peakforceangle']
+
        var annotation = annotation.value
        var minspm = minspm.value
        var maxspm = maxspm.value
@@ -849,13 +914,21 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
 
        datapoints['peakforceangle'] = []
        datapoints['peakforce'] = []
+       multilines['xs'] = []
+       multilines['ys'] = []
 
       for (i=0; i<c.length; i++) {
           if (spm1[i]>=minspm && spm1[i]<=maxspm) {
              if (distance1[i]>=mindist && distance1[i]<=maxdist) {
                 if (driveenergy1[i]>=minwork && driveenergy1[i]<=maxwork) {
-                   datapoints['peakforceangle'].push(peakforceangle[i])
-                   datapoints['peakforce'].push(peakforce[i])
+                   if (plottype=='scatter') {
+                     datapoints['peakforceangle'].push(peakforceangle[i])
+                     datapoints['peakforce'].push(peakforce[i])
+                   }
+                   if (plottype=='line') {
+                     multilines['xs'].push(multilinesx[i])
+                     multilines['ys'].push(multilinesy[i])
+                   }
                    catchav += c[i]
                    finishav += finish[i]
                    slipav += slip[i]
@@ -897,6 +970,7 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
        source.change.emit();
        sourceslipwash.change.emit()
        sourcepoints.change.emit();
+       sourcemultiline.change.emit();
        """)
 
     annotation = TextInput(title="Type your plot notes here", value="", 
diff --git a/rowers/templates/forcecurve_single.html b/rowers/templates/forcecurve_single.html
index 2cebb103..2326aa0a 100644
--- a/rowers/templates/forcecurve_single.html
+++ b/rowers/templates/forcecurve_single.html
@@ -22,27 +22,24 @@
 <h1>Empower Force Curve</h1>
 
 <ul class="main-content">
-  <li class="grid_4">
-    {% if user.is_authenticated and mayedit %}
-    <form enctype="multipart/form-data" action="{{ formloc }}" method="post">
-      {% csrf_token %}
-      {% if workstrokesonly %}
-      <input type="hidden" name="workstrokesonly" value="True">
-      <input class="button blue small" value="Remove Rest Strokes" type="Submit">
-      {% else %}
-      <input class="button blue small" type="hidden" name="workstrokesonly" value="False">
-      <input class="button blue small" value="Include Rest Strokes" type="Submit">
-    </form>
-    {% endif %}
-    <span class="tooltiptext">If your data source allows, this will show or hide strokes taken during rest intervals.</span>
-    {% endif %}
-  </li>
   <li class="grid_4">
     <div id="theplot" class="flexplot">
       {{ the_div|safe }}
       </div>
 
   </li>
+  <li class="grid_4">
+    <form enctype="multipart/form-data"  action="" method="post">
+      {% csrf_token %}
+      <table>
+        {{ form.as_table }}
+      </table>
+      <p>
+        <input name="chartform" type="submit"
+               value="Update Chart">
+      </p>
+    </form>
+  </li>
 </ul>
 
 
diff --git a/rowers/views/statements.py b/rowers/views/statements.py
index 76691ab1..2179bebb 100644
--- a/rowers/views/statements.py
+++ b/rowers/views/statements.py
@@ -48,6 +48,7 @@ from django.http import (
     )
 from django.contrib.auth import authenticate, login, logout
 from rowers.forms import (
+    ForceCurveOptionsForm,
     LoginForm,DocumentsForm,UploadOptionsForm,ImageForm,CourseForm,
     TeamUploadOptionsForm,WorkFlowLeftPanelForm,WorkFlowMiddlePanelForm,
     WorkFlowLeftPanelElement,WorkFlowMiddlePanelElement,
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index c976e6f7..8b3ac052 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -26,15 +26,24 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
     if not promember:
         return HttpResponseRedirect("/rowers/about/")
 
-    if request.method == 'POST' and 'workstrokesonly' in request.POST:
-        workstrokesonly = request.POST['workstrokesonly']
-        if workstrokesonly == 'True':
-            workstrokesonly = True
+    if request.method == 'POST':
+        form = ForceCurveOptionsForm(request.POST)
+        if form.is_valid():
+            includereststrokes = form.cleaned_data['includereststrokes']
+            plottype = form.cleaned_data['plottype']
+            workstrokesonly = not includereststrokes
         else:
-            workstrokesonly = False
+            workstrokesonly = True
+            plottype = 'line'
+    else:
+        form = ForceCurveOptionsForm()
+        plottype = 'line'
 
-    script,div,js_resources,css_resources = interactive_forcecurve([row],
-                                                                   workstrokesonly=workstrokesonly)
+    script,div,js_resources,css_resources = interactive_forcecurve(
+        [row],
+        workstrokesonly=workstrokesonly,
+        plottype=plottype,
+    )
 
     breadcrumbs = [
             {
@@ -53,12 +62,13 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
             ]
 
     r = getrower(request.user)
-    
+
     return render(request,
                   'forcecurve_single.html',
                   {
                       'the_script':script,
                       'rower':r,
+                      'form':form,
                       'workout':row,
                       'breadcrumbs':breadcrumbs,
                       'active':'nav-workouts',
@@ -67,7 +77,6 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
                       'css_res':css_resources,
                       'id':id,
                       'mayedit':mayedit,
-                      'workstrokesonly': not workstrokesonly,
                       'teams':get_my_teams(request.user),
                   })
 

From ea649d2a499e24f5baf6ace9c9e05bed85338b8f Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 2 Apr 2019 19:05:39 +0200
Subject: [PATCH 5/5] line collection - averages do strange on sliders

---
 rowers/interactiveplots.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index d601d558..86217e08 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -926,8 +926,10 @@ def interactive_forcecurve(theworkouts,workstrokesonly=True,plottype='scatter'):
                      datapoints['peakforce'].push(peakforce[i])
                    }
                    if (plottype=='line') {
-                     multilines['xs'].push(multilinesx[i])
-                     multilines['ys'].push(multilinesy[i])
+                     xs = [c[i],slip[i],peakforceangle[i],wash[i],finish[i]]
+                     ys = [0,thresholdforce,peakforce[i],thresholdforce,finish[i]]
+                     multilines['xs'].push(xs)
+                     multilines['ys'].push(ys)
                    }
                    catchav += c[i]
                    finishav += finish[i]