diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 2cf6d157..f780769d 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -313,7 +313,8 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'): p.legend.location = "top_left" p.legend.background_fill_alpha = 0.7 - p.sizing_mode = 'scale_width' + # p.sizing_mode = 'scale_width' + p.sizing_mode = 'stretch_both' p.yaxis.axis_label = 'Minutes' @@ -3104,7 +3105,7 @@ def interactive_flex_chart2(id=0,promember=0, plot.title.text = row.name plot.title.text_font_size=value("1.0em") - + plot.sizing_mode = 'scale_width' plot.xaxis.axis_label = xaxlabel plot.yaxis.axis_label = yaxlabel @@ -3338,17 +3339,21 @@ def interactive_flex_chart2(id=0,promember=0, title="Max Distance",callback=callback) callback.args["maxdist"] = slider_dist_max - layout = layoutrow([layoutcolumn([annotation, + thesliders = layoutcolumn([annotation, slider_spm_min, slider_spm_max, slider_dist_min, slider_dist_max, slider_work_min, slider_work_max, - ], - ), + ]) + + thesliders.sizing_mode = 'scale_width' + + layout = layoutrow([thesliders, plot]) + # layout.sizing_mode = 'scale_width' layout.sizing_mode = 'scale_width' script, div = components(layout) @@ -3795,7 +3800,7 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line', # add watermark plot.extra_y_ranges = {"watermark": watermarkrange} plot.extra_x_ranges = {"watermark": watermarkrange} - plot.sizing_mode = 'scale_width' + plot.sizing_mode = 'stretch_both' plot.image_url([watermarkurl],0.05,0.9, watermarkw,watermarkh, diff --git a/rowers/templates/flexchart3otw.html b/rowers/templates/flexchart3otw.html index 94d40ac9..ff4cfa16 100644 --- a/rowers/templates/flexchart3otw.html +++ b/rowers/templates/flexchart3otw.html @@ -24,7 +24,7 @@