fix world age error
This commit is contained in:
parent
d671ccd6ba
commit
5e5f23b5e5
@ -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 backend(sym)
|
return @eval 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 backend(Symbol(lowercase(pkgstr)))
|
return @eval backend(Symbol(lowercase($pkgstr)))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# the default if nothing else is installed
|
# the default if nothing else is installed
|
||||||
backend(:plotly)
|
@eval backend(:plotly)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -283,22 +283,20 @@ using Requires
|
|||||||
import Hiccup, Media
|
import Hiccup, Media
|
||||||
Media.media(Plot, Media.Plot)
|
Media.media(Plot, Media.Plot)
|
||||||
|
|
||||||
# default text/plain so it doesn't complain
|
|
||||||
function Base.show{B}(io::IO, ::MIME"text/plain", plt::Plot{B})
|
|
||||||
print(io, "Plot{$B}()")
|
|
||||||
end
|
|
||||||
|
|
||||||
function Juno.render(e::Juno.Editor, plt::Plot)
|
function Juno.render(e::Juno.Editor, plt::Plot)
|
||||||
Juno.render(e, nothing)
|
Juno.render(e, nothing)
|
||||||
end
|
end
|
||||||
|
|
||||||
if get(ENV, "PLOTS_USE_ATOM_PLOTPANE", true) in (true, 1, "1", "true", "yes")
|
if get(ENV, "PLOTS_USE_ATOM_PLOTPANE", true) in (true, 1, "1", "true", "yes")
|
||||||
# this is like "display"... sends an html div with the plot to the PlotPane
|
|
||||||
function Juno.render(pane::Juno.PlotPane, plt::Plot)
|
function Juno.render(pane::Juno.PlotPane, plt::Plot)
|
||||||
# temporarily overwrite size to be Atom.plotsize
|
# temporarily overwrite size to be Atom.plotsize
|
||||||
sz = plt[:size]
|
sz = plt[:size]
|
||||||
|
jsize = Juno.plotsize()
|
||||||
|
jsize[1] == 0 && (jsize[1] = 400)
|
||||||
|
jsize[2] == 0 && (jsize[2] = 500)
|
||||||
|
|
||||||
plt[:size] = Juno.plotsize()
|
plt[:size] = Juno.plotsize()
|
||||||
Juno.render(pane, Hiccup.div(".fill", HTML(stringmime(MIME("text/html"), plt))))
|
Juno.render(pane, HTML(stringmime(MIME("text/html"), plt)))
|
||||||
plt[:size] = sz
|
plt[:size] = sz
|
||||||
end
|
end
|
||||||
# special handling for PlotlyJS
|
# special handling for PlotlyJS
|
||||||
@ -309,7 +307,7 @@ using Requires
|
|||||||
function Juno.render(pane::Juno.PlotPane, plt::Plot)
|
function Juno.render(pane::Juno.PlotPane, plt::Plot)
|
||||||
display(Plots.PlotsDisplay(), plt)
|
display(Plots.PlotsDisplay(), plt)
|
||||||
s = "PlotPane turned off. Unset ENV[\"PLOTS_USE_ATOM_PLOTPANE\"] and restart Julia to enable it."
|
s = "PlotPane turned off. Unset ENV[\"PLOTS_USE_ATOM_PLOTPANE\"] and restart Julia to enable it."
|
||||||
Juno.render(pane, Hiccup.div(HTML(s)))
|
Juno.render(pane, HTML(s))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -317,6 +315,6 @@ using Requires
|
|||||||
function Juno.render(pane::Juno.PlotPane, plt::Plot{PlotlyBackend})
|
function Juno.render(pane::Juno.PlotPane, plt::Plot{PlotlyBackend})
|
||||||
display(Plots.PlotsDisplay(), plt)
|
display(Plots.PlotsDisplay(), plt)
|
||||||
s = "PlotPane turned off. The plotly backend cannot render in the PlotPane due to javascript issues. Plotlyjs is similar to plotly and is compatible with the plot pane."
|
s = "PlotPane turned off. The plotly backend cannot render in the PlotPane due to javascript issues. Plotlyjs is similar to plotly and is compatible with the plot pane."
|
||||||
Juno.render(pane, Hiccup.div(HTML(s)))
|
Juno.render(pane, HTML(s))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user