diff --git a/.travis.yml b/.travis.yml index eb544af5..f20a425d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ script: # - julia -e 'Pkg.clone("https://github.com/tbreloff/Images.jl.git"); Pkg.checkout("Images","tom_imgcompare");' # - julia -e 'Pkg.clone("Images"); Pkg.build("Images")' # - julia -e 'Pkg.clone("ImageMagick"); Pkg.build("ImageMagick")' + - julia -e 'Pkg.clone("https://github.com/tbreloff/ImageMagick.jl.git"); Pkg.checkout("ImageMagick","tb_write"); Pkg.build("ImageMagick")' - julia -e 'Pkg.clone("https://github.com/tbreloff/VisualRegressionTests.jl.git");' - julia -e 'Pkg.clone("https://github.com/tbreloff/ExamplePlots.jl.git");' # - julia -e 'Pkg.add("Cairo"); Pkg.build("Cairo")' diff --git a/src/colors.jl b/src/colors.jl index e669523d..f5da9f2c 100644 --- a/src/colors.jl +++ b/src/colors.jl @@ -114,9 +114,9 @@ end # ColorGradient(map(convertColor, cs), vals; kw...) # end -# function ColorGradient(grad::ColorGradient; alpha = nothing) -# ColorGradient(convertColor(grad.colors, alpha), grad.values) -# end +function ColorGradient(grad::ColorGradient; alpha = nothing) + ColorGradient(convertColor(grad.colors, alpha), grad.values) +end getColor(gradient::ColorGradient, idx::Int) = gradient.colors[mod1(idx, length(gradient.colors))] diff --git a/test/REQUIRE b/test/REQUIRE index 42789931..796b2ed3 100644 --- a/test/REQUIRE +++ b/test/REQUIRE @@ -7,7 +7,6 @@ FactCheck Cairo Gadfly Images -ImageMagick PyPlot @osx QuartzImageIO GR diff --git a/test/runtests.jl b/test/runtests.jl index 1ef7b04e..c9289a12 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -33,5 +33,12 @@ facts("GR") do # image_comparison_facts(:gr, only=[1], eps=img_eps) end +facts("PlotlyJS") do + @fact plotlyjs() --> Plots.PlotlyJSBackend() + @fact backend() --> Plots.PlotlyJSBackend() + + image_comparison_facts(:plotlyjs, only=[1,2,3,4,7,8,9,10,11,12,14,15,20,22,23,24], eps=img_eps) +end + FactCheck.exitstatus() end # module