From 07ed7eb6ddeccf466fd5ed86302a60dfb0c6d4c6 Mon Sep 17 00:00:00 2001 From: MA Laforge Date: Mon, 10 Sep 2018 20:47:27 -0700 Subject: [PATCH] Re-establish alpha support on lines, etc (InspectDR). --- src/backends/inspectdr.jl | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/backends/inspectdr.jl b/src/backends/inspectdr.jl index 21ff817d..1d2f4704 100644 --- a/src/backends/inspectdr.jl +++ b/src/backends/inspectdr.jl @@ -262,8 +262,10 @@ For st in :shape: nmax = i if length(rng) > 1 linewidth = series[:linewidth] - linecolor = _inspectdr_mapcolor(_cycle(series[:linecolor], i)) - fillcolor = _inspectdr_mapcolor(_cycle(series[:fillcolor], i)) + c = plot_color(get_linecolor(series), get_linealpha(series)) + linecolor = _inspectdr_mapcolor(_cycle(c, i)) + c = plot_color(get_fillcolor(series), get_fillalpha(series)) + fillcolor = _inspectdr_mapcolor(_cycle(c, i)) line = InspectDR.line( style=:solid, width=linewidth, color=linecolor ) @@ -277,8 +279,10 @@ For st in :shape: i = (nmax >= 2 ? div(nmax, 2) : nmax) #Must pick one set of colors for legend if i > 1 #Add dummy waveform for legend entry: linewidth = series[:linewidth] - linecolor = _inspectdr_mapcolor(_cycle(series[:linecolor], i)) - fillcolor = _inspectdr_mapcolor(_cycle(series[:fillcolor], i)) + c = plot_color(get_linecolor(series), get_linealpha(series)) + linecolor = _inspectdr_mapcolor(_cycle(c, i)) + c = plot_color(get_fillcolor(series), get_fillalpha(series)) + fillcolor = _inspectdr_mapcolor(_cycle(c, i)) wfrm = InspectDR.add(plot, Float64[], Float64[], id=series[:label]) wfrm.line = InspectDR.line( style=:none, width=linewidth, #linewidth affects glyph @@ -297,7 +301,7 @@ For st in :shape: wfrm.line = InspectDR.line( style = _style, width = series[:linewidth], - color = series[:linecolor], + color = plot_color(get_linecolor(series), get_linealpha(series)), ) #InspectDR does not control markerstrokewidth independently. if :none == _style