From c20a7b3c69b3bc239eeab7171e4d2bf354d8b85e Mon Sep 17 00:00:00 2001 From: Thomas Breloff Date: Sat, 19 Sep 2015 17:23:18 -0400 Subject: [PATCH] added fillto for gadfly/immerse --- src/args.jl | 3 ++- src/backends/gadfly.jl | 10 ++++++++++ src/utils.jl | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/args.jl b/src/args.jl index bfacf581..f22adf92 100644 --- a/src/args.jl +++ b/src/args.jl @@ -234,7 +234,8 @@ function getSeriesRGBColor(c, d::Dict, n::Int) end # should be a RGB now... either it was passed in, generated automatically, or created from a string - @assert isa(c, RGB) + # @assert isa(c, RGB) + @assert isa(c, Colorant) # return the RGB c diff --git a/src/backends/gadfly.jl b/src/backends/gadfly.jl index fe10f842..24b9759e 100644 --- a/src/backends/gadfly.jl +++ b/src/backends/gadfly.jl @@ -134,6 +134,16 @@ function addGadflySeries!(gplt, d::Dict) # add the Geoms append!(gfargs, getLineGeoms(d)) + + # fillto + if d[:fillto] != nothing + fillto = makevec(d[:fillto]) + n = length(fillto) + push!(d[:kwargs], (:ymin, Float64[min(y, fillto[mod1(i,n)]) for (i,y) in enumerate(d[:y])])) + push!(d[:kwargs], (:ymax, Float64[max(y, fillto[mod1(i,n)]) for (i,y) in enumerate(d[:y])])) + # push!(d[:kwargs], (:ymax, Float64[max(y, fillto) for y in d[:y]])) + push!(gfargs, Gadfly.Geom.ribbon) + end # handle markers geoms, guides = getMarkerGeomsAndGuides(d) diff --git a/src/utils.jl b/src/utils.jl index 8ec34da2..08f7d74a 100644 --- a/src/utils.jl +++ b/src/utils.jl @@ -104,7 +104,8 @@ function sticksHack(; kw...) dLine, dScatter end - +makevec(v::AVec) = v +makevec{T}(v::T) = T[v] function regressionXY(x, y)