Fix aspect & limits handling for 2D Makie plots

Aspect handling now appears to be similar to pyplot.

Project.toml

@@ -1,7 +1,7 @@
 name = "GridVisualize"
 uuid = "5eed8a63-0fb0-45eb-886d-8d5a387d12b8"
 authors = ["Juergen Fuhrmann <[email protected]>"]
-version = "1.1.1"
+version = "1.1.2"
 
 [deps]
 ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4"

src/dispatch.jl

@@ -322,7 +322,7 @@ function default_plot_kwargs()
         :color => Pair((0.0, 0.0, 0.0), "1D plot line color"),
         :cellwise => Pair(false, "1D plots cellwise; unmaintained and can be slow)"),
         :label => Pair("", "1D plot label"),
-        :levels => Pair(5, "array of isolevels or number of isolevels for contour plots"),
+        :levels => Pair(7, "array of isolevels or number of isolevels for contour plots"),
         :elevation => Pair(0.0, "2D plot height factor for elevation"),
         :colorlevels => Pair(51, "2D/3D contour plot: number of color levels"),
         :colormap => Pair(

src/makie.jl

@@ -761,23 +761,43 @@ function scalarplot!(ctx, TP::Type{MakieType}, ::Type{Val{2}}, grids, parentgrid
     if !haskey(ctx, :contourplot)
         if !haskey(ctx, :scene)
             coord = parentgrid[Coordinates]
-            ex = extrema(coord; dims = (2))
-            data_aspect = (ex[2][2] - ex[2][1]) / (ex[1][2] - ex[1][1])
-            makie_aspect = 1.0 / (data_aspect * ctx[:aspect])
+            #            ex = extrema(coord; dims = (2))
+
+            aspect = nothing
+            autolimitaspect = nothing
+            if ctx[:aspect] == 1.0
+                aspect = XMakie.DataAspect()
+            else
+                autolimitaspect = ctx[:aspect]
+            end
             if ctx[:elevation] ≈ 0
                 ctx[:scene] = XMakie.Axis(
                     ctx[:figure];
                     title = map(data -> data.t, ctx[:contourdata]),
-                    aspect = makie_aspect,
+                    aspect = aspect,
+                    autolimitaspect = autolimitaspect,
                     scenekwargs(ctx)...,
                 )
             else
                 ctx[:scene] = XMakie.Axis3(
                     ctx[:figure];
                     title = map(data -> data.t, ctx[:contourdata]),
+                    aspect = aspect,
+                    autolimitaspect = autolimitaspect,
                     scenekwargs(ctx)...,
                 )
             end
+
+            xlimits = ctx[:xlimits]
+            ylimits = ctx[:ylimits]
+            if xlimits[1] < xlimits[2]
+                XMakie.xlims!(ctx[:scene], xlimits...)
+            end
+            if ylimits[1] < ylimits[2]
+                XMakie.ylims!(ctx[:scene], ylimits...)
+            end
+
+
         end
 
         # Draw the mesh for the cells