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

clean up pgfx-legends duplications

Browse Source
This commit is contained in:
Simon Christ 2021-05-06 21:27:24 +02:00
parent 8893782b13
commit f355ff9904
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/backends/pgfplotsx.jl
View File

@ -142,7 +142,6 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
axis_opt = PGFPlotsX.Options( axis_opt = PGFPlotsX.Options(
"point meta max" => get_clims(sp)[2], "point meta max" => get_clims(sp)[2],
"point meta min" => get_clims(sp)[1], "point meta min" => get_clims(sp)[1],
"legend cell align" => "left",
"title" => sp[:title], "title" => sp[:title],
"title style" => PGFPlotsX.Options( "title style" => PGFPlotsX.Options(
pgfx_get_title_pos(title_loc)..., pgfx_get_title_pos(title_loc)...,
@ -154,22 +153,7 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
"draw opacity" => title_a, "draw opacity" => title_a,
"rotate" => sp[:titlefontrotation], "rotate" => sp[:titlefontrotation],
), ),
"legend style" => PGFPlotsX.Options( "legend style" => pgfx_get_legend_style(sp),
pgfx_linestyle(
pgfx_thickness_scaling(sp),
sp[:foreground_color_legend],
fg_alpha,
"solid",
) => nothing,
"fill" => cstr,
"fill opacity" => a,
"text opacity" => alpha(plot_color(sp[:legendfontcolor])),
"font" => pgfx_font(
sp[:legendfontsize],
pgfx_thickness_scaling(sp),
),
"text" => plot_color(sp[:legendfontcolor]),
),
"axis background/.style" => PGFPlotsX.Options( "axis background/.style" => PGFPlotsX.Options(
"fill" => bgc_inside, "fill" => bgc_inside,
"opacity" => bgc_inside_a, "opacity" => bgc_inside_a,
@ -183,11 +167,6 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
nothing nothing
sp_height > 0 * mm ? push!(axis_opt, "height" => string(axis_height)) : sp_height > 0 * mm ? push!(axis_opt, "height" => string(axis_height)) :
nothing nothing
# legend position / formatting
push!(axis_opt["legend style"],
pgfx_get_legend_pos(sp[:legend])...
)
merge!(axis_opt["legend style"], pgfx_get_legend_style(sp))
for letter in (:x, :y, :z) for letter in (:x, :y, :z)
if letter != :z || RecipesPipeline.is3d(sp) if letter != :z || RecipesPipeline.is3d(sp)
pgfx_axis!(axis_opt, sp, letter) pgfx_axis!(axis_opt, sp, letter)
@ -805,8 +784,22 @@ end
function pgfx_get_legend_style(sp) function pgfx_get_legend_style(sp)
legfont = legendfont(sp) legfont = legendfont(sp)
PGFPlotsX.Options( PGFPlotsX.Options(
pgfx_linestyle(
pgfx_thickness_scaling(sp),
sp[:foreground_color_legend],
fg_alpha,
"solid",
) => nothing,
"fill" => cstr,
"fill opacity" => a,
"text opacity" => alpha(plot_color(sp[:legendfontcolor])),
"font" => pgfx_font(
sp[:legendfontsize],
pgfx_thickness_scaling(sp),
),
"text" => plot_color(sp[:legendfontcolor]),
"cells" => PGFPlotsX.Options("anchor" => get((left = "west", right = "east", hcenter = "center"), legfont.halign, "west")), "cells" => PGFPlotsX.Options("anchor" => get((left = "west", right = "east", hcenter = "center"), legfont.halign, "west")),
"font" => pgfx_font(legfont.pointsize, pgfx_thickness_scaling(sp)) pgfx_get_legend_pos(sp[:legend])...,
) )
end end