fix for spurious scale warnings; closes #444

This commit is contained in:
Thomas Breloff 2016-08-11 13:11:22 -04:00
parent e164a8274a
commit 90aba32ca5

View File

@ -795,12 +795,17 @@ function warnOnUnsupported(pkg::AbstractBackend, d::KW)
end end
function warnOnUnsupported_scales(pkg::AbstractBackend, d::KW) function warnOnUnsupported_scales(pkg::AbstractBackend, d::KW)
scales = supported_scales(pkg)
for k in (:xscale, :yscale, :zscale, :scale) for k in (:xscale, :yscale, :zscale, :scale)
if haskey(d, k) if haskey(d, k)
v = d[k] v = d[k]
v = get(_scaleAliases, v, v) all_supported = if typeof(v) <: AbstractArray
if !(v in supported_scales(pkg)) all(vi -> get(_scaleAliases, vi, vi) in scales, v)
warn("scale $(d[k]) is unsupported with $pkg. Choose from: $(supported_scales(pkg))") 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 end
end end