Merge pull request #223 from MakieOrg/hw/makie0.24

[WIP] compat with makie 0.24

Author: hexaeder

NEWS.md

@@ -0,0 +1,17 @@
+# NEWS
+
+## Breaking Changes
+
+### Version 0.6.0 (Makie 0.24 Compatibility)
+
+**Breaking Changes:**
+- **Removed `edge_plottype` parameter**: The `edge_plottype` argument has been removed from `graphplot`. Edge plotting is now handled automatically with improved performance - curved edges (BezierPaths) are now rendered as efficiently as straight edges using a unified plotting system.
+
+**New Features:**
+- **Added `edge_linestyle` parameter**: New parameter to control line styles for individual edges. Supports vectors and dictionaries for per-edge customization. 
+  *Performance note*: The new unified edge system maintains optimal performance for both straight and curved edges when using homogeneous linestyles. Only when using different linestyles for different edges (inhomogeneous) does the system fall back to creating separate line plots for each edge, which may reduce performance for graphs with many edges.
+
+**Internal Changes:**
+- Refactored reactive system to use `map!` instead of `@lift` macros for better performance and Makie 0.24 compatibility
+- Unified edge plotting system replaces separate `linesegments` and `beziersegments` approaches
+- Improved interaction system with updated selection handling

Project.toml

@@ -1,7 +1,7 @@
 name = "GraphMakie"
 uuid = "1ecd5474-83a3-4783-bb4f-06765db800d2"
 authors = ["Simon Danisch", "Hans Würfel"]
-version = "0.5.15"
+version = "0.6.0"
 
 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -15,13 +15,13 @@ SimpleTraits = "699a6c99-e7fa-54fc-8d76-47d257e15c1d"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 
 [compat]
-CairoMakie = "0.14"
+CairoMakie = "0.15"
 DataStructures = "0.17, 0.18"
 FileIO = "1"
 GeometryBasics = "0.5"
 Graphs = "1.4"
 Literate = "2"
-Makie = "0.23"
+Makie = "0.24.3"
 NetworkLayout = "0.4.9"
 PolynomialRoots = "1"
 ReferenceTests = "0.10"

assets/reftests.jl-10.png

@@ -8,7 +8,6 @@ DecisionTree = "7806a523-6efd-50cb-b5f6-3fa6f1930dbb"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 GraphMakie = "1ecd5474-83a3-4783-bb4f-06765db800d2"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
-JSServe = "824d6782-a2ef-11e9-3a09-e5662e0c26f9"
 LayeredLayouts = "f4a74d36-062a-4d48-97cd-1356bad1de4e"
 Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
 MLJ = "add582a8-e3ab-11e8-2d5e-e98b27df1bc7"
@@ -21,21 +20,20 @@ StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
 WGLMakie = "276b4fcb-3e11-5398-bf8b-a0c2d153d008"
 
 [compat]
-CairoMakie = "0.14"
+CairoMakie = "0.15"
 Cbc = "1"
 DataStructures = "0.18"
 DecisionTree = "0.12"
 Documenter = "1"
 GraphMakie = ">= 0.1"
 Graphs = "1"
-JSServe = "2"
 LayeredLayouts = "0.2"
 Literate = "2"
 MLJ = "0.20"
-Makie = "0.23"
+Makie = "0.24"
 NetworkDynamics = "0.9"
 NetworkLayout = "0.4.7"
 OrdinaryDiffEqTsit5 = "1"
 RegistryInstances = "0.1"
 StableRNGs = "1"
-WGLMakie = "0.12"
+WGLMakie = "0.13"

assets/scenegraph.jl-01.png

@@ -21,7 +21,7 @@ ax.aspect = DataAspect()
 The `graphplot` command is a recipe which wraps several steps
 - layout the graph in space using a layout function,
 - create a `scatter` plot for the nodes and
