Skip to content

fix colormap usage also for histograms #72

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

Open
brunzema wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix colormap usage also for histograms #72

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
63 changes: 30 additions & 33 deletions joypy/joyplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,38 +462,36 @@ def _get_color(i, num_axes, j, num_subgroups):

num_subgroups = len(group)

if hist:
# matplotlib hist() already handles multiple subgroups in a histogram
a.hist(group, label=sublabels, bins=bins, color=color,
range=[min(global_x_range), max(global_x_range)],
edgecolor=linecolor, zorder=group_zorder, **kwargs)
else:
for j, subgroup in enumerate(group):

# Compute the x_range of the current plot
if range_style == 'all':
# All plots have the same range
x_range = global_x_range
elif range_style == 'own':
# Each plot has its own range
x_range = _x_range(subgroup, tails)
elif range_style == 'group':
# Each plot has a range that covers the whole group
x_range = _x_range(group, tails)
elif isinstance(range_style, (list, np.ndarray)):
# All plots have exactly the range passed as argument
x_range = _x_range(range_style, 0.0)
else:
raise NotImplementedError("Unrecognized range style.")

if sublabels is None:
sublabel = None
else:
sublabel = sublabels[j]

element_zorder = group_zorder + j/(num_subgroups+1)
element_color = _get_color(i, num_axes, j, num_subgroups)
for j, subgroup in enumerate(group):

# Compute the x_range of the current plot
if range_style == 'all':
# All plots have the same range
x_range = global_x_range
elif range_style == 'own':
# Each plot has its own range
x_range = _x_range(subgroup, tails)
elif range_style == 'group':
# Each plot has a range that covers the whole group
x_range = _x_range(group, tails)
elif isinstance(range_style, (list, np.ndarray)):
# All plots have exactly the range passed as argument
x_range = _x_range(range_style, 0.0)
else:
raise NotImplementedError("Unrecognized range style.")

if sublabels is None:
sublabel = None
else:
sublabel = sublabels[j]

element_zorder = group_zorder + j/(num_subgroups+1)
element_color = _get_color(i, num_axes, j, num_subgroups)

if hist:
a.hist(subgroup, label=sublabel, bins=bins, color=element_color,
range=x_range, edgecolor=linecolor, zorder=element_zorder, **kwargs)
else:
plot_density(a, x_range, subgroup,
fill=fill, linecolor=linecolor, label=sublabel,
zorder=element_zorder, color=element_color,
Expand Down Expand Up @@ -581,5 +579,4 @@ def _get_color(i, num_axes, j, num_subgroups):
h_pad = 5 + (- 5*(1 + overlap))
fig.tight_layout(h_pad=h_pad)

return fig, _axes

return fig, _axes