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

Added support for multiple marker colors / sizes

Browse Source
This commit is contained in:
Josef Heinen 2016-01-10 19:05:16 +01:00
parent e5a864a760
commit d71c3ecd86
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/backends/gr.jl
View File

@ -124,23 +124,42 @@ function gr_display(plt::Plot{GRPackage})
GR.savestate() GR.savestate()
haskey(d, :linewidth) && GR.setlinewidth(d[:linewidth]) haskey(d, :linewidth) && GR.setlinewidth(d[:linewidth])
if haskey(d, :markersize)
typeof(d[:markersize]) <: Number && GR.setmarkersize(d[:markersize] / 4.0)
else
println("TODO: multiple marker sizes")
end
GR.settextalign(GR.TEXT_HALIGN_LEFT, GR.TEXT_VALIGN_HALF) GR.settextalign(GR.TEXT_HALIGN_LEFT, GR.TEXT_VALIGN_HALF)
for p in plt.seriesargs for p in plt.seriesargs
#haskey(p, :fillrange) && println("TODO: fill between")
if p[:linetype] == :path if p[:linetype] == :path
if haskey(p, :fillcolor)
GR.setfillcolorind(gr_getcolorind(p[:fillcolor]))
GR.setfillintstyle(GR.INTSTYLE_SOLID)
end
haskey(p, :linecolor) && GR.setlinecolorind(gr_getcolorind(p[:linecolor])) haskey(p, :linecolor) && GR.setlinecolorind(gr_getcolorind(p[:linecolor]))
haskey(p, :linestyle) && GR.setlinetype(gr_linetype[p[:linestyle]]) haskey(p, :linestyle) && GR.setlinetype(gr_linetype[p[:linestyle]])
if p[:fillrange] != nothing
GR.fillarea([p[:x][1]; p[:x]; p[:x][length(p[:x])]], [p[:fillrange]; p[:y]; p[:fillrange]])
end
GR.polyline(p[:x], p[:y]) GR.polyline(p[:x], p[:y])
elseif p[:linetype] == :scatter elseif p[:linetype] == :scatter
haskey(p, :markercolor) && GR.setmarkercolorind(gr_getcolorind(p[:markercolor])) haskey(p, :markercolor) && GR.setmarkercolorind(gr_getcolorind(p[:markercolor]))
haskey(p, :markershape) && GR.setmarkertype(gr_markertype[p[:markershape]]) haskey(p, :markershape) && GR.setmarkertype(gr_markertype[p[:markershape]])
if haskey(d, :markersize)
if typeof(d[:markersize]) <: Number
GR.setmarkersize(d[:markersize] / 4.0)
GR.polymarker(p[:x], p[:y]) GR.polymarker(p[:x], p[:y])
else
c = p[:markercolor]
GR.setcolormap(GR.COLORMAP_COOLWARM)
for i = 1:length(p[:x])
if isa(c, ColorGradient) && p[:zcolor] != nothing
ci = round(Int, 1000 + p[:zcolor][i] * 255)
GR.setmarkercolorind(ci)
end
GR.setmarkersize(d[:markersize][i] / 4.0)
GR.polymarker([p[:x][i]], [p[:y][i]])
end
end
else
GR.polymarker(p[:x], p[:y])
end
else else
println("TODO: add support for linetype $(p[:linetype])") println("TODO: add support for linetype $(p[:linetype])")
end end