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

plot! updates series args now

Browse Source
This commit is contained in:
Diaga 2020-07-28 19:54:27 +05:00
parent a929903a63
commit e60669eae5
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pipeline.jl
View File

@ -183,7 +183,6 @@ function _plot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
_update_plot_args(plt, plotattributes) _update_plot_args(plt, plotattributes)
if !plt.init if !plt.init
plt.o = Base.invokelatest(_create_backend_figure, plt) plt.o = Base.invokelatest(_create_backend_figure, plt)
# create the layout and subplots from the inputs # create the layout and subplots from the inputs
plt.layout, plt.subplots, plt.spmap = build_layout(plt.attr) plt.layout, plt.subplots, plt.spmap = build_layout(plt.attr)
for (idx, sp) in enumerate(plt.subplots) for (idx, sp) in enumerate(plt.subplots)
@ -263,6 +262,13 @@ function _subplot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
sp_attrs[sp] = attr sp_attrs[sp] = attr
end end
series_attr = KW()
for (k,v) in plotattributes
if is_series_attr(k)
series_attr[k] = pop!(plotattributes,k)
end
end
# override subplot/axis args. `sp_attrs` take precendence # override subplot/axis args. `sp_attrs` take precendence
for (idx, sp) in enumerate(plt.subplots) for (idx, sp) in enumerate(plt.subplots)
attr = if !haskey(plotattributes, :subplot) || plotattributes[:subplot] == idx attr = if !haskey(plotattributes, :subplot) || plotattributes[:subplot] == idx
@ -271,6 +277,13 @@ function _subplot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
get(sp_attrs, sp, KW()) get(sp_attrs, sp, KW())
end end
_update_subplot_args(plt, sp, attr, idx, false) _update_subplot_args(plt, sp, attr, idx, false)
# Update series attrs
serieslist = series_list(sp)
for (cmdidx, series) in enumerate(serieslist)
merge!(series.plotattributes, series_attr)
_slice_series_args!(series.plotattributes, plt, sp, cmdidx)
end
end end
# do we need to link any axes together? # do we need to link any axes together?