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 Path hover issues #3195

Merged
merged 1 commit into from
Nov 26, 2018
Merged

Fixed Path hover issues #3195

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
20 changes: 11 additions & 9 deletions holoviews/plotting/bokeh/path.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def get_data(self, element, ranges, style):
(isinstance(v, util.basestring) and v in element) or isinstance(v, dim))
inds = (1, 0) if self.invert_axes else (0, 1)
mapping = dict(self._mapping)
if not cdim and not style_mapping:
if not cdim and not style_mapping and 'hover' not in self.handles:
if self.static_source:
data = {}
else:
Expand All @@ -75,10 +75,10 @@ def get_data(self, element, ranges, style):
data = dict(xs=xs, ys=ys)
return data, mapping, style

vals = {}
hover = 'hover' in self.handles
vals = defaultdict(list)
if hover:
vals = {util.dimension_sanitizer(vd.name): [] for vd in element.vdims}
vals.update({util.dimension_sanitizer(vd.name): [] for vd in element.vdims})
if cdim:
dim_name = util.dimension_sanitizer(cdim.name)
cmapper = self._get_colormapper(cdim, element, ranges, style)
Expand All @@ -89,21 +89,23 @@ def get_data(self, element, ranges, style):
for path in element.split():
if cdim:
cvals = path.dimension_values(cdim)
vals[dim_name] = cvals[:-1]
vals[dim_name].append(cvals[:-1])
array = path.array(path.kdims)
alen = len(array)
paths = [array[s1:s2+1] for (s1, s2) in zip(range(alen-1), range(1, alen+1))]
paths += [array[s1:s2+1] for (s1, s2) in zip(range(alen-1), range(1, alen+1))]
if not hover:
continue
for vd in element.vdims:
if vd == cdim:
continue
values = path.dimension_values(vd)[:-1]
vd_name = util.dimension_sanitizer(vd.name)
vals[vd_name] = values
vals[vd_name].append(values)
if values.dtype.kind == 'M':
vals[vd_name+'_dt_strings'] = [vd.pprint_value(v) for v in values]

vals[vd_name+'_dt_strings'].append([vd.pprint_value(v) for v in values])
xs, ys = ([path[:, idx] for path in paths] for idx in inds)
data = dict(xs=xs, ys=ys, **{d: np.asarray(vs) for d, vs in vals.items()})
values = {d: np.concatenate(vs) if len(vs) else [] for d, vs in vals.items()}
data = dict(xs=xs, ys=ys, **values)
self._get_hover_data(data, element)
return data, mapping, style

Expand Down