From b0991a06248a1f2452d09edc8c6d267abdaee233 Mon Sep 17 00:00:00 2001 From: Thomas Breloff Date: Fri, 6 Nov 2015 15:58:15 -0500 Subject: [PATCH] working on args --- src/args.jl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/args.jl b/src/args.jl index 0fac09e76..d451a34dc 100644 --- a/src/args.jl +++ b/src/args.jl @@ -424,14 +424,14 @@ function processLineArg(d::Dict, arg) arg.color == nothing || (d[:fillcolor] = arg.color == :auto ? :auto : colorscheme(arg.color)) arg.alpha == nothing || (d[:fillalpha] = arg.alpha) - # linewidth - elseif trueOrAllTrue(a -> typeof(a) <: Integer, arg) - d[:linewidth] = arg - # 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 + # linewidth + elseif trueOrAllTrue(a -> typeof(a) <: Real, arg) + d[:linewidth] = arg + # color elseif !handleColors!(d, arg, :linecolor) 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.alpha == nothing || (d[:markeralpha] = arg.alpha) - # markersize - elseif trueOrAllTrue(a -> typeof(a) <: Integer, arg) - d[:markersize] = arg - # 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 + # markersize + elseif trueOrAllTrue(a -> typeof(a) <: Real, arg) + d[:markersize] = arg + # markercolor elseif !handleColors!(d, arg, :markercolor) warn("Skipped marker arg $arg.")