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

fix bar

Browse Source
This commit is contained in:
Simon Christ 2019-11-24 18:10:34 +01:00
parent 44341d1ff5
commit a9cbe354c1
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/backends/pgfplotsx.jl
View File

@ -143,12 +143,6 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
else else
series_func = PGFPlotsX.Plot series_func = PGFPlotsX.Plot
end end
if isfilledcontour(series)
# push!(series_opt, "contour filled" => nothing)
# st = :surface
# axis_opt["view"] = (0, 90)
# push!(series_opt, "shader" => "interp")
end
if series[:fillrange] !== nothing && !isfilledcontour(series) if series[:fillrange] !== nothing && !isfilledcontour(series)
push!(series_opt, "area legend" => nothing) push!(series_opt, "area legend" => nothing)
end end
@ -189,9 +183,7 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
(series[:fillrange] !== nothing && !isfilledcontour(series)) (series[:fillrange] !== nothing && !isfilledcontour(series))
segment_opt = merge( segment_opt, pgfx_fillstyle(opt, i) ) segment_opt = merge( segment_opt, pgfx_fillstyle(opt, i) )
end end
coordinates = pgfx_series_coordinates!( sp, coordinates = pgfx_series_coordinates!( sp, series, segment_opt, opt, rng )
isfilledcontour(series) ? :filledcontour : st,
segment_opt, opt, rng )
segment_plot = series_func( segment_plot = series_func(
merge(series_opt, segment_opt), merge(series_opt, segment_opt),
coordinates, coordinates,
@ -231,9 +223,10 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
end end
end end
## seriestype specifics ## seriestype specifics
@inline function pgfx_series_coordinates!(sp, st, segment_opt, opt, rng) @inline function pgfx_series_coordinates!(sp, series, segment_opt, opt, rng)
st = series[:seriestype]
# function args # function args
args = if st in (:contour, :contour3d, :filledcontour) args = if st in (:contour, :contour3d)
opt[:x], opt[:y], Array(opt[:z])' opt[:x], opt[:y], Array(opt[:z])'
elseif st in (:heatmap, :surface, :wireframe) elseif st in (:heatmap, :surface, :wireframe)
surface_to_vecs(opt[:x], opt[:y], opt[:z]) surface_to_vecs(opt[:x], opt[:y], opt[:z])
@ -249,8 +242,7 @@ end
else else
opt[:x], opt[:y] opt[:x], opt[:y]
end end
seg_args = if st in (:contour, :contour3d, :filledcontour) seg_args = if st in (:contour, :contour3d)
args args
else else
(arg[rng] for arg in args) (arg[rng] for arg in args)
@ -265,6 +257,9 @@ end
x, y = collect(seg_args) x, y = collect(seg_args)
return PGFPlotsX.Table([:x => x, :y => y, :u => opt[:quiver][1], :v => opt[:quiver][2]]) return PGFPlotsX.Table([:x => x, :y => y, :u => opt[:quiver][1], :v => opt[:quiver][2]])
else else
if isfilledcontour(series)
st = :filledcontour
end
pgfx_series_coordinates!(Val(st), segment_opt, opt, seg_args) pgfx_series_coordinates!(Val(st), segment_opt, opt, seg_args)
end end
end end
@ -322,7 +317,7 @@ function pgfx_series_coordinates!(st_val::Val{:wireframe}, segment_opt, opt, arg
return PGFPlotsX.Coordinates(args...) return PGFPlotsX.Coordinates(args...)
end end
function pgfx_series_coordinates!(st_val::Val{:shape}, segment_opt, opt, args) function pgfx_series_coordinates!(st_val::Val{:shape}, segment_opt, opt, args)
push!( segment_opt, "area legends" => nothing ) # push!( segment_opt, "area legend" => nothing )
return PGFPlotsX.Coordinates(args...) return PGFPlotsX.Coordinates(args...)
end end
function pgfx_series_coordinates!(st_val::Union{Val{:contour}, Val{:contour3d}}, segment_opt, opt, args) function pgfx_series_coordinates!(st_val::Union{Val{:contour}, Val{:contour3d}}, segment_opt, opt, args)