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

Added rotation_totals and rotation_bars for rotating show_counts and show_percentage annotations #211

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added rotation_totals and rotation_bars for rotating show_counts and show_percentage annotations #211

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0359f3d
added rotation to the bar labels
gundruke Feb 22, 2023
2d579c6
Added rotation_bars and rotation_totals to init
gundruke Feb 22, 2023
0e6da3f
changed offset text annotation horizontal annotation for intersection…
gundruke Feb 22, 2023
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
27 changes: 21 additions & 6 deletions upsetplot/plotting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,19 @@ class UpSet:
This may be applied with or without show_counts.

.. versionadded:: 0.4
rotation_totals : int, default=0
Angle of rotation to be used for text (both counts and percentage)
indicating total set size. Note, '0' is set as default and would
produce horizontal text.
rotation_bars : int, default=0
Angle of rotation to be used for text (both counts and percentage)
indicating intersection size.
Note, '0' is set as default and would
produce horizontal text.
include_empty_subsets : bool (default=False)
If True, all possible category combinations will be shown as subsets,
even when some are not present in data.

"""
_default_figsize = (10, 6)

Expand All @@ -256,6 +266,7 @@ def __init__(self, data, orientation='horizontal', sort_by='degree',
with_lines=True, element_size=32,
intersection_plot_elements=6, totals_plot_elements=2,
show_counts='', show_percentages=False,
rotation_totals=0, rotation_bars=0,
include_empty_subsets=False):

self._horizontal = orientation == 'horizontal'
Expand All @@ -282,6 +293,8 @@ def __init__(self, data, orientation='horizontal', sort_by='degree',
self._subset_plots.pop()
self._show_counts = show_counts
self._show_percentages = show_percentages
self._rotation_totals = rotation_totals
self._rotation_bars = rotation_bars

(self.total, self._df, self.intersections,
self.totals) = _process_data(
Expand Down Expand Up @@ -398,7 +411,7 @@ def _plot_bars(self, ax, data, title, colors=None, use_labels=False):
cum_y = y if cum_y is None else cum_y + y
all_rects.extend(rects)

self._label_sizes(ax, rects, 'top' if self._horizontal else 'right')
self._label_sizes(ax, rects, 'top' if self._horizontal else 'right', self._rotation_bars)

ax.xaxis.set_visible(False)
for x in ['top', 'bottom', 'right']:
Expand Down Expand Up @@ -721,8 +734,10 @@ def plot_intersections(self, ax):
styles, labels = zip(*self.subset_legend)
styles = [patches.Patch(**patch_style) for patch_style in styles]
ax.legend(styles, labels)

ax.yaxis.offsetText.set(ha="right")

def _label_sizes(self, ax, rects, where):
def _label_sizes(self, ax, rects, where, rotation=0):
if not self._show_counts and not self._show_percentages:
return
if self._show_counts is True:
Expand Down Expand Up @@ -763,23 +778,23 @@ def make_args(val):
ax.text(width + margin,
rect.get_y() + rect.get_height() * .5,
fmt.format(*make_args(width)),
ha='left', va='center')
ha='left', va='center', rotation=rotation)
elif where == 'left':
margin = 0.01 * abs(np.diff(ax.get_xlim()))
for rect in rects:
width = rect.get_width() + rect.get_x()
ax.text(width + margin,
rect.get_y() + rect.get_height() * .5,
fmt.format(*make_args(width)),
ha='right', va='center')
ha='right', va='center', rotation=rotation)
elif where == 'top':
margin = 0.01 * abs(np.diff(ax.get_ylim()))
for rect in rects:
height = rect.get_height() + rect.get_y()
ax.text(rect.get_x() + rect.get_width() * .5,
height + margin,
fmt.format(*make_args(height)),
ha='center', va='bottom')
ha='center', va='bottom', rotation=rotation)
else:
raise NotImplementedError('unhandled where: %r' % where)

Expand All @@ -790,7 +805,7 @@ def plot_totals(self, ax):
ax = self._reorient(ax)
rects = ax.barh(np.arange(len(self.totals.index.values)), self.totals,
.5, color=self._facecolor, align='center')
self._label_sizes(ax, rects, 'left' if self._horizontal else 'top')
self._label_sizes(ax, rects, 'left' if self._horizontal else 'top', self._rotation_totals)

max_total = self.totals.max()
if self._horizontal:
Expand Down