Skip to content

Commit

Permalink
Don't use tabs during print because it doesn't work with overprinting (
Browse files Browse the repository at this point in the history
  • Loading branch information
IanButterworth authored Sep 5, 2023
1 parent 422a324 commit 9e5002e
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions src/ProgressMeter.jl
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,13 @@ mutable struct ProgressUnknown <: AbstractProgress
end

function ProgressUnknown(;
dt::Real=0.1,
desc::AbstractString="Progress: ",
color::Symbol=:green,
spinner::Bool=false,
output::IO=stderr,
dt::Real=0.1,
desc::AbstractString="Progress: ",
color::Symbol=:green,
spinner::Bool=false,
output::IO=stderr,
offset::Integer=0,
enabled::Bool = true,
enabled::Bool = true,
showspeed::Bool = false)
CLEAR_IJULIA[] = clear_ijulia()
reentrantlocker = Threads.ReentrantLock()
Expand Down Expand Up @@ -409,8 +409,8 @@ spinner_char(p::ProgressUnknown, spinner::AbstractVector{<:AbstractChar}) =
spinner_char(p::ProgressUnknown, spinner::AbstractString) =
p.done ? spinner_done : spinner[nextind(spinner, 1, p.spincounter % length(spinner))]

function updateProgress!(p::ProgressUnknown; showvalues = (), truncate_lines = false,
valuecolor = :blue, desc = p.desc, ignore_predictor = false,
function updateProgress!(p::ProgressUnknown; showvalues = (), truncate_lines = false,
valuecolor = :blue, desc = p.desc, ignore_predictor = false,
spinner::Union{AbstractChar,AbstractString,AbstractVector{<:AbstractChar}} = spinner_chars,
offset::Integer = p.offset, keep = (offset == 0))
!p.enabled && return
Expand All @@ -422,10 +422,10 @@ function updateProgress!(p::ProgressUnknown; showvalues = (), truncate_lines = f
elapsed_time = t - p.tinit
dur = durationstring(elapsed_time)
if p.spinner
msg = @sprintf "%c %s \t Time: %s" spinner_char(p, spinner) p.desc dur
msg = @sprintf "%c %s Time: %s" spinner_char(p, spinner) p.desc dur
p.spincounter += 1
else
msg = @sprintf "%s %d \t Time: %s" p.desc p.counter dur
msg = @sprintf "%s %d Time: %s" p.desc p.counter dur
end
if p.showspeed
sec_per_iter = elapsed_time / p.counter
Expand All @@ -452,10 +452,10 @@ function updateProgress!(p::ProgressUnknown; showvalues = (), truncate_lines = f
if t > p.tlast+p.dt
dur = durationstring(t-p.tinit)
if p.spinner
msg = @sprintf "%c %s \t Time: %s" spinner_char(p, spinner) p.desc dur
msg = @sprintf "%c %s Time: %s" spinner_char(p, spinner) p.desc dur
p.spincounter += 1
else
msg = @sprintf "%s %d \t Time: %s" p.desc p.counter dur
msg = @sprintf "%s %d Time: %s" p.desc p.counter dur
end
if p.showspeed
elapsed_time = t - p.tinit
Expand Down Expand Up @@ -867,8 +867,8 @@ end
@showprogress dt "Computing..." pmap(x->x^2, 1:50)
```
displays progress in performing a computation. `dt` is the minimum
interval in seconds between updates to the user. You may optionally
supply a custom message to be printed that specifies the computation
interval in seconds between updates to the user. You may optionally
supply a custom message to be printed that specifies the computation
being performed.
`@showprogress` works for loops, comprehensions, map, reduce, and pmap.
Expand Down

0 comments on commit 9e5002e

Please sign in to comment.