From 2a65454ba5983e7bee4f18673386324e63cedb86 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 9 Nov 2020 21:31:06 +0100
Subject: [PATCH] flex chart bug fix

---
 rowers/interactiveplots.py    | 10 ++++++----
 rowers/views/analysisviews.py |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 004c25db..ed1d54eb 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -2983,7 +2983,7 @@ def interactive_otwcpchart(powerdf,promember=0,rowername="",r=None,cpfit='data',
     watermarkh = 35
     watermarkanchor = 'bottom_right'
     plot.extra_y_ranges = {"watermark": watermarkrange}
-    plot.sizing_mode = 'stretch_both'
+    plot.sizing_mode = 'scale_both'
 
 
 
@@ -3292,7 +3292,8 @@ def interactive_cpchart(rower,thedistances,thesecs,theavpower,
     watermarkh = 35
     watermarkanchor = 'bottom_right'
     plot.extra_y_ranges = {"watermark": watermarkrange}
-    plot.sizing_mode = 'stretch_both'
+    plot.sizing_mode = 'scale_both'
+
 
     plot.image_url([watermarkurl],1.8*max(thesecs),watermarky,
                    watermarkw,watermarkh,
@@ -3479,7 +3480,7 @@ def interactive_windchart(id=0,promember=0):
     plot.xaxis.axis_label = "Distance (m)"
     plot.yaxis.axis_label = "Wind Speed (m/s)"
     plot.y_range = Range1d(-7,7)
-    plot.sizing_mode = 'stretch_both'
+    plot.sizing_mode = 'scale_both'
 
 
     plot.extra_y_ranges = {"winddirection": Range1d(start=0,end=360)}
@@ -6391,7 +6392,8 @@ def interactive_otw_advanced_pace_chart(id=0,promember=0):
     watermarkanchor = 'bottom_right'
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
-    plot.sizing_mode = 'stretch_both'
+    plot.sizing_mode = 'scale_both'
+
 
     plot.image_url([watermarkurl],watermarkx,watermarky,
                    watermarkw,watermarkh,
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 361d57f3..ff4a64d4 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -558,6 +558,7 @@ def cpdata(workouts, options):
 
         res = interactive_otwcpchart(powerdf,promember=True,rowername=rowername,r=r,
                                      cpfit=cpfit,title=title,type=wtype)
+        print('noot')
         script = res[0]
         div = res[1]
         p1 = res[2]