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

fix grouping of zero-height bar in barplot #3058

Merged
merged 11 commits into from
Oct 12, 2023
Merged

fix grouping of zero-height bar in barplot #3058

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4b3be1f
fix grouping of zero-height bar in `barplot`
ctarn Jul 11, 2023
5c12582
treat all-zero as positive
ctarn Jul 11, 2023
6334090
Merge branch 'master' into ctarn/barplot
SimonDanisch Jul 20, 2023
a3a4e29
Merge branch 'master' into ctarn/barplot
ctarn Aug 24, 2023
d9bdd79
store `last_pos` of each group
ctarn Aug 24, 2023
06584a2
Merge branch 'master' into ctarn/barplot
ffreyer Aug 29, 2023
c805cea
Merge branch 'MakieOrg:master' into ctarn/barplot
ctarn Sep 30, 2023
d62f997
add #3058 to NEWS
ctarn Sep 30, 2023
885880b
test: add zero-height bar
ctarn Sep 30, 2023
db5861c
test: merge barplot-related tests into `barplot`
ctarn Sep 30, 2023
542f5ac
Merge branch 'master' into ctarn/barplot
ctarn Oct 7, 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
6 changes: 5 additions & 1 deletion src/basic_recipes/barplot.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ function stack_grouped_from_to(i_stack, y, grp)
from = Array{Float64}(undef, length(y))
to = Array{Float64}(undef, length(y))

groupby = StructArray((; grp..., is_pos = y .> 0))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I can tell just changing this to .>= works too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am afraid not. Given two stacked bars of heights [-6, 0], the second bar would stacked on the first one as expected.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. You do remind me that we should determine the is_pos only based other bars inside of the same group, instead of globally. I will append a commit later. Thanks.

Copy link
Contributor Author

@ctarn ctarn Aug 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the delayed update. I have been too busy recently :(. A new commit has been added. You can test it using:

import Makie, CairoMakie

fig = Makie.Figure()

ax = Makie.Axis(fig[1, 1])
xs = [1, 1, 1, 1]
ys = [0, 1, -1, -1]
stack = [1, 2, 1, 2]
dodge = [1, 1, 2, 2]
color = Makie.cgrad(:Set2_8)[1:4]
Makie.barplot!(ax, xs, ys; stack, dodge, color, bar_labels=string.(ys))

display(fig)

last_pos = any(y .> 0) || all(y .== 0)
is_pos = map(y) do v
last_pos = iszero(v) ? last_pos : v > 0
end
groupby = StructArray((; grp..., is_pos))

grps = StructArrays.finduniquesorted(groupby)

Expand Down