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

Reduce redundant computation in distplot linewidth #2559

Merged
merged 1 commit into from
Apr 23, 2021
+25 −22
Merged

Reduce redundant computation in distplot linewidth #2559

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
47 changes: 25 additions & 22 deletions seaborn/distributions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,18 @@ def plot_univariate_histogram(

# Now we handle linewidth, which depends on the scaling of the plot

# We will base everything on the minimum bin width
hist_metadata = pd.concat([
# Use .items for generality over dict or df
h.index.to_frame() for _, h in histograms.items()
]).reset_index(drop=True)
thin_bar_idx = hist_metadata["widths"].idxmin()
binwidth = hist_metadata.loc[thin_bar_idx, "widths"]
left_edge = hist_metadata.loc[thin_bar_idx, "edges"]

# Set initial value
default_linewidth = math.inf

# Loop through subsets based only on facet variables
for sub_vars, _ in self.iter_data():

Expand All @@ -643,15 +655,6 @@ def plot_univariate_histogram(
# Innocuous in other cases?
ax.autoscale_view()

# We will base everything on the minimum bin width
hist_metadata = pd.concat([
# Use .items for generality over dict or df
h.index.to_frame() for _, h in histograms.items()
]).reset_index(drop=True)
thin_bar_idx = hist_metadata["widths"].idxmin()
binwidth = hist_metadata.loc[thin_bar_idx, "widths"]
left_edge = hist_metadata.loc[thin_bar_idx, "edges"]

# Convert binwidth from data coordinates to pixels
pts_x, pts_y = 72 / ax.figure.dpi * abs(
ax.transData.transform([left_edge + binwidth] * 2)
Expand All @@ -664,24 +667,24 @@ def plot_univariate_histogram(

# The relative size of the lines depends on the appearance
# This is a provisional value and may need more tweaking
default_linewidth = .1 * binwidth_points
default_linewidth = min(.1 * binwidth_points, default_linewidth)

# Set the attributes
for bar in hist_artists:
# Set the attributes
for bar in hist_artists:

# Don't let the lines get too thick
max_linewidth = bar.get_linewidth()
if not fill:
max_linewidth *= 1.5
# Don't let the lines get too thick
max_linewidth = bar.get_linewidth()
if not fill:
max_linewidth *= 1.5

linewidth = min(default_linewidth, max_linewidth)
linewidth = min(default_linewidth, max_linewidth)

# If not filling, don't let lines dissapear
if not fill:
min_linewidth = .5
linewidth = max(linewidth, min_linewidth)
# If not filling, don't let lines dissapear
if not fill:
min_linewidth = .5
linewidth = max(linewidth, min_linewidth)

bar.set_linewidth(linewidth)
bar.set_linewidth(linewidth)

# --- Finalize the plot ----

Expand Down