working on args

This commit is contained in:
Thomas Breloff 2015-11-06 15:58:15 -05:00
parent 6236acea02
commit b0991a0624

View File

@ -424,14 +424,14 @@ function processLineArg(d::Dict, arg)
arg.color == nothing || (d[:fillcolor] = arg.color == :auto ? :auto : colorscheme(arg.color)) arg.color == nothing || (d[:fillcolor] = arg.color == :auto ? :auto : colorscheme(arg.color))
arg.alpha == nothing || (d[:fillalpha] = arg.alpha) arg.alpha == nothing || (d[:fillalpha] = arg.alpha)
# linewidth
elseif trueOrAllTrue(a -> typeof(a) <: Integer, arg)
d[:linewidth] = arg
# linealpha # linealpha
elseif trueOrAllTrue(a -> typeof(a) <: Real && a >= 0 && a <= 1, arg) elseif trueOrAllTrue(a -> typeof(a) <: Real && a > 0 && a < 1, arg)
d[:linealpha] = arg d[:linealpha] = arg
# linewidth
elseif trueOrAllTrue(a -> typeof(a) <: Real, arg)
d[:linewidth] = arg
# color # color
elseif !handleColors!(d, arg, :linecolor) elseif !handleColors!(d, arg, :linecolor)
warn("Skipped line arg $arg.") warn("Skipped line arg $arg.")
@ -463,14 +463,14 @@ function processMarkerArg(d::Dict, arg)
arg.color == nothing || (d[:markercolor] = arg.color == :auto ? :auto : colorscheme(arg.color)) arg.color == nothing || (d[:markercolor] = arg.color == :auto ? :auto : colorscheme(arg.color))
arg.alpha == nothing || (d[:markeralpha] = arg.alpha) arg.alpha == nothing || (d[:markeralpha] = arg.alpha)
# markersize
elseif trueOrAllTrue(a -> typeof(a) <: Integer, arg)
d[:markersize] = arg
# linealpha # linealpha
elseif trueOrAllTrue(a -> typeof(a) <: Real && a >= 0 && a <= 1, arg) elseif trueOrAllTrue(a -> typeof(a) <: Real && a > 0 && a < 1, arg)
d[:markeralpha] = arg d[:markeralpha] = arg
# markersize
elseif trueOrAllTrue(a -> typeof(a) <: Real, arg)
d[:markersize] = arg
# markercolor # markercolor
elseif !handleColors!(d, arg, :markercolor) elseif !handleColors!(d, arg, :markercolor)
warn("Skipped marker arg $arg.") warn("Skipped marker arg $arg.")