allow calling cgrad with colorlibrary

mkborregaard · Feb 27, 2017 · b04b815 · b04b815
1 parent cc1a37a
commit b04b815
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/color_gradients.jl b/src/color_gradients.jl
@@ -149,7 +149,7 @@ function cgrad_reverse(s::Symbol)
     end
 end
 
-function iscgrad_symbol(s::Symbol; color_library = _gradients[1])
+function iscgrad_symbol(s::Symbol)
     rev, s = cgrad_reverse(s)
     lib = color_libraries[_gradients[1]]
     haskey(lib.lib,s) && return true
@@ -160,12 +160,12 @@ function iscgrad_symbol(s::Symbol; color_library = _gradients[1])
     return false
 end
 
-function cgrad_colors(s::Symbol)
+function cgrad_colors(s::Symbol; color_library = _gradients[1])
     rev, s = cgrad_reverse(s)
     if rev
-        reverse(getgradient(s))
+        reverse(getgradient(s, color_library))
     else
-        getgradient(s)
+        getgradient(s, color_library)
     end
 end
 
@@ -185,6 +185,8 @@ function _color_list(arg, alpha)
     colors
 end
 
+cgrad(arg::Symbol, cl::Symbol, values; kw...) = cgrad(cgrad_colors(arg, color_library = cl), values; kw...)
+
 # construct a ColorGradient when given explicit values
 function cgrad(arg, values; alpha = nothing)
     colors = _color_list(arg, alpha)
@@ -203,6 +205,8 @@ function cgrad(arg, values; alpha = nothing)
     ColorGradient(colors, values)
 end
 
+cgrad(arg::Symbol, cl::Symbol; kw...) = cgrad(cgrad_colors(arg, color_library = cl); kw...)
+
 # construct a ColorGradient automatically
 function cgrad(arg; alpha = nothing, scale = :identity)
     colors = _color_list(arg, alpha)
@@ -224,6 +228,8 @@ function cgrad(arg; alpha = nothing, scale = :identity)
     ColorGradient(colors, values)
 end
 
+
+
 # the default gradient
 cgrad(; kw...) = cgrad(:default; kw...)
 

diff --git a/src/colors.jl b/src/colors.jl
@@ -3,7 +3,7 @@ invisible() = RGBA{Float64}(0.,0.,0.,0.)
 
 # the one-arg cases, meant for single colors
 plot_color(s::AbstractString) = parse(RGBA{Float64}, s)
-plot_color(s::Symbol; color_library = _gradients[1]) = (iscgrad_symbol(s, color_library = color_library) ? cgrad(s) : parse(RGBA{Float64}, s))
+plot_color(s::Symbol) = (iscgrad_symbol(s) ? cgrad(s) : parse(RGBA{Float64}, s))
 plot_color(b::Bool) = b ? error("plot_color(true) not allowed.") : invisible()
 plot_color(::Void) = invisible()
 plot_color(c::Colorant) = convert(RGBA{Float64}, c)
@@ -17,7 +17,7 @@ plot_color(x, ::Void) = plot_color(x)
 # alpha override
 plot_color(x, α::Number) = RGBA{Float64}(convert(RGB, plot_color(x)), α)
 plot_color(c::Colorant, α::Number) = RGBA{Float64}(red(c), green(c), blue(c), α)
-plot_color(s::Symbol, α::Number; color_library = _gradients[1]) = (iscgrad_symbol(s, color_library = color_library) ? cgrad(s, alpha=α) : RGBA{Float64}(convert(RGB, plot_color(s)), α))
+plot_color(s::Symbol, α::Number) = (iscgrad_symbol(s) ? cgrad(s, alpha=α) : RGBA{Float64}(convert(RGB, plot_color(s)), α))
 plot_color(grad::ColorGradient, α::Number) = cgrad(grad, alpha=α)
 
 function plot_color(cs::AbstractArray)