working on args

This commit is contained in:
Thomas Breloff 2015-10-06 11:37:45 -05:00
parent b6855b6fba
commit bbc18549b3
3 changed files with 5 additions and 4 deletions

View File

@ -189,6 +189,7 @@ end
const _keyAliases = Dict(
:c => :color,
:lab => :label,
:l => :line,
:w => :linewidth,
:width => :linewidth,
:lw => :linewidth,
@ -366,10 +367,10 @@ function processMarkerArg(d::Dict, arg)
if T <: Symbol
arg = get(_markerAliases, arg, arg)
println(arg)
# println(arg)
if arg in _allMarkers
println("HERE ", arg)
# println("HERE ", arg)
d[:marker] = arg
elseif arg != :match && !handleColors!(d, arg, :markercolor)
warn("Skipped marker arg $arg. Unknown symbol.")

View File

@ -14,7 +14,7 @@ function createGadflyAnnotation(d::Dict)
shape = ohlcshape(x, y, d[:markersize])
d[:y] = Float64[z.open for z in y]
d[:linetype] = :none
return Gadfly.Guide.annotation(Gadfly.compose(Gadfly.context(), shape, Gadfly.fill(nothing), Gadfly.stroke(getColor(d[:color],1)))
return Gadfly.Guide.annotation(Gadfly.compose(Gadfly.context(), shape, Gadfly.fill(nothing), Gadfly.stroke(getColor(d[:color],1))))
elseif marker == :rect
shape = square(x, y, sz)

View File

@ -145,7 +145,7 @@ function getColor(gradient::ColorGradient, z::Real, idx::Int)
cs[end]
end
getColorVector(gradient::ColorGradient) = [gradient.cs[1]]
getColorVector(gradient::ColorGradient) = [gradient.colors[1]]
function interpolate(c1::Colorant, c2::Colorant, w::Real)
lab1 = Lab(c1)