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

Fix PyPlot hatch alpha

Browse Source
This commit is contained in:
Pearl Li 2020-10-28 12:06:00 -07:00
parent b9f9ec3f62
commit 58dd3dac5b
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/backends/pyplot.jl
View File

@ -678,15 +678,19 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
fs = get_fillstyle(series, i) fs = get_fillstyle(series, i)
has_fs = !isnothing(fs) has_fs = !isnothing(fs)
lc = get_linecolor(series, clims, i) lc = get_linecolor(series, clims, i)
la = get_linealpha(series, i)
fc = get_fillcolor(series, clims, i) fc = get_fillcolor(series, clims, i)
fa = get_fillalpha(series, i)
path = pypath."Path"(hcat(x[rng], y[rng])) path = pypath."Path"(hcat(x[rng], y[rng]))
patches = pypatches."PathPatch"( patches = pypatches."PathPatch"(
path; path;
label = series[:label], label = series[:label],
zorder = series[:series_plotindex], zorder = series[:series_plotindex],
edgecolor = py_color(has_fs ? fc : lc, get_linealpha(series, i)), # hatch color/alpha controlled by edge (not face) color/alpha
facecolor = py_color(fc, has_fs ? 0 : get_fillalpha(series, i)), # if has_fs, set edge color/alpha <- fill color/alpha and face alpha <- 0
edgecolor = has_fs ? py_color(fc, fa) : py_color(lc, la),
facecolor = py_color(fc, has_fs ? 0 : fa),
hatch = py_fillstyle(fs), hatch = py_fillstyle(fs),
linewidth = py_thickness_scale(plt, get_linewidth(series, i)), linewidth = py_thickness_scale(plt, get_linewidth(series, i)),
linestyle = py_linestyle(st, get_linestyle(series, i)), linestyle = py_linestyle(st, get_linestyle(series, i)),
@ -721,12 +725,16 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
fs = get_fillstyle(series, i) fs = get_fillstyle(series, i)
has_fs = !isnothing(fs) has_fs = !isnothing(fs)
la = get_linealpha(series, i)
fc = get_fillcolor(series, clims, i) fc = get_fillcolor(series, clims, i)
fa = get_fillalpha(series, i)
handle = getproperty(ax, f)(args..., trues(n), false, py_fillstepstyle(st); handle = getproperty(ax, f)(args..., trues(n), false, py_fillstepstyle(st);
zorder = series[:series_plotindex], zorder = series[:series_plotindex],
edgecolor = py_color(fc, get_linealpha(series, i)), # hatch color/alpha controlled by edge (not face) color/alpha
facecolor = py_color(fc, has_fs ? 0 : get_fillalpha(series, i)), # if has_fs, set edge color/alpha <- fill color/alpha and face alpha <- 0
edgecolor = py_color(fc, has_fs ? fa : la),
facecolor = py_color(fc, has_fs ? 0 : fa),
hatch = py_fillstyle(fs), hatch = py_fillstyle(fs),
linewidths = 0 linewidths = 0
) )
@ -1313,11 +1321,15 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
fs = get_fillstyle(series) fs = get_fillstyle(series)
has_fs = !isnothing(fs) has_fs = !isnothing(fs)
lc = get_linecolor(series, clims) lc = get_linecolor(series, clims)
la = get_linealpha(series)
fc = get_fillcolor(series, clims) fc = get_fillcolor(series, clims)
fa = get_fillalpha(series)
pypatches."Patch"( pypatches."Patch"(
edgecolor = py_color(single_color(has_fs ? fc : lc), get_linealpha(series)), # hatch color/alpha controlled by edge (not face) color/alpha
facecolor = py_color(single_color(fc), has_fs ? 0 : get_fillalpha(series)), # if has_fs, set edge color/alpha <- fill color/alpha and face alpha <- 0
edgecolor = has_fs ? py_color(single_color(fc), fa) : py_color(single_color(lc), la),
facecolor = py_color(single_color(fc), has_fs ? 0 : fa),
hatch = py_fillstyle(fs), hatch = py_fillstyle(fs),
linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)), linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)),
linestyle = py_linestyle(series[:seriestype], get_linestyle(series)), linestyle = py_linestyle(series[:seriestype], get_linestyle(series)),