diff --git a/src/args.jl b/src/args.jl index ac476c18..f0efbc70 100644 --- a/src/args.jl +++ b/src/args.jl @@ -631,6 +631,13 @@ function getSeriesArgs(pkg::PlottingPackage, initargs::Dict, kw, commandIndex::I for k in keys(_seriesDefaults) setDictValue(kwdict, d, k, commandIndex, _seriesDefaults) end + + # groupby args? + for k in (:idxfilter, :numUncounted, :dataframe) + if haskey(kwdict, k) + d[k] = kwdict[k] + end + end if haskey(_typeAliases, d[:linetype]) d[:linetype] = _typeAliases[d[:linetype]] diff --git a/src/backends/gadfly.jl b/src/backends/gadfly.jl index 4d581471..e0d460e7 100644 --- a/src/backends/gadfly.jl +++ b/src/backends/gadfly.jl @@ -376,9 +376,9 @@ end function updateGadflyGuides(plt::Plot, d::Dict) gplt = getGadflyContext(plt) - haskey(d, :title) && findGuideAndSet(gplt, Gadfly.Guide.title, d[:title]) - haskey(d, :xlabel) && findGuideAndSet(gplt, Gadfly.Guide.xlabel, d[:xlabel]) - haskey(d, :ylabel) && findGuideAndSet(gplt, Gadfly.Guide.ylabel, d[:ylabel]) + haskey(d, :title) && findGuideAndSet(gplt, Gadfly.Guide.title, string(d[:title])) + haskey(d, :xlabel) && findGuideAndSet(gplt, Gadfly.Guide.xlabel, string(d[:xlabel])) + haskey(d, :ylabel) && findGuideAndSet(gplt, Gadfly.Guide.ylabel, string(d[:ylabel])) xlims = addGadflyLimitsScale(gplt, d, true) ylims = addGadflyLimitsScale(gplt, d, false) diff --git a/src/plot.jl b/src/plot.jl index 424663f4..f89ee1af 100644 --- a/src/plot.jl +++ b/src/plot.jl @@ -274,9 +274,9 @@ function createKWargsList(plt::PlottingObject, x, y; kw...) # build the series arg dict numUncounted = get(d, :numUncounted, 0) n = plt.n + i + numUncounted - # dumpdict(d, "before getSeriesArgs") + dumpdict(d, "before getSeriesArgs") d = getSeriesArgs(plt.backend, getinitargs(plt, n), d, i + numUncounted, convertSeriesIndex(plt, n), n) - # dumpdict(d, "after getSeriesArgs") + dumpdict(d, "after getSeriesArgs") d[:x], d[:y] = computeXandY(xs[mod1(i,mx)], ys[mod1(i,my)]) if haskey(d, :idxfilter)