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

reproduce 3D docs plot

Browse Source
This commit is contained in:
Simon Christ 2019-11-19 14:47:54 +01:00
parent 2d100d8261
commit 1a751c7bae
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/backends/pgfplotsx.jl
View File

@ -1,3 +1,5 @@
PGFPlotsX.print_tex(io::IO, data::Symbol) = PGFPlotsX.print_tex(io, string(data))
const _pgfplotsx_linestyles = KW( const _pgfplotsx_linestyles = KW(
:solid => "solid", :solid => "solid",
:dash => "dashed", :dash => "dashed",
@ -445,10 +447,6 @@ function _update_plot_object(plt::Plot{PGFPlotsXBackend})
empty!(PGFPlotsX.CUSTOM_PREAMBLE) empty!(PGFPlotsX.CUSTOM_PREAMBLE)
for sp in plt.subplots for sp in plt.subplots
bb = bbox(sp) bb = bbox(sp)
legpos = sp[:legend]
if haskey(_pgfplotsx_legend_pos, legpos)
legpos = _pgfplotsx_legend_pos[legpos]
end
cstr = plot_color(sp[:background_color_legend]) cstr = plot_color(sp[:background_color_legend])
a = alpha(cstr) a = alpha(cstr)
title_cstr = plot_color(sp[:titlefontcolor]) title_cstr = plot_color(sp[:titlefontcolor])
@ -464,7 +462,7 @@ function _update_plot_object(plt::Plot{PGFPlotsXBackend})
"draw opacity" => title_a, "draw opacity" => title_a,
"rotate" => sp[:titlefontrotation] "rotate" => sp[:titlefontrotation]
), ),
"legend pos" => _pgfplotsx_legend_pos[sp[:legend]], "legend pos" => get(_pgfplotsx_legend_pos, sp[:legend], "outer north east"),
"legend style" => PGFPlotsX.Options( "legend style" => PGFPlotsX.Options(
pgfx_linestyle(pgfx_thickness_scaling(sp), sp[:foreground_color_legend], 1.0, "solid") => nothing, pgfx_linestyle(pgfx_thickness_scaling(sp), sp[:foreground_color_legend], 1.0, "solid") => nothing,
"fill" => cstr, "fill" => cstr,
@ -492,7 +490,6 @@ function _update_plot_object(plt::Plot{PGFPlotsXBackend})
for series in series_list(sp) for series in series_list(sp)
for col in (:markercolor, :fillcolor, :linecolor) for col in (:markercolor, :fillcolor, :linecolor)
if typeof(series.plotattributes[col]) == ColorGradient if typeof(series.plotattributes[col]) == ColorGradient
# TODO: fix this
if !pushed_colormap if !pushed_colormap
push!(PGFPlotsX.CUSTOM_PREAMBLE, """\\pgfplotsset{ push!(PGFPlotsX.CUSTOM_PREAMBLE, """\\pgfplotsset{
colormap={plots}{$(pgfx_colormap(series.plotattributes[col]))}, colormap={plots}{$(pgfx_colormap(series.plotattributes[col]))},
@ -504,12 +501,6 @@ function _update_plot_object(plt::Plot{PGFPlotsXBackend})
) )
end end
# TODO: is this needed?
# if sp[:colorbar] == :none
# kw[:colorbar] = "false"
# else
# kw[:colorbar] = "true"
# end
# goto is needed to break out of col and series for # goto is needed to break out of col and series for
@goto colorbar_end @goto colorbar_end
end end
@ -543,8 +534,12 @@ function _update_plot_object(plt::Plot{PGFPlotsXBackend})
opt[:x], opt[:y] opt[:x], opt[:y]
end end
series_opt = PGFPlotsX.Options( series_opt = PGFPlotsX.Options(
"color" => opt[:linecolor] "color" => opt[:linecolor],
"scatter" => nothing,
) )
if opt[:marker_z] !== nothing
push!(series_opt, "point meta" => "explicit")
end
segments = iter_segments(series) segments = iter_segments(series)
segment_opt = PGFPlotsX.Options() segment_opt = PGFPlotsX.Options()
for (i, rng) in enumerate(segments) for (i, rng) in enumerate(segments)
@ -573,7 +568,7 @@ function _update_plot_object(plt::Plot{PGFPlotsXBackend})
end end
series_plot = series_func( series_plot = series_func(
merge(series_opt, segment_opt), merge(series_opt, segment_opt),
PGFPlotsX.Coordinates(args...) PGFPlotsX.Coordinates(args..., meta = opt[:marker_z])
) )
# add series annotations # add series annotations
anns = series[:series_annotations] anns = series[:series_annotations]

2
test/test_pgfplotsx.jl
View File

@ -23,7 +23,7 @@ end
z = 1:n z = 1:n
pl = plot(x, y, z, zcolor=reverse(z), m=(10, 0.8, :blues, Plots.stroke(0)), leg=false, cbar=true, w=5) pl = plot(x, y, z, zcolor=reverse(z), m=(10, 0.8, :blues, Plots.stroke(0)), leg=false, cbar=true, w=5)
pgfx_plot, pgfx_tex = create_plot!(pl, zeros(n), zeros(n), 1:n, w=10) pgfx_plot, pgfx_tex = create_plot!(pl, zeros(n), zeros(n), 1:n, w=10)
if @test_nowarn(haskey(pgfx_plot.o.contents[1].options.dict, "colormap") == true) if @test_nowarn(haskey(pgfx_plot.o.contents[1].options.dict, "colorbar") == true)
@test pgfx_plot.o.contents[1]["colorbar"] === nothing @test pgfx_plot.o.contents[1]["colorbar"] === nothing
end end
end # testset end # testset