From 90aba32ca5fb4f9c5297b3090a3d249a75640603 Mon Sep 17 00:00:00 2001 From: Thomas Breloff Date: Thu, 11 Aug 2016 13:11:22 -0400 Subject: [PATCH] fix for spurious scale warnings; closes #444 --- src/args.jl | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/args.jl b/src/args.jl index f66ccf6d..fbc3993c 100644 --- a/src/args.jl +++ b/src/args.jl @@ -795,12 +795,17 @@ function warnOnUnsupported(pkg::AbstractBackend, d::KW) end function warnOnUnsupported_scales(pkg::AbstractBackend, d::KW) + scales = supported_scales(pkg) for k in (:xscale, :yscale, :zscale, :scale) if haskey(d, k) v = d[k] - v = get(_scaleAliases, v, v) - if !(v in supported_scales(pkg)) - warn("scale $(d[k]) is unsupported with $pkg. Choose from: $(supported_scales(pkg))") + all_supported = if typeof(v) <: AbstractArray + all(vi -> get(_scaleAliases, vi, vi) in scales, v) + else + get(_scaleAliases, v, v) in scales + end + if !all_supported + warn("scale $v is unsupported with $pkg. Choose from: $(supported_scales(pkg))") end end end