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

[WIP] Add value_labels option to bar plots #496

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[WIP] Add value_labels option to bar plots #496

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
619989f
Add value_labels option to bar plots
jsignell Jul 28, 2020
3f621cc
Get rid of errant print data
jsignell Jul 28, 2020
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
24 changes: 18 additions & 6 deletions hvplot/converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ class HoloViewsConverter(object):
'polygons' : ['logz', 'c'],
'labels' : ['text', 'c', 'xoffset', 'yoffset', 'text_font', 'text_font_size'],
'kde' : ['bw_method', 'ind', 'bandwidth', 'cut', 'filled'],
'bivariate': ['bandwidth', 'cut', 'filled', 'levels']
'bivariate': ['bandwidth', 'cut', 'filled', 'levels'],
}

_kind_mapping = {
Expand Down Expand Up @@ -311,7 +311,7 @@ def __init__(self, data, x, y, kind=None, by=None, use_index=True,
x_sampling=None, y_sampling=None, project=False,
tools=[], attr_labels=None, coastline=False,
tiles=False, sort_date=True, check_symmetric_max=1000000,
**kwds):
value_labels=False, **kwds):

# Process data and related options
self._redim = fields
Expand Down Expand Up @@ -375,6 +375,7 @@ def __init__(self, data, x, y, kind=None, by=None, use_index=True,

# Process options
self.stacked = stacked
self.value_labels = value_labels

plot_opts = dict(self._default_plot_opts,
**self._process_plot())
Expand Down Expand Up @@ -1269,7 +1270,7 @@ def _process_chart_args(self, data, x, y, single_y=False, categories=None):
y = self._process_chart_y(data, x, y, single_y)

# sort by date if enabled and x is a date
if x is not None and self.sort_date and self.datatype == 'pandas':
if x is not None and not isinstance(x, list) and self.sort_date and self.datatype == 'pandas':
from pandas.api.types import is_datetime64_any_dtype as is_datetime
if x in self.indexes:
index = self.indexes.index(x)
Expand Down Expand Up @@ -1383,11 +1384,15 @@ def bar(self, x=None, y=None, data=None):
data, x, y = self._process_chart_args(data, x, y, categories=self.by)
if (x or self.by) and y and (self.by or not isinstance(y, (list, tuple) or len(y) == 1)):
y = y[0] if isinstance(y, (list, tuple)) else y
return self.single_chart(Bars, x, y, data)
obj = self.single_chart(Bars, x, y, data)
if self.value_labels:
labels = Labels(obj.data, obj.kdims + obj.vdims, obj.vdims).opts(text_baseline="bottom")
return obj * labels
return obj
return self._category_plot(Bars, x, list(y), data)

def barh(self, x=None, y=None, data=None):
return self.bar(x, y, data).opts('Bars', invert_axes=True)
return self.bar(x, y, data).opts('Bars', invert_axes=True).opts("Labels", text_align="left", text_baseline="middle")

##########################
# Statistical charts #
Expand Down Expand Up @@ -1608,7 +1613,14 @@ def labels(self, x=None, y=None, data=None):
self.use_index = False
data, x, y = self._process_chart_args(data, x, y, single_y=True)

text = self.kwds.get('text', [c for c in data.columns if c not in (x, y)][0])
text = self.kwds.get('text', None)
if text is None:
unused_cols = [c for c in data.columns if c not in (x, y)]
if len(unused_cols) > 0:
text = unused_cols[0]
else:
text = y

kdims, vdims = self._get_dimensions([x, y], [text])
opts = self._get_opts('Labels')
return Labels(data, kdims, vdims).redim(**self._redim).opts(**opts)
Expand Down