Merge branch 'master' into add-tricontour

Author: SimonDanisch

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+- Added `font` attribute and fixed faulty selection in `scatter`. Scatter fonts can now be themed with `markerfont`. [#4832](https://github.com/MakieOrg/Makie.jl/pull/4832)
+- Fixed categorical `cgrad` interpolating at small enough steps [#4858](https://github.com/MakieOrg/Makie.jl/pull/4858)
+- Added `tricontour` plot, which plots contour lines, similar to `tricontourf` [#4795](https://github.com/MakieOrg/Makie.jl/pull/4795). 
+
+## [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)
@@ -24,7 +31,12 @@
 - Changed `inspectable` to be inherited from the parent scenes theme. [#4739](https://github.com/MakieOrg/Makie.jl/pull/4739)
 - Reverted change to `poly` which disallowed 3D geometries from being plotted [#4738](https://github.com/MakieOrg/Makie.jl/pull/4738)
 - Enabled autocompletion on Block types, e.g. `?Axis.xti...` [#4786](https://github.com/MakieOrg/Makie.jl/pull/4786)
-- Added `tricontour` plot, which plots contour lines, similar to `tricontourf` [#4795](https://github.com/MakieOrg/Makie.jl/pull/4795). 
+- Added `dpi` metadata to all rendered png files, where `px_per_unit = 1` means 96dpi, `px_per_unit = 2` means 192dpi, and so on. This gives frontends a chance to show plain Makie png images with the correct scaling [#4812](https://github.com/MakieOrg/Makie.jl/pull/4812).
+- Fixed issue with voxels not working correctly with `rotate!()` [#4824](https://github.com/MakieOrg/Makie.jl/pull/4824)
+- 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
 
@@ -749,7 +761,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 <[email protected]>"]
-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"

GLMakie/assets/shader/voxel.vert

@@ -174,7 +174,8 @@ void main() {
     // the quad is associated with the "previous" or "next" slice of voxels. We
     // can derive that from the normal direction, as the normal always points
     // away from the voxel center.
-    o_uvw = (plane_vertex - 0.5 * (1.0 - gap) * o_normal) / size;
+    // requires object space normal (unit_vecs[dim])
+    o_uvw = (plane_vertex - 0.5 * (1.0 - gap) * normal_dir * unit_vecs[dim]) / size;
 
     // normal in: -x -y -z +x +y +z direction
     o_side = dim + 3 * int(0.5 + 0.5 * normal_dir);

GLMakie/src/drawing_primitives.jl

@@ -451,7 +451,7 @@ function draw_atomic(screen::Screen, scene::Scene, @nospecialize(plot::Union{Sca
                         return nothing
                     end
                 end
-                font = get(gl_attributes, :font, Observable(Makie.defaultfont()))
+                font = map(to_font, pop!(gl_attributes, :font))
                 gl_attributes[:uv_offset_width][] == Vec4f(0) && delete!(gl_attributes, :uv_offset_width)
                 get!(gl_attributes, :uv_offset_width) do
                     return Makie.primitive_uv_offset_width(atlas, marker, font)

GLMakie/src/glshaders/voxel.jl

@@ -3,6 +3,7 @@ function draw_voxels(screen, main::VolumeTypes, data::Dict)
     geom = Rect2f(Point2f(0), Vec2f(1.0))
     to_opengl_mesh!(screen.glscreen, data, const_lift(GeometryBasics.triangle_mesh, geom))
     shading = pop!(data, :shading, FastShading)
+    debug = to_value(pop!(data, :debug, ""))
     @gen_defaults! data begin
         voxel_id = main => Texture
         gap = 0f0
@@ -26,7 +27,7 @@ function draw_voxels(screen, main::VolumeTypes, data::Dict)
                 "MAX_LIGHT_PARAMETERS" => "#define MAX_LIGHT_PARAMETERS $(screen.config.max_light_parameters)",
                 "buffers" => output_buffers(screen, to_value(transparency)),
                 "buffer_writes" => output_buffer_writes(screen, to_value(transparency)),
-                "DEBUG_FLAG_DEFINE" => to_value(get(data, :debug, ""))
+                "DEBUG_FLAG_DEFINE" => debug
             )
         )
     end

GLMakie/test/runtests.jl

@@ -110,7 +110,7 @@ end
     sleep(0.1)
     GLMakie.closeall()
 
-        # Why does it start with a skipped tick?
+    # Why does it start with a skipped tick?
     i = 1
     while tick_record[i].state == Makie.SkippedRenderTick
         check_tick(tick_record[1], Makie.SkippedRenderTick, i)
@@ -134,6 +134,11 @@ end
 end
 
 
+
+
+# NOTE: Keep this at the end! It also verifies that all cleanup is complete after
+#       all other tests have finished
+
 @testset "gl object deletion" begin
     GLMakie.closeall()
 

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"

MakieCore/src/basic_plots.jl

@@ -484,6 +484,8 @@ Plots a marker for each element in `(x, y, z)`, `(x, y)`, or `positions`.
     marker_offset = Vec3f(0)
     "Controls whether the model matrix (without translation) applies to the marker itself, rather than just the positions. (If this is true, `scale!` and `rotate!` will affect the marker."
     transform_marker = false
+    "Sets the font used for character markers. Can be a `String` specifying the (partial) name of a font or the file path of a font file"
+    font = @inherit markerfont
     "Optional distancefield used for e.g. font and bezier path rendering. Will get set automatically."
     distancefield = nothing
     uv_offset_width = (0.0, 0.0, 0.0, 0.0)

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"

ReferenceTests/src/tests/attributes.jl

@@ -6,12 +6,60 @@
     fig
 end
 
-@reference_test "(mesh)scatter with NaN rotation and markersize" begin
-    scene = Scene(size = (150, 300))
+@reference_test "(mesh)scatter with NaN rotation and markersize, edge cases" begin
+    parent = Scene(size = (300, 300))
+    scene = Scene(parent, viewport = Rect2f(0,0, 150, 300))
     xs = [-0.6, 0.0, 0.6]
     scatter!(scene,     xs, fill( 0.75, 3), marker = :ltriangle, rotation = [0.5, NaN, -0.5], markersize = 50)
     scatter!(scene,     xs, fill( 0.25, 3), marker = :ltriangle, markersize = [50, NaN, 50])
     meshscatter!(scene, xs, fill(-0.25, 3), marker = Rect2f(-0.5,-0.5,1,1), rotation = [0.5, NaN, -0.5], markersize = 0.2)
     meshscatter!(scene, xs, fill(-0.75, 3), marker = Rect2f(-0.5,-0.5,1,1), markersize = [0.2, NaN, 0.2])
-    scene
+
+    # Edge case: Quaternionf(0,0,0,1) should not default billboard to true
+    scene3 = Scene(parent, viewport = Rect2f(150, 0, 150, 300), camera = cam3d!)
+    scatter!(scene3, (0.5, 0.5, 0), marker = Rect,
+        rotation = Quaternionf(0.01,0,0,1), markersize = 0.5, markerspace = :data)
+    scatter!(scene3, (-0.5, 0.5, 0), marker = Rect,
+        rotation = Quaternionf(0,0,0,1), markersize = 0.5, markerspace = :data)
+    scatter!(scene3, [-0.5, 0.5], [-0.5, -0.5], [0, 0], marker = Rect, markersize = 0.5, markerspace = :data)
+
+    parent
+end
+
+@reference_test "Categorical color interpolation" begin
+    parent = Scene(size = (500, 500))
+
+    # test with cgrad
+    # - optimally switch near horizontal center (colormap gets upscaled to colorrange)
+    # - no interpolation (match image behind marker/line (slightly above or below))
+    scene = Scene(parent, viewport = Rect2f(0, 0, 500, 190))
+    cg = cgrad(:viridis, 5, categorical = true, scale = log10);
+    scatter_kwargs = (colorrange = (0, 1000), colormap = cg, marker = Rect, markersize = 25)
+    line_kwargs = (colorrange = (0, 1000), colormap = cg, linewidth = 10)
+    image!(scene, -1..1, -1..1, reshape(cg.colors.colors, (1, 5)), interpolate = false)
+    for i in 2:5
+        edge = cg.values[i]
+        y = range(-1, 1, length=6)[i]
+        scatter!(scene, -1..1, fill(y, 15), color = round(Int, 1000 * edge) .+ (-5:9); scatter_kwargs...)
+        lines!(scene, -1..1, fill(y, 15),   color = round(Int, 1000 * edge) .+ (-5:9); line_kwargs...)
+    end
+
+    # test with categorical
+    # - optimally alternate between black and white (no downscaling of colormap)
+    # - no interpolation (match image behind marker/line (slightly above or below))
+    scene = Scene(parent, viewport = Rect2f(0, 200, 500, 300))
+    cg = Categorical([RGBf(i%2, i%2, i%2) for i in 0:1000]);
+    scatter_kwargs = (colorrange = (0, 1000), colormap = cg, marker = Rect, markersize = 20, alpha = 1)
+    line_kwargs = (colorrange = (0, 1000), colormap = cg, linewidth = 8, alpha = 1)
+    cm = to_colormap(cg)
+    image!(scene, -1..1, -1..1, reshape(cm[1:6], (1, 6)), interpolate = false)
+    p = nothing
+    for i in 1:5
+        edge = 100 * i
+        y = range(-1, 1, length=7)[i+1]
+        p = scatter!(scene, -1..1, fill(y, 15), color = edge .+ (-7:7); scatter_kwargs...)
+        lines!(scene, -1..1, fill(y, 15), color = edge .+ (-7:7); line_kwargs...)
+    end
+
+    parent
 end

ReferenceTests/src/tests/examples2d.jl

@@ -894,6 +894,28 @@ end
     fig
 end
 
+@reference_test "filled contour 2d with curvilinear grid" begin
+    x = -10:10
+    y = -10:10
+    # The curvilinear grid:
+    xs = [x + 0.01y^3 for x in x, y in y]
+    ys = [y + 10cos(x/40) for x in x, y in y]
+
+    # Now, for simplicity, we calculate the `Z` values to be
+    # the radius from the center of the grid (0, 10).
+    zs = sqrt.(xs .^ 2 .+ (ys .- 10) .^ 2)
+
+    # We can use Makie's tick finders to get some nice looking contour levels.
+    # This could also be Makie.get_tickvalues(Makie.LinearTicks(7), extrema(zs)...)
+    # but it's more stable as a test if we hardcode it.
+    levels = 0:4:20
+
+    # and now, we plot!
+    fig, ax, ctr = contourf(xs, ys, zs; levels = levels)
+
+    fig
+end
+
 @reference_test "contour labels 3D" begin
     fig = Figure()
     Axis3(fig[1, 1])

ReferenceTests/src/tests/figures_and_makielayout.jl

@@ -50,12 +50,15 @@ end
         [
             Label(fig, "A", width = nothing) Label(fig, "C", width = nothing);
             menu1                            menu3;
+            Box(fig, visible = false) Box(fig, visible = false);
             Label(fig, "B", width = nothing) Label(fig, "D", width = nothing);
             menu2                            menu4;
         ]
     )
-    menu2.is_open = true
+
+    menu1.is_open = true
     menu4.is_open = true
+
     fig
 end
 
@@ -233,37 +236,25 @@ end
     fig
 end
 
-@reference_test "PolarAxis surface" begin
-    f = Figure()
-    ax = PolarAxis(f[1, 1])
-    zs = [r*cos(phi) for phi in range(0, 4pi, length=100), r in range(1, 2, length=100)]
-    p = surface!(ax, 0..2pi, 0..10, zs, shading = NoShading, colormap = :coolwarm, colorrange=(-2, 2))
-    rlims!(ax, 0, 11) # verify that r = 10 doesn't end up at r > 10
-    translate!(p, 0, 0, -200)
-    Colorbar(f[1, 2], p)
-    f
-end
-
-# may fail in WGLMakie due to missing dashes
-@reference_test "PolarAxis scatterlines spine" begin
-    f = Figure(size = (800, 400))
+@reference_test "PolarAxis decorations" begin
+    # may fail in WGLMakie due to missing dashes
+    # tests: some decorations, theta_as_x, title, scatter, lines
+    f = Figure(size = (800, 800), backgroundcolor = :gray)
     ax1 = PolarAxis(f[1, 1], title = "No spine", spinevisible = false, theta_as_x = false)
     scatterlines!(ax1, range(0, 1, length=100), range(0, 10pi, length=100), color = 1:100)
 
     ax2 = PolarAxis(f[1, 2], title = "Modified spine")
     ax2.spinecolor[] = :red
     ax2.spinestyle[] = :dash
     ax2.spinewidth[] = 5
+    rlims!(ax2, 0, 1.5)
     scatterlines!(ax2, range(0, 10pi, length=100), range(0, 1, length=100), color = 1:100)
-    f
-end
 
-# may fail in CairoMakie due to different text stroke handling
-# and in WGLMakie due to missing stroke
-@reference_test "PolarAxis decorations" begin
-    f = Figure(size = (400, 400), backgroundcolor = :black)
+    # may fail in CairoMakie due to different text stroke handling
+    # and in WGLMakie due to missing stroke
+    # tests: decorations
     ax = PolarAxis(
-        f[1, 1],
+        f[2, 1],
         backgroundcolor = :black,
         rminorgridvisible = true, rminorgridcolor = :red,
         rminorgridwidth = 1.0, rminorgridstyle = :dash,
@@ -278,6 +269,15 @@ end
         thetaticks = ([0, π/2, π, 3π/2], ["A", "B", "C", rich("D", color = :orange)]), # https://github.com/MakieOrg/Makie.jl/issues/3583
         rticks = ([0.0, 2.5, 5.0, 7.5, 10.0], ["0.0", "2.5", "5.0", "7.5", rich("10.0", color = :orange)])
     )
+
+    # tests: surface, grid layering, hidedecorations!() effect on spacing
+    ax = PolarAxis(f[2, 2], gridz = 1, backgroundcolor = :lightblue)
+    hidedecorations!(ax)
+    ax.rgridvisible[] = true
+    ax.thetagridvisible[] = true
+    zs = [r*cos(phi) for phi in range(0, 4pi, length=100), r in range(1, 2, length=100)]
+    p = surface!(ax, 0..2pi, 0..10, zeros(size(zs)), color = zs, shading = NoShading, colormap = :coolwarm, colorrange=(-2, 2))
+    rlims!(ax, 0, 11) # verify that r = 10 doesn't end up at r > 10
     f
 end
 

ReferenceTests/src/tests/primitives.jl

@@ -790,6 +790,7 @@ end
     cs = [:white, :red, :green, :blue, :black, :orange, :cyan, :magenta]
     voxels(fig[1, 1], chunk, color = cs, axis=(show_axis = false,))
     a, p = voxels(fig[1, 2], Float32.(chunk), colormap = [:red, :blue], is_air = x -> x == 0.0, axis=(show_axis = false,))
+    Makie.rotate!(p, Vec3f(1,2,3), 0.8)
     fig
 end
 
@@ -1160,3 +1161,22 @@ end
 
     fig
 end
+
+@reference_test "Scatter fonts" begin
+    scene = Scene(size = (150, 150), camera = campixel!)
+
+    # Just needs to not be Fira Mona here, but good to test the default too
+    @test Makie.to_font(Makie.automatic) == Makie.to_font("TeX Gyre Heros Makie")
+
+    scatter!(scene, (40,  40), marker=Rect, markersize=45, color = :black, strokecolor = :red, strokewidth = 1)
+    scatter!(scene, (40,  40), marker='◇', markersize=45, color = :white)
+    scatter!(scene, (110, 40), marker=Rect, markersize=45, color = :green, strokecolor = :red, strokewidth = 1)
+    text!(scene,    (110, 40), text = "◇", fontsize = 45, align = (:center, :center), color = :white)
+
+    scatter!(scene, (40,  110), marker=Rect, font = "Fira Mono", markersize=45, color = :black, strokecolor = :red, strokewidth = 1)
+    scatter!(scene, (40,  110), marker='◇',  font = "Fira Mono", markersize=45, color = :white)
+    scatter!(scene, (110, 110), marker=Rect, font = "Fira Mono", markersize=45, color = :green, strokecolor = :red, strokewidth = 1)
+    text!(scene,    (110, 110), text = "◇",  font = "Fira Mono", fontsize = 45, align = (:center, :center), color = :white)
+
+    scene
+end