Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add optional callback #72

Merged
merged 2 commits into from
Sep 20, 2022
Merged

add optional callback #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a547bc
add callback kw
t-bltg Sep 20, 2022
823bd70
support `callback`
t-bltg Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/ImageInTerminal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,24 +107,25 @@ Supported encoding:
- ascii (`XTermColors` backend)
"""

function imshow(io::IO, img::AbstractArray{<:Colorant}, maxsize::Tuple=displaysize(io))
function imshow(
io::IO, img::AbstractArray{<:Colorant}, maxsize::Tuple=displaysize(io); kw...
)
buf = IOContext(PipeBuffer(), :color => get(io, :color, false))
if choose_sixel(img)
sixel_encode(buf, img)
else
print_func = (io, x) -> ascii_show(io, x, COLORMODE[], :auto, maxsize; kw...)
if ndims(img) > 2
Base.show_nd(
buf, img, (buf, x) -> ascii_show(buf, x, COLORMODE[], :auto, maxsize), true
)
Base.show_nd(buf, img, print_func, true)
else
ascii_show(buf, img, COLORMODE[], :auto, maxsize)
print_func(buf, img)
end
end
write(io, read(buf, String))
end

imshow(img::AbstractArray{<:Colorant}, args...) = imshow(stdout, img, args...)
imshow(img, args...) =
imshow(img::AbstractArray{<:Colorant}, args...; kw...) = imshow(stdout, img, args...; kw...)
imshow(img, args...; kw...) =
throw(ArgumentError("imshow only supports colorant arrays with 1 or 2 dimensions"))

sixel_encode(args...; kwargs...) = Sixel.sixel_encode(args...; kwargs...)
Expand Down
13 changes: 13 additions & 0 deletions test/tst_imshow.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,17 @@ end
end
end

@testset "callback" begin
img = imresize(mandril, 10, 10)
io = PipeBuffer()
fgcols, bgcols = [], []
callback(I, fgcol, bgcol, chars...) = begin
push!(fgcols, fgcol)
push!(bgcols, bgcol)
end
@ensurecolor imshow(io, img; callback=callback)
@test length(fgcols) == prod(size(img))
@test all(ismissing.(bgcols))
end

set_colormode(8) # reset to default state