Bump DimensionalData to fix broadcasting (#34)

* Bump compat with DimensionalData

* Fix ambiguity error with newer DimensionalData

* Skip right to DimensionalData 0.23

* Fix dims after imview.
* header now shared more often when taking views of data
* restored imview live update functionality (actually behave like a view)
* Removed ability to call imview then implot and keep axes. This was never going to work in the long run.

* Fix tests

* Align composecolors with new behavior of imview

Author: sefffal

Project.toml

@@ -28,7 +28,7 @@ WCS = "15f3aee2-9e10-537f-b834-a6fb8bdb944d"
 AbstractFFTs = "1.1"
 AstroAngles = "0.1"
 ColorSchemes = "3.18"
-DimensionalData = "0.20.8"
+DimensionalData = "0.23"
 FITSIO = "0.16, 0.17"
 FileIO = "1.15"
 ImageAxes = "0.6"

src/AstroImages.jl

@@ -240,16 +240,19 @@ end
 )
     return AstroImage(data, dims, refdims, header, wcs, Ref(wcs_stale), wcsdims)
 end
-@inline DimensionalData.rebuildsliced(
+
+@inline function DimensionalData.rebuildsliced(
     f::Function,
-    img::AstroImage,
-    data,
-    I,
-    header=deepcopy(header(img)),
-    wcs=getfield(img, :wcs),
-    wcs_stale=getfield(img, :wcs_stale)[],
-    wcsdims=getfield(img, :wcsdims),
-) = rebuild(img, data, DimensionalData.slicedims(f, img, I)..., nothing, nothing, header, wcs, wcs_stale, wcsdims)
+    A::AstroImage,
+    data::AbstractArray,
+    I::Tuple,
+    header=header(A),
+    wcs=getfield(A, :wcs),
+    wcs_stale=getfield(A, :wcs_stale)[],
+    wcsdims=getfield(A, :wcsdims),)
+    sd = DimensionalData.slicedims(f, A, I)
+    rebuild(A; data, dims=sd[1], refdims=sd[2], header, wcs, wcs_stale, wcsdims)
+end
 
 # Return result wrapped in AstroImage
 # For these functions that return lazy wrappers, we want to share header
@@ -448,6 +451,8 @@ See also: [`shareheader`](@ref).
 """
 copyheader(img::AstroImage, data::AbstractArray) =
     AstroImage(data, dims(img), refdims(img), deepcopy(header(img)), copy(getfield(img, :wcs)), Ref(getfield(img, :wcs_stale)[]), getfield(img,:wcsdims))
+copyheader(img::AstroImage, data::AstroImage) =
+    AstroImage(data, dims(data), refdims(data), deepcopy(header(img)), copy(getfield(img, :wcs)), Ref(getfield(img, :wcs_stale)[]), getfield(img,:wcsdims))
 
 """
     shareheader(img::AstroImage, data) -> imgnew
@@ -457,6 +462,7 @@ synchronized header; modifying one also affects the other.
 See also: [`copyheader`](@ref).
 """ 
 shareheader(img::AstroImage, data::AbstractArray) = AstroImage(data, dims(img), refdims(img), header(img), getfield(img, :wcs), Ref(getfield(img, :wcs_stale)[]), getfield(img,:wcsdims))
+shareheader(img::AstroImage, data::AstroImage) = AstroImage(data, dims(data), refdims(data), header(img), getfield(img, :wcs), Ref(getfield(img, :wcs_stale)[]), getfield(img,:wcsdims))
 # Share header if an AstroImage, do nothing if AbstractArray
 maybe_shareheader(img::AstroImage, data) = shareheader(img, data)
 maybe_shareheader(::AbstractArray, data) = data

src/ccd2rgb.jl

@@ -74,6 +74,6 @@ function composecolors(
             clamp(pxblended.alpha,0,1)
         )
     end
-    return copyheader(first(images), combined)
+    return combined
 end
 export composechannels

src/imview.jl

@@ -240,21 +240,22 @@ function imview(
     # Origin is centre of pixel (1,1) at bottom left.
     if ndims(img) == 2
         imgT = view(
-            permutedims(img,(2,1)),
+            permuteddimsview(img,(2,1)),
             reverse(axes(img,2)),
             :,
         )
     elseif ndims(img) >= 3
         newdims = (2,1, 3:ndims(img)...)
         ds = Tuple(((:) for _ in 2:ndims(img)))
         imgT = view(
-            permutedims(img,newdims),
+            permuteddimsview(img,newdims),
             reverse(axes(img,2)),
             ds...,
         )
     else
         imgT = img
     end
+
     isempt = isempty(imgT)
     if isempt
         @warn "imview called with empty argument"
@@ -273,18 +274,7 @@ function imview(
     return _imview(imgT, normed, stretch, _lookup_cmap(cmap), contrast, bias)
 end
 
-# Unwrap AstroImages before view, then rebuild. 
-# We have to permute the dimensions of the image to get the origin at the bottom left.
-# But we don't want this to affect the dimensions of the array.
-# Also, this reduces the number of methods we need to compile for imview by standardizing types
-# earlier on. The compiled code for showing an array is the same as an array wrapped by an
-# AstroImage, except for one unwrapping step.
-function imview(
-    img::AstroImage;
-    kwargs...
-)
-    return shareheader(img, imview(parent(img); kwargs...))
-end
+
 
 # Special handling for complex images
 """
@@ -307,8 +297,26 @@ function imview(img::AbstractArray{T}; kwargs...) where {T<:Complex}
     vcat(mag_view,angle_view)
 end
 
-function _imview(img, normed::AbstractArray{T}, stretch, cmap, contrast, bias) where T
+# Unwrap AstroImages before view, then rebuild. 
+# We have to permute the dimensions of the image to get the origin at the bottom left.
+# But we don't want this to affect the dimensions of the array.
+# Also, this reduces the number of methods we need to compile for imview by standardizing types
+# earlier on. The compiled code for showing an array is the same as an array wrapped by an
+# AstroImage, except for one unwrapping step.
+function _imview(
+    img::AstroImage, normed::AbstractArray{T}, stretch, cmap, contrast, bias
+) where T
 
+    p = parent(img)
+    out = _imview(p, normed, stretch, cmap, contrast, bias)
+    # out = shareheader(img, v)
+    return out
+end
+
+
+
+
+function _imview(img, normed::AbstractArray{T}, stretch, cmap, contrast, bias) where T
     function colormap(pixr, pixn)::RGBA{N0f8}
         if ismissing(pixr) || !isfinite(pixr) || ismissing(pixn) || !isfinite(pixn)
             # We check pixr in addition to pixn because we want to preserve if the pixels
@@ -341,8 +349,7 @@ function _imview(img, normed::AbstractArray{T}, stretch, cmap, contrast, bias) w
         return pix
     end
     mapper = mappedarray(colormap, img, normed)
-
-    return maybe_copyheader(img, mapper)
+    return mapper
 end
 
 

src/io.jl

@@ -45,13 +45,13 @@ function AstroImage(filename::AbstractString, exts::Union{NTuple{N,<:Integer},Ab
         end
     end
 end
-function AstroImage(filename::AbstractString; kwargs...) where {N}
+function AstroImage(filename::AbstractString; kwargs...)
     return FITS(filename, "r") do fits
         ext = indexer(fits)
         return AstroImage(fits[ext]; kwargs...)
     end
 end
-function AstroImage(filename::AbstractString, ::Colon, args...; kwargs...) where {N}
+function AstroImage(filename::AbstractString, ::Colon, args...; kwargs...)
     return FITS(filename, "r") do fits
         return map(fits) do hdu
             return AstroImage(hdu, args...; kwargs...)
@@ -84,7 +84,7 @@ returned as AstroImage, and TableHDUs are returned as column tables.
 
 !!! Currently any header on TableHDUs are not supported and are ignored.
 """
-function fileio_load(f::File{format"FITS"}, ext::Union{Int,Nothing}=nothing, args...; kwargs...) where {N}
+function fileio_load(f::File{format"FITS"}, ext::Union{Int,Nothing}=nothing, args...; kwargs...)
     return FITS(f.filename, "r") do fits
         if isnothing(ext)
             ext = indexer(fits)
@@ -99,7 +99,7 @@ function fileio_load(f::File{format"FITS"}, exts::Union{NTuple{N,<:Integer},Abst
         end
     end
 end
-function fileio_load(f::File{format"FITS"}, ::Colon, args...; kwargs...) where {N}
+function fileio_load(f::File{format"FITS"}, ::Colon, args...; kwargs...)
     return FITS(f.filename, "r") do fits
         exts_resolved = 1:length(fits)
         map(exts_resolved) do ext

src/plot-recipes.jl

@@ -71,6 +71,7 @@
             img = data
         end
         imgv = imview(img; clims, stretch, cmap, contrast, bias)
+        imgv = shareheader(img, imgv)
     end
 
     # Reduce large images using the same heuristic as Images.jl
@@ -516,7 +517,6 @@ function WCSGrid(img::AstroImageMat, wcsn=1)
     miny = first(dims(img,1))
     maxy = last(dims(img,1))
     extent = (minx-0.5, maxx+0.5, miny-0.5, maxy+0.5)
-    @show extent
     return WCSGrid(img, extent, wcsn)
 end
 

test/runtests.jl

@@ -211,13 +211,17 @@ end
 ##
 @testset "imview" begin
 
-    arr1 = permutedims(reshape(1:9,3,3))
+    arr1 = collect(permutedims(reshape(1:9,3,3)))
     img = AstroImage(arr1)
 
     @test imview(arr1) == imview(img)
-    @test imview(img) isa AstroImage
-    @test !(imview(arr1) isa AstroImage)
 
+    ## Test view functionality
+    ivimg = imview(img, clims=(0,9))
+    img[1] = 0
+    @test imview(img, clims=(0,9)) == ivimg # Should have updated
+    img[1] = 1
+        
     img_rendered_1 = imview(img, clims=(1,9), stretch=identity, contrast=1, bias=0.5, cmap=nothing)
 
     # Image Orientation
@@ -312,6 +316,13 @@ end
         6  5  4
         3  2  1
     ]
+
+
+    # https://github.com/JuliaAstro/AstroImages.jl/issues/33
+    dark = AstroImage(zeros(1, 10, 10));
+    raw = AstroImage(ones(5, 10, 10));
+    @test size(dark .- raw) == size(raw)
+
 end
 ##