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

no eval shenanigans

Browse Source
This commit is contained in:
Sebastian Pfitzner 2017-07-17 15:16:20 +02:00
parent 95c60b9554
commit 6d66190644
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backends.jl
View File

@ -135,7 +135,7 @@ function pickDefaultBackend()
Pkg.installed(env_default) # this will error if not installed Pkg.installed(env_default) # this will error if not installed
sym = Symbol(lowercase(env_default)) sym = Symbol(lowercase(env_default))
if haskey(_backendType, sym) if haskey(_backendType, sym)
return @eval backend($sym) return backend(sym)
else else
warn("You have set PLOTS_DEFAULT_BACKEND=$env_default but it is not a valid backend package. Choose from:\n\t", warn("You have set PLOTS_DEFAULT_BACKEND=$env_default but it is not a valid backend package. Choose from:\n\t",
join(sort(_backends), "\n\t")) join(sort(_backends), "\n\t"))
@ -150,12 +150,12 @@ function pickDefaultBackend()
# features, speed, and robustness # features, speed, and robustness
for pkgstr in ("GR", "PyPlot", "PlotlyJS", "PGFPlots", "UnicodePlots", "InspectDR", "GLVisualize") for pkgstr in ("GR", "PyPlot", "PlotlyJS", "PGFPlots", "UnicodePlots", "InspectDR", "GLVisualize")
if Pkg.installed(pkgstr) != nothing if Pkg.installed(pkgstr) != nothing
return @eval backend(Symbol(lowercase($pkgstr))) return backend(Symbol(lowercase(pkgstr)))
end end
end end
# the default if nothing else is installed # the default if nothing else is installed
@eval backend(:plotly) backend(:plotly)
end end

4
src/output.jl
View File

@ -224,10 +224,6 @@ if is_installed("FileIO")
end end
end end
# function html_output_format(fmt) # function html_output_format(fmt)
# if fmt == "png" # if fmt == "png"
# @eval function Base.show(io::IO, ::MIME"text/html", plt::Plot) # @eval function Base.show(io::IO, ::MIME"text/html", plt::Plot)