Plotly javascript loaded.
") end # end borrowing (thanks :) ########################### + # if isatom() + # import Atom + # Atom.@msg evaljs(_js_code) + # end + end # TODO: other initialization end @@ -436,15 +445,23 @@ function html_body(plt::Plot{PlotlyBackend}, style = nothing) style = "width:$(w)px;height:$(h)px;" end uuid = Base.Random.uuid4() - """ + html = """ """ + # @show html + html end +function js_body(plt::Plot{PlotlyBackend}, uuid) + js = """ + PLOT = document.getElementById('$(uuid)'); + Plotly.plot(PLOT, $(get_series_json(plt)), $(get_plot_json(plt))); + """ +end function html_body(subplt::Subplot{PlotlyBackend}) @@ -479,7 +496,8 @@ function Base.writemime(io::IO, ::MIME"image/png", plt::AbstractPlot{PlotlyBacke end function Base.writemime(io::IO, ::MIME"text/html", plt::AbstractPlot{PlotlyBackend}) - write(io, html_head(plt) * html_body(plt)) + write(io, html_head(plt) * html_body(plt)) + # write(io, html_body(plt)) end function Base.display(::PlotsDisplay, plt::AbstractPlot{PlotlyBackend}) diff --git a/src/backends/plotlyjs.jl b/src/backends/plotlyjs.jl index 1f12358f..ca972d98 100644 --- a/src/backends/plotlyjs.jl +++ b/src/backends/plotlyjs.jl @@ -44,6 +44,7 @@ function _add_series(::PlotlyJSBackend, plt::Plot; kw...) typ = pop!(pdict, :type) gt = PlotlyJS.GenericTrace(typ; pdict...) PlotlyJS.addtraces!(syncplot, gt) + # PlotlyJS.addtraces!(syncplot.plot, gt) push!(plt.seriesargs, d) plt @@ -73,6 +74,7 @@ function _update_plot(plt::Plot{PlotlyJSBackend}, d::Dict) syncplot = plt.o w,h = d[:size] PlotlyJS.relayout!(syncplot, pdict, width = w, height = h) + # PlotlyJS.relayout!(syncplot.plot, pdict, width = w, height = h) end @@ -125,4 +127,3 @@ end function Base.display(::PlotsDisplay, plt::Subplot{PlotlyJSBackend}) error() end - diff --git a/src/backends/supported.jl b/src/backends/supported.jl index 11168686..6b868f58 100644 --- a/src/backends/supported.jl +++ b/src/backends/supported.jl @@ -723,7 +723,7 @@ supportedArgs(::PGFPlotsBackend) = [ # :legend, # :linecolor, # :linestyle, - # :linetype, + :linetype, # :linewidth, # :linealpha, # :markershape, @@ -743,11 +743,11 @@ supportedArgs(::PGFPlotsBackend) = [ # :size, # :title, # :windowtitle, - # :x, + :x, # :xlabel, # :xlims, # :xticks, - # :y, + :y, # :ylabel, # :ylims, # :yrightlabel, @@ -765,9 +765,8 @@ supportedArgs(::PGFPlotsBackend) = [ # :levels, ] supportedAxes(::PGFPlotsBackend) = [:auto, :left] -supportedTypes(::PGFPlotsBackend) = [:contour] #, :path, :scatter ,:steppre, :steppost, :sticks, :hist2d, :hexbin, :hist, :bar, :hline, :vline, :contour] +supportedTypes(::PGFPlotsBackend) = [:path, :scatter, :line, :steppost, :hist, :bar] #, :steppre, :sticks, :hist2d, :hexbin, :bar, :hline, :vline, :contour] supportedStyles(::PGFPlotsBackend) = [:auto, :solid] #, :dash, :dot, :dashdot, :dashdotdot] supportedMarkers(::PGFPlotsBackend) = [:none, :auto, :ellipse] #, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5] #vcat(_allMarkers, Shape) supportedScales(::PGFPlotsBackend) = [:identity] #, :log, :log2, :log10, :asinh, :sqrt] subplotSupported(::PGFPlotsBackend) = false - diff --git a/src/output.jl b/src/output.jl index aeb3adfb..f3659a0d 100644 --- a/src/output.jl +++ b/src/output.jl @@ -124,18 +124,23 @@ end # --------------------------------------------------------- function setup_atom() - # @require Atom begin - # @eval begin - # import Atom - # - # Atom.displaysize(::AbstractPlot) = (535, 379) - # Atom.displaytitle(::AbstractPlot) = "Plots.jl" - # - # Atom.@render Atom.PlotPane p::Plot begin - # x, y = Atom.@rpc Atom.plotsize() - # plot!(p, size=(x,y)) # changes the size of the Plots.Plot - # Atom.div(Dict(:style=>"background: white"), Atom.HTML(stringmime("text/html", p))) - # end - # end - # end + @require Atom begin + import Atom, Media + + # connects the render function + Media.media{T <: Union{GadflyBackend,ImmerseBackend,PyPlotBackend,GRBackend}}(Plot{T}, Media.Plot) + + # Atom.displaysize(::AbstractPlot) = (535, 379) + # Atom.displaytitle(plt::AbstractPlot) = "Plots.jl (backend: $(backend(plt)))" + + # this is like "display"... sends an html div with the plot to the PlotPane + function Media.render(pane::Atom.PlotPane, plt::Plot) + Media.render(pane, Atom.div(Atom.d(), Atom.HTML(stringmime(MIME("text/html"), plt)))) + end + + + # function Media.render(pane::Atom.PlotPane, plt::Plot{PlotlyBackend}) + # html = Media.render(pane, Atom.div(Atom.d(), Atom.HTML(stringmime(MIME("text/html"), plt)))) + # end + end end diff --git a/src/utils.jl b/src/utils.jl index 3bdd2c2f..30ea6f99 100644 --- a/src/utils.jl +++ b/src/utils.jl @@ -198,6 +198,7 @@ function fakedata(sz...) end isijulia() = isdefined(Main, :IJulia) && Main.IJulia.inited +isatom() = isdefined(Main, :Atom) && Atom.isconnected() istuple(::Tuple) = true istuple(::Any) = false @@ -498,4 +499,4 @@ xmin(plt::Plot) = minimum([minimum(d[:x]) for d in plt.seriesargs]) xmax(plt::Plot) = maximum([maximum(d[:x]) for d in plt.seriesargs]) "Extrema of x-values in plot" -Base.extrema(plt::Plot) = (xmin(plt), xmax(plt)) \ No newline at end of file +Base.extrema(plt::Plot) = (xmin(plt), xmax(plt))