Fix Makie new API

Author: islent

Project.toml

@@ -6,7 +6,6 @@ version = "0.1.0"
 [deps]
 AstroIO = "c85a633c-0c3f-44a2-bffe-7f9d0681b3e7"
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
-CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
@@ -35,13 +34,12 @@ VideoIO = "d6d074c3-1acf-5d4c-9a43-ef38773959a2"
 [compat]
 AstroIO = "0.1"
 CSV = "0.9"
-CairoMakie = "0.6"
 ColorSchemes = "3"
 Colors = "0.12"
 DataFrames = "1"
 DocStringExtensions = "0.8"
 FileIO = "1"
-GLMakie = "0.4"
+GLMakie = "0.5"
 Images = "0.25"
 LaTeXStrings = "1"
 LoopVectorization = "0.12"

docs/src/lib/Methods.md

@@ -28,7 +28,7 @@ plot_makie!
 plot_peano
 ```
 
-## CairoMakie
+## GLMakie
 
 ```@docs
 projection

docs/src/manual/analyse.md

@@ -2,29 +2,24 @@
 
 ```@example analysis
 using AstroPlot
-scene, layout = plot_profiling("profiling.csv")
-scene
+fig = plot_profiling("profiling.csv")
 ```
 
 ```@example analysis
-scene, layout = plot_energy("energy.csv")
-scene
+fig = plot_energy("energy.csv")
 ```
 
 ```@example analysis
-scene, layout = plot_energy_delta("energy.csv")
-scene
+fig = plot_energy_delta("energy.csv")
 ```
 
 ```@example analysis
 using AstroIO
 header, data = read_gadget2("plummer/snapshot_0000.gadget2", uAstro, uGadget2)
 
-scene, layout = plot_densitycurve(data)
-scene
+fig = plot_densitycurve(data)
 ```
 
 ```@example analysis
-scene, layout = plot_rotationcurve(data)
-scene
+fig = plot_rotationcurve(data)
 ```

docs/src/manual/mesh.md

@@ -7,7 +7,7 @@ using PhysicalMeshes
 using AstroPlot
 
 c = Cube(PVector(0.0,0.0,0.0), PVector(1.0,1.0,1.0))
-scene = plot_makie(c, nothing)
+fig = plot_makie(c, nothing)
 ```
 
 ## Static Cartesian Mesh

docs/src/manual/snapshots.md

@@ -10,20 +10,19 @@ plot_positionslice("mosaic/", "snapshot_", collect(0:100), ".gadget2", gadget2()
 ```
 
 ```@example snapshots
-scene, layout = plot_trajectory(
+fig = plot_trajectory(
     "plummer/", "snapshot_", collect(0:20:200), [1,2,3], ".gadget2", gadget2(),
 )
-scene
 ```
 
 ```@example snapshots
-ScaleScene, ScaleLayout, LagrangeScene, LagrangeLayout, df = plot_radii(
+FigScale, FigLagrange, df = plot_radii(
     "plummer/", "snapshot_", collect(0:20:200), ".gadget2", gadget2(),
     times = collect(0.0:0.01:0.1) * u"Gyr", title = "Direct Sum const",
 )
-ScaleScene
+FigScale
 ```
 
 ```@example snapshots
-LagrangeScene
+FigLagrange
 ```

src/AstroPlot.jl

@@ -10,7 +10,6 @@ using ProgressMeter
 using DataFrames
 using CSV
 using GLMakie
-using CairoMakie
 using Colors
 using ColorSchemes
 using DocStringExtensions

src/PhysicalParticles.jl

@@ -12,7 +12,8 @@ function estimate_markersize(data, u; xaxis = :x, yaxis = :y)
     xMin = getfield(e, Symbol(string(xaxis) * "Min"))
     yMax = getfield(e, Symbol(string(yaxis) * "Max"))
     yMin = getfield(e, Symbol(string(yaxis) * "Min"))
