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

Merge pull request #1436 from daschw/fill-magic

Browse Source 
fix fill magic argument
This commit is contained in:
Daniel Schwabeneder 2018-03-18 23:21:16 +01:00 committed by GitHub
commit 6c396e1d88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/args.jl
View File

@ -751,6 +751,10 @@ function processFillArg(d::KW, arg)
elseif allAlphas(arg) elseif allAlphas(arg)
d[:fillalpha] = arg d[:fillalpha] = arg
# fillrange provided as vector or number
elseif typeof(arg) <: Union{AbstractArray{<:Real}, Real}
d[:fillrange] = arg
elseif !handleColors!(d, arg, :fillcolor) elseif !handleColors!(d, arg, :fillcolor)
d[:fillrange] = arg d[:fillrange] = arg

10
src/backends/plotly.jl
View File

@ -548,7 +548,7 @@ function plotly_series(plt::Plot, series::Series)
if series[:fillrange] == true || series[:fillrange] == 0 || isa(series[:fillrange], Tuple) if series[:fillrange] == true || series[:fillrange] == 0 || isa(series[:fillrange], Tuple)
d_out[:fill] = "tozeroy" d_out[:fill] = "tozeroy"
d_out[:fillcolor] = rgba_string(series[:fillcolor]) d_out[:fillcolor] = rgba_string(series[:fillcolor])
elseif isa(series[:fillrange], AbstractVector) elseif typeof(series[:fillrange]) <: Union{AbstractVector{<:Real}, Real}
d_out[:fill] = "tonexty" d_out[:fill] = "tonexty"
d_out[:fillcolor] = rgba_string(series[:fillcolor]) d_out[:fillcolor] = rgba_string(series[:fillcolor])
elseif !(series[:fillrange] in (false, nothing)) elseif !(series[:fillrange] in (false, nothing))
@ -677,6 +677,14 @@ function plotly_series(plt::Plot, series::Series)
# series, one for series being filled to) instead of one # series, one for series being filled to) instead of one
d_out_fillrange = deepcopy(d_out) d_out_fillrange = deepcopy(d_out)
d_out_fillrange[:showlegend] = false d_out_fillrange[:showlegend] = false
# if fillrange is provided as real or tuple of real, expand to array
if typeof(series[:fillrange]) <: Real
series[:fillrange] = fill(series[:fillrange], length(series[:x]))
elseif typeof(series[:fillrange]) <: Tuple
f1 = typeof(series[:fillrange][1]) <: Real ? fill(series[:fillrange][1], length(series[:x])) : series[:fillrange][1]
f2 = typeof(series[:fillrange][2]) <: Real ? fill(series[:fillrange][2], length(series[:x])) : series[:fillrange][2]
series[:fillrange] = (f1, f2)
end
if isa(series[:fillrange], AbstractVector) if isa(series[:fillrange], AbstractVector)
d_out_fillrange[:y] = series[:fillrange] d_out_fillrange[:y] = series[:fillrange]
delete!(d_out_fillrange, :fill) delete!(d_out_fillrange, :fill)