prepare 0.22.2 (#4826)

* bump versions

* update changelog

* hot-fix broken legendelements() functions

* add the function that's being called

Author: ffreyer

CHANGELOG.md

@@ -2,7 +2,10 @@
 
 ## [Unreleased]
 
-- `contourf` (contour filled) now supports _curvilinear_ grids, where `x` and `y` are matrices (`contour` lines were added in v.0.22.0) [#4670](https://github.com/MakieOrg/Makie.jl/pull/4670).
+
+## [0.22.2] - 2025-02-26
+
+- Added support for curvilinear grids in `contourf` (contour filled), where `x` and `y` are matrices (`contour` lines were added in [0.22.0]) [#4670](https://github.com/MakieOrg/Makie.jl/pull/4670).
 - Updated WGLMakie's threejs version from 0.157 to 0.173, fixing some threejs bugs [#4809](https://github.com/MakieOrg/Makie.jl/pull/4809).
 - Moved Axis3 clip planes slightly outside to avoid clipping objects on the border with 0 margin [#4742](https://github.com/MakieOrg/Makie.jl/pull/4742)
 - Fixed an issue with transformations not propagating to child plots when their spaces only match indirectly. [#4723](https://github.com/MakieOrg/Makie.jl/pull/4723)
@@ -30,6 +33,7 @@
 - Fixed issue with tick event not triggering in WGLMakie [#4818](https://github.com/MakieOrg/Makie.jl/pull/4818)
 - Improved performance of some Blocks, mainly `Textbox` and `Menu` [#4821](https://github.com/MakieOrg/Makie.jl/pull/4821)
 - Fixed issue with `PolarAxis` not considering tick visibility in protrusion calculations. [#4823](https://github.com/MakieOrg/Makie.jl/pull/4823)
+- Fixed some plots failing to create Legend entries due to missing attributes [#4826](https://github.com/MakieOrg/Makie.jl/pull/4826)
 
 ## [0.22.1] - 2025-01-17
 
@@ -754,7 +758,8 @@ All other changes are collected [in this PR](https://github.com/MakieOrg/Makie.j
 - Fixed rendering of `heatmap`s with one or more reversed ranges in CairoMakie, as in `heatmap(1:10, 10:-1:1, rand(10, 10))` [#1100](https://github.com/MakieOrg/Makie.jl/pull/1100).
 - Fixed volume slice recipe and added docs for it [#1123](https://github.com/MakieOrg/Makie.jl/pull/1123).
 
-[Unreleased]: https://github.com/MakieOrg/Makie.jl/compare/v0.22.1...HEAD
+[Unreleased]: https://github.com/MakieOrg/Makie.jl/compare/v0.22.2...HEAD
+[0.22.2]: https://github.com/MakieOrg/Makie.jl/compare/v0.22.1...v0.22.2
 [0.22.1]: https://github.com/MakieOrg/Makie.jl/compare/v0.22.0...v0.22.1
 [0.22.0]: https://github.com/MakieOrg/Makie.jl/compare/v0.21.18...v0.22.0
 [0.21.18]: https://github.com/MakieOrg/Makie.jl/compare/v0.21.17...v0.21.18

CairoMakie/Project.toml

@@ -1,7 +1,7 @@
 name = "CairoMakie"
 uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 author = ["Simon Danisch <sdanisch@gmail.com>"]
-version = "0.13.1"
+version = "0.13.2"
 
 [deps]
 CRC32c = "8bf52ea8-c179-5cab-976a-9e18b702a9bc"
@@ -24,7 +24,7 @@ FileIO = "1.1"
 FreeType = "3, 4.0"
 GeometryBasics = "0.5"
 LinearAlgebra = "1.0, 1.6"
-Makie = "=0.22.1"
+Makie = "=0.22.2"
 PrecompileTools = "1.0"
 julia = "1.3"
 

GLMakie/Project.toml

@@ -1,6 +1,6 @@
 name = "GLMakie"
 uuid = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
-version = "0.11.2"
+version = "0.11.3"
 
 [deps]
 ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
@@ -30,7 +30,7 @@ FreeTypeAbstraction = "0.10"
 GLFW = "3.4.3"
 GeometryBasics = "0.5"
 LinearAlgebra = "1.0, 1.6"
-Makie = "=0.22.1"
+Makie = "=0.22.2"
 Markdown = "1.0, 1.6"
 MeshIO = "0.5"
 ModernGL = "1"

MakieCore/Project.toml

@@ -1,7 +1,7 @@
 name = "MakieCore"
 uuid = "20f20a25-4f0e-4fdf-b5d1-57303727442b"
 authors = ["Simon Danisch"]
-version = "0.9.0"
+version = "0.9.1"
 
 [deps]
 ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"

Project.toml

@@ -1,7 +1,7 @@
 name = "Makie"
 uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 authors = ["Simon Danisch", "Julius Krumbiegel"]
-version = "0.22.1"
+version = "0.22.2"
 
 [deps]
 Animations = "27a7e980-b3e6-11e9-2bcd-0b925532e340"
@@ -97,7 +97,7 @@ KernelDensity = "0.5, 0.6"
 LaTeXStrings = "1.2"
 LinearAlgebra = "1.0, 1.6"
 MacroTools = "0.5"
-MakieCore = "=0.9"
+MakieCore = "=0.9.1"
 Markdown = "1.0, 1.6"
 MathTeXEngine = "0.5, 0.6"
 Observables = "0.5.5"

RPRMakie/Project.toml

@@ -1,7 +1,7 @@
 name = "RPRMakie"
 uuid = "22d9f318-5e34-4b44-b769-6e3734a732a6"
 authors = ["Simon Danisch"]
-version = "0.8.1"
+version = "0.8.2"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -17,7 +17,7 @@ Colors = "0.9, 0.10, 0.11, 0.12, 0.13"
 FileIO = "1.6"
 GeometryBasics = "0.5"
 LinearAlgebra = "1.0, 1.6"
-Makie = "=0.22.1"
+Makie = "=0.22.2"
 Printf = "1.0, 1.6"
 RadeonProRender = "0.3.2"
 julia = "1.3"

WGLMakie/Project.toml

@@ -1,7 +1,7 @@
 name = "WGLMakie"
 uuid = "276b4fcb-3e11-5398-bf8b-a0c2d153d008"
 authors = ["SimonDanisch <sdanisch@gmail.com>"]
-version = "0.11.1"
+version = "0.11.2"
 
 [deps]
 Bonito = "824d6782-a2ef-11e9-3a09-e5662e0c26f8"
@@ -27,7 +27,7 @@ FreeTypeAbstraction = "0.10"
 GeometryBasics = "0.5"
 Hyperscript = "0.0.3, 0.0.4, 0.0.5"
 LinearAlgebra = "1.0, 1.6"
-Makie = "=0.22.1"
+Makie = "=0.22.2"
 Observables = "0.5.1"
 PNGFiles = "0.3, 0.4"
 PrecompileTools = "1.0"

src/makielayout/blocks/legend.jl

@@ -503,9 +503,9 @@ function legendelements(plot::Union{Violin, BoxPlot, CrossBar}, legend)
         color = color,
         strokecolor = choose_scalar(plot.strokecolor, legend[:polystrokecolor]),
         strokewidth = choose_scalar(plot.strokewidth, legend[:polystrokewidth]),
-        colormap = plot.colormap,
-        colorrange = plot.colorrange,
-        alpha = plot.alpha,
+        colormap = get(plot, :colormap, :viridis),
+        colorrange = get(plot, :colorrange, automatic),
+        alpha = get(plot, :alpha, 1f0),
     )]
 end
 
@@ -533,7 +533,7 @@ function legendelements(plot::Union{Poly, Density}, legend)
         colormap = plot.colormap,
         colorrange = plot.colorrange,
         linestyle = plot.linestyle,
-        alpha = plot.alpha,
+        alpha = get(plot, :alpha, 1f0)
     )]
 end
 
@@ -720,7 +720,7 @@ function get_labeled_plots(ax; merge::Bool, unique::Bool)
 end
 
 get_plots(p::AbstractPlot) = [p]
-# NOTE: this is important, since we know that `get_plots` is only ever called on the toplevel, 
+# NOTE: this is important, since we know that `get_plots` is only ever called on the toplevel,
 # we can assume that any plotlist on the toplevel should be decomposed into individual plots.
 # However, if the user passes a label argument with a legend override, what do we do?
 get_plots(p::PlotList) = haskey(p.attributes, :label) && p.attributes[:label] isa Pair ? [p] : p.plots

test/SceneLike/makielayout.jl

@@ -507,6 +507,26 @@ end
     @test_nowarn Legend(f[1, 1], [[]], ["No legend elements"])
 end
 
+@testset "Legend data gathering" begin
+    function make_fig(plot_func, args...)
+        f = Figure()
+        ax = Axis(f[1, 1])
+        plot_func(ax, args..., label="test")
+        Legend(f[1, 2], ax)
+        return f
+    end
+
+    @test make_fig(density!, rand(100)) isa Figure
+    @test make_fig(poly!, Rect2f(0,0,1,1)) isa Figure
+    @test make_fig(band!, rand(3), rand(3), rand(3)) isa Figure
+    @test make_fig(violin!, rand(1:3, 10), rand(10)) isa Figure
+    @test make_fig(boxplot!, rand(1:3, 10), rand(10)) isa Figure
+    @test make_fig(crossbar!, rand(3), rand(3), rand(3) .-1, rand(3) .+1) isa Figure
+    @test make_fig(scatter!, rand(3)) isa Figure
+    @test make_fig(lines!, rand(3)) isa Figure
+    @test make_fig(linesegments!, rand(8)) isa Figure
+end
+
 @testset "ReversibleScale" begin
     @test ReversibleScale(identity).inverse === identity
     @test ReversibleScale(log).inverse === exp