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

Clean up wall of pushes in _pgfplots_get_marker, and lines starting with kwarg.

Browse Source
This commit is contained in:
Patrick Kofod Mogensen 2016-05-11 21:58:50 +02:00
parent 89f8030ba1
commit 9231da4610
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/backends/pgfplots.jl
View File

@ -128,42 +128,44 @@ end
function _pgfplots_get_marker!(kwargs, plt) function _pgfplots_get_marker!(kwargs, plt)
# Control marker shape # Control marker shape, size, colors, alphas, and stroke width
mark = plt[:markershape] mark = plt[:markershape]
push!(kwargs[:style], "mark = " * _pgfplots_markers[mark])
# Control marker size
push!(kwargs[:style], "mark size = $(plt[:markersize]/2)")
# Control marker colors and alphas
α = plt[:markeralpha] == nothing ? 1.0 : plt[:markeralpha] α = plt[:markeralpha] == nothing ? 1.0 : plt[:markeralpha]
push!(kwargs[:style], "mark options = {color=$(_pgfplots_get_color(plt, :markerstrokecolor))") push!(kwargs[:style], "mark = " * _pgfplots_markers[mark],
push!(kwargs[:style], "line width=$(plt[:markerstrokewidth])") "mark size = $(plt[:markersize]/2)",
"mark options = {color=$(_pgfplots_get_color(plt, :markerstrokecolor))",
"fill=$(_pgfplots_get_color(plt, :markercolor))",
"fill opacity = $α",
"line width=$(plt[:markerstrokewidth])")
# Rotate the marker if :dtriangle was chosen
mark == :dtriangle && push!(kwargs[:style], "rotate=180") mark == :dtriangle && push!(kwargs[:style], "rotate=180")
push!(kwargs[:style], "fill=$(_pgfplots_get_color(plt, :markercolor)), fill opacity = $α")
markstrokestyle = plt[:markerstrokestyle] # Apply marker stroke style if it is a valid PGFPlots stroke style
if haskey(_pgfplots_linestyles, markstrokestyle) if haskey(_pgfplots_linestyles, plt[:markerstrokestyle])
push!(kwargs[:style], _pgfplots_linestyles[markstrokestyle]) push!(kwargs[:style], _pgfplots_linestyles[plt[:markerstrokestyle]])
end end
# End the open mark options bracker
push!(kwargs[:style], "}") push!(kwargs[:style], "}")
end end
function _pgfplots_get_series_color!(kwargs, plt) function _pgfplots_get_series_color!(kwargs, plt)
α = plt[:seriesalpha] == nothing ? 1.0 : plt[:seriesalpha] α = plt[:seriesalpha] == nothing ? 1.0 : plt[:seriesalpha]
push!(kwargs[:style], "color=$(_pgfplots_get_color(plt, :seriescolor))") push!(kwargs[:style], "color=$(_pgfplots_get_color(plt, :seriescolor))",
push!(kwargs[:style], "draw opacity = $α") "draw opacity = $α")
end end
function _pgfplots_get_line_color!(kwargs, plt) function _pgfplots_get_line_color!(kwargs, plt)
α = plt[:linealpha] == nothing ? 1.0 : plt[:linealpha] α = plt[:linealpha] == nothing ? 1.0 : plt[:linealpha]
kwargs[:style] *= ", color=$(_pgfplots_get_color(plt, :linecolor))" kwargs[:style] *= ", color=$(_pgfplots_get_color(plt, :linecolor))" *
kwargs[:style] *= ", draw opacity = $α" ", draw opacity = $α"
end end
function _pgfplots_get_fill_color!(kwargs, plt) function _pgfplots_get_fill_color!(kwargs, plt)
α = plt[:fillalpha] == nothing ? 1.0 : plt[:fillalpha] α = plt[:fillalpha] == nothing ? 1.0 : plt[:fillalpha]
kwargs[:style] *= ", fill=$(_pgfplots_get_color(plt, :fillcolor))" kwargs[:style] *= ", fill=$(_pgfplots_get_color(plt, :fillcolor))" *
kwargs[:style] *= ", fill opacity = $α" ", fill opacity = $α"
end end
function _pgfplots_get_label!(kwargs, plt) function _pgfplots_get_label!(kwargs, plt)