From ef63c8d66e68adb56468cf8ac947f92254b3764d Mon Sep 17 00:00:00 2001 From: Andy Nowacki Date: Thu, 16 Aug 2018 15:28:36 +0100 Subject: [PATCH] Remove broadcasting of getSeriesRGBColor 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). --- src/args.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/args.jl b/src/args.jl index 6b2dd4cd..7e94c0f0 100644 --- a/src/args.jl +++ b/src/args.jl @@ -1563,7 +1563,7 @@ function _update_series_attributes!(d::KW, plt::Plot, sp::Subplot) end # update series color - d[:seriescolor] = getSeriesRGBColor.(d[:seriescolor], Ref(sp), plotIndex) + d[:seriescolor] = getSeriesRGBColor(d[:seriescolor], sp, plotIndex) # update other colors for s in (:line, :marker, :fill) @@ -1577,7 +1577,7 @@ function _update_series_attributes!(d::KW, plt::Plot, sp::Subplot) elseif d[csym] == :match plot_color(d[:seriescolor]) else - getSeriesRGBColor.(d[csym], Ref(sp), plotIndex) + getSeriesRGBColor(d[csym], sp, plotIndex) end end @@ -1585,9 +1585,9 @@ function _update_series_attributes!(d::KW, plt::Plot, sp::Subplot) d[:markerstrokecolor] = if d[:markerstrokecolor] == :match plot_color(sp[:foreground_color_subplot]) elseif d[:markerstrokecolor] == :auto - getSeriesRGBColor.(d[:markercolor], Ref(sp), plotIndex) + getSeriesRGBColor(d[:markercolor], sp, plotIndex) else - getSeriesRGBColor.(d[:markerstrokecolor], Ref(sp), plotIndex) + getSeriesRGBColor(d[:markerstrokecolor], sp, plotIndex) end # if marker_z, fill_z or line_z are set, ensure we have a gradient