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

fix for group arg

Browse Source
This commit is contained in:
Thomas Breloff 2015-10-28 01:37:52 -04:00
parent 373d868a17
commit 1f1d1f70a1
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/args.jl
View File

@ -631,6 +631,13 @@ function getSeriesArgs(pkg::PlottingPackage, initargs::Dict, kw, commandIndex::I
for k in keys(_seriesDefaults) for k in keys(_seriesDefaults)
setDictValue(kwdict, d, k, commandIndex, _seriesDefaults) setDictValue(kwdict, d, k, commandIndex, _seriesDefaults)
end end
# groupby args?
for k in (:idxfilter, :numUncounted, :dataframe)
if haskey(kwdict, k)
d[k] = kwdict[k]
end
end
if haskey(_typeAliases, d[:linetype]) if haskey(_typeAliases, d[:linetype])
d[:linetype] = _typeAliases[d[:linetype]] d[:linetype] = _typeAliases[d[:linetype]]

6
src/backends/gadfly.jl
View File

@ -376,9 +376,9 @@ end
function updateGadflyGuides(plt::Plot, d::Dict) function updateGadflyGuides(plt::Plot, d::Dict)
gplt = getGadflyContext(plt) gplt = getGadflyContext(plt)
haskey(d, :title) && findGuideAndSet(gplt, Gadfly.Guide.title, d[:title]) haskey(d, :title) && findGuideAndSet(gplt, Gadfly.Guide.title, string(d[:title]))
haskey(d, :xlabel) && findGuideAndSet(gplt, Gadfly.Guide.xlabel, d[:xlabel]) haskey(d, :xlabel) && findGuideAndSet(gplt, Gadfly.Guide.xlabel, string(d[:xlabel]))
haskey(d, :ylabel) && findGuideAndSet(gplt, Gadfly.Guide.ylabel, d[:ylabel]) haskey(d, :ylabel) && findGuideAndSet(gplt, Gadfly.Guide.ylabel, string(d[:ylabel]))
xlims = addGadflyLimitsScale(gplt, d, true) xlims = addGadflyLimitsScale(gplt, d, true)
ylims = addGadflyLimitsScale(gplt, d, false) ylims = addGadflyLimitsScale(gplt, d, false)

4
src/plot.jl
View File

@ -274,9 +274,9 @@ function createKWargsList(plt::PlottingObject, x, y; kw...)
# build the series arg dict # build the series arg dict
numUncounted = get(d, :numUncounted, 0) numUncounted = get(d, :numUncounted, 0)
n = plt.n + i + numUncounted 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) 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)]) d[:x], d[:y] = computeXandY(xs[mod1(i,mx)], ys[mod1(i,my)])
if haskey(d, :idxfilter) if haskey(d, :idxfilter)