port to Gaston v2

Author: t-bltg

PlotsBase/Project.toml

@@ -1,6 +1,6 @@
 name = "PlotsBase"
 uuid = "c52230a3-c5da-43a3-9e85-260fcdfdc737"
-version = "0.1"
+version = "0.1.0"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -12,8 +12,8 @@ FFMPEG = "c87230d0-a227-11e9-1b43-d7ebe4e7570a"
 FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
 JLFzf = "1019f520-868f-41f5-a6de-eb00f4b6a39c"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
 LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
+Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Measures = "442fdcdd-2543-5da2-b0f3-8c86c306513e"
 NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
@@ -38,15 +38,9 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 UnicodeFun = "1cfade01-22cf-5700-b092-accc4b62d6e1"
 Unzip = "41fe7b60-77ed-43a1-b4f0-825fd5a5650d"
 
-[sources]
-PlotThemes = {path = "../PlotThemes"}
-RecipesBase = {path = "../RecipesBase"}
-RecipesPipeline = {path = "../RecipesPipeline"}
-
 [weakdeps]
 FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
 GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
-Gaston = "4b11ee91-296f-5714-9832-002c20994614"
 GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
 HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
 IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a"
@@ -58,6 +52,11 @@ PythonPlot = "274fc56d-3b97-40fa-a1cd-1b4a50311bf9"
 UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
+[sources]
+PlotThemes = {path = "../PlotThemes"}
+RecipesBase = {path = "../RecipesBase"}
+RecipesPipeline = {path = "../RecipesPipeline"}
+
 [extensions]
 FileIOExt = "FileIO"
 GRExt = "GR"
@@ -100,8 +99,8 @@ PrecompileTools = "1"
 Preferences = "1"
 Printf = "1"
 PythonPlot = "1"
-Random = "1"
 REPL = "1"
+Random = "1"
 RecipesBase = "1.3.1"
 RecipesPipeline = "1"
 Reexport = "1"
@@ -111,9 +110,9 @@ SparseArrays = "1"
 Statistics = "1"
 StatsBase = "0.34"
 TableOperations = "1"
+UUIDs = "1"
 UnicodeFun = "0.4"
 UnicodePlots = "3"
 Unitful = "1.25"
 Unzip = "0.2"
-UUIDs = "1"
 julia = "1.10"

PlotsBase/ext/GastonExt.jl

@@ -124,7 +124,7 @@ PlotsBase.should_warn_on_unsupported(::GastonBackend) = false
 
 # create the window/figure for this backend.
 function PlotsBase._create_backend_figure(plt::Plot{GastonBackend})
-    return plt.o = Gaston.figure(nothing; autolayout = false)  # for now all the figures will be kept
+    return plt.o = Gaston.Figure(nothing; autolayout = false)  # for now all the figures will be kept
 end
 
 function PlotsBase._before_layout_calcs(plt::Plot{GastonBackend})
@@ -135,7 +135,8 @@ function PlotsBase._before_layout_calcs(plt::Plot{GastonBackend})
         n, sps = gaston_get_subplots(0, plt.subplots, plt.layout)
     end
 
-    plt.o.multiplot = gaston_init_subplots!(plt, sps)
+    r, c = gaston_init_subplots!(plt, sps)
+    plt.o.multiplot = "layout $r,$c columnsfirst"
 
     # then add the series (curves in gaston)
     foreach(series -> gaston_add_series(plt, series), plt.series_list)
@@ -178,19 +179,14 @@ for (mime, term) in (
     @eval function PlotsBase._show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{GastonBackend})
         term = String($term)
         if plt.o ≢ nothing
-            tmpfile = tempname() * ".$term"
-            ret = Gaston.save(;
-                saveopts = gaston_saveopts(plt),
-                handle = plt.o.handle,
-                output = tmpfile,
-                term,
-            )
+            filename = tempname() * ".$term"
+            ret = Gaston.save(plt.o; filename, term = "$term $(gaston_saveopts(plt))")
             if ret ≡ nothing || ret
-                while !isfile(tmpfile)
+                while !isfile(filename)
                 end  # avoid race condition with read in next line
-                write(io, read(tmpfile))
+                write(io, read(filename))
             end
-            isfile(tmpfile) && rm(tmpfile, force = true)
+            isfile(filename) && rm(filename, force = true)
         end
         return nothing
     end
@@ -264,8 +260,7 @@ function gaston_init_subplot!(
     obj = if sp ≡ nothing
         sp
     else
-        dims =
-            RecipesPipeline.is3d(sp) || sp[:projection] == "3d" || needs_any_3d_axes(sp) ? 3 : 2
+        dims = RecipesPipeline.is3d(sp) || sp[:projection] == "3d" || needs_any_3d_axes(sp) ? 3 : 2
         any_label = false
         for series in series_list(sp)
             if dims == 2 && series[:seriestype] ∈ (:heatmap, :contour)
@@ -274,9 +269,10 @@ function gaston_init_subplot!(
             any_label |= should_add_to_legend(series)
         end
         axesconf = gaston_parse_axes_attrs(plt, sp, dims, any_label)
-        sp.o = Gaston.Plot(; dims, curves = [], axesconf)
+        # sp.o = Gaston.Plot(; dims, curves = [], axesconf)
+        sp.o = Gaston.Axis(axesconf, Gaston.Plot[], dims == 3)
     end
-    push!(plt.o.subplots, obj)
+    push!(plt.o, obj)  # add new Axis ≡ subplot
     return nothing
 end
 
@@ -320,7 +316,7 @@ function gaston_multiplot_pos_size!(dat)
             sp.o ≡ nothing && continue
             # gnuplot screen coordinates: bottom left at 0,0 and top right at 1,1
             gx, gy = x, 1 - y - h
-            sp.o.axesconf = "set origin $gx, $gy; set size $w, $h; " * sp.o.axesconf
+            sp.o.settings = "set origin $gx, $gy; set size $w, $h; " * sp.o.settings
         end
     end
     return nothing
@@ -331,13 +327,12 @@ function gaston_add_series(plt::Plot{GastonBackend}, series::Series)
     (gsp = sp.o) ≡ nothing && return
     x, y, z = series[:x], series[:y], series[:z]
     st = series[:seriestype]
-    curves = Gaston.Curve[]
-    if gsp.dims == 2 && z ≡ nothing
+    if !gsp.is3d && z ≡ nothing
         for (n, seg) in enumerate(series_segments(series, st; check = true))
             i, rng = seg.attr_index, seg.range
             fr = _cycle(series[:fillrange], 1:length(x[rng]))
             for sc in gaston_seriesconf!(sp, series, n == 1, i)
-                push!(curves, Gaston.Curve(x[rng], y[rng], nothing, fr, sc))
+                push!(gsp.plots, Gaston.Plot(x[rng], y[rng], fr, sc))
             end
         end
     else
@@ -367,15 +362,16 @@ function gaston_add_series(plt::Plot{GastonBackend}, series::Series)
             end
         end
         for sc in gaston_seriesconf!(sp, series, true, 1)
-            push!(curves, Gaston.Curve(x, y, z, supp, sc))
+            push!(gsp.plots, Gaston.Plot(x, y, z, supp, sc))
         end
     end
 
-    for c in curves
-        append = length(gsp.curves) > 0
-        push!(gsp.curves, c)
-        Gaston.write_data(c, gsp.dims, gsp.datafile; append)
-    end
+    # Gaston @v1
+    # for c in curves
+    #     append = length(gsp.curves) > 0
+    #     push!(gsp.curves, c)
+    #     Gaston.write_data(c, gsp.dims, gsp.datafile; append)
+    # end
     return nothing
 end