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

compare fixed

Browse Source
This commit is contained in:
Sander Roosendaal
2017-02-23 15:16:41 +01:00
parent 2b49407af3
commit 393dc6bbf8
1 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
rowers/interactiveplots.py
View File

@@ -1837,8 +1837,29 @@ def interactive_comparison_chart(id1=0,id2=0,xparam='distance',yparam='spm',
plot_width=920,
toolbar_sticky=False)
TIPS = OrderedDict([
('time','@ftime1'),
('pace','@fpace1'),
('hr','@hr1'),
('spm','@spm1{1.1}'),
('distance','@distance1{5}'),
])
TIPS2 = OrderedDict([
('time','@ftime2'),
('pace','@fpace2'),
('hr','@hr2'),
('spm','@spm2{1.1}'),
('distance','@distance2{5}'),
])
hover1 = plot.select(type=HoverTool)
hover1.tooltips = TIPS
hover2 = plot.select(type=HoverTool)
hover2.tooltips = TIPS2
if plottype=='line':
l1 = plot.line('x1','y1',source=source1,
color="blue",legend=row1.name,
@@ -1854,6 +1875,8 @@ def interactive_comparison_chart(id1=0,id2=0,xparam='distance',yparam='spm',
fill_alpha=0.4,
line_color=None,color="red")
plot.add_tools(HoverTool(renderers=[l1],tooltips=TIPS))
plot.add_tools(HoverTool(renderers=[l2],tooltips=TIPS2))
plot.legend.location = "bottom_right"
plot.title.text = row1.name+' vs '+row2.name
@@ -1880,50 +1903,7 @@ def interactive_comparison_chart(id1=0,id2=0,xparam='distance',yparam='spm',
plot.y_range = Range1d(ymin,ymax)
TIPS = OrderedDict([
('time1','@ftime1'),
('pace1','@fpace1'),
('hr1','@hr1'),
('spm1','@spm1{1.1}'),
('distance1','@distance1{5}'),
])
TIPS2 = OrderedDict([
('time2','@ftime2'),
('pace2','@fpace2'),
('hr2','@hr2'),
('spm2','@spm2{1.1}'),
('distance2','@distance2{5}'),
])
plot.add_tools(HoverTool(renderers=[l1],tooltips=TIPS))
plot.add_tools(HoverTool(renderers=[l2],tooltips=TIPS2))
# hover1 = plot.select(dict(type=HoverTool))
# hover2 = plot.select(dict(type=HoverTool))
# hover1.renderers = [l1]
# hover2.renderers = [l2]
# hover1.tooltips = OrderedDict([
# ('time1','@ftime1'),
# ('pace1','@fpace1'),
# ('hr1','@hr1'),
# ('spm1','@spm1{1.1}'),
# ('distance1','@distance1{5}'),
# ])
# hover2.tooltips = OrderedDict([
# ('time2','@ftime2'),
# ('pace2','@fpace2'),
# ('hr2','@hr2'),
# ('spm2','@spm2{1.1}'),
# ('distance2','@distance2{5}'),
# ])
# hover1.mode = 'mouse'
# hover2.mode = 'mouse'
script, div = components(plot)
return [script,div]