mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Plotly: Remove argument checking for levels

Browse Source 
Checking of the `levels` keyword argument will be moved out
of individual backends' code, so we can assume that `levels`
if present in `plotattributes` is either an `AbstractVector` or
`Integer`.
This commit is contained in:
Andy Nowacki 2021-08-24 16:12:13 +01:00
parent fbabf50f5a
commit 33a7e12ae8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backends/plotly.jl
View File

@ -621,8 +621,9 @@ function plotly_series(plt::Plot, series::Series)
:coloring => filled ? "fill" : "lines", :coloring => filled ? "fill" : "lines",
:showlabels => series[:contour_labels] == true, :showlabels => series[:contour_labels] == true,
) )
# Plotly does not support arbitrary sets of contours: # Plotly does not support arbitrary sets of contours
# https://github.com/plotly/plotly.js/issues/4503 # (https://github.com/plotly/plotly.js/issues/4503)
# so we distinguish AbstractRanges and AbstractVectors
let levels = series[:levels] let levels = series[:levels]
if levels isa AbstractRange if levels isa AbstractRange
plotattributes_out[:contours][:start] = first(levels) plotattributes_out[:contours][:start] = first(levels)
@ -638,10 +639,9 @@ function plotly_series(plt::Plot, series::Series)
"setting arbitrary contour levels with Plotly backend is not supported; " * "setting arbitrary contour levels with Plotly backend is not supported; " *
"use a range to set equally-spaced contours or an integer to set the " * "use a range to set equally-spaced contours or an integer to set the " *
"approximate number of contours with the keyword `levels`. " * "approximate number of contours with the keyword `levels`. " *
"Using levels $(levels_range)" "Setting levels to $(levels_range)"
) )
elseif isinteger(levels) elseif levels isa Integer
# Assume this is a number of levels
plotattributes_out[:ncontours] = levels + 2 plotattributes_out[:ncontours] = levels + 2
end end
end end

2
test/test_plotly.jl
View File

@ -46,7 +46,7 @@ using Plots, Test
"setting arbitrary contour levels with Plotly backend " * "setting arbitrary contour levels with Plotly backend " *
"is not supported; use a range to set equally-spaced contours or an " * "is not supported; use a range to set equally-spaced contours or an " *
"integer to set the approximate number of contours with the keyword " * "integer to set the approximate number of contours with the keyword " *
"`levels`. Using levels -1.0:0.5:1.0", "`levels`. Setting levels to -1.0:0.5:1.0",
) Plots.plotly_series(p) ) Plots.plotly_series(p)
@test series_dict[1][:contours][:start] == first(levels_range) @test series_dict[1][:contours][:start] == first(levels_range)
@test series_dict[1][:contours][:end] == last(levels_range) @test series_dict[1][:contours][:end] == last(levels_range)