Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Colorfy.jl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Maps each value in `values` to a color. Colors can be obtained using the [`Color
## Options

* `alphas` - Scalar or a vector of color alphas (default to `Colorfy.defaultalphas(values)`);
* `colorscheme` - Scheme name or a `ColorSchemes.ColorScheme` object (default to `Colorfy.defaultcolorscheme(values)`);
* `colorscheme` - Color scheme specification (default to `Colorfy.defaultcolorscheme(values)`);
* `colorrange` - Tuple with minimum and maximum color values or a symbol that can be passed
to the `rangescale` argument of the `ColorSchemes.get` function (default to `Colorfy.defaultcolorrange(values)`);
"""
Expand Down Expand Up @@ -161,10 +161,11 @@ end
"""
Colorfy.ascolorscheme(colorscheme)

Valid `ColorScheme` object for a given `colorscheme`.
Valid `ColorScheme` object for a given `colorscheme` specification.
"""
ascolorscheme(colorscheme::Symbol) = colorschemes[colorscheme]
ascolorscheme(colorscheme::AbstractString) = ascolorscheme(Symbol(colorscheme))
ascolorscheme(colorscheme::AbstractVector) = ColorScheme([parse(Colorant, color) for color in colorscheme])
ascolorscheme(colorscheme::ColorScheme) = colorscheme

"""
Expand Down
7 changes: 7 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@ using Test
@test Colorfy.colorscheme(colorfier) == colorschemes[:grays]
@test Colorfy.colorrange(colorfier) == :extrema

colorfier = Colorfier(values, colorscheme=["black", "white"])
@test Colorfy.values(colorfier) == values
@test Colorfy.alphas(colorfier) == fill(1, 10)
@test Colorfy.colorscheme(colorfier)[0.0] == colorant"black"
@test Colorfy.colorscheme(colorfier)[1.0] == colorant"white"
@test Colorfy.colorrange(colorfier) == :extrema

colorfier = Colorfier(values, colorrange=(0.25, 0.75))
@test Colorfy.values(colorfier) == values
@test Colorfy.alphas(colorfier) == fill(1, 10)
Expand Down
Loading