sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

working on 3.9

Browse Source
This commit is contained in:
Sander Roosendaal
2023-06-03 21:20:02 +02:00
parent baa162c2d7
commit b6202369c7
8 changed files with 66 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rowers/interactiveplots.py
View File

@@ -4853,18 +4853,17 @@ def interactive_multiflex(datadf, xparam, yparam, groupby, extratitle='',
TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap'
if groupby != 'date':
hover = HoverTool(names=['data'],
tooltips=[
(groupby, '@groupval{1.1}'),
(xparamname, '@x{1.1}'),
(yparamname, '@y')
hover = HoverTool(tooltips=[
(groupby, '@groupval{1.1}'),
(xparamname, '@x{1.1}'),
(yparamname, '@y')
])
else: # pragma: no cover
hover = HoverTool(names=['data'],
tooltips=[
(groupby, '@groupval'),
(xparamname, '@x{1.1}'),
(yparamname, '@y'),
hover = HoverTool(
tooltips=[
(groupby, '@groupval'),
(xparamname, '@x{1.1}'),
(yparamname, '@y'),
])
hover.mode = 'mouse'
@@ -6851,7 +6850,7 @@ def interactive_otw_advanced_pace_chart(id=0, promember=0):
)
plot.title.text = row.name
plot.title.text_font_size = value("1.2em")
#plot.title.text_font_size = value("1.2em")
plot.xaxis.axis_label = "Time"
plot.yaxis.axis_label = "Pace (/500m)"
plot.xaxis[0].formatter = DatetimeTickFormatter(
@@ -7236,8 +7235,10 @@ def interactive_zoneschart(rower, data, startdate, enddate, trainingzones='hr',
p.extra_y_ranges["yax2"] = Range1d(start=0, end=y2rangemax)
p.line('date', 'hours', source=source2,
y_range_name="yax2", color="black", width=5)
p.circle('date', 'hours', source=source2, y_range_name="yax2", color="black", size=10,
legend_label='Hours')
p.circle('date', 'hours', source=source2, y_range_name="yax2", color="black", size=10)
# p.circle('date', 'hours', source=source2, y_range_name="yax2", color="black", size=10,
# legend_label='Hours')
p.add_layout(LinearAxis(y_range_name="yax2",
axis_label='Hours'), 'right')