mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

conserve extra_kwargs

Browse Source
This commit is contained in:
Simon Christ 2020-07-31 14:32:51 +02:00 committed by GitHub
parent 5673ced5d7
commit a842ebe599
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/backends/pgfplotsx.jl
View File

@ -83,17 +83,17 @@ function Base.push!(pgfx_plot::PGFPlotsXPlot, item)
push!(pgfx_plot.the_plot, item) push!(pgfx_plot.the_plot, item)
end end
function pgfx_split_extra_opts(extra)
return (get(extra, :add, nothing), filter( x-> first(x) != :add, extra))
end
function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend}) function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
if !pgfx_plot.is_created || pgfx_plot.was_shown if !pgfx_plot.is_created || pgfx_plot.was_shown
pgfx_sanitize_plot!(plt) pgfx_sanitize_plot!(plt)
# extract extra kwargs # extract extra kwargs
extra_plot_opt = plt[:extra_plot_kwargs] extra_plot, extra_plot_opt = pgfx_split_extra_opts(plt[:extra_plot_kwargs])
extra_plot = nothing
if haskey(extra_plot_opt, :add)
extra_plot = wraptuple(pop!(extra_plot_opt,:add))
end
the_plot = PGFPlotsX.TikzPicture(PGFPlotsX.Options(extra_plot_opt...)) the_plot = PGFPlotsX.TikzPicture(PGFPlotsX.Options(extra_plot_opt...))
if extra_plot !== nothing if extra_plot !== nothing
extra_plot = wraptuple(extra_plot)
push!(the_plot, extra_plot...) push!(the_plot, extra_plot...)
end end
bgc = plt.attr[:background_color_outside] == :match ? bgc = plt.attr[:background_color_outside] == :match ?
@ -249,13 +249,10 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
else else
PGFPlotsX.Axis PGFPlotsX.Axis
end end
extra_sp_opt = sp[:extra_kwargs] extra_sp, extra_sp_opt = pgfx_split_extra_opts(sp[:extra_kwargs])
extra_sp = nothing
if haskey(extra_sp_opt, :add)
extra_sp = wraptuple(pop!(extra_sp_opt,:add))
end
axis = axisf(merge(axis_opt, PGFPlotsX.Options(extra_sp_opt...))) axis = axisf(merge(axis_opt, PGFPlotsX.Options(extra_sp_opt...)))
if extra_sp !== nothing if extra_sp !== nothing
extra_sp = wraptuple(extra_sp_opt)
push!(axis, extra_sp...) push!(axis, extra_sp...)
end end
if sp[:legendtitle] !== nothing if sp[:legendtitle] !== nothing
@ -279,11 +276,7 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
"color" => single_color(opt[:linecolor]), "color" => single_color(opt[:linecolor]),
"name path" => string(series_id), "name path" => string(series_id),
) )
extra_series_opt = series[:extra_kwargs] extra_series, extra_series_opt = pgfx_split_extra_opts(series[:extra_kwargs])
extra_series = nothing
if haskey(extra_series_opt, :add)
extra_series = wraptuple(pop!(extra_series_opt,:add))
end
series_opt = merge(series_opt, PGFPlotsX.Options(extra_series_opt...)) series_opt = merge(series_opt, PGFPlotsX.Options(extra_series_opt...))
if RecipesPipeline.is3d(series) || st in (:heatmap, :contour) if RecipesPipeline.is3d(series) || st in (:heatmap, :contour)
series_func = PGFPlotsX.Plot3 series_func = PGFPlotsX.Plot3
@ -376,6 +369,7 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
segment_plot = segment_plot =
series_func(merge(series_opt, segment_opt), coordinates) series_func(merge(series_opt, segment_opt), coordinates)
if extra_series !== nothing if extra_series !== nothing
extra_series = wraptuple(extra_series)
push!(segment_plot, extra_series...) push!(segment_plot, extra_series...)
end end
push!(axis, segment_plot) push!(axis, segment_plot)