working on args

JuliaPlots · Nov 6, 2015 · b0991a0 · b0991a0
1 parent 6236ace
commit b0991a0
Showing 1 changed file with 10 additions and 10 deletions.
diff --git 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.")