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

fix 3d-like seriestypes

Browse Source
This commit is contained in:
Simon Christ 2020-09-11 21:05:02 +02:00
parent ef8f9f0713
commit 8bede094ba
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/backends/pgfplotsx.jl
View File

@ -561,37 +561,39 @@ function pgfx_add_series!(::Val{:surface}, axis, series_opt, series, series_func
"mesh/cols" => length(opt[:y]), "mesh/cols" => length(opt[:y]),
"z buffer" => "sort", "z buffer" => "sort",
) )
pgfx_add_series!(Val(:path), axis, series_opt, series, series_func, opt) args = pgfx_series_arguments(series, opt)
series_plot = series_func(series_opt, PGFPlotsX.Coordinates(args...))
push!(axis, series_plot)
end end
function pgfx_add_series!(::Val{:wireframe}, axis, series_opt, series, series_func, opt) function pgfx_add_series!(::Val{:wireframe}, axis, series_opt, series, series_func, opt)
push!(series_opt, "mesh" => nothing, push!(series_opt, "mesh" => nothing,
"mesh/rows" => length(opt[:x]) "mesh/rows" => length(opt[:x])
) )
pgfx_add_series!(Val(:path), axis, series_opt, series, series_func, opt) args = pgfx_series_arguments(series, opt)
series_plot = series_func(series_opt, PGFPlotsX.Coordinates(args...))
push!(axis, series_plot)
end end
function pgfx_add_series!(::Val{:heatmap}, axis, series_opt, series, series_func, opt) function pgfx_add_series!(::Val{:heatmap}, axis, series_opt, series, series_func, opt)
push!(axis.options, "view" => "{0}{90}")
push!( push!(
series_opt, series_opt,
"matrix plot*" => nothing, "matrix plot*" => nothing,
"mesh/rows" => length(opt[:x]), "mesh/rows" => length(opt[:x]),
"mesh/cols" => length(opt[:y]), "mesh/cols" => length(opt[:y]),
) )
pgfx_add_series!(Val(:path), axis, series_opt, series, series_func, opt) args = pgfx_series_arguments(series, opt)
series_plot = series_func(series_opt, PGFPlotsX.Coordinates(args...))
push!(axis, series_plot)
end end
function pgfx_add_series!(::Val{:contour}, axis, series_opt, series, series_func, opt) function pgfx_add_series!(::Val{:contour}, axis, series_opt, series, series_func, opt)
if isfilledcontour(series) if isfilledcontour(series)
pgfx_add_series!(Val(:filledcontour), axis, series_opt, series, series_func, opt) pgfx_add_series!(Val(:filledcontour), axis, series_opt, series, series_func, opt)
end end
push!( push!(axis.options, "view" => "{0}{90}")
series_opt, pgfx_add_series!(Val(:contour3d), axis, series_opt, series, series_func, opt)
"contour prepared" => PGFPlotsX.Options("labels" => opt[:contour_labels]),
)
args = pgfx_series_arguments(series, opt)
series_plot = series_func(series_opt, PGFPlotsX.Table(Contour.contours(args..., opt[:levels])))
push!(axis, series_plot)
end end
function pgfx_add_series!(::Val{:filledcontour}, axis, series_opt, series, series_func, opt) function pgfx_add_series!(::Val{:filledcontour}, axis, series_opt, series, series_func, opt)
@ -613,7 +615,13 @@ function pgfx_add_series!(::Val{:filledcontour}, axis, series_opt, series, serie
end end
function pgfx_add_series!(::Val{:contour3d}, axis, series_opt, series, series_func, opt) function pgfx_add_series!(::Val{:contour3d}, axis, series_opt, series, series_func, opt)
pgfx_add_series!(Val(:contour), axis, series_opt, series, series_func, opt) push!(
series_opt,
"contour prepared" => PGFPlotsX.Options("labels" => opt[:contour_labels]),
)
args = pgfx_series_arguments(series, opt)
series_plot = series_func(series_opt, PGFPlotsX.Table(Contour.contours(args..., opt[:levels])))
push!(axis, series_plot)
end end
function pgfx_add_series!(::Val{:quiver}, axis, series_opt, series, series_func, opt) function pgfx_add_series!(::Val{:quiver}, axis, series_opt, series, series_func, opt)