Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure nested Overlays correctly merge hover tools #1817

Merged
merged 1 commit into from
Aug 21, 2017
Merged

Ensure nested Overlays correctly merge hover tools #1817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions holoviews/plotting/bokeh/element.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,6 +1374,9 @@ def _merge_tools(self, subplot):
if tool:
renderers = tool.renderers+hover.renderers
tool.renderers = list(util.unique_iterator(renderers))
if 'hover' not in self.handles:
self.handles['hover'] = tool


def _get_factors(self, overlay):
xfactors, yfactors = [], []
Expand Down
13 changes: 12 additions & 1 deletion tests/testplotinstantiation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,13 +687,24 @@ def test_polygons_overlay_hover(self):
self._test_hover_info(obj, [('Test', '@{Test}'), ('z', '@{z}')])

def test_hover_tool_instance_renderer_association(self):
hover = HoverTool(tooltips=[("index", "$index")])
tooltips = [("index", "$index")]
hover = HoverTool(tooltips=tooltips)
opts = dict(tools=[hover])
overlay = Curve(np.random.rand(10,2)).opts(plot=opts) * Points(np.random.rand(10,2))
plot = bokeh_renderer.get_plot(overlay)
curve_plot = plot.subplots[('Curve', 'I')]
self.assertEqual(len(curve_plot.handles['hover'].renderers), 1)
self.assertIn(curve_plot.handles['glyph_renderer'], curve_plot.handles['hover'].renderers)
self.assertEqual(plot.handles['hover'].tooltips, tooltips)

def test_hover_tool_nested_overlay_renderers(self):
overlay1 = NdOverlay({0: Curve(range(2)), 1: Curve(range(3))}, kdims=['Test'])
overlay2 = NdOverlay({0: Curve(range(4)), 1: Curve(range(5))}, kdims=['Test'])
nested_overlay = (overlay1 * overlay2).opts(plot={'Curve': dict(tools=['hover'])})
plot = bokeh_renderer.get_plot(nested_overlay)
self.assertEqual(len(plot.handles['hover'].renderers), 4)
self.assertEqual(plot.handles['hover'].tooltips,
[('Test', '@{Test}'), ('x', '@{x}'), ('y', '@{y}')])

def _test_colormapping(self, element, dim, log=False):
plot = bokeh_renderer.get_plot(element)
Expand Down