-- create a `linesegments` plot for the edges.
+- create a `lines` plot for the edges.
 
 The default layout is `Spring()` from
 [`NetworkLayout.jl`](https://github.com/JuliaGraphs/NetworkLayout.jl). The
@@ -62,7 +62,7 @@ p.layout = fixed_layout; autolimits!(ax)
 ## change edge width & color
 p.edge_width = 5.0
 p.edge_color[][3] = :green;
-p.edge_color = p.edge_color[] # trigger observable
+p.edge_color[] = p.edge_color[] # trigger observable
 @save_reference f #hide
 
 #=
@@ -316,12 +316,9 @@ f, ax, p = graphplot(g; layout=Spring(dim=3, seed=5),
 @save_reference f #hide
 
 #=
-Using [`JSServe.jl`](https://github.com/SimonDanisch/JSServe.jl) and [`WGLMakie.jl`](https://github.com/MakieOrg/Makie.jl/tree/master/WGLMakie)
+Using [`WGLMakie.jl`](https://github.com/MakieOrg/Makie.jl/tree/master/WGLMakie)
 we can also add some interactivity:
 =#
-using JSServe #md
-Page(exportable=true, offline=true) #md
-#
 using WGLMakie #md
 WGLMakie.activate!() #md
 set_theme!(size=(800, 600)) #md

docs/Project.toml

@@ -114,22 +114,19 @@ autolimits!(ax); hidedecorations!(ax); hidespines!(ax); ylims!(-5,1)
 fig = Figure()
 graphplot(fig[1,1],
           DiGraph([Edge(1 => 2), Edge(2 => 3)]),
-          edge_attr = (; linestyle = [:dot, :dash]),
-          edge_plottype = :beziersegments,
+          edge_linestyle = [:dot, :dash],
           )
 hidedecorations!(current_axis())
 
 graphplot(fig[1,2],
           DiGraph([Edge(1 => 2), Edge(2 => 1)]),
-          edge_attr = (; linestyle = [:dot, :dash]),
-          edge_plottype = :beziersegments,
+          edge_linestyle = [:dot, :dash],
           )
 hidedecorations!(current_axis())
 
 graphplot(fig[2,1], layout=Stress(),
           DiGraph([Edge(1 => 2), Edge(2 => 3), Edge(3=>4), Edge(4=>1)]),
-          edge_attr = (; linestyle = Linestyle([0.5, 1.0, 1.5, 2.5])),
-          edge_plottype = :beziersegments,
+          edge_linestyle = Linestyle([0.5, 1.0, 1.5, 2.5]),
           )
 hidedecorations!(current_axis())
 fig
@@ -159,15 +156,15 @@ hidedecorations!(ax)
 @save_reference fig
 
 p.node_size[][1] = 40
-notify(p.node_size)
+p.node_size[] = p.node_size[]
 @save_reference fig
 
 p.arrow_size[][3] = 40
-notify(p.arrow_size)
+p.arrow_size[] = p.arrow_size[]
 @save_reference fig
 
 p.node_pos[][1] = (0,0)
-notify(p.node_pos)
+p.node_pos[] = p.node_pos[]
 @save_reference fig
 
 # test large nodes
@@ -200,9 +197,9 @@ hidedecorations!(ax)
 @save_reference fig
 
 # Update observables
-p[:ilabels][][1] = "1111"
 p.node_size[] = DefaultDict(Makie.automatic, Dict{Int, Any}(2=>100))
-notify(p[:ilabels])
+p[:ilabels][][1] = "1111"
+p[:ilabels][] = p[:ilabels][]
 @save_reference fig
 
 p[:ilabels_fontsize][] = 10

docs/examples/plots.jl

@@ -154,7 +154,7 @@ record(fig, "truss.mp4", trange; framerate=fps) do t
     for i in eachindex(pos0)
         p[:node_pos][][i] = (s_at_t.v[i, :x], s_at_t.v[i, :y])
     end
-    notify(p[:node_pos])
+    p[:node_pos][] = p[:node_pos][]
     load = s_at_t.e[:, :Fabs]
     p.edge_color[] = load
     p.elabels = [@sprintf("%.0f", l) for l in load]

docs/examples/reftests.jl

@@ -4,7 +4,6 @@ using Literate
 using CairoMakie
 
 # preload the deps from the examples to supress precompilation output in docs
-using JSServe
 using NetworkDynamics
 using LayeredLayouts
 using Graphs

docs/examples/truss.jl

@@ -3,6 +3,7 @@ module GraphMakie
 using NetworkLayout
 using Graphs
 using Makie
+using Makie: add_input!, add_constant!
 using LinearAlgebra
 using SimpleTraits