From 7121879f398dabf4e5806a35fe2de22bfd02c901 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 24 Jan 2022 17:43:09 +0100 Subject: [PATCH 1/2] flix --- rowers/interactiveplots.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 77c77250..04cb5427 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -5522,6 +5522,36 @@ def interactive_flexchart_stacked(id,r,xparam='time', y3max = get_yaxmaxima(r,yparam3,mode) y4max = get_yaxmaxima(r,yparam4,mode) + if yparam1 == 'pace' and row.workouttype in mytypes.otetypes: + y1max = r.fastpaceerg + y1min = r.slowpaceerg + print('aap',y1min) + elif yparam1 == 'pace' and row.workouttype in mytypes.otwtypes: + y1max = r.otwpacefast + y1min = r.otwpaceslow + + if yparam2 == 'pace' and row.workouttype in mytypes.otetypes: + y2max = r.fastpaceerg + y2min = r.slowpaceerg + elif yparam2 == 'pace' and row.workouttype in mytypes.otwtypes: + y2max = r.otwpacefast + y2min = r.otwpaceslow + + if yparam3 == 'pace' and row.workouttype in mytypes.otetypes: + y3max = r.fastpaceerg + y3min = r.slowpaceerg + elif yparam3 == 'pace' and row.workouttype in mytypes.otwtypes: + y3max = r.otwpacefast + y3min = r.otwpaceslow + + if yparam4 == 'pace' and row.workouttype in mytypes.otetypes: + y4max = r.fastpaceerg + y4min = r.slowpaceerg + elif yparam4 == 'pace' and row.workouttype in mytypes.otwtypes: + y4max = r.otwpacefast + y4min = r.otwpaceslow + + plot1.y_range = Range1d(start=y1min,end=y1max) plot2.y_range = Range1d(start=y2min,end=y2max) plot3.y_range = Range1d(start=y3min,end=y3max) From 4fee2353741e1a411dbaf6b420d43241c1fd84d1 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 24 Jan 2022 17:52:28 +0100 Subject: [PATCH 2/2] better - it already did what I intended by my previous code change --- rowers/interactiveplots.py | 30 -------------------------- rowers/templates/favoritecharts.html | 3 ++- rowers/tests/testdata/testdata.tcx.gz | Bin 0 -> 4001 bytes 3 files changed, 2 insertions(+), 31 deletions(-) create mode 100644 rowers/tests/testdata/testdata.tcx.gz diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 04cb5427..77c77250 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -5522,36 +5522,6 @@ def interactive_flexchart_stacked(id,r,xparam='time', y3max = get_yaxmaxima(r,yparam3,mode) y4max = get_yaxmaxima(r,yparam4,mode) - if yparam1 == 'pace' and row.workouttype in mytypes.otetypes: - y1max = r.fastpaceerg - y1min = r.slowpaceerg - print('aap',y1min) - elif yparam1 == 'pace' and row.workouttype in mytypes.otwtypes: - y1max = r.otwpacefast - y1min = r.otwpaceslow - - if yparam2 == 'pace' and row.workouttype in mytypes.otetypes: - y2max = r.fastpaceerg - y2min = r.slowpaceerg - elif yparam2 == 'pace' and row.workouttype in mytypes.otwtypes: - y2max = r.otwpacefast - y2min = r.otwpaceslow - - if yparam3 == 'pace' and row.workouttype in mytypes.otetypes: - y3max = r.fastpaceerg - y3min = r.slowpaceerg - elif yparam3 == 'pace' and row.workouttype in mytypes.otwtypes: - y3max = r.otwpacefast - y3min = r.otwpaceslow - - if yparam4 == 'pace' and row.workouttype in mytypes.otetypes: - y4max = r.fastpaceerg - y4min = r.slowpaceerg - elif yparam4 == 'pace' and row.workouttype in mytypes.otwtypes: - y4max = r.otwpacefast - y4min = r.otwpaceslow - - plot1.y_range = Range1d(start=y1min,end=y1max) plot2.y_range = Range1d(start=y2min,end=y2max) plot3.y_range = Range1d(start=y3min,end=y3max) diff --git a/rowers/templates/favoritecharts.html b/rowers/templates/favoritecharts.html index b29a5bbc..c34c1973 100644 --- a/rowers/templates/favoritecharts.html +++ b/rowers/templates/favoritecharts.html @@ -25,7 +25,8 @@

Charts Settings of {{ rower.user.first_name }} {{ rower.user.last_name }}

- Use this form to change some of the characteristics of the static charts. The grid option + Use this form to change some of the characteristics of the static charts, as well as the + pace axis ranges on the flex charts. The grid option overlays grid lines over the charts. The fastest and slowest pace determine cutoff values for pace.

diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz new file mode 100644 index 0000000000000000000000000000000000000000..dc37faecbc42a89caddc8c628e17e5040e2d3f96 GIT binary patch literal 4001 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 H#DD<+FnSt$ literal 0 HcmV?d00001