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

Use GR builtin marker routine

Browse Source
This commit is contained in:
Josef Heinen 2020-01-24 15:00:31 +01:00
parent d093d1ad7e
commit 312f98e380
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/backends/gr.jl
View File

@ -90,6 +90,7 @@ end
gr_set_linecolor(c) = GR.setlinecolorind(gr_getcolorind(_cycle(c,1))) gr_set_linecolor(c) = GR.setlinecolorind(gr_getcolorind(_cycle(c,1)))
gr_set_fillcolor(c) = GR.setfillcolorind(gr_getcolorind(_cycle(c,1))) gr_set_fillcolor(c) = GR.setfillcolorind(gr_getcolorind(_cycle(c,1)))
gr_set_markercolor(c) = GR.setmarkercolorind(gr_getcolorind(_cycle(c,1))) gr_set_markercolor(c) = GR.setmarkercolorind(gr_getcolorind(_cycle(c,1)))
gr_set_bordercolor(c) = GR.setbordercolorind(gr_getcolorind(_cycle(c,1)))
gr_set_textcolor(c) = GR.settextcolorind(gr_getcolorind(_cycle(c,1))) gr_set_textcolor(c) = GR.settextcolorind(gr_getcolorind(_cycle(c,1)))
gr_set_transparency(α::Real) = GR.settransparency(clamp(α, 0, 1)) gr_set_transparency(α::Real) = GR.settransparency(clamp(α, 0, 1))
gr_set_transparency(::Nothing) = GR.settransparency(1) gr_set_transparency(::Nothing) = GR.settransparency(1)
@ -321,8 +322,8 @@ end
# draw ONE symbol marker # draw ONE symbol marker
function gr_draw_marker(xi, yi, msize::Number, shape::Symbol) function gr_draw_marker(xi, yi, msize::Number, shape::Symbol)
GR.setmarkertype(gr_markertype[shape]) GR.setmarkertype(gr_markertype[shape])
GR.setmarkersize(0.3msize) w, h = gr_plot_size
GR.setborderwidth(0) GR.setmarkersize(0.3msize / ((w + h) * 0.001))
GR.polymarker([xi], [yi]) GR.polymarker([xi], [yi])
end end
@ -338,23 +339,13 @@ function gr_draw_markers(series::Series, x, y, clims, msize = series[:markersize
for i=eachindex(x) for i=eachindex(x)
msi = _cycle(msize, i) msi = _cycle(msize, i)
shape = _cycle(shapes, i) shape = _cycle(shapes, i)
cfunc = isa(shape, Shape) ? gr_set_fillcolor : gr_set_markercolor
# draw a filled in shape, slightly bigger, to estimate a stroke GR.setborderwidth(series[:markerstrokewidth]);
if series[:markerstrokewidth] > 0 gr_set_bordercolor(get_markerstrokecolor(series, i));
c = get_markerstrokecolor(series, i) gr_set_markercolor(get_markercolor(series, clims, i));
cfunc(c) gr_set_transparency(get_markeralpha(series, i))
gr_set_transparency(c, get_markerstrokealpha(series, i))
gr_draw_marker(x[i], y[i], msi + series[:markerstrokewidth], shape)
end
# draw the shape - don't draw filled area if marker shape is 1D gr_draw_marker(x[i], y[i], msi, shape)
if !(shape in (:hline, :vline, :+, :x))
c = get_markercolor(series, clims, i)
cfunc(c)
gr_set_transparency(c, get_markeralpha(series, i))
gr_draw_marker(x[i], y[i], msi, shape)
end
end end
end end
end end
@ -363,7 +354,8 @@ end
function gr_set_line(lw, style, c) #, a) function gr_set_line(lw, style, c) #, a)
GR.setlinetype(gr_linetype[style]) GR.setlinetype(gr_linetype[style])
GR.setlinewidth(_gr_thickness_scaling[1] * max(0, lw)) w, h = gr_plot_size
GR.setlinewidth(_gr_thickness_scaling[1] * max(0, lw / ((w + h) * 0.001)))
gr_set_linecolor(c) #, a) gr_set_linecolor(c) #, a)
end end