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

Merge pull request #2289 from daschw/deps

Browse Source 
Update dependencies
This commit is contained in:
Daniel Schwabeneder 2019-11-30 13:28:28 +01:00 committed by GitHub
commit 93d7e53f8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 836 additions and 849 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Project.toml
View File

@ -33,19 +33,19 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
[compat] [compat]
Contour = "0.5" Contour = "0.5"
FFMPEG = "0.2" FFMPEG = "0.2"
FixedPointNumbers = "0.3, 0.6" FixedPointNumbers = "0.6"
GR = "0.31, 0.44" GR = "0.44"
GeometryTypes = "0.7" GeometryTypes = "0.7"
JSON = "0.21" JSON = "0.21"
Measures = "0.3" Measures = "0.3"
NaNMath = "0.3" NaNMath = "0.3"
PlotThemes = "0.2, 1" PlotThemes = "1"
PlotUtils = "0.6.1" PlotUtils = "0.6.1"
RecipesBase = "0.6, 0.7" RecipesBase = "0.6, 0.7"
Reexport = "0.2" Reexport = "0.2"
Requires = "0.5" Requires = "0.5"
Showoff = "0.3.1" Showoff = "0.3.1"
StatsBase = "0.14, 0.32" StatsBase = "0.32"
julia = "1" julia = "1"
[extras] [extras]

3
deps/generateprecompiles.jl vendored
View File

@ -42,7 +42,8 @@ blacklist = [
# the following are not visible to Plots, only its dependencies # the following are not visible to Plots, only its dependencies
"CategoricalArrays", "CategoricalArrays",
"FixedPointNumbers", "FixedPointNumbers",
"SparseArrays" "SparseArrays",
r"#{1,2}[^\"#]+#{1,2}\d+",
] ]
data = SnoopCompile.read(log_path) data = SnoopCompile.read(log_path)

1665
src/precompile.jl
View File

File diff suppressed because it is too large Load Diff

9
src/themes.jl
View File

@ -13,7 +13,6 @@ function _theme(s::Symbol, defaults::KW; kw...)
reset_defaults() reset_defaults()
# Set the theme's gradient as default # Set the theme's gradient as default
fix_colorgradient!(defaults)
if haskey(defaults, :colorgradient) 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))
@ -41,13 +40,6 @@ function _theme(s::Symbol, defaults::KW; kw...)
return return
end end
# be compatible with old PlotThemes specifying the colorgradient with `:gradient`
function fix_colorgradient!(defaults)
if haskey(defaults, :gradient) && !haskey(defaults, :colorgradient)
defaults[:colorgradient] = pop!(defaults, :gradient)
end
end
@deprecate set_theme(s) theme(s) @deprecate set_theme(s) theme(s)
@userplot ShowTheme @userplot ShowTheme
@ -65,7 +57,6 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
defaults = PlotThemes._themes[thm].defaults defaults = PlotThemes._themes[thm].defaults
# get the gradient # get the gradient
fix_colorgradient!(defaults)
gradient_colors = get(defaults, :colorgradient, cgrad(:inferno).colors) gradient_colors = get(defaults, :colorgradient, cgrad(:inferno).colors)
colorgradient = cgrad(cfunc.(RGB.(gradient_colors))) colorgradient = cgrad(cfunc.(RGB.(gradient_colors)))