Include Resampler

Author: kbarros

ext/PlottingExt/PlotIntensities.jl

@@ -37,6 +37,14 @@ function colorrange_from_data(; data, saturation, sensitivity, allpositive)
     end
 end
 
+# Makie.heatmap can fail on large grids due to an OpenGL error. A workaround is
+# to wrap the data in a Makie.Resampler if any of the array dimensions is
+# "large" https://github.com/MakieOrg/Makie.jl/issues/4950. The empirical cutoff
+# 2000 should (hopefully) be conservative for most systems.
+function maybe_resample(data)
+    all(<(2000), size(data)) ? data : Makie.Resampler(data)
+end
+
 """
     plot_intensities!(panel, res; opts...)
 
@@ -61,11 +69,8 @@ function Sunny.plot_intensities!(panel, res::Sunny.BandIntensities{Float64}; col
 
     if res.qpts isa Sunny.QPath 
         mindisp, maxdisp = extrema(res.disp)
-        ebounds = if isnothing(ylims)
-            (min(0, mindisp), 1.1*maxdisp)
-        else
-            ylims .* unit_energy
-        end
+        ylims = @something ylims (min(0, mindisp), 1.1*maxdisp) ./ unit_energy
+        ebounds = ylims .* unit_energy
         energies = range(ebounds[1], ebounds[2], 512)
         fwhm = @something fwhm 0.02*(ebounds[2]-ebounds[1])
         σ = fwhm/2√(2log(2))
@@ -77,8 +82,8 @@ function Sunny.plot_intensities!(panel, res::Sunny.BandIntensities{Float64}; col
         colorrange = @something colorrange colorrange_suggest
 
         xticklabelrotation = maximum(length.(res.qpts.xticks[2])) > 3 ? π/6 : 0.0
-        ax = Makie.Axis(panel; xlabel="Momentum (r.l.u.)", ylabel, res.qpts.xticks, xticklabelrotation, axisopts...)
-        Makie.heatmap!(ax, axes(data, 2), collect(energies/unit_energy), data'; colorrange, colormap, lowclip=:white)
+        ax = Makie.Axis(panel; xlabel="Momentum (r.l.u.)", ylabel, res.qpts.xticks, xticklabelrotation, limits=(nothing, ylims), axisopts...)
+        Makie.heatmap!(ax, (1, size(data, 2)), ylims, maybe_resample(collect(data')); colorrange, colormap, lowclip=:white)
         for i in axes(res.disp, 1)
             Makie.lines!(ax, res.disp[i,:]/unit_energy; color=:lightskyblue3)
         end
@@ -138,18 +143,17 @@ function Sunny.plot_intensities!(panel, res::Sunny.Intensities{Float64}; colorma
     if qpts isa Sunny.QPath
         unit_energy, ylabel = get_unit_energy(units, into)
         xticklabelrotation = maximum(length.(qpts.xticks[2])) > 3 ? π/6 : 0.0
-        ax = Makie.Axis(panel[1, 1]; xlabel="Momentum (r.l.u.)", ylabel, qpts.xticks, xticklabelrotation, axisopts...)
-        isnothing(ylims) || Makie.ylims!(ax, ylims)
-        hm = Makie.heatmap!(ax, axes(data, 2), collect(energies/unit_energy), data'; colormap, colorrange)
+        ax = Makie.Axis(panel[1, 1]; xlabel="Momentum (r.l.u.)", ylabel, qpts.xticks, xticklabelrotation, limits=(nothing, ylims), axisopts...)
+        hm = Makie.heatmap!(ax, (1, size(data, 2)), extrema(energies)./unit_energy, maybe_resample(data'); colormap, colorrange)
         Makie.Colorbar(panel[1, 2], hm)
         return ax
     elseif qpts isa Sunny.QGrid{2}
         if isone(length(energies))
             aspect = grid_aspect_ratio(crystal, qpts)
             xlabel, ylabel = suggest_labels_for_grid(qpts)
-            (xs, ys) = map(range, qpts.coefs_lo, qpts.coefs_hi, size(qpts.qs))
+            (xbounds, ybounds) = zip(qpts.coefs_lo, qpts.coefs_hi)
             ax = Makie.Axis(panel[1, 1]; xlabel, ylabel, aspect, axisopts...)
-            hm = Makie.heatmap!(ax, xs, ys, dropdims(data; dims=1); colormap, colorrange)
+            hm = Makie.heatmap!(ax, xbounds, ybounds, maybe_resample(dropdims(data; dims=1)); colormap, colorrange)
             Makie.Colorbar(panel[1, 2], hm)
             return ax
         else
@@ -179,9 +183,9 @@ function Sunny.plot_intensities!(panel, res::Sunny.StaticIntensities{Float64}; c
         colorrange = @something colorrange colorrange_suggest
         aspect = grid_aspect_ratio(crystal, qpts)
         xlabel, ylabel = suggest_labels_for_grid(qpts)
-        (xs, ys) = map(range, qpts.coefs_lo, qpts.coefs_hi, size(qpts.qs))
+        (xbounds, ybounds) = zip(qpts.coefs_lo, qpts.coefs_hi)
         ax = Makie.Axis(panel[1, 1]; xlabel, ylabel, aspect, axisopts...)
-        hm = Makie.heatmap!(ax, xs, ys, data; colormap, colorrange)
+        hm = Makie.heatmap!(ax, xbounds, ybounds, maybe_resample(data); colormap, colorrange)
         Makie.Colorbar(panel[1, 2], hm)
         return ax
     else
@@ -200,9 +204,8 @@ function Sunny.plot_intensities!(panel, res::Sunny.PowderIntensities{Float64}; c
     colormap = @something colormap (allpositive ? :gnuplot2 : :bwr)
     colorrange = @something colorrange colorrange_suggest
 
-    ax = Makie.Axis(panel[1, 1]; xlabel, ylabel, axisopts...)
-    isnothing(ylims) || Makie.ylims!(ylims)
-    hm = Makie.heatmap!(ax, res.radii, collect(res.energies/unit_energy), res.data'; colormap, colorrange)
+    ax = Makie.Axis(panel[1, 1]; xlabel, ylabel, limits=(nothing, ylims), axisopts...)
+    hm = Makie.heatmap!(ax, extrema(res.radii), extrema(res.energies)./unit_energy, maybe_resample(res.data'); colormap, colorrange)
     Makie.Colorbar(panel[1, 2], hm)
     return ax
 end