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

allow Function for fillrange and zcolor; fix fill kw

Browse Source
This commit is contained in:
Thomas Breloff 2016-02-09 19:22:05 -05:00
parent 5f8ecfa3fa
commit 3e49af9093
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/args.jl
View File

@ -493,7 +493,16 @@ function processFillArg(d::Dict, arg)
arg.color == nothing || (d[:fillcolor] = arg.color == :auto ? :auto : colorscheme(arg.color)) arg.color == nothing || (d[:fillcolor] = arg.color == :auto ? :auto : colorscheme(arg.color))
arg.alpha == nothing || (d[:fillalpha] = arg.alpha) arg.alpha == nothing || (d[:fillalpha] = arg.alpha)
# fillrange function
elseif trueOrAllTrue(a -> isa(a, Function), arg)
d[:fillrange] = arg
# fillalpha
elseif trueOrAllTrue(a -> typeof(a) <: Real && a > 0 && a < 1, arg)
d[:fillalpha] = arg
elseif !handleColors!(d, arg, :fillcolor) elseif !handleColors!(d, arg, :fillcolor)
d[:fillrange] = arg d[:fillrange] = arg
end end
end end
@ -746,8 +755,6 @@ function getSeriesArgs(pkg::PlottingPackage, plotargs::Dict, kw, commandIndex::I
c = (c == :match ? d[:linecolor] : getSeriesRGBColor(c, plotargs, plotIndex)) c = (c == :match ? d[:linecolor] : getSeriesRGBColor(c, plotargs, plotIndex))
d[:fillcolor] = c d[:fillcolor] = c
# TODO: rebuild
# set label # set label
label = d[:label] label = d[:label]
label = (label == "AUTO" ? "y$globalIndex" : label) label = (label == "AUTO" ? "y$globalIndex" : label)

8
src/plot.jl
View File

@ -321,6 +321,14 @@ function createKWargsList(plt::PlottingObject, x, y; kw...)
d[:linetype] = :path d[:linetype] = :path
end end
# map functions to vectors
if isa(d[:zcolor], Function)
d[:zcolor] = map(d[:zcolor], d[:x])
end
if isa(d[:fillrange], Function)
d[:fillrange] = map(d[:fillrange], d[:x])
end
# cleanup those fields that were used only for generating kw args # cleanup those fields that were used only for generating kw args
for k in (:idxfilter, :numUncounted, :dataframe) for k in (:idxfilter, :numUncounted, :dataframe)
delete!(d, k) delete!(d, k)