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

Merge pull request #343 from jheinen/dev

Browse Source 
Added suport for marker borders
This commit is contained in:
Tom Breloff 2016-06-18 00:02:42 -04:00 committed by GitHub
commit 4c884651a8
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backends/gr.jl
View File

@ -41,7 +41,6 @@ supported_scales(::GRBackend) = [:identity, :log10]
is_subplot_supported(::GRBackend) = true is_subplot_supported(::GRBackend) = true
function _initialize_backend(::GRBackend; kw...) function _initialize_backend(::GRBackend; kw...)
@eval begin @eval begin
import GR import GR
@ -261,6 +260,23 @@ function normalize_zvals(zv::AVec)
end end
function gr_draw_markers(d::KW, x, y)
if d[:markershape] in (:circle, :rect, :diamond, :utriangle, :dtriangle,
:pentagon, :hexagon, :heptagon, :octagon,
:star4, :star5, :star6, :star7, :star8)
# for filled markers, draw the marker border first and
# then continue drawing with reduced marker size
msize = 0.5 * d[:markersize]
GR.setmarkersize(msize)
gr_set_markercolor(d[:markerstrokecolor], d[:markerstrokealpha])
gr_polymarker(d, x, y)
GR.setmarkersize(msize * 0.75)
gr_set_markercolor(d[:markercolor], d[:markeralpha])
end
gr_polymarker(d, x, y)
end
function gr_draw_markers(d::KW, x, y, msize, mz, c, a) function gr_draw_markers(d::KW, x, y, msize, mz, c, a)
if length(x) > 0 if length(x) > 0
mz == nothing && gr_set_markercolor(c, a) mz == nothing && gr_set_markercolor(c, a)
@ -268,7 +284,7 @@ function gr_draw_markers(d::KW, x, y, msize, mz, c, a)
if typeof(msize) <: Number && mz == nothing if typeof(msize) <: Number && mz == nothing
# draw the markers all the same # draw the markers all the same
GR.setmarkersize(msize) GR.setmarkersize(msize)
gr_polymarker(d, x, y) gr_draw_markers(d, x, y)
else else
# draw each marker differently # draw each marker differently
for i = 1:length(x) for i = 1:length(x)