From 0eb3474fae639d33a7cff08e144b488e7b65fd49 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 25 Oct 2020 09:00:37 +0100 Subject: [PATCH] x axis in minutes --- rowers/interactiveplots.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 34bd6634..d7e89e75 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -2898,12 +2898,15 @@ def interactive_otwcpchart(powerdf,promember=0,rowername="",r=None,cpfit='data', deltas = powerdf['Delta'].apply(lambda x: timedeltaconv(x)) powerdf['ftime'] = niceformat(deltas) + powerdf['Deltaminutes'] = powerdf['Delta']/60. source = ColumnDataSource( data = powerdf ) + + # there is no Paul's law for OTW thesecs = powerdf['Delta'] @@ -2935,7 +2938,7 @@ def interactive_otwcpchart(powerdf,promember=0,rowername="",r=None,cpfit='data', data = dict( CP = fitpower, CPmax = ratio*fitpower, - duration = fitt, + duration = fitt/60., ftime = ftime, workout = workouts, ) @@ -2974,21 +2977,21 @@ def interactive_otwcpchart(powerdf,promember=0,rowername="",r=None,cpfit='data', y_range_name = "watermark", ) - plot.circle('Delta','CP',source=source,fill_color='red',size=15, + plot.circle('Deltaminutes','CP',source=source,fill_color='red',size=15, legend='Power Data') - plot.xaxis.axis_label = "Duration (seconds)" + plot.xaxis.axis_label = "Duration (minutes)" plot.yaxis.axis_label = "Power (W)" plot.y_range = Range1d(0,1.5*max(theavpower)) - plot.x_range = Range1d(1,2*max(thesecs)) + plot.x_range = Range1d(0.5*min(thesecs)/60.,2*max(thesecs)/60.) plot.legend.orientation = "vertical" if not title: title = "Critical Power for "+rowername plot.title.text = title xaxis = plot.select(dict(type=Axis, layout="below"))[0] - xaxis.formatter = PrintfTickFormatter(format="%5f") - #xaxis.formatter.use_scientific = False + xaxis.formatter = PrintfTickFormatter() + hover = plot.select(dict(type=HoverTool))