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

Merge pull request #1142 from daschw/line_z

Browse Source 
Fix linestyle on GR (fix #1139)(fix #1123)
This commit is contained in:
Daniel Schwabeneder 2017-10-08 13:50:43 +02:00 committed by GitHub
commit 7d220f571d
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/backends/gr.jl
View File

@ -943,16 +943,22 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
if st in (:path, :scatter) if st in (:path, :scatter)
if length(x) > 1 if length(x) > 1
lz = series[:line_z]
segments_iterator = if lz != nothing && length(lz) > 1
[i:(i + 1) for i in 1:(length(x) - 1)]
else
iter_segments(x, y)
end
# do area fill # do area fill
if frng != nothing if frng != nothing
GR.setfillintstyle(GR.INTSTYLE_SOLID) GR.setfillintstyle(GR.INTSTYLE_SOLID)
fr_from, fr_to = (is_2tuple(frng) ? frng : (y, frng)) fr_from, fr_to = (is_2tuple(frng) ? frng : (y, frng))
for i in 1:length(x) - 1 for (i, rng) in enumerate(segments_iterator)
gr_set_fillcolor(get_fillcolor(sp, series, i)) gr_set_fillcolor(get_fillcolor(sp, series, i))
xseg = _cycle(x, [i, i+1, i+1, i]) fx = _cycle(x, vcat(rng, reverse(rng)))
yseg = [_cycle(fr_from, [i, i+1]); _cycle(fr_to, [i+1, i])] fy = vcat(_cycle(fr_from,rng), _cycle(fr_to,reverse(rng)))
series[:fillalpha] != nothing && GR.settransparency(series[:fillalpha]) series[:fillalpha] != nothing && GR.settransparency(series[:fillalpha])
GR.fillarea(xseg, yseg) GR.fillarea(fx, fy)
end end
gr_set_line(1, :solid, yaxis[:foreground_color_axis]) gr_set_line(1, :solid, yaxis[:foreground_color_axis])
GR.settransparency(1) GR.settransparency(1)
@ -961,12 +967,10 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
# draw the line(s) # draw the line(s)
if st == :path if st == :path
for i in 1:length(x) - 1 for (i, rng) in enumerate(segments_iterator)
xseg = x[i:(i + 1)]
yseg = y[i:(i + 1)]
gr_set_line(series[:linewidth], series[:linestyle], get_linecolor(sp, series, i)) #, series[:linealpha]) gr_set_line(series[:linewidth], series[:linestyle], get_linecolor(sp, series, i)) #, series[:linealpha])
arrowside = (i == length(y) - 1) && isa(series[:arrow], Arrow) ? series[:arrow].side : :none arrowside = isa(series[:arrow], Arrow) ? series[:arrow].side : :none
gr_polyline(xseg, yseg; arrowside = arrowside) gr_polyline(x[rng], y[rng]; arrowside = arrowside)
end end
gr_set_line(1, :solid, yaxis[:foreground_color_axis]) gr_set_line(1, :solid, yaxis[:foreground_color_axis])
cmap && gr_colorbar(sp, clims) cmap && gr_colorbar(sp, clims)
@ -1036,16 +1040,21 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
elseif st in (:path3d, :scatter3d) elseif st in (:path3d, :scatter3d)
# draw path # draw path
if st == :path3d if st == :path3d
for i in 1:length(x) - 1 if length(x) > 1
xseg = x[i:(i + 1)] lz = series[:line_z]
yseg = y[i:(i + 1)] segments_iterator = if lz != nothing && length(lz) > 1
zseg = z[i:(i + 1)] [i:(i + 1) for i in 1:(length(x) - 1)]
else
iter_segments(x, y, z)
end
for (i, rng) in enumerate(segments_iterator)
gr_set_line(series[:linewidth], series[:linestyle], get_linecolor(sp, series, i)) #, series[:linealpha]) gr_set_line(series[:linewidth], series[:linestyle], get_linecolor(sp, series, i)) #, series[:linealpha])
GR.polyline3d(xseg, yseg, zseg) GR.polyline3d(x[rng], y[rng], z[rng])
end end
gr_set_line(1, :solid, yaxis[:foreground_color_axis]) gr_set_line(1, :solid, yaxis[:foreground_color_axis])
cmap && gr_colorbar(sp, clims) cmap && gr_colorbar(sp, clims)
end end
end
# draw markers # draw markers
if st == :scatter3d || series[:markershape] != :none if st == :scatter3d || series[:markershape] != :none