Merge pull request #9 from JuliaImages/teh/non1

Fix display of images with non-1 indices

Author: Evizero

REQUIRE

@@ -2,5 +2,5 @@ julia 0.5
 Crayons 0.1.0
 ColorTypes 0.3.2
 ImageCore 0.1.1
-ImageTransformations 0.1.0
+ImageTransformations 0.2.1
 Compat 0.17

appveyor.yml

@@ -23,6 +23,8 @@ matrix:
     - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
     - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
 
+build: off
+
 install:
 # Download most recent Julia Windows binary
   - ps: (new-object net.webclient).DownloadFile(

src/encodeimg.jl

@@ -44,17 +44,18 @@ function encodeimg{C<:Colorant}(
         maxwidth::Int = 80)
     maxheight = max(maxheight, 5)
     maxwidth  = max(maxwidth,  5)
-    h, w = size(img)
+    h, w = map(length, indices(img))
     while ceil(h/2) > maxheight || w > maxwidth
         img = restrict(img)
-        h, w = size(img)
+        h, w = map(length, indices(img))
     end
+    yinds, xinds = indices(img)
     io = IOBuffer()
-    for y in 1:2:h
+    for y in first(yinds):2:last(yinds)
         print(io, Crayon(reset = true))
-        for x in 1:w
+        for x in xinds
             fgcol = _colorant2ansi(img[y,x], colordepth)
-            bgcol = if y+1 <= h
+            bgcol = if y+1 <= last(yinds)
                 _colorant2ansi(img[y+1,x], colordepth)
             else
                 # if reached it means that the last character row
@@ -76,15 +77,16 @@ function encodeimg{C<:Colorant}(
         maxwidth::Int = 80)
     maxheight = max(maxheight, 5)
     maxwidth  = max(maxwidth,  5)
-    h, w = size(img)
+    h, w = map(length, indices(img))
     while h > maxheight || 2w > maxwidth
         img = restrict(img)
-        h, w = size(img)
+        h, w = map(length, indices(img))
     end
+    yinds, xinds = indices(img)
     io = IOBuffer()
-    for y in 1:h
+    for y in yinds
         print(io, Crayon(reset = true))
-        for x in 1:w
+        for x in xinds
             color = img[y,x]
             fgcol = _colorant2ansi(color, colordepth)
             chr = _charof(alpha(color))
@@ -102,14 +104,14 @@ function encodeimg{C<:Colorant}(
         img::AbstractVector{C},
         maxwidth::Int = 80)
     maxwidth  = max(maxwidth, 5)
-    w = length(img)
+    w = length(indices(img, 1))
     if w > maxwidth
         img = imresize(img, maxwidth)
-        w = length(img)
+        w = length(indices(img, 1))
     end
     io = IOBuffer()
     print(io, Crayon(reset = true))
-    for i in 1:w
+    for i in indices(img, 1)
         color = img[i]
         fgcol = _colorant2ansi(color, colordepth)
         chr = _charof(alpha(color))
@@ -125,19 +127,20 @@ function encodeimg{C<:Colorant}(
         img::AbstractVector{C},
         maxwidth::Int = 80)
     maxwidth  = max(maxwidth, 5)
-    w = length(img)
+    inds = indices(img, 1)
+    w = length(inds)
     n = 3w > maxwidth ? floor(Int,maxwidth/6) : w
     io = IOBuffer()
     print(io, Crayon(reset = true))
-    for i in 1:n
+    for i in (0:n-1)+first(inds)
         color = img[i]
         fgcol = _colorant2ansi(color, colordepth)
         chr = _charof(alpha(color))
         print(io, Crayon(foreground = fgcol), chr, chr, " ")
     end
     if n < w
         print(io, Crayon(reset = true), " … ")
-        for i in w-n+1:w
+        for i in last(inds)-n+1:last(inds)
             color = img[i]
             fgcol = _colorant2ansi(color, colordepth)
             chr = _charof(alpha(color))
@@ -147,4 +150,3 @@ function encodeimg{C<:Colorant}(
     println(io, Crayon(reset = true))
     replace.(readlines(seek(io,0)), ["\n"], [""])::Vector{String}, 1, n < w ? 3*(length(1:n) + 1 + length(w-n+1:w)) : 3w
 end
-

src/imshow.jl

@@ -15,7 +15,7 @@ function imshow{C<:Colorant}(
         colordepth::TermColorDepth,
         maxsize::Tuple = displaysize(io))
     io_h, io_w = maxsize
-    img_h, img_w = size(img)
+    img_h, img_w = map(length, indices(img))
     str = if img_h <= io_h-4 && 2img_w <= io_w
         first(encodeimg(BigBlocks(),   colordepth, img, io_h-4, io_w))
     else
@@ -76,4 +76,3 @@ downsampled to fit into the display (using `restrict`).
 """
 imshow24bit(io::IO, img, args...) = imshow(io, img, TermColor24bit(), args...)
 imshow24bit(img, args...) = imshow24bit(STDOUT, img, args...)
-

test/REQUIRE

@@ -1,5 +1,8 @@
 FixedPointNumbers 0.3
 TestImages
+OffsetArrays
+CoordinateTransformations
+Rotations
 @windows ImageMagick
 @linux ImageMagick
 @osx QuartzImageIO

test/reference/lighthouse_rotated.txt

@@ -0,0 +1,15 @@
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀

test/runtests.jl

@@ -1,4 +1,4 @@
-using ImageInTerminal, ImageCore, ColorTypes, FixedPointNumbers, TestImages, ImageTransformations
+using ImageInTerminal, ImageCore, ColorTypes, FixedPointNumbers, TestImages, ImageTransformations, CoordinateTransformations, Rotations, OffsetArrays
 using Base.Test
 
 reference_path(filename) = joinpath(dirname(@__FILE__), "reference", "$(filename).txt")

test/tst_baseshow.jl

@@ -34,3 +34,4 @@ end
     @test_reference "colorant_show_24bit" res
 end
 
+ImageInTerminal.use_256()

test/tst_encodeimg.jl

@@ -365,3 +365,34 @@ end
     end
 end
 
+@testset "non-1 indexing" begin
+    @testset "rgb line" begin
+        res, h, w = @inferred ImageInTerminal.encodeimg(ImageInTerminal.SmallBlocks(), ImageInTerminal.TermColor256(), OffsetArray(rgb_line, (-1,)), 8)
+        @test typeof(res) <: Vector{String}
+        @test h === 1
+        @test w === 8
+        @test length(res) === 1
+        @test res[1] == "\e[0m\e[38;5;21m█\e[38;5;56m█\e[38;5;91m█\e[38;5;91m█\e[38;5;126m█\e[38;5;126m█\e[38;5;161m█\e[38;5;196m█\e[0m"
+    end
+    @testset "rgb line2" begin
+        res, h, w = @inferred ImageInTerminal.encodeimg(ImageInTerminal.BigBlocks(), ImageInTerminal.TermColor256(), OffsetArray(rgb_line, (2,)), 9)
+        @test typeof(res) <: Vector{String}
+        @test h === 1
+        @test w === 9
+        @test length(res) === 1
+        @test res[1] == "\e[0m\e[38;5;21m██ \e[0m … \e[38;5;196m██ \e[0m"
+        res, h, w = @inferred ImageInTerminal.encodeimg(ImageInTerminal.BigBlocks(), ImageInTerminal.TermColor256(), OffsetArray(rgb_line, (-2,)), 22)
+        @test typeof(res) <: Vector{String}
+        @test h === 1
+        @test w === 21
+        @test length(res) === 1
+        @test res[1] == "\e[0m\e[38;5;21m██ \e[38;5;21m██ \e[38;5;56m██ \e[0m … \e[38;5;161m██ \e[38;5;196m██ \e[38;5;196m██ \e[0m"
+    end
+    @testset "lighthouse" begin
+        res, h, w = @inferred ImageInTerminal.encodeimg(ImageInTerminal.SmallBlocks(), ImageInTerminal.TermColor256(), OffsetArray(lighthouse, (2,-10)), 60, 60)
+        @test typeof(res) <: Vector{String}
+        @test h === 17
+        @test w === 49
+        @test_reference "lighthouse_small_60x60_256" res
+    end
+end

test/tst_imshow.jl

@@ -75,3 +75,20 @@ end
     end
 end
 
+@testset "imshow non1" begin
+    @testset "lena" begin
+        img = OffsetArray(imresize(lena, 10, 10), (-10,5))
+        io = IOBuffer()
+        imshow(io, img)
+        res = replace.(readlines(seek(io,0)), ["\n"], [""])
+        @test_reference "lena_big_imshow" res
+    end
+    @testset "rotation" begin
+        tfm = recenter(RotMatrix(pi/4), center(lighthouse))
+        lhr = warp(lighthouse, tfm)
+        io = IOBuffer()
+        imshow(io, lhr)
+        res = replace.(readlines(seek(io,0)), ["\n"], [""])
+        @test_reference "lighthouse_rotated" res
+    end
+end