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

Remove broadcasting of getSeriesRGBColor

Browse Source 
No longer broadcast over d[:seriescolor] when updating
series attributes.  This fixes #1665, where in Julia
v1.0 the PlotUtils ColorGradient type is assumed to
be iterable (JuliaLang/julia/#18618).
This commit is contained in:
Andy Nowacki 2018-08-16 15:28:36 +01:00
parent 1697b99bbc
commit ef63c8d66e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/args.jl
View File

@ -1563,7 +1563,7 @@ function _update_series_attributes!(d::KW, plt::Plot, sp::Subplot)
end end
# update series color # update series color
d[:seriescolor] = getSeriesRGBColor.(d[:seriescolor], Ref(sp), plotIndex) d[:seriescolor] = getSeriesRGBColor(d[:seriescolor], sp, plotIndex)
# update other colors # update other colors
for s in (:line, :marker, :fill) for s in (:line, :marker, :fill)
@ -1577,7 +1577,7 @@ function _update_series_attributes!(d::KW, plt::Plot, sp::Subplot)
elseif d[csym] == :match elseif d[csym] == :match
plot_color(d[:seriescolor]) plot_color(d[:seriescolor])
else else
getSeriesRGBColor.(d[csym], Ref(sp), plotIndex) getSeriesRGBColor(d[csym], sp, plotIndex)
end end
end end
@ -1585,9 +1585,9 @@ function _update_series_attributes!(d::KW, plt::Plot, sp::Subplot)
d[:markerstrokecolor] = if d[:markerstrokecolor] == :match d[:markerstrokecolor] = if d[:markerstrokecolor] == :match
plot_color(sp[:foreground_color_subplot]) plot_color(sp[:foreground_color_subplot])
elseif d[:markerstrokecolor] == :auto elseif d[:markerstrokecolor] == :auto
getSeriesRGBColor.(d[:markercolor], Ref(sp), plotIndex) getSeriesRGBColor(d[:markercolor], sp, plotIndex)
else else
getSeriesRGBColor.(d[:markerstrokecolor], Ref(sp), plotIndex) getSeriesRGBColor(d[:markerstrokecolor], sp, plotIndex)
end end
# if marker_z, fill_z or line_z are set, ensure we have a gradient # if marker_z, fill_z or line_z are set, ensure we have a gradient