From 47c3b911373c25eb832849a0a98f8f273a58c96f Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 27 Mar 2019 21:05:41 +0100
Subject: [PATCH 1/3] some flex chart improvements

---
 rowers/interactiveplots.py          | 14 ++++++++++++++
 rowers/templates/flexchart3otw.html |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 106be7bf..1152682a 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -3227,6 +3227,13 @@ def interactive_flex_chart2(id=0,promember=0,
                       background_fill_color='white',
                       text_color='black',
     )
+
+    sliderlabel = Label(x=10,y=470,x_units='screen',y_units='screen',
+                        text='',
+                        background_fill_alpha=0.7,
+                        background_fill_color='white',
+                        text_color='black',text_font_size='10pt',
+                        )
     
 
     if (xparam != 'time') and (xparam != 'distance') and (xparam != 'cumdist'):
@@ -3236,6 +3243,7 @@ def interactive_flex_chart2(id=0,promember=0,
 
     plot.add_layout(y1means)
     plot.add_layout(annolabel)
+    plot.add_layout(sliderlabel)
 
     try:
         yaxlabel = axlabels[yparam1]
@@ -3381,6 +3389,7 @@ def interactive_flex_chart2(id=0,promember=0,
                                     y2label=y2label,
                                     xlabel=xlabel,
                                     annolabel=annolabel,
+                                    sliderlabel=sliderlabel,
                                     y2means=y2means,
     ), code="""
        var data = source.data
@@ -3412,6 +3421,11 @@ def interactive_flex_chart2(id=0,promember=0,
        var maxdist = maxdist.value
        var minwork = minwork.value
        var maxwork = maxwork.value
+
+       sliderlabel.text = 'SPM: '+minspm.toFixed(0)+'-'+maxspm.toFixed(0)
+       sliderlabel.text += ', Dist: '+mindist.toFixed(0)+'-'+maxdist.toFixed(0)
+       sliderlabel.text += ', WpS: '+minwork.toFixed(0)+'-'+maxwork.toFixed(0)
+
        var xm = 0
        var ym1 = 0
        var ym2 = 0
diff --git a/rowers/templates/flexchart3otw.html b/rowers/templates/flexchart3otw.html
index 4018f2b3..0355b053 100644
--- a/rowers/templates/flexchart3otw.html
+++ b/rowers/templates/flexchart3otw.html
@@ -51,8 +51,8 @@
         {{ optionsform.as_table }}
       </table>
       <p>
-        <input name="chartform" class="button green" type="submit"
-               value="Submit">
+        <input name="chartform" type="submit"
+               value="Update Chart">
       </p>
     </form>
   </li>

From 83f92a495117654da4bd5ffd32736cddea335e54 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 27 Mar 2019 21:12:12 +0100
Subject: [PATCH 2/3] tested

---
 rowers/tests/testdata/testdata.csv.gz | Bin 12523 -> 12523 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index e9ceee4780f44178a84f490a42ea0a032fcd40c0..4ffb3fb6440e699167b9b946f274ab5ad6bb3544 100644
GIT binary patch
delta 16
YcmaEz_&SkYzMF&N^Yz&q*`F8y06|;_ivR!s

delta 16
XcmaEz_&SkYzMF$1y>He=_9q4aJIw~Q


From 6ca4039a5b81f7dfcb0650e7e481fda5bb68d240 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 28 Mar 2019 21:10:14 +0100
Subject: [PATCH 3/3] fix #466

---
 rowers/tests/testdata/testdata.csv.gz | Bin 12523 -> 12523 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index 4ffb3fb6440e699167b9b946f274ab5ad6bb3544..69170456e574eb4e5316349433b1103377ed4d96 100644
GIT binary patch
delta 16
XcmaEz_&SkYzMF&Ni00gl>`x2;JP8J{

delta 16
YcmaEz_&SkYzMF&N^Yz&q*`F8y06|;_ivR!s