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

move plotargs merge and handlePlotColors before series

Browse Source
This commit is contained in:
Thomas Breloff 2016-05-02 12:16:41 -04:00
parent 8c8ede361e
commit 2e2e8a2230
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/plot.jl
View File

@ -90,6 +90,17 @@ function plot!(plt::Plot, args...; kw...)
nothing nothing
end end
# merge plot args
if !haskey(d, :subplot)
for k in keys(_plotDefaults)
if haskey(d, k)
plt.plotargs[k] = d[k]
end
end
# merge!(plt.plotargs, d)
handlePlotColors(plt.backend, plt.plotargs)
end
_add_series(plt, d, groupby, args...) _add_series(plt, d, groupby, args...)
_add_annotations(plt, d) _add_annotations(plt, d)
@ -98,8 +109,8 @@ function plot!(plt::Plot, args...; kw...)
# add title, axis labels, ticks, etc # add title, axis labels, ticks, etc
if !haskey(d, :subplot) if !haskey(d, :subplot)
merge!(plt.plotargs, d) # merge!(plt.plotargs, d)
handlePlotColors(plt.backend, plt.plotargs) # handlePlotColors(plt.backend, plt.plotargs)
dumpdict(plt.plotargs, "Updating plot items") dumpdict(plt.plotargs, "Updating plot items")
_update_plot(plt, plt.plotargs) _update_plot(plt, plt.plotargs)
end end