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

Abbreviate PyPlot fillstyle variables

Browse Source
This commit is contained in:
Pearl Li 2020-10-28 11:43:37 -07:00
parent eb0e6c7ed1
commit b9f9ec3f62
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/backends/pyplot.jl
View File

@ -675,19 +675,19 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
handle = [] handle = []
for (i, rng) in enumerate(iter_segments(series)) for (i, rng) in enumerate(iter_segments(series))
if length(rng) > 1 if length(rng) > 1
fillstyle = get_fillstyle(series, i) fs = get_fillstyle(series, i)
has_fillstyle = !isnothing(fillstyle) has_fs = !isnothing(fs)
linecolor = get_linecolor(series, clims, i) lc = get_linecolor(series, clims, i)
fillcolor = get_fillcolor(series, clims, i) fc = get_fillcolor(series, clims, 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_fillstyle ? fillcolor : linecolor, get_linealpha(series, i)), edgecolor = py_color(has_fs ? fc : lc, get_linealpha(series, i)),
facecolor = py_color(fillcolor, has_fillstyle ? 0 : get_fillalpha(series, i)), facecolor = py_color(fc, has_fs ? 0 : get_fillalpha(series, i)),
hatch = py_fillstyle(fillstyle), 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)),
fill = true fill = true
@ -719,16 +719,15 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
dim1, _cycle(fillrange[1], rng), _cycle(fillrange[2], rng) dim1, _cycle(fillrange[1], rng), _cycle(fillrange[2], rng)
end end
fillstyle = get_fillstyle(series, i) fs = get_fillstyle(series, i)
has_fillstyle = !isnothing(fillstyle) has_fs = !isnothing(fs)
linecolor = get_linecolor(series, clims, i) fc = get_fillcolor(series, clims, i)
fillcolor = get_fillcolor(series, clims, 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(fillcolor, get_linealpha(series, i)), edgecolor = py_color(fc, get_linealpha(series, i)),
facecolor = py_color(fillcolor, has_fillstyle ? 0 : get_fillalpha(series, i)), facecolor = py_color(fc, has_fs ? 0 : get_fillalpha(series, i)),
hatch = py_fillstyle(fillstyle), hatch = py_fillstyle(fs),
linewidths = 0 linewidths = 0
) )
push!(handles, handle) push!(handles, handle)
@ -1311,16 +1310,15 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
# add a line/marker and a label # add a line/marker and a label
push!(handles, push!(handles,
if series[:seriestype] == :shape || series[:fillrange] !== nothing if series[:seriestype] == :shape || series[:fillrange] !== nothing
fs = get_fillstyle(series)
fillstyle = get_fillstyle(series) has_fs = !isnothing(fs)
has_fillstyle = !isnothing(fillstyle) lc = get_linecolor(series, clims)
linecolor = get_linecolor(series, clims) fc = get_fillcolor(series, clims)
fillcolor = get_fillcolor(series, clims)
pypatches."Patch"( pypatches."Patch"(
edgecolor = py_color(single_color(has_fillstyle ? fillcolor : linecolor), get_linealpha(series)), edgecolor = py_color(single_color(has_fs ? fc : lc), get_linealpha(series)),
facecolor = py_color(single_color(fillcolor), has_fillstyle ? 0 : get_fillalpha(series)), facecolor = py_color(single_color(fc), has_fs ? 0 : get_fillalpha(series)),
hatch = py_fillstyle(fillstyle), 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)),
capstyle = "butt" capstyle = "butt"