create syncplot at show/display

This commit is contained in:
Daniel Schwabeneder 2019-08-07 16:39:39 +02:00
parent f11b976574
commit 0e79070ad8

View File

@ -2,77 +2,111 @@
# -------------------------------------------------------------------------------------- # --------------------------------------------------------------------------------------
function plotlyjs_syncplot(plt::Plot{PlotlyJSBackend})
function _create_backend_figure(plt::Plot{PlotlyJSBackend}) plt[:overwrite_figure] && closeall()
if !isplotnull() && plt[:overwrite_figure] && isa(current().o, PlotlyJS.SyncPlot) plt.o = PlotlyJS.plot()
PlotlyJS.SyncPlot(PlotlyJS.Plot(), options = current().o.options) traces = PlotlyJS.GenericTrace[]
else for series_dict in plotly_series(plt)
PlotlyJS.plot() plotly_type = pop!(series_dict, :type)
push!(traces, PlotlyJS.GenericTrace(plotly_type; series_dict...))
end end
PlotlyJS.addtraces!(plt.o, traces...)
layout = plotly_layout(plt)
w, h = plt[:size]
PlotlyJS.relayout!(plt.o, layout, width = w, height = h)
return plt.o
end end
function _series_added(plt::Plot{PlotlyJSBackend}, series::Series) # function _create_backend_figure(plt::Plot{PlotlyJSBackend})
syncplot = plt.o # if !isplotnull() && plt[:overwrite_figure] && isa(current().o, PlotlyJS.SyncPlot)
pdicts = plotly_series(plt, series) # PlotlyJS.SyncPlot(PlotlyJS.Plot(), options = current().o.options)
for pdict in pdicts # else
typ = pop!(pdict, :type) # PlotlyJS.plot()
gt = PlotlyJS.GenericTrace(typ; pdict...) # end
PlotlyJS.addtraces!(syncplot, gt) # end
end #
end #
# function _series_added(plt::Plot{PlotlyJSBackend}, series::Series)
function _series_updated(plt::Plot{PlotlyJSBackend}, series::Series) # syncplot = plt.o
xsym, ysym = (ispolar(series) ? (:t,:r) : (:x,:y)) # pdicts = plotly_series(plt, series)
kw = KW(xsym => (series.plotattributes[:x],), ysym => (series.plotattributes[:y],)) # for pdict in pdicts
z = series[:z] # typ = pop!(pdict, :type)
if z != nothing # gt = PlotlyJS.GenericTrace(typ; pdict...)
kw[:z] = (isa(z,Surface) ? transpose_z(series, series[:z].surf, false) : z,) # PlotlyJS.addtraces!(syncplot, gt)
end # end
PlotlyJS.restyle!( # end
plt.o, #
findfirst(isequal(series), plt.series_list), # function _series_updated(plt::Plot{PlotlyJSBackend}, series::Series)
kw # xsym, ysym = (ispolar(series) ? (:t,:r) : (:x,:y))
) # kw = KW(xsym => (series.plotattributes[:x],), ysym => (series.plotattributes[:y],))
end # z = series[:z]
# if z != nothing
# kw[:z] = (isa(z,Surface) ? transpose_z(series, series[:z].surf, false) : z,)
# end
# PlotlyJS.restyle!(
# plt.o,
# findfirst(isequal(series), plt.series_list),
# kw
# )
# end
#
#
# # ----------------------------------------------------------------
#
# function _update_plot_object(plt::Plot{PlotlyJSBackend})
# pdict = plotly_layout(plt)
# syncplot = plt.o
# w,h = plt[:size]
# PlotlyJS.relayout!(syncplot, pdict, width = w, height = h)
# end
# ---------------------------------------------------------------- # ----------------------------------------------------------------
function _update_plot_object(plt::Plot{PlotlyJSBackend}) const _plotlyjs_mimeformats = Dict(
pdict = plotly_layout(plt) "application/pdf" => "pdf",
syncplot = plt.o "image/png" => "png",
w,h = plt[:size] "image/svg+xml" => "svg",
PlotlyJS.relayout!(syncplot, pdict, width = w, height = h) "image/eps" => "eps",
)
for (mime, fmt) in _plotlyjs_mimeformats
@eval _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plotlyjs_syncplot(plt), format = $fmt)
end end
const _plotlyjs_showformats = ["text/html", "application/vnd.plotly.v1+json"]
# ---------------------------------------------------------------- for mime in ["text/html", "application/vnd.plotly.v1+json"]
@eval _show(io::IO, mime::MIME{Symbol($mime)}, plt::Plot{PlotlyJSBackend}) = show(io, mime, plotlyjs_syncplot(plt))
_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 _show(io::IO, m::MIME"application/vnd.plotly.v1+json", plt::Plot{PlotlyJSBackend})
show(io, m, plt.o)
end end
# _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}) # function _show(io::IO, m::MIME"application/vnd.plotly.v1+json", plt::Plot{PlotlyJSBackend})
filename = string(tempname(), ".html") # show(io, m, plt.o)
savefig(plt, filename) # end
filename
end
function _display(plt::Plot{PlotlyJSBackend})
if get(ENV, "PLOTS_USE_ATOM_PLOTPANE", true) in (true, 1, "1", "true", "yes") # function write_temp_html(plt::Plot{PlotlyJSBackend})
display(plt.o) # filename = string(tempname(), ".html")
else # savefig(plt, filename)
standalone_html_window(plt) # filename
end # end
end
_display(plt::Plot{PlotlyJSBackend}) = display(plotlyjs_syncplot(plt))
# function _display(plt::Plot{PlotlyJSBackend})
# if get(ENV, "PLOTS_USE_ATOM_PLOTPANE", true) in (true, 1, "1", "true", "yes")
# display(plt.o)
# else
# standalone_html_window(plt)
# end
# end
@require WebIO = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29" begin @require WebIO = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29" begin
function WebIO.render(plt::Plot{PlotlyJSBackend}) function WebIO.render(plt::Plot{PlotlyJSBackend})