From 99941dde8f5ee95aa676af480a18821b2a0505ba Mon Sep 17 00:00:00 2001 From: Michael Krabbe Borregaard Date: Tue, 14 Aug 2018 09:13:15 +0200 Subject: [PATCH 1/2] info --> @info --- src/animation.jl | 2 +- src/backends.jl | 2 +- src/output.jl | 4 ++-- src/plot.jl | 6 +++--- test/imgcomp.jl | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/animation.jl b/src/animation.jl index 6c1f880f..f3f3637a 100644 --- a/src/animation.jl +++ b/src/animation.jl @@ -87,7 +87,7 @@ function buildanimation(animdir::AbstractString, fn::AbstractString, run(`ffmpeg -v 0 -framerate $fps -loop $loop -i $(animdir)/%06d.png -pix_fmt yuv420p -y $fn`) end - show_msg && info("Saved animation to ", fn) + show_msg && @info("Saved animation to ", fn) AnimatedGif(fn) end diff --git a/src/backends.jl b/src/backends.jl index ad1b92d2..7f5bcd77 100644 --- a/src/backends.jl +++ b/src/backends.jl @@ -43,7 +43,7 @@ end # --------------------------------------------------------- function add_backend(pkg::Symbol) - info("To do a standard install of $pkg, copy and run this:\n\n") + @info("To do a standard install of $pkg, copy and run this:\n\n") println(add_backend_string(_backend_instance(pkg))) println() end diff --git a/src/output.jl b/src/output.jl index 7c762d6b..8f1df0a3 100644 --- a/src/output.jl +++ b/src/output.jl @@ -173,10 +173,10 @@ function _show(io::IO, ::MIME"text/html", plt::Plot) output_type = get(_best_html_output_type, backend_name(plt.backend), :svg) end if output_type == :png - # info("writing png to html output") + # @info("writing png to html output") print(io, "") elseif output_type == :svg - # info("writing svg to html output") + # @info("writing svg to html output") show(io, MIME("image/svg+xml"), plt) elseif output_type == :txt show(io, MIME("text/plain"), plt) diff --git a/src/plot.jl b/src/plot.jl index 7e62b126..9d0ee6c4 100644 --- a/src/plot.jl +++ b/src/plot.jl @@ -177,7 +177,7 @@ function _plot!(plt::Plot, d::KW, args::Tuple) kw_list = _process_userrecipes(plt, d, args) - # info(1) + # @info(1) # map(DD, kw_list) @@ -196,7 +196,7 @@ function _plot!(plt::Plot, d::KW, args::Tuple) _process_plotrecipe(plt, next_kw, kw_list, still_to_process) end - # info(2) + # @info(2) # map(DD, kw_list) # -------------------------------- @@ -212,7 +212,7 @@ function _plot!(plt::Plot, d::KW, args::Tuple) # "SERIES RECIPES" # -------------------------------- - # info(3) + # @info(3) # map(DD, kw_list) for kw in kw_list diff --git a/test/imgcomp.jl b/test/imgcomp.jl index c1442686..abc08b13 100644 --- a/test/imgcomp.jl +++ b/test/imgcomp.jl @@ -9,7 +9,7 @@ using VisualRegressionTests # ENV["MPLBACKEND"] = "Agg" # try # @eval import PyPlot -# info("Matplotlib version: $(PyPlot.matplotlib[:__version__])") +# @info("Matplotlib version: $(PyPlot.matplotlib[:__version__])") # end @@ -29,7 +29,7 @@ const _current_plots_version = v"0.17.4" function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = isinteractive(), sigma = [1,1], eps = 1e-2) Plots._debugMode.on = debug example = Plots._examples[idx] - info("Testing plot: $pkg:$idx:$(example.header)") + @info("Testing plot: $pkg:$idx:$(example.header)") backend(pkg) backend() From badf302756de326049145e54c2dae8c36b88e9f0 Mon Sep 17 00:00:00 2001 From: Michael Krabbe Borregaard Date: Tue, 14 Aug 2018 09:19:32 +0200 Subject: [PATCH 2/2] Explicitly specify assignment to global --- src/animation.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/animation.jl b/src/animation.jl index f3f3637a..e0b2f5ab 100644 --- a/src/animation.jl +++ b/src/animation.jl @@ -142,7 +142,7 @@ function _animate(forloop::Expr, args...; callgif = false) end push!(block.args, :(if $filterexpr; frame($animsym); end)) - push!(block.args, :($countersym += 1)) + push!(block.args, :(global $countersym += 1)) # add a final call to `gif(anim)`? retval = callgif ? :(gif($animsym)) : animsym @@ -151,7 +151,7 @@ function _animate(forloop::Expr, args...; callgif = false) esc(quote $freqassert # if filtering, check frequency is an Integer > 0 $animsym = Animation() # init animation object - $countersym = 1 # init iteration counter + global $countersym = 1 # init iteration counter $forloop # for loop, saving a frame after each iteration $retval # return the animation object, or the gif end)