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

Merge pull request #1132 from darwindarak/dd/pyplot-linez

Browse Source 
RFC: Fix `line_z` for PyPlot backend (fix #1021)
This commit is contained in:
Daniel Schwabeneder 2017-10-06 09:24:57 +02:00 committed by GitHub
commit 1c21a0d609
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/backends/pyplot.jl
View File

@ -499,20 +499,19 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
:zorder => plt.n, :zorder => plt.n,
:cmap => py_linecolormap(series), :cmap => py_linecolormap(series),
:linewidth => py_dpi_scale(plt, series[:linewidth]), :linewidth => py_dpi_scale(plt, series[:linewidth]),
:linestyle => py_linestyle(st, series[:linestyle]) :linestyle => py_linestyle(st, series[:linestyle]),
:norm => pycolors["Normalize"](; extrakw...)
) )
if needs_colorbar lz = _cycle(series[:line_z], 1:n)
kw[:norm] = pycolors["Normalize"](; extrakw...)
end
lz = collect(series[:line_z])
handle = if is3d(st) handle = if is3d(st)
for rng in iter_segments(x, y, z) for rng in iter_segments(x, y, z)
length(rng) < 2 && continue length(rng) < 2 && continue
push!(segments, [(_cycle(x,i),_cycle(y,i),_cycle(z,i)) for i in rng]) for i in rng[1:end-1]
push!(segments, [(_cycle(x,i),_cycle(y,i),_cycle(z,i)),
(_cycle(x,i+1),_cycle(y,i+1),_cycle(z,i+1))])
end
end end
# for i=1:n
# segments[i] = [(_cycle(x,i), _cycle(y,i), _cycle(z,i)), (_cycle(x,i+1), _cycle(y,i+1), _cycle(z,i+1))]
# end
lc = pyart3d["Line3DCollection"](segments; kw...) lc = pyart3d["Line3DCollection"](segments; kw...)
lc[:set_array](lz) lc[:set_array](lz)
ax[:add_collection3d](lc, zs=z) #, zdir='y') ax[:add_collection3d](lc, zs=z) #, zdir='y')
@ -520,11 +519,11 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
else else
for rng in iter_segments(x, y) for rng in iter_segments(x, y)
length(rng) < 2 && continue length(rng) < 2 && continue
push!(segments, [(_cycle(x,i),_cycle(y,i)) for i in rng]) for i in rng[1:end-1]
push!(segments, [(_cycle(x,i),_cycle(y,i)), (_cycle(x,i+1),_cycle(y,i+1))])
end
end end
# for i=1:n
# segments[i] = [(_cycle(x,i), _cycle(y,i)), (_cycle(x,i+1), _cycle(y,i+1))]
# end
lc = pycollections["LineCollection"](segments; kw...) lc = pycollections["LineCollection"](segments; kw...)
lc[:set_array](lz) lc[:set_array](lz)
ax[:add_collection](lc) ax[:add_collection](lc)