Merge branch 'master' into gap

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## [Unreleased]
 
 - `boundingbox` now relies on `apply_transform(transform, data_limits(plot))` rather than transforming the corner points of the bounding box [#3856](https://github.com/MakieOrg/Makie.jl/pull/3856)
+- Adjusted `Axis` limits to consider transformations more consistently [#3864](https://github.com/MakieOrg/Makie.jl/pull/3864)
 
 ## [0.21.0] - 2024-05-08
 

ReferenceTests/src/tests/examples2d.jl

@@ -1157,10 +1157,10 @@ end
 
     fig = Figure(size = (600, 600))
     # Create a recipe plot
-    ax, plot_top = heatmap(fig[1, 1], randn(10, 10))
+    ax, plot_top = heatmap(fig[1, 1], randn(10, 10), colormap = [:transparent])
     # Plot some recipes at the level below the contour
-    scatterlineplot_1 = scatterlines!(plot_top, 1:10, 1:10; linewidth = 20, markersize = 20, color = :red)
-    scatterlineplot_2 = scatterlines!(plot_top, 1:10, 1:10; linewidth = 20, markersize = 30, color = :blue)
+    scatterlineplot_1 = scatterlines!(ax, 1:10, 1:10; linewidth = 20, markersize = 20, color = :red)
+    scatterlineplot_2 = scatterlines!(ax, 1:10, 1:10; linewidth = 20, markersize = 30, color = :blue)
     # Translate the lowest level plots (scatters)
     translate!(scatterlineplot_1.plots[2], 0, 0, 1)
     translate!(scatterlineplot_2.plots[2], 0, 0, -1)

ReferenceTests/src/tests/figures_and_makielayout.jl

@@ -327,3 +327,16 @@ end
     fig
 end
 
+@reference_test "Axis limits with translation, scaling and transform_func" begin
+    f = Figure()
+    a = Axis(f[1,1], xscale = log10, yscale = log10)
+    ps = Point2f.([0.1, 0.1, 1000, 1000], [1, 100, 1, 100])
+    hl = linesegments!(a, ps[[1, 3, 2, 4]], color = :red)
+    vl = linesegments!(a, ps, color = :blue)
+    # translation happens before scale! here because scale! acts on scene and
+    # translate! acts on the plot (these are combined by matmult)
+    scale!(a.scene, 0.5, 2, 1.0)
+    translate!(hl, 0, 1, 0)
+    translate!(vl, 1, 0, 0)
+    f
+end

src/makielayout/blocks/axis.jl

@@ -80,7 +80,6 @@ function update_axis_camera(scene::Scene, t, lims, xrev::Bool, yrev::Bool)
     tlims = Makie.apply_transform(t, lims)
     camera = scene.camera
 
-    # TODO: apply model
     update_limits!(scene.float32convert, tlims) # update float32 scaling
     lims32 = f32_convert(scene.float32convert, tlims)  # get scaled limits
     left, bottom = minimum(lims32)
@@ -853,33 +852,31 @@ function getlimits(la::Axis, dim)
         return !to_value(get(plot, :visible, true))
     end
 
-    # TODO:
-    # We used to include scale! and rotate! in data_limits. For compat we include
-    # them here again until we implement a full solution
-
-    # # get all data limits, minus the excluded plots
-    # boundingbox = Makie.data_limits(la.scene, exclude)
-    bb_ref = Base.RefValue(Rect3d())
-    for plot in la.scene
-        if !exclude(plot)
-            bb = data_limits(plot)
-            # Limits can be one dimensional (partially NaN) e.g. for hlines
-            # which results in every model * point to become NaN. For now we skip
-            # model application if the model matrix is identity to avoid this...
-            model = plot.model[][Vec(1,2,3), Vec(1,2,3)]
-            if !(model ≈ I)
-                bb = Rect3d(map(p -> model * to_ndim(Point3d, p, 0), coordinates(bb)))
-            end
-            update_boundingbox!(bb_ref, bb)
+    # get all data limits, minus the excluded plots
+    tf = la.scene.transformation.transform_func[]
+    itf = inverse_transform(tf)
+    if itf === nothing
+        @warn "Axis transformation $tf does not define an `inverse_transform()`. This may result in a bad choice of limits due to model transformations being ignored." maxlog = 1
+        bb = data_limits(la.scene, exclude)
+    else
+        # get limits with transform_func and model applied
+        bb = boundingbox(la.scene, exclude)
+        # then undo transform_func so that ticks can handle transform_func
+        # without ignoring translations, scaling or rotations from model
+        try
+            bb = apply_transform(itf, bb)
+        catch e
+            # TODO: Is this necessary?
+            @warn "Failed to apply inverse transform $itf to bounding box $bb. Falling back on data_limits()." exception = e
+            bb = data_limits(la.scene, exclude)
         end
     end
-    boundingbox = bb_ref[]
 
     # if there are no bboxes remaining, `nothing` signals that no limits could be determined
-    isfinite_rect(boundingbox, dim) || return nothing
+    isfinite_rect(bb, dim) || return nothing
 
     # otherwise start with the first box
-    mini, maxi = minimum(boundingbox), maximum(boundingbox)
+    mini, maxi = minimum(bb), maximum(bb)
     return (mini[dim], maxi[dim])
 end