From d4ef1761e4188f1ffb68aa88fb07b360391b3eed Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Tue, 16 May 2017 21:32:57 +0200 Subject: [PATCH 1/3] change skipped images because of new example --- test/runtests.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 953ad8fe..2bc0af8b 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -23,7 +23,7 @@ facts("PyPlot") do @fact pyplot() --> Plots.PyPlotBackend() @fact backend() --> Plots.PyPlotBackend() - image_comparison_facts(:pyplot, skip=[6,25,30], eps=img_eps) + image_comparison_facts(:pyplot, skip=[6,26,31], eps=img_eps) end facts("GR") do @@ -31,7 +31,7 @@ facts("GR") do @fact backend() --> Plots.GRBackend() if is_linux() && isinteractive() - image_comparison_facts(:gr, skip=[2,25,30], eps=img_eps) + image_comparison_facts(:gr, skip=[2,26,31], eps=img_eps) end end From 1f7ecb969ca8013fdad9e4833939008280a163af Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Tue, 16 May 2017 21:43:22 +0200 Subject: [PATCH 2/3] move new PlotExample to the end for VRT --- src/examples.jl | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/src/examples.jl b/src/examples.jl index 9f54509d..2fd6a0e9 100644 --- a/src/examples.jl +++ b/src/examples.jl @@ -172,24 +172,6 @@ PlotExample("", end)] ), -PlotExample("Animation with subplots", - "The `layout` macro can be used to create an animation with subplots.", - [:(begin - l = @layout([[a; b] c]) - p = plot(plot([sin,cos],1,leg=false), - scatter([atan,cos],1,leg=false), - plot(log,1,xlims=(1,10π),ylims=(0,5),leg=false),layout=l) - - anim = Animation() - for x = linspace(1,10π,100) - plot(push!(p,x,Float64[sin(x),cos(x),atan(x),cos(x),log(x)])) - frame(anim) - end - end)] -), - - - PlotExample("Open/High/Low/Close", "Create an OHLC chart. Pass in a list of (open,high,low,close) tuples as your `y` argument. This uses recipes to first convert the tuples to OHLC objects, and subsequently create a :path series with the appropriate line segments.", [:(begin @@ -318,7 +300,23 @@ PlotExample("Boxplot and Violin series recipes", violin(singers, :VoicePart, :Height, line = 0, fill = (0.2, :blue)) boxplot!(singers, :VoicePart, :Height, line = (2,:black), fill = (0.3, :orange)) end)] -) +), + +PlotExample("Animation with subplots", + "The `layout` macro can be used to create an animation with subplots.", + [:(begin + l = @layout([[a; b] c]) + p = plot(plot([sin,cos],1,leg=false), + scatter([atan,cos],1,leg=false), + plot(log,1,xlims=(1,10π),ylims=(0,5),leg=false),layout=l) + + anim = Animation() + for x = linspace(1,10π,100) + plot(push!(p,x,Float64[sin(x),cos(x),atan(x),cos(x),log(x)])) + frame(anim) + end + end)] +), ] From 89cd67792b302482143539c352aa5c9e6f401ca2 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Tue, 16 May 2017 21:46:11 +0200 Subject: [PATCH 3/3] update numbers of skipped examples in VRT --- test/runtests.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 2bc0af8b..94f95a1b 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -23,7 +23,7 @@ facts("PyPlot") do @fact pyplot() --> Plots.PyPlotBackend() @fact backend() --> Plots.PyPlotBackend() - image_comparison_facts(:pyplot, skip=[6,26,31], eps=img_eps) + image_comparison_facts(:pyplot, skip=[6,25,30,31], eps=img_eps) end facts("GR") do @@ -31,7 +31,7 @@ facts("GR") do @fact backend() --> Plots.GRBackend() if is_linux() && isinteractive() - image_comparison_facts(:gr, skip=[2,26,31], eps=img_eps) + image_comparison_facts(:gr, skip=[2,25,30,31], eps=img_eps) end end