mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2503 from daschw/typerecipes

Browse Source 
Make type recipes aware of current axes.
This commit is contained in:
Daniel Schwabeneder 2020-03-27 16:18:30 +01:00 committed by GitHub
commit 74a37b7817
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/series.jl
View File

@ -20,6 +20,7 @@ function prepareSeriesData(a::AbstractArray{<:MaybeNumber})
f = isimmutable(a) ? replace : replace! f = isimmutable(a) ? replace : replace!
a = f(x -> ismissing(x) || isinf(x) ? NaN : x, map(float, a)) a = f(x -> ismissing(x) || isinf(x) ? NaN : x, map(float, a))
end end
prepareSeriesData(a::AbstractArray{<:Missing}) = fill(NaN, axes(a))
prepareSeriesData(a::AbstractArray{<:MaybeString}) = replace(x -> ismissing(x) ? "" : x, a) prepareSeriesData(a::AbstractArray{<:MaybeString}) = replace(x -> ismissing(x) ? "" : x, a)
prepareSeriesData(s::Surface{<:AMat{<:MaybeNumber}}) = Surface(prepareSeriesData(s.surf)) prepareSeriesData(s::Surface{<:AMat{<:MaybeNumber}}) = Surface(prepareSeriesData(s.surf))
prepareSeriesData(s::Surface) = s # non-numeric Surface, such as an image prepareSeriesData(s::Surface) = s # non-numeric Surface, such as an image
@ -171,9 +172,9 @@ end
@recipe f(::Type{V}, x, y, z) where {V<:Val} = error("The backend must not support the series type $V, and there isn't a series recipe defined.") @recipe f(::Type{V}, x, y, z) where {V<:Val} = error("The backend must not support the series type $V, and there isn't a series recipe defined.")
function _apply_type_recipe(plotattributes, v, letter) function _apply_type_recipe(plotattributes, v, letter)
_handle_axis_args!(plotattributes) _preprocess_axis_args!(plotattributes, letter)
rdvec = RecipesBase.apply_recipe(plotattributes, typeof(v), v) rdvec = RecipesBase.apply_recipe(plotattributes, typeof(v), v)
_handle_axis_args!(plotattributes, letter) _postprocess_axis_args!(plotattributes, letter)
return rdvec[1].args[1] return rdvec[1].args[1]
end end
@ -181,7 +182,7 @@ end
# This sort of recipe should return a pair of functions... one to convert to number, # This sort of recipe should return a pair of functions... one to convert to number,
# and one to format tick values. # and one to format tick values.
function _apply_type_recipe(plotattributes, v::AbstractArray, letter) function _apply_type_recipe(plotattributes, v::AbstractArray, letter)
_handle_axis_args!(plotattributes) _preprocess_axis_args!(plotattributes, letter)
# First we try to apply an array type recipe. # First we try to apply an array type recipe.
w = RecipesBase.apply_recipe(plotattributes, typeof(v), v)[1].args[1] w = RecipesBase.apply_recipe(plotattributes, typeof(v), v)[1].args[1]
# If the type did not change try it element-wise # If the type did not change try it element-wise
@ -189,7 +190,7 @@ function _apply_type_recipe(plotattributes, v::AbstractArray, letter)
isempty(skipmissing(v)) && return Float64[] isempty(skipmissing(v)) && return Float64[]
x = first(skipmissing(v)) x = first(skipmissing(v))
args = RecipesBase.apply_recipe(plotattributes, typeof(x), x)[1].args args = RecipesBase.apply_recipe(plotattributes, typeof(x), x)[1].args
_handle_axis_args!(plotattributes, letter) _postprocess_axis_args!(plotattributes, letter)
if length(args) == 2 && all(arg -> arg isa Function, args) if length(args) == 2 && all(arg -> arg isa Function, args)
numfunc, formatter = args numfunc, formatter = args
return Formatted(map(numfunc, v), formatter) return Formatted(map(numfunc, v), formatter)
@ -197,7 +198,7 @@ function _apply_type_recipe(plotattributes, v::AbstractArray, letter)
return v return v
end end
end end
_handle_axis_args!(plotattributes, letter) _postprocess_axis_args!(plotattributes, letter)
return w return w
end end
@ -218,29 +219,34 @@ end
# end # end
# don't do anything for ints or floats # don't do anything for ints or floats
_apply_type_recipe(plotattributes, v::AbstractArray{T}, letter) where {T<:Union{Integer,AbstractFloat}} = v _apply_type_recipe(plotattributes, v::AbstractArray{<:DataPoint}, letter) = v
# axis args in type recipes should only be applied to the current axis # axis args before type recipes should still be mapped to all axes
function _handle_axis_args!(plotattributes, letter) function _preprocess_axis_args!(plotattributes)
if letter in (:x, :y, :z) replaceAliases!(plotattributes, _keyAliases)
replaceAliases!(plotattributes, _keyAliases) for (k, v) in plotattributes
for (k, v) in plotattributes if haskey(_axis_defaults, k)
if haskey(_axis_defaults, k) pop!(plotattributes, k)
pop!(plotattributes, k) for l in (:x, :y, :z)
lk = Symbol(letter, k) lk = Symbol(l, k)
haskey(plotattributes, lk) || (plotattributes[lk] = v) haskey(plotattributes, lk) || (plotattributes[lk] = v)
end end
end end
end end
end end
function _preprocess_axis_args!(plotattributes, letter)
plotattributes[:letter] = letter
_preprocess_axis_args!(plotattributes)
end
# axis args before type recipes should still be mapped to all axes # axis args in type recipes should only be applied to the current axis
function _handle_axis_args!(plotattributes) function _postprocess_axis_args!(plotattributes, letter)
replaceAliases!(plotattributes, _keyAliases) pop!(plotattributes, :letter)
for (k, v) in plotattributes if letter in (:x, :y, :z)
if haskey(_axis_defaults, k) replaceAliases!(plotattributes, _keyAliases)
pop!(plotattributes, k) for (k, v) in plotattributes
for letter in (:x, :y, :z) if haskey(_axis_defaults, k)
pop!(plotattributes, k)
lk = Symbol(letter, k) lk = Symbol(letter, k)
haskey(plotattributes, lk) || (plotattributes[lk] = v) haskey(plotattributes, lk) || (plotattributes[lk] = v)
end end