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

reduce some inlining and better type information

Browse Source
This commit is contained in:
Chris Rackauckas 2019-08-21 12:02:25 -04:00
parent 5dff00e2a3
commit d111c2ba91
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/output.jl
View File

@ -129,29 +129,29 @@ savefig(fn::AbstractString) = savefig(current(), fn)
Display a plot using the backends' gui window Display a plot using the backends' gui window
""" """
gui(plt::Plot = current()) = display(PlotsDisplay(), plt) @noinline gui(plt::Plot = current()) = display(PlotsDisplay(), plt)
# IJulia only... inline display # IJulia only... inline display
function inline(plt::Plot = current()) @noinline function inline(plt::Plot = current())
isijulia() || error("inline() is IJulia-only") isijulia() || error("inline() is IJulia-only")
Main.IJulia.clear_output(true) Main.IJulia.clear_output(true)
display(Main.IJulia.InlineDisplay(), plt) display(Main.IJulia.InlineDisplay(), plt)
end end
function Base.display(::PlotsDisplay, plt::Plot) @noinline function Base.display(::PlotsDisplay, plt::Plot)
prepare_output(plt) prepare_output(plt)
#_display(plt) _display(plt)
end end
_do_plot_show(plt, showval::Bool) = showval && gui(plt) @noinline _do_plot_show(plt, showval::Bool) = showval && gui(plt)
function _do_plot_show(plt, showval::Symbol) @noinline function _do_plot_show(plt, showval::Symbol)
showval == :gui && gui(plt) showval == :gui && gui(plt)
showval in (:inline,:ijulia) && inline(plt) showval in (:inline,:ijulia) && inline(plt)
end end
# --------------------------------------------------------- # ---------------------------------------------------------
const _best_html_output_type = KW( const _best_html_output_type = Dict{Symbol,Symbol}(
:pyplot => :png, :pyplot => :png,
:unicodeplots => :txt, :unicodeplots => :txt,
:plotlyjs => :html, :plotlyjs => :html,
@ -159,7 +159,7 @@ const _best_html_output_type = KW(
) )
# a backup for html... passes to svg or png depending on the html_output_format arg # a backup for html... passes to svg or png depending on the html_output_format arg
function _show(io::IO, ::MIME"text/html", plt::Plot) @noinline function _show(io::IO, ::MIME"text/html", plt::Plot)
output_type = Symbol(plt.attr[:html_output_format]) output_type = Symbol(plt.attr[:html_output_format])
if output_type == :auto if output_type == :auto
output_type = get(_best_html_output_type, backend_name(plt.backend), :svg) output_type = get(_best_html_output_type, backend_name(plt.backend), :svg)
@ -178,11 +178,11 @@ function _show(io::IO, ::MIME"text/html", plt::Plot)
end end
# delegate showable to _show instead # delegate showable to _show instead
function Base.showable(m::M, plt::P) where {M<:MIME, P<:Plot} @noinline function Base.showable(m::M, plt::P) where {M<:MIME, P<:Plot}
return hasmethod(_show, Tuple{IO, M, P}) return hasmethod(_show, Tuple{IO, M, P})
end end
function _display(plt::Plot) @noinline function _display(plt::Plot)
@warn("_display is not defined for this backend.") @warn("_display is not defined for this backend.")
end end
@ -202,7 +202,7 @@ for mime in ("text/plain", "text/html", "image/png", "image/eps", "image/svg+xml
end end
# default text/plain for all backends # default text/plain for all backends
_show(io::IO, ::MIME{Symbol("text/plain")}, plt::Plot) = show(io, plt) @noinline _show(io::IO, ::MIME{Symbol("text/plain")}, plt::Plot) = show(io, plt)
"Close all open gui windows of the current backend" "Close all open gui windows of the current backend"
closeall() = closeall(backend()) closeall() = closeall(backend())