-    return estimate_markersize(ustrip(u*u, (xMax - xMin) * (yMax - yMin)))
+    u2 = isnothing(u) ? nothing : u*u
+    return estimate_markersize(ustrip(u2, (xMax - xMin) * (yMax - yMin)))
 end
 
 """
@@ -75,46 +76,50 @@ Plot `scatter` data points (in interactive mode)
 
 ```julia
 d = randn_pvector(50)
-plot_makie!(scene, d, nothing)
+plot_makie!(fig, d, nothing)
 
 d = randn_pvector(50, u"km")
-plot_makie!(scene, d, u"m")
+plot_makie!(fig, d, u"m")
 ```
 """
-function plot_makie!(scene, data::Array{T,1}, u::Union{Nothing, Unitful.FreeUnits} = u"kpc";
+function plot_makie!(fig, data::Array{T,1}, u::Union{Nothing, Unitful.FreeUnits} = u"kpc";
     markersize = estimate_markersize(data, u),
     markerspace=SceneSpace,
     resolution = (1000, 1000),
     kw...
 ) where T<:PVector
     d = [point3(ustrip(u, p)) for p in data]
-    Makie.scatter!(scene, d; markersize, markerspace, figure = (resolution = resolution,), kw...)
+    Makie.scatter!(fig, d; markersize, markerspace, figure = (resolution = resolution,), kw...)
 end
 
-function plot_makie!(scene, data::Array{T,1}, u::Union{Nothing, Unitful.FreeUnits} = u"kpc";
+function plot_makie!(fig, data::Array{T,1}, u::Union{Nothing, Unitful.FreeUnits} = u"kpc";
     markersize = estimate_markersize(data, u),
     markerspace=SceneSpace,
     resolution = (1000, 1000),
     kw...
 ) where T<:AbstractParticle3D
     d = [point3(ustrip(u, p.Pos)) for p in data]
-    Makie.scatter!(scene, d; markersize, markerspace, figure = (resolution = resolution,), kw...)
+    Makie.scatter!(fig, d; markersize, markerspace, figure = (resolution = resolution,), kw...)
 end
 
-function plot_makie!(scene, data::StructArray{T,N,NT,Tu}, u::Union{Nothing, Unitful.FreeUnits} = u"kpc"; kw...) where T<:AbstractParticle3D where N where NT where Tu
-    plot_makie!(scene, data.Pos, u; kw...)
+function plot_makie!(fig, data::StructArray{T,N,NT,Tu}, u::Union{Nothing, Unitful.FreeUnits} = u"kpc"; kw...) where T<:AbstractParticle3D where N where NT where Tu
+    plot_makie!(fig, data.Pos, u; kw...)
 end
 
-function plot_makie!(scene, data::Union{Array{T,N}, StructArray{T,N,NT,Tu}}, collection::Collection, u::Union{Nothing, Unitful.FreeUnits} = u"kpc"; kw...) where T<:AbstractParticle3D where N where NT where Tu
+function plot_makie!(fig, data::Union{Array{T,N}, StructArray{T,N,NT,Tu}}, collection::Collection, u::Union{Nothing, Unitful.FreeUnits} = u"kpc"; kw...) where T<:AbstractParticle3D where N where NT where Tu
     d = filter(p->p.Collection == collection, data)
     if isempty(d)
         @warn "No $collection particle found."
         return nothing
     else
-        plot_makie!(scene, d, u; kw...)
+        plot_makie!(fig, d, u; kw...)
     end
 end
 
+function plot_makie!(fig, data::StructArray{T,N,NT,Tu}, u::Union{Nothing, Unitful.FreeUnits} = u"kpc"; kw...) where T<:AbstractPoint3D where N where NT where Tu
+    plot_makie!(fig, Array(data), u; kw...)
+end
+
 """
 $(TYPEDSIGNATURES)
 Scatter plot of points or particles in REPL

src/analyse/density.jl

@@ -83,8 +83,8 @@ function plot_densitycurve(data, units = uAstro;
                            savefolder = pwd(),
                            resolution = (1600, 900),
                            kw...)
-    scene, layout = layoutscene(; resolution)
-    ax = layout[1,1] = GLMakie.Axis(scene; xlabel, ylabel, title)
+    fig = Figure(; resolution)
+    ax = GLMakie.Axis(fig[1,1]; xlabel, ylabel, title)
     plot_densitycurve!(ax, data, units;  savelog, savefolder, kw...)
-    return scene, layout
+    return fig
 end

src/analyse/energy.jl

@@ -43,10 +43,10 @@ function plot_energy_kinetic(df::DataFrame;
                      ylabel = "E [$uEnergy]",
                      resolution = (1600, 900),
                      kw...)
-    scene, layout = layoutscene(; resolution)
-    ax = layout[1,1] = GLMakie.Axis(scene; xlabel, ylabel, title)
+    fig = Figure(; resolution)
+    ax = GLMakie.Axis(fig[1,1]; xlabel, ylabel, title)
     plot_energy_kinetic!(ax, df; kw...)
-    return scene, layout, df
+    return fig, df
 end
 
 """
@@ -76,10 +76,10 @@ function plot_energy_potential(df::DataFrame;
                      ylabel = "E [$uEnergy]",
                      resolution = (1600, 900),
                      kw...)
-    scene, layout = layoutscene(; resolution)
-    ax = layout[1,1] = GLMakie.Axis(scene; xlabel, ylabel, title)
+    fig = Figure(; resolution)
+    ax = GLMakie.Axis(fig[1,1]; xlabel, ylabel, title)
     plot_energy_potential!(ax, df; kw...)
-    return scene, layout, df
+    return fig, df
 end
 
 """
@@ -122,8 +122,8 @@ function plot_energy(df::DataFrame;
                      valign = :top,
                      margin = (10, 10, 10, 10),
                      kw...)
-    scene, layout = layoutscene(; resolution)
-    ax = layout[1,1] = GLMakie.Axis(scene; xlabel, ylabel, title)
+    fig = Figure(; resolution)
+    ax = GLMakie.Axis(fig[1,1]; xlabel, ylabel, title)
 
     if !hasproperty(df, :energy) && hasproperty(df, :potential) && hasproperty(df, :kinetic)
         df.energy = df.potential + df.kinetic
@@ -158,12 +158,12 @@ function plot_energy(df::DataFrame;
     end
 
     if length(p) > 1
-        leg = layout[1,1] = Legend(scene, p, names;
+        leg = Legend(fig[1,1], p, names;
             tellheight, tellwidth, halign, valign, margin,
         )
     end
 
-    return scene, layout, df
+    return fig, df
 end
 
 """
@@ -240,10 +240,10 @@ function plot_energy_delta(df::DataFrame;
                            ylabel = "dE$(axisunit(uEnergy))",
                            resolution = (1600, 900),
                            kw...)
-    scene, layout = layoutscene(; resolution)
-    ax = layout[1,1] = GLMakie.Axis(scene; xlabel, ylabel, title)
+    fig = Figure(; resolution)
+    ax = GLMakie.Axis(fig[1,1]; xlabel, ylabel, title)
     plot_energy_delta!(ax, df; kw...)
-    return scene, layout, df
+    return fig, df
 end
 
 """
@@ -304,7 +304,6 @@ end
 """
 $(TYPEDSIGNATURES)
 Compute kinetic energy and sum potential energy of particles in each snapshot.
-Return a Tuple of `scene` and `layout`
 
 ## Arguments
 $_common_argument_snapshot

src/analyse/force.jl

@@ -87,8 +87,8 @@ function plot_force(data, units = uAstro;
         title = "Force" * ts,
         kw...
     )
-    scene, layout = layoutscene(; resolution)
-    ax = layout[1,1] = GLMakie.Axis(scene; xlabel, ylabel, title)
+    fig = Figure(; resolution)
+    ax = GLMakie.Axis(fig[1,1]; xlabel, ylabel, title)
     plot_force!(ax, data, units; savelog, savefolder, markersize, kw...)
-    return scene, layout
+    return fig
 end