Skip to content

Commit

Permalink
Remove broadcasting of getSeriesRGBColor
Browse files Browse the repository at this point in the history
No longer broadcast over d[:seriescolor] when updating
series attributes.  This fixes JuliaPlots#1665, where in Julia
v1.0 the PlotUtils ColorGradient type is assumed to
be iterable (JuliaLang/julia/#18618).
  • Loading branch information
anowacki committed Aug 16, 2018
1 parent 1697b99 commit ef63c8d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/args.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -1577,17 +1577,17 @@ 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

# update markerstrokecolor
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
Expand Down

0 comments on commit ef63c8d

Please sign in to comment.