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

Merge pull request #1314 from daschw/showtheme

Browse Source 
update showtheme recipe
This commit is contained in:
Daniel Schwabeneder 2017-12-15 14:04:19 +01:00 committed by GitHub
commit 4bb43887a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/themes.jl
View File

@ -77,15 +77,16 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
defaults = _get_defaults(thm) defaults = _get_defaults(thm)
# get the gradient # get the gradient
gradient_colors = pop!(defaults, :gradient, cgrad(:inferno).colors) gradient_colors = get(defaults, :gradient, cgrad(:inferno).colors)
gradient = cgrad(cfunc.(RGB.(gradient_colors))) gradient = cgrad(cfunc.(RGB.(gradient_colors)))
# get the palette # get the palette
palette = pop!(defaults, :palette, get_color_palette(:auto, plot_color(:white), 17)) palette = get(defaults, :palette, get_color_palette(:auto, plot_color(:white), 17))
palette = cfunc.(RGB.(palette)) palette = cfunc.(RGB.(palette))
# apply the theme # apply the theme
for k in keys(defaults) for k in keys(defaults)
k in (:gradient, :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
@ -110,7 +111,6 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
subplot := 1 subplot := 1
palette := palette palette := palette
seriestype := :path seriestype := :path
linewidth := 2
cumsum(randn(50)) cumsum(randn(50))
end end
@ -118,8 +118,6 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
subplot := 2 subplot := 2
seriestype := :scatter seriestype := :scatter
palette := palette palette := palette
markersize := 5
markerstrokewidth := 0
marker := (:circle, :diamond, :star5, :square)[j] marker := (:circle, :diamond, :star5, :square)[j]
randn(10), randn(10) randn(10), randn(10)
end end