From 6fcabadf25dd87c4fa735238740f0334fd95e6ca Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 9 Nov 2020 15:49:32 +0100 Subject: [PATCH] label positions force curve --- rowers/interactiveplots.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 26a82fe3..004c25db 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -1206,63 +1206,63 @@ def interactive_forcecurve(theworkouts,workstrokesonly=True,plottype='scatter'): plot.add_layout(avf) - peakflabel = Label(x=410,y=460,x_units='screen',y_units='screen', + peakflabel = Label(x=760,y=460,x_units='screen',y_units='screen', text="Fpeak: {peakforceav:6.2f}".format(peakforceav=peakforceav), background_fill_alpha=.7, background_fill_color='white', text_color='blue', ) - avflabel = Label(x=420,y=430,x_units='screen',y_units='screen', + avflabel = Label(x=770,y=430,x_units='screen',y_units='screen', text="Favg: {averageforceav:6.2f}".format(averageforceav=averageforceav), background_fill_alpha=.7, background_fill_color='white', text_color='blue', ) - catchlabel = Label(x=415,y=400,x_units='screen',y_units='screen', + catchlabel = Label(x=765,y=400,x_units='screen',y_units='screen', text="Catch: {catchav:6.2f}".format(catchav=catchav), background_fill_alpha=0.7, background_fill_color='white', text_color='red', ) - peakforceanglelabel = Label(x=375,y=370,x_units='screen',y_units='screen', + peakforceanglelabel = Label(x=725,y=370,x_units='screen',y_units='screen', text="Peak angle: {peakforceangleav:6.2f}".format(peakforceangleav=peakforceangleav), background_fill_alpha=0.7, background_fill_color='white', text_color='red', ) - finishlabel = Label(x=410,y=340,x_units='screen',y_units='screen', + finishlabel = Label(x=760,y=340,x_units='screen',y_units='screen', text="Finish: {finishav:6.2f}".format(finishav=finishav), background_fill_alpha=0.7, background_fill_color='white', text_color='red', ) - sliplabel = Label(x=425,y=310,x_units='screen',y_units='screen', + sliplabel = Label(x=775,y=310,x_units='screen',y_units='screen', text="Slip: {slipav:6.2f}".format(slipav=slipav-catchav), background_fill_alpha=0.7, background_fill_color='white', text_color='red', ) - washlabel = Label(x=415,y=280,x_units='screen',y_units='screen', + washlabel = Label(x=765,y=280,x_units='screen',y_units='screen', text="Wash: {washav:6.2f}".format(washav=finishav-washav), background_fill_alpha=0.7, background_fill_color='white', text_color='red', ) - lengthlabel = Label(x=405,y=250, x_units='screen',y_units='screen', + lengthlabel = Label(x=755,y=250, x_units='screen',y_units='screen', text="Length: {length:6.2f}".format(length=finishav-catchav), background_fill_alpha=0.7, background_fill_color='white', text_color='green' ) - efflengthlabel = Label(x=340,y=220, x_units='screen',y_units='screen', + efflengthlabel = Label(x=690,y=220, x_units='screen',y_units='screen', text="Effective Length: {length:6.2f}".format(length=washav-slipav), background_fill_alpha=0.7, background_fill_color='white',