Skip to content

Make layouts tolerant of having too-few items #4247

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

Merged
BeastyBlacksmith merged 4 commits into from
Jun 23, 2022
Merged

Make layouts tolerant of having too-few items #4247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3106bea
Make layouts tolerant of fewer items.
BioTurboNick Jun 22, 2022
afd9e57
Add tests
BioTurboNick Jun 23, 2022
165ca8d
Remove grid kwarg
BioTurboNick Jun 23, 2022
1c706e2
format add `plot!` test
BeastyBlacksmith Jun 23, 2022
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
4 changes: 2 additions & 2 deletions src/layouts.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,9 +455,9 @@ end

function layout_args(plotattributes::AKW, n_override::Integer)
layout, n = layout_args(n_override, get(plotattributes, :layout, n_override))
if n != n_override
if n < n_override
error(
"When doing layout, n ($n) != n_override ($(n_override)). You're probably trying to force existing plots into a layout that doesn't fit them.",
"When doing layout, n ($n) < n_override ($(n_override)). You're probably trying to force existing plots into a layout that doesn't fit them.",
)
end
layout, n
Expand Down
20 changes: 20 additions & 0 deletions test/test_layouts.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,26 @@ end
@test p[3][:framestyle] === :none
end

@testset "Allowed subplot counts" begin
p = plot(plot(1:2); layout = grid(2, 2))
@test length(p) == 1
p = plot(plot(1:2), plot(1:2); layout = grid(2, 2))
@test length(p) == 2
p = plot(plot(1:2), plot(1:2), plot(1:2); layout = grid(2, 2))
@test length(p) == 3
@test length(plot!(p, plot(1:2))) == 4
p = plot(plot(1:2), plot(1:2), plot(1:2), plot(1:2); layout = grid(2, 2))
@test length(p) == 4
@test_throws ErrorException plot(
plot(1:2),
plot(1:2),
plot(1:2),
plot(1:2),
plot(1:2);
layout = grid(2, 2),
)
end

@testset "Coverage" begin
p = plot((plot(i) for i in 1:4)..., layout = (2, 2))

Expand Down