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

Fixed bug in bokeh hover tool for unsanitized dimensions #524

Merged
merged 1 commit into from
Feb 28, 2016
Merged

Fixed bug in bokeh hover tool for unsanitized dimensions #524

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
14 changes: 3 additions & 11 deletions holoviews/plotting/bokeh/chart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ def get_data(self, element, ranges=None, empty=False):

data[dims[0]] = [] if empty else element.dimension_values(0)
data[dims[1]] = [] if empty else element.dimension_values(1)
if 'hover' in self.tools+self.default_tools:
for d in dims:
data[d] = [] if empty else element.dimension_values(d)
self._get_hover_data(data, element, empty)
return data, mapping


Expand Down Expand Up @@ -178,10 +176,7 @@ def get_data(self, element, ranges=None, empty=None):
else:
data = dict(top=element.values, left=element.edges[:-1],
right=element.edges[1:])

if 'hover' in self.default_tools + self.tools:
data.update({d: [] if empty else element.dimension_values(d)
for d in element.dimensions(label=True)})
self._get_hover_data(data, element, empty)
return (data, mapping)


Expand Down Expand Up @@ -221,10 +216,7 @@ def get_data(self, element, ranges=None, empty=None):
cmap = get_cmap(style.get('cmap', style.get('palette', None)))
data['color'] = [] if empty else map_colors(vals, main_range, cmap)
mapping['fill_color'] = 'color'

if 'hover' in self.default_tools + self.tools:
data.update({d: [] if empty else element.dimension_values(d)
for d in element.dimensions(label=True)})
self._get_hover_data(data, element, empty)
return (data, mapping)


Expand Down
14 changes: 13 additions & 1 deletion holoviews/plotting/bokeh/element.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,23 @@ def _init_tools(self, element):
"""
tools = self.default_tools + self.tools
if 'hover' in tools:
tooltips = [(d, '@'+d) for d in element.dimensions(label=True)]
tooltips = [(d.pprint_label, '@'+util.dimension_sanitizer(d.name))
for d in element.dimensions()]
tools[tools.index('hover')] = HoverTool(tooltips=tooltips)
return tools


def _get_hover_data(self, data, element, empty=False):
"""
Initializes hover data based on Element dimension values.
If empty initializes with no data.
"""
if 'hover' in self.default_tools + self.tools:
for d in element.dimensions(label=True):
sanitized = dimension_sanitizer(d)
data[sanitized] = [] if empty else element.dimension_values(d)


def _axes_props(self, plots, subplots, element, ranges):
dims = element.dimensions()
xlabel, ylabel, zlabel = self._axis_labels(element, subplots)
Expand Down