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

replace gradiend with colorgradient in theme to avoid confusion with Plots' quiver alias 'gradient'

Browse Source
This commit is contained in:
Daniel Schwabeneder 2019-11-26 14:43:22 +01:00
parent ca0c78fe5c
commit 243ff2d59e
1 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/themes.jl
View File

@ -4,37 +4,16 @@
Specify the colour theme for plots. Specify the colour theme for plots.
""" """
function theme(s::Symbol; kw...) function theme(s::Symbol; kw...)
defaults = _get_defaults(s) defaults = PlotThemes._themes[s].defaults
_theme(s, defaults; kw...) _theme(s, defaults; kw...)
end end
function _get_defaults(s::Symbol)
thm = PlotThemes._themes[s]
if :defaults in fieldnames(typeof(thm))
return thm.defaults
else # old PlotTheme type
defaults = KW(
:bg => thm.bg_secondary,
:bginside => thm.bg_primary,
:fg => thm.lines,
:fgtext => thm.text,
:fgguide => thm.text,
:fglegend => thm.text,
:palette => thm.palette,
)
if thm.gradient !== nothing
push!(defaults, :gradient => thm.gradient)
end
return defaults
end
end
function _theme(s::Symbol, defaults::KW; kw...) function _theme(s::Symbol, defaults::KW; kw...)
# Reset to defaults to overwrite active theme # Reset to defaults to overwrite active theme
reset_defaults() reset_defaults()
# Set the theme's gradient as default # Set the theme's gradient as default
if haskey(defaults, :gradient) if haskey(defaults, :colorgradient)
PlotUtils.clibrary(:misc) PlotUtils.clibrary(:misc)
PlotUtils.default_cgrad(default = :sequential, sequential = PlotThemes.gradient_name(s)) PlotUtils.default_cgrad(default = :sequential, sequential = PlotThemes.gradient_name(s))
else else
@ -44,8 +23,8 @@ function _theme(s::Symbol, defaults::KW; kw...)
# maybe overwrite the theme's gradient # maybe overwrite the theme's gradient
kw = KW(kw) kw = KW(kw)
if haskey(kw, :gradient) if haskey(kw, :colorgradient)
kwgrad = pop!(kw, :gradient) kwgrad = pop!(kw, :colorgradient)
for clib in clibraries() for clib in clibraries()
if kwgrad in cgradients(clib) if kwgrad in cgradients(clib)
PlotUtils.clibrary(clib) PlotUtils.clibrary(clib)
@ -74,11 +53,11 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
@recipe function showtheme(st::ShowTheme) @recipe function showtheme(st::ShowTheme)
thm, cfunc = _get_showtheme_args(st.args...) thm, cfunc = _get_showtheme_args(st.args...)
defaults = _get_defaults(thm) defaults = PlotThemes._themes[thm].defaults
# get the gradient # get the gradient
gradient_colors = get(defaults, :gradient, cgrad(:inferno).colors) gradient_colors = get(defaults, :colorgradient, cgrad(:inferno).colors)
gradient = cgrad(cfunc.(RGB.(gradient_colors))) colorgradient = cgrad(cfunc.(RGB.(gradient_colors)))
# get the palette # get the palette
palette = get(defaults, :palette, get_color_palette(:auto, plot_color(:white), 17)) palette = get(defaults, :palette, get_color_palette(:auto, plot_color(:white), 17))
@ -86,7 +65,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
# apply the theme # apply the theme
for k in keys(defaults) for k in keys(defaults)
k in (:gradient, :palette) && continue k in (:colorgradient, :palette) && continue
def = defaults[k] def = defaults[k]
arg = get(_keyAliases, k, k) arg = get(_keyAliases, k, k)
plotattributes[arg] = if typeof(def) <: Colorant plotattributes[arg] = if typeof(def) <: Colorant
@ -139,7 +118,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
@series begin @series begin
subplot := 4 subplot := 4
seriestype := :heatmap seriestype := :heatmap
seriescolor := gradient seriescolor := colorgradient
ticks := -5:5:5 ticks := -5:5:5
x, y, z x, y, z
end end
@ -147,7 +126,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
@series begin @series begin
subplot := 5 subplot := 5
seriestype := :surface seriestype := :surface
seriescolor := gradient seriescolor := colorgradient
x, y, z x, y, z
end end
@ -159,7 +138,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
@series begin @series begin
subplot := 6 subplot := 6
seriescolor := gradient seriescolor := colorgradient
linewidth := 3 linewidth := 3
line_z := z line_z := z
x, y, z x, y, z