From 2e2e8a223060dab9f48ecf5c59555eb1b74f1209 Mon Sep 17 00:00:00 2001 From: Thomas Breloff Date: Mon, 2 May 2016 12:16:41 -0400 Subject: [PATCH] move plotargs merge and handlePlotColors before series --- src/plot.jl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/plot.jl b/src/plot.jl index e10553f3..42677913 100644 --- a/src/plot.jl +++ b/src/plot.jl @@ -90,6 +90,17 @@ function plot!(plt::Plot, args...; kw...) nothing 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_annotations(plt, d) @@ -98,8 +109,8 @@ function plot!(plt::Plot, args...; kw...) # add title, axis labels, ticks, etc if !haskey(d, :subplot) - merge!(plt.plotargs, d) - handlePlotColors(plt.backend, plt.plotargs) + # merge!(plt.plotargs, d) + # handlePlotColors(plt.backend, plt.plotargs) dumpdict(plt.plotargs, "Updating plot items") _update_plot(plt, plt.plotargs) end