From d942660f91f9054ef9dc3de7c0ee712c03f69587 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Sat, 11 Apr 2020 17:01:23 +0200 Subject: [PATCH] fix scale_func for plotly --- src/backends/plotly.jl | 2 +- src/examples.jl | 25 +++++++++++++++---------- test/runtests.jl | 6 +++--- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/backends/plotly.jl b/src/backends/plotly.jl index 6b124fa9..61560158 100644 --- a/src/backends/plotly.jl +++ b/src/backends/plotly.jl @@ -176,7 +176,7 @@ function plotly_axis(plt::Plot, axis::Axis, sp::Subplot) lims = axis_limits(sp, letter) if axis[:ticks] != :native || axis[:lims] != :auto - ax[:range] = map(scalefunc(axis[:scale]), lims) + ax[:range] = map(RecipesPipeline.scale_func(axis[:scale]), lims) end if !(axis[:ticks] in (nothing, :none, false)) diff --git a/src/examples.jl b/src/examples.jl index 7b3cd4cd..1c116d98 100644 --- a/src/examples.jl +++ b/src/examples.jl @@ -986,21 +986,26 @@ const _examples = PlotExample[ ] # Some constants for PlotDocs and PlotReferenceImages -_animation_examples = [2, 30] +_animation_examples = [2, 31] _backend_skips = Dict( :gr => [25, 30], - :pyplot => [25, 30], + :pyplot => [2, 25, 30, 31], :plotlyjs => [2, 21, 24, 25, 30, 31], :plotly => [2, 21, 24, 25, 30, 31], :pgfplots => [2, 5, 6, 10, 16, 20, 22, 23, 25, 28, 30, 31, 34, 37, 38, 39], - :pgfplotsx => [ 6, # images - 10, # histogram2d - 16, # pgfplots thinks the upper panel is too small - 22, # contourf - 23, # pie - 32, # spy - 38, # histogram2d - ] ) + :pgfplotsx => [ + 2, # animation + 6, # images + 10, # histogram2d + 16, # pgfplots thinks the upper panel is too small + 22, # contourf + 23, # pie + 31, # animation + 32, # spy + 38, # histogram2d + 45, # wireframe + ], +) diff --git a/test/runtests.jl b/test/runtests.jl index 9b36f097..04426ec3 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -62,9 +62,9 @@ pyplot() image_comparison_facts(:pyplot, tol=img_tol, skip = Plots._backend_skips[:pyplot]) end -pgfplots() -@testset "PGFPlots" begin - image_comparison_facts(:pgfplots, tol=img_tol, skip = Plots._backend_skips[:pgfplots]) +pgfplotsx() +@testset "PGFPlotsX" begin + image_comparison_facts(:pgfplotsx, tol=img_tol, skip = Plots._backend_skips[:pgfplotsx]) end =# ##