From ffea050bc20573596a4bbeded52060db6478cb26 Mon Sep 17 00:00:00 2001 From: Spencer Lyon Date: Tue, 8 Jan 2019 14:04:03 -0500 Subject: [PATCH 1/2] ENH: don't special case html display for jupyter --- src/backends/plotlyjs.jl | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/backends/plotlyjs.jl b/src/backends/plotlyjs.jl index 791016d7..575d076b 100644 --- a/src/backends/plotlyjs.jl +++ b/src/backends/plotlyjs.jl @@ -50,13 +50,6 @@ end # ---------------------------------------------------------------- -function _show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend}) - if isijulia() && !_use_remote[] - write(io, PlotlyJS.html_body(PlotlyJS.JupyterPlot(plt.o))) - else - show(io, MIME("text/html"), plt.o) - end -end function plotlyjs_save_hack(io::IO, plt::Plot{PlotlyJSBackend}, ext::String) tmpfn = tempname() * "." * ext @@ -67,6 +60,7 @@ _show(io::IO, ::MIME"image/svg+xml", plt::Plot{PlotlyJSBackend}) = plotlyjs_save _show(io::IO, ::MIME"image/png", plt::Plot{PlotlyJSBackend}) = plotlyjs_save_hack(io, plt, "png") _show(io::IO, ::MIME"application/pdf", plt::Plot{PlotlyJSBackend}) = plotlyjs_save_hack(io, plt, "pdf") _show(io::IO, ::MIME"image/eps", plt::Plot{PlotlyJSBackend}) = plotlyjs_save_hack(io, plt, "eps") +_show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend}) = show(io, MIME("text/html"), plt.o) function write_temp_html(plt::Plot{PlotlyJSBackend}) filename = string(tempname(), ".html") From 80a97b0f2693e0b7e9959859144e4121f364f4b7 Mon Sep 17 00:00:00 2001 From: Spencer Lyon Date: Tue, 8 Jan 2019 14:04:33 -0500 Subject: [PATCH 2/2] ENH: use PlotlyJS.savefig(::IO, ...) methods instead of former `plotlyjs_save_hack` hack --- src/backends/plotlyjs.jl | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/backends/plotlyjs.jl b/src/backends/plotlyjs.jl index 575d076b..08e40762 100644 --- a/src/backends/plotlyjs.jl +++ b/src/backends/plotlyjs.jl @@ -1,5 +1,4 @@ - -# https://github.com/spencerlyon2/PlotlyJS.jl +# https://github.com/sglyon/PlotlyJS.jl # -------------------------------------------------------------------------------------- @@ -50,17 +49,11 @@ end # ---------------------------------------------------------------- - -function plotlyjs_save_hack(io::IO, plt::Plot{PlotlyJSBackend}, ext::String) - tmpfn = tempname() * "." * ext - PlotlyJS.savefig(plt.o, tmpfn) - write(io, read(open(tmpfn))) -end -_show(io::IO, ::MIME"image/svg+xml", plt::Plot{PlotlyJSBackend}) = plotlyjs_save_hack(io, plt, "svg") -_show(io::IO, ::MIME"image/png", plt::Plot{PlotlyJSBackend}) = plotlyjs_save_hack(io, plt, "png") -_show(io::IO, ::MIME"application/pdf", plt::Plot{PlotlyJSBackend}) = plotlyjs_save_hack(io, plt, "pdf") -_show(io::IO, ::MIME"image/eps", plt::Plot{PlotlyJSBackend}) = plotlyjs_save_hack(io, plt, "eps") _show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend}) = show(io, MIME("text/html"), plt.o) +_show(io::IO, ::MIME"image/svg+xml", plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plt.o, format="svg") +_show(io::IO, ::MIME"image/png", plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plt.o, format="png") +_show(io::IO, ::MIME"application/pdf", plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plt.o, format="pdf") +_show(io::IO, ::MIME"image/eps", plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plt.o, format="eps") function write_temp_html(plt::Plot{PlotlyJSBackend}) filename = string(tempname(), ".html")