addressed changes requested

This commit is contained in:
Florian Oswald 2017-05-17 17:48:03 +02:00
parent 9c2c548874
commit 915c41c9d9
2 changed files with 6 additions and 25 deletions

View File

@ -336,10 +336,10 @@ const _all_defaults = KW[
] ]
# to be able to reset font sizes to initial values # to be able to reset font sizes to initial values
const _initial_fontsizes = Dict(:titlefont => deepcopy(_subplot_defaults[:titlefont]), const _initial_fontsizes = Dict(:titlefont => _subplot_defaults[:titlefont].pointsize,
:legendfont => deepcopy(_subplot_defaults[:legendfont]), :legendfont => _subplot_defaults[:legendfont].pointsize,
:tickfont => deepcopy(_axis_defaults[:tickfont]), :tickfont => _axis_defaults[:tickfont].pointsize,
:guidefont => deepcopy(_axis_defaults[:guidefont])) :guidefont => _axis_defaults[:guidefont].pointsize)
const _all_args = sort(collect(union(map(keys, _all_defaults)...))) const _all_args = sort(collect(union(map(keys, _all_defaults)...)))
@ -525,25 +525,6 @@ function default(d::KW, k::Symbol)
get(d, k, default(k)) get(d, k, default(k))
end end
# reset the defaults globally to values at startup
"""
`initial(key)` returns the intial value for that key
"""
function initial(k::Symbol)
k = get(_keyAliases, k, k)
for defaults in _all_initial_defaults
if haskey(defaults, k)
return defaults[k]
end
end
if haskey(_axis_initial_defaults, k)
return _axis_initial_defaults[k]
end
k in _suppress_warnings || error("Unknown key: ", k)
end
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

View File

@ -307,8 +307,8 @@ end
function scalefontsizes() function scalefontsizes()
for k in (:titlefont, :guidefont, :tickfont, :legendfont) for k in (:titlefont, :guidefont, :tickfont, :legendfont)
f = default(k) f = default(k)
if haskey(_initial_fontsizes,k) for k in keys(_initial_fontsizes)
factor = f.pointsize / _initial_fontsizes[k].pointsize factor = f.pointsize / _initial_fontsizes[k]
scalefontsize(k, 1.0/factor) scalefontsize(k, 1.0/factor)
end end
end end