Merge pull request #15 from JuliaImages/teh/timeaxis_nesting

Fix nesting of timeaxis
JuliaImages · Mar 22, 2017 · cf0faf8 · cf0faf8
2 parents 5025ff9 + 8262b6b
commit cf0faf8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/ImageMetadata.jl b/src/ImageMetadata.jl
@@ -238,6 +238,7 @@ macro get(img, k, default)
     end
 end
 
+ImageAxes.timeaxis(img::ImageMetaAxis) = timeaxis(data(img))
 ImageAxes.timedim(img::ImageMetaAxis) = timedim(data(img))
 ImageCore.colordim(img::ImageMetaAxis) = colordim(data(img))
 

diff --git a/test/core.jl b/test/core.jl
@@ -300,6 +300,7 @@ end
     @test @inferred(size_spatial(img)) == (3,5)
     @test @inferred(indices_spatial(img)) == (Base.OneTo(3), Base.OneTo(5))
     assert_timedim_last(img)
+    @test timeaxis(img) == Axis{:time}(0.1:0.1:0.8)
 end
 
 @testset "spatialprops" begin
-Original file line number
+Diff line change
@@ Expand Up / @@ -238,6 +238,7 @@ macro get(img, k, default) @@
         end
     end
+    ImageAxes.timeaxis(img::ImageMetaAxis) = timeaxis(data(img))
     ImageAxes.timedim(img::ImageMetaAxis) = timedim(data(img))
     ImageCore.colordim(img::ImageMetaAxis) = colordim(data(img))
@@ Expand Down @@