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

Moved clims into plot/series attributes (#3897)

Browse Source 
* Moved limits into plot/series attributes

* Moved const to args
This commit is contained in:
Nicholas Bauer 2021-10-26 03:09:23 -04:00 committed by Zhanibek
parent e9c97e7fa3
commit 9dcf9bd262
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/args.jl
View File

@ -89,6 +89,8 @@ const _allTypes = vcat(
_3dTypes, _3dTypes,
) )
const _z_colored_series = [:contour, :contour3d, :heatmap, :histogram2d, :surface, :hexbin]
const _typeAliases = Dict{Symbol,Symbol}( const _typeAliases = Dict{Symbol,Symbol}(
:n => :none, :n => :none,
:no => :none, :no => :none,

19
src/colorbars.jl
View File

@ -5,27 +5,24 @@ process_clims(s::Union{Symbol,Nothing,Missing}) = ignorenan_extrema
# don't specialize on ::Function otherwise python functions won't work # don't specialize on ::Function otherwise python functions won't work
process_clims(f) = f process_clims(f) = f
const sp_clims = IdDict{Subplot,Tuple{Float64,Float64}}()
const series_clims = IdDict{Series,Tuple{Float64,Float64}}()
get_clims(sp::Subplot)::Tuple{Float64,Float64} = get_clims(sp::Subplot)::Tuple{Float64,Float64} =
haskey(sp_clims, sp) ? sp_clims[sp] : update_clims(sp) haskey(sp.attr, :clims_calculated) ? sp[:clims_calculated] : update_clims(sp)
get_clims(series::Series)::Tuple{Float64,Float64} = get_clims(series::Series)::Tuple{Float64,Float64} =
haskey(series_clims, series) ? series_clims[series] : update_clims(series) haskey(series.plotattributes, :clims_calculated) ?
series[:clims_calculated]::Tuple{Float64,Float64} : update_clims(series)
get_clims(sp::Subplot, series::Series)::Tuple{Float64,Float64} = get_clims(sp::Subplot, series::Series)::Tuple{Float64,Float64} =
series[:colorbar_entry] ? get_clims(sp) : get_clims(series) series[:colorbar_entry] ? get_clims(sp) : get_clims(series)
function update_clims(sp::Subplot, op = process_clims(sp[:clims]))::Tuple{Float64,Float64} function update_clims(sp::Subplot, op = process_clims(sp[:clims]))::Tuple{Float64,Float64}
zmin, zmax = Inf, -Inf zmin, zmax = Inf, -Inf
for series in series_list(sp) for series in series_list(sp)
if series[:colorbar_entry] if series[:colorbar_entry]::Bool
zmin, zmax = _update_clims(zmin, zmax, update_clims(series, op)...) zmin, zmax = _update_clims(zmin, zmax, update_clims(series, op)...)
else else
update_clims(series, op) update_clims(series, op)
end end
end end
return sp_clims[sp] = zmin <= zmax ? (zmin, zmax) : (NaN, NaN) return sp[:clims_calculated] = zmin <= zmax ? (zmin, zmax) : (NaN, NaN)
end end
""" """
@ -36,10 +33,9 @@ values of the input. The value is stored as a series property, which is retrieve
""" """
function update_clims(series::Series, op = ignorenan_extrema)::Tuple{Float64,Float64} function update_clims(series::Series, op = ignorenan_extrema)::Tuple{Float64,Float64}
zmin, zmax = Inf, -Inf zmin, zmax = Inf, -Inf
z_colored_series = (:contour, :contour3d, :heatmap, :histogram2d, :surface, :hexbin)
# keeping this unrolled has higher performance # keeping this unrolled has higher performance
if series[:seriestype] ∈ z_colored_series && series[:z] !== nothing if series[:seriestype] ∈ _z_colored_series && series[:z] !== nothing
zmin, zmax = update_clims(zmin, zmax, series[:z], op) zmin, zmax = update_clims(zmin, zmax, series[:z], op)
end end
if series[:line_z] !== nothing if series[:line_z] !== nothing
@ -51,8 +47,7 @@ function update_clims(series::Series, op = ignorenan_extrema)::Tuple{Float64,Flo
if series[:fill_z] !== nothing if series[:fill_z] !== nothing
zmin, zmax = update_clims(zmin, zmax, series[:fill_z], op) zmin, zmax = update_clims(zmin, zmax, series[:fill_z], op)
end end
return series[:clims_calculated] = zmin <= zmax ? (zmin, zmax) : (NaN, NaN)
return series_clims[series] = zmin <= zmax ? (zmin, zmax) : (NaN, NaN)
end end
update_clims(zmin, zmax, vals::AbstractSurface, op)::Tuple{Float64,Float64} = update_clims(zmin, zmax, vals::AbstractSurface, op)::Tuple{Float64,Float64} =