Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow 2d coordinates for heatmap plots in PyPlot backend #4298

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Allow 2d coordinates for heatmap plots in PyPlot backend #4298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
807af04
Allow 2d coordinates for heatmap plots
johnomotani Aug 3, 2022
3133ee8
Fix formatting
johnomotani Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/axes.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ function expand_extrema!(axis::Axis, v::Tuple{MIN,MAX}) where {MIN<:Number,MAX<:
ex.emax = isfinite(v[2]) ? max(v[2], ex.emax) : ex.emax
ex
end
function expand_extrema!(axis::Axis, v::AVec{N}) where {N<:Number}
function expand_extrema!(axis::Axis, v::Union{AVec{N},AMat{N}}) where {N<:Number}
ex = axis[:extrema]
for vi in v
expand_extrema!(ex, vi)
Expand Down Expand Up @@ -515,6 +515,10 @@ function expand_extrema!(sp::Subplot, plotattributes::AKW)
if plotattributes[:seriestype] === :heatmap
for letter in (:x, :y)
data = plotattributes[letter]
if typeof(data) <: Surface
# Was given 2d coordinates, need to extract from Surface struct
data = data.surf
end
axis = sp[get_attr_symbol(letter, :axis)]
scale = get(plotattributes, get_attr_symbol(letter, :scale), :identity)
expand_extrema!(axis, heatmap_edges(data, scale))
Expand Down
34 changes: 33 additions & 1 deletion src/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,14 @@ function _heatmap_edges(v::AVec, isedges::Bool = false, ispolar::Bool = false)
extra_max = (v[end] - v[end - 1]) / 2
vcat(vmin - extra_min, 0.5 * (v[1:(end - 1)] + v[2:end]), vmax + extra_max)
end
function _heatmap_edges(v::AMat, isedges::Bool = false, ispolar::Bool = false)
# For now, don't handle edges here and just defer to the backend
v
end

"create an (n+1) list of the outsides of heatmap rectangles"
function heatmap_edges(
v::AVec,
v::Union{AVec,AMat},
scale::Symbol = :identity,
isedges::Bool = false,
ispolar::Bool = false,
Expand Down Expand Up @@ -307,6 +311,34 @@ function heatmap_edges(
return x, y
end

function heatmap_edges(
x::AMat,
xscale::Symbol,
y::AMat,
yscale::Symbol,
z_size::Tuple{Int,Int},
ispolar::Bool = false,
)
x_size = size(x)
y_size = size(y)
if x_size != y_size
error("""When x and y are 2d, they must have the same size""")
end
ismidpoints = z_size == x_size
isedges = (z_size[1] + 1, z_size[2] + 1) == x_size
if !ismidpoints && !isedges
println("z_size=$z_size, x_size=$x_size, y_size=$y_size")
println("x $(typeof(x)), y $(typeof(y))")
error(
"""Size of x & y does not match the size of z.
Must be either `size(z) == size(x) == size(y))` (x & y define midpoints)
or `(size(z)[1]+1,size(z)[2]+1) == size(x) == size(y)` (x & y define edges).""",
)
end
x, y = heatmap_edges(x, xscale, isedges), heatmap_edges(y, yscale, isedges, ispolar) # special handle for `r` in polar plots
return x, y
end

function is_uniformly_spaced(v; tol = 1e-6)
dv = diff(v)
maximum(dv) - minimum(dv) < tol * mean(abs.(dv))
Expand Down