fix bounds checking and add plotting tests

Author: mileslucas

src/core.jl

@@ -29,8 +29,8 @@ abstract type PSFModel{T} <: AbstractMatrix{T} end
 # getindex just calls model with reversed indices
 Base.getindex(model::PSFModel, idx::Vararg{<:Integer,2}) = model(reverse(idx))
 # always inbounds
-Base.checkbounds(::Type{Bool}, ::PSFModel, idx) = true
-Base.checkbounds(::Type{Bool}, ::PSFModel, idx...) = true
+Base.checkbounds(::Type{Bool}, ::PSFModel, inds...) = true
+Base.checkbounds(::Type{Bool}, ::PSFModel, inds::CartesianIndex) = true
 
 # broadcasting hack to slurp other axes (doesn't work for numbers)
 Broadcast.combine_axes(psf::PSFModel, other::AbstractMatrix) = axes(other)
@@ -56,8 +56,8 @@ _position(nt::NamedTuple{()}) = SA[0, 0]
 ]
 
 function indices_from_extent(pos, extent)
-    halfextent = @. 0.5 * extent
-    lower = @. round(Int, pos - halfextent)
-    upper = @. round(Int, pos + halfextent)
+    half_extent = @. 0.5 * extent
+    lower = @. floor(Int, pos - half_extent)
+    upper = @. ceil(Int, pos + half_extent)
     return last(lower):last(upper), first(lower):first(upper)
 end

src/plotting.jl

@@ -3,12 +3,12 @@ using RecipesBase
 @recipe function f(model::PSFModel, inds...)
     seriestype := :heatmap
     aspect_ratio --> 1
-    xlim --> extrema(inds[2])
-    ylim --> extrema(inds[1])
+    xlims --> extrema(first(inds))
+    ylims --> extrema(last(inds))
 
-    arr = model[inds...]
+    arr = model[reverse(inds)...]
 
     return inds..., arr
 end
 
-@recipe f(model::PSFModel, inds=axes(model)) = model, inds...
+@recipe f(model::PSFModel, inds=reverse(axes(model))) = model, inds...

test/plotting.jl

@@ -1,21 +1,30 @@
 using RecipesBase: apply_recipe
 
 @testset "plotting - $K" for K in (Gaussian, AiryDisk, Moffat)
-    psf = K(y=1, fwhm=5)
+    psf = K(x=0, y=1, fwhm=5)
     recipes = apply_recipe(Dict{Symbol,Any}(), psf)
     for rec in recipes
-        @test getfield(rec, 1) == Dict{Symbol,Any}(
+        @test rec.args[1] === psf
+        ys, xs = axes(psf)
+        @test rec.args[2] == xs
+        @test rec.args[3] == ys
+    end
+
+    recipes_full = apply_recipe(Dict{Symbol,Any}(), psf, reverse(axes(psf))...)
+    for rec in recipes_full
+        @test rec.plotattributes == Dict{Symbol,Any}(
             :seriestype => :heatmap,
-            :xlim => (-15, 15),
-            :ylim => (-14, 16),
+            :xlims => (-8, 8),
+            :ylims => (-7, 9),
             :aspect_ratio => 1
+        )
 
         xs = rec.args[1]
         ys = rec.args[2]
         _psf = rec.args[3]
 
-        @test xs == -15:15
-        @test ys == -14:16
+        @test xs == -8:8
+        @test ys == -7:9
         @test _psf == collect(psf)
     end
 end