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

Merge pull request #969 from pearlzli/plotly-fill

Browse Source 
Add fillrange for Plotly backend
This commit is contained in:
Daniel Schwabeneder 2017-07-14 22:55:33 +02:00 committed by GitHub
commit 0b1118540a
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backends/plotly.jl
View File

@ -435,6 +435,7 @@ function plotly_series(plt::Plot, series::Series)
isscatter = st in (:scatter, :scatter3d, :scattergl) isscatter = st in (:scatter, :scatter3d, :scattergl)
hasmarker = isscatter || series[:markershape] != :none hasmarker = isscatter || series[:markershape] != :none
hasline = st in (:path, :path3d) hasline = st in (:path, :path3d)
hasfillrange = st in (:path, :scatter, :scattergl) && isa(series[:fillrange], AbstractVector)
# for surface types, set the data # for surface types, set the data
if st in (:heatmap, :contour, :surface, :wireframe) if st in (:heatmap, :contour, :surface, :wireframe)
@ -461,8 +462,11 @@ function plotly_series(plt::Plot, series::Series)
if series[:fillrange] == true || series[:fillrange] == 0 if series[:fillrange] == true || series[:fillrange] == 0
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)
d_out[:fill] = "tonexty"
d_out[:fillcolor] = rgba_string(series[:fillcolor])
elseif !(series[:fillrange] in (false, nothing)) elseif !(series[:fillrange] in (false, nothing))
warn("fillrange ignored... plotly only supports filling to zero. fillrange: $(series[:fillrange])") warn("fillrange ignored... plotly only supports filling to zero and to a vector of values. fillrange: $(series[:fillrange])")
end end
d_out[:x], d_out[:y] = x, y d_out[:x], d_out[:y] = x, y
@ -576,7 +580,19 @@ function plotly_series(plt::Plot, series::Series)
plotly_polar!(d_out, series) plotly_polar!(d_out, series)
plotly_hover!(d_out, series[:hover]) plotly_hover!(d_out, series[:hover])
[d_out] if hasfillrange
# if hasfillrange is true, return two dictionaries (one for original
# series, one for series being filled to) instead of one
d_out_fillrange = copy(d_out)
d_out_fillrange[:y] = series[:fillrange]
d_out_fillrange[:showlegend] = false
delete!(d_out_fillrange, :fill)
delete!(d_out_fillrange, :fillcolor)
return [d_out_fillrange, d_out]
else
return [d_out]
end
end end
function plotly_series_shapes(plt::Plot, series::Series) function plotly_series_shapes(plt::Plot, series::Series)