Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop

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

rowers/templates/flexchart3otw.html

@@ -51,8 +51,8 @@
         {{ optionsform.as_table }}
       </table>
       <p>
-        <input name="chartform" class="button green" type="submit"
+        <input name="chartform" type="submit"
-               value="Submit">
+               value="Update Chart">
       </p>
     </form>
   </li>