update to Makie 0.23

Author: j-fu

Project.toml

@@ -1,7 +1,7 @@
 name = "GridVisualize"
 uuid = "5eed8a63-0fb0-45eb-886d-8d5a387d12b8"
 authors = ["Juergen Fuhrmann <[email protected]>", "Patrick Jaap <[email protected]>"]
-version = "1.12.0"
+version = "1.13.0"
 
 [deps]
 ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
@@ -30,13 +30,13 @@ WGLMakie = "276b4fcb-3e11-5398-bf8b-a0c2d153d008"
 
 
 [compat]
-CairoMakie = "0.11.3, 0.12, 0.13"
+CairoMakie = "0.11.3, 0.12, 0.13, 0.14, 0.15"
 ColorSchemes = "3"
 Colors = "0.12,0.13,1"
 DocStringExtensions = "0.8,0.9"
 ElasticArrays = "1"
 ExtendableGrids = "1.10"
-GLMakie = "0.9, 0.10, 0.11"
+GLMakie = "0.9, 0.10, 0.11, 0.12, 0.13"
 GeometryBasics = "0.4.1, 0.5"
 GridVisualizeTools = "3"
 HypertextLiteral = "0.9"
@@ -50,7 +50,7 @@ PlutoVista = "0.8.24,1"
 Printf = "1.6"
 PyPlot = "2"
 StaticArrays = "1"
-WGLMakie = "0.10, 0.11"
+WGLMakie = "0.10, 0.11, 0.12, 0.13"
 julia = "1.9"
 
 [extras]

examples/plotting.jl

@@ -184,7 +184,7 @@ end
 # Stream plots are currently only available with PyPlot and Makie
 function plotting_stream2d(; Plotter = default_plotter(), n = 50, kwargs...)
     g, f = vec2d(; n = n)
-    return GridVisualize.streamplot(g, f; Plotter = Plotter, rasterpoints = 100, kwargs...)
+    return GridVisualize.streamplot(g, f; Plotter = Plotter, rasterpoints = 20, kwargs...)
 end
 # ![](plotting_stream2d.png)
 

src/makie.jl

@@ -850,16 +850,28 @@ function vectorplot!(ctx, TP::Type{MakieType}, ::Type{Val{2}}, grid, func)
             )
             add_scene!(ctx, ctx[:scene])
         end
-
-        ctx[:arrowplot] = XMakie.arrows!(
-            ctx[:scene],
-            map(data -> data.qc[1, :], ctx[:arrowdata]),
-            map(data -> data.qc[2, :], ctx[:arrowdata]),
-            map(data -> data.qv[1, :], ctx[:arrowdata]),
-            map(data -> data.qv[2, :], ctx[:arrowdata]);
-            color = :black,
-            linewidth = ctx[:linewidth],
-        )
+        if isdefined(XMakie, :arrows2d!) # Makie >=0.23
+            ctx[:arrowplot] = XMakie.arrows2d!(
+                ctx[:scene],
+                map(data -> data.qc[1, :], ctx[:arrowdata]),
+                map(data -> data.qc[2, :], ctx[:arrowdata]),
+                map(data -> data.qv[1, :], ctx[:arrowdata]),
+                map(data -> data.qv[2, :], ctx[:arrowdata]);
+                color = :black,
+                shaftwidth = ctx[:linewidth],
+                tipwidth = 3 * ctx[:linewidth],
+            )
+        else
+            ctx[:arrowplot] = XMakie.arrows!(
+                ctx[:scene],
+                map(data -> data.qc[1, :], ctx[:arrowdata]),
+                map(data -> data.qc[2, :], ctx[:arrowdata]),
+                map(data -> data.qv[1, :], ctx[:arrowdata]),
+                map(data -> data.qv[2, :], ctx[:arrowdata]);
+                color = :black,
+                linewidth = ctx[:linewidth],
+            )
+        end
         XMakie.reset_limits!(ctx[:scene])
     end
     return reveal(ctx, TP)