CompatHelper: bump compat for Makie in [weakdeps] to 0.24, (keep existing compat) (#2447)

* CompatHelper: bump compat for Makie in [weakdeps] to 0.24, (keep existing compat)

* CompatHelper: bump compat for CairoMakie to 0.15 for package test, (keep existing compat) (#2449)

Co-authored-by: CompatHelper Julia <[email protected]>

* CompatHelper: bump compat for CairoMakie to 0.15 for package docs, (keep existing compat) (#2448)

Co-authored-by: CompatHelper Julia <[email protected]>

* new syntax for connecting observables (#2457)

* Update docs/Project.toml

* Update docs/Project.toml

---------

Co-authored-by: CompatHelper Julia <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Hendrik Ranocha <[email protected]>
Co-authored-by: Benedict <[email protected]>
Co-authored-by: Joshua Lampert <[email protected]>

Author: 5 people

Project.toml

@@ -81,7 +81,7 @@ LinearAlgebra = "1"
 LinearMaps = "2.7, 3.0"
 LoopVectorization = "0.12.171"
 MPI = "0.20.6"
-Makie = "0.21, 0.22, 0.23"
+Makie = "0.21, 0.22, 0.23, 0.24"
 MuladdMacro = "0.2.4"
 NLsolve = "4.5.1"
 Octavian = "0.3.28"

docs/Project.toml

@@ -20,7 +20,7 @@ Trixi2Vtk = "bc1476a1-1ca6-4cc3-950b-c312b255ff95"
 TrixiBase = "9a0f1c46-06d5-4909-a5a3-ce25d3fa3284"
 
 [compat]
-CairoMakie = "0.12, 0.13, 0.14"
+CairoMakie = "0.12, 0.13, 0.14, 0.15"
 Changelog = "1.1"
 Convex = "0.16"
 Documenter = "1.11"

ext/TrixiMakieExt.jl

@@ -216,8 +216,10 @@ function iplot(pd::PlotData2DTriangulated;
     # Create a mesh overlay by plotting a mesh both on top of and below the solution contours.
     wire_points = Makie.@lift(convert_PlotData2D_to_mesh_Points(getindex(pd,
                                                                          variable_names[$(menu.selection)])))
-    wire_mesh_top = Makie.lines!(ax, wire_points, color = :white)
-    wire_mesh_bottom = Makie.lines!(ax, wire_points, color = :white)
+    wire_mesh_top = Makie.lines!(ax, wire_points, color = :white,
+                                 visible = toggle_solution_mesh.active)
+    wire_mesh_bottom = Makie.lines!(ax, wire_points, color = :white,
+                                    visible = toggle_solution_mesh.active)
     Makie.translate!(wire_mesh_top, 0, 0, 1e-3)
     Makie.translate!(wire_mesh_bottom, 0, 0, -1e-3)
 
@@ -232,7 +234,8 @@ function iplot(pd::PlotData2DTriangulated;
         [Makie.Point(point.data[1:2]..., z_offset) for point in wire_points]
     end
     flat_wire_points = Makie.@lift get_flat_points($wire_points, $z_offset)
-    wire_mesh_flat = Makie.lines!(ax, flat_wire_points, color = :black)
+    wire_mesh_flat = Makie.lines!(ax, flat_wire_points, color = :black,
+                                  visible = toggle_mesh.active)
 
     # create a small variation in the extrema to avoid the Makie `range_step` cannot be zero error.
     # see https://github.com/MakieOrg/Makie.jl/issues/931 for more details.
@@ -250,11 +253,6 @@ function iplot(pd::PlotData2DTriangulated;
     Makie.Colorbar(fig[1, 3], limits = Makie.@lift(scaled_extrema($solution_z)),
                    colormap = colormap)
 
-    # This syncs the toggle buttons to the mesh plots.
-    Makie.connect!(wire_mesh_top.visible, toggle_solution_mesh.active)
-    Makie.connect!(wire_mesh_bottom.visible, toggle_solution_mesh.active)
-    Makie.connect!(wire_mesh_flat.visible, toggle_mesh.active)
-
     # On OSX, shift-command-4 for screenshots triggers a constant "up-zoom".
     # To avoid this, we remap up-zoom to the right shift button instead.
     Makie.cameracontrols(ax.scene).controls.up_key = Makie.Keyboard.right_shift

test/Project.toml

@@ -31,7 +31,7 @@ TrixiTest = "0a316866-cbd0-4425-8bcb-08103b2c1f26"
 [compat]
 ADTypes = "1.11"
 Aqua = "0.8"
-CairoMakie = "0.12, 0.13, 0.14"
+CairoMakie = "0.12, 0.13, 0.14, 0.15"
 Convex = "0.16"
 DelimitedFiles = "1"
 DoubleFloats = "1.4.0"