removed plotly-latest.min.js and added build.jl which downloads it; fix for quiver_using_hack; working on pyplot display behavior
This commit is contained in:
parent
7248d8d7ce
commit
45a1ed69d4
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@
|
||||
.DS_Store
|
||||
examples/.ipynb_checkpoints/*
|
||||
examples/meetup/.ipynb_checkpoints/*
|
||||
deps/plotly-latest.min.js
|
||||
|
||||
41
deps/plotly-latest.min.js
vendored
41
deps/plotly-latest.min.js
vendored
File diff suppressed because one or more lines are too long
@ -72,20 +72,20 @@ function _initialize_backend(::PyPlotBackend)
|
||||
|
||||
PyPlot.ioff()
|
||||
|
||||
if !isa(Base.Multimedia.displays[end], Base.REPL.REPLDisplay)
|
||||
PyPlot.ioff() # stops wierd behavior of displaying incomplete graphs in IJulia
|
||||
# if !isa(Base.Multimedia.displays[end], Base.REPL.REPLDisplay)
|
||||
# PyPlot.ioff() # stops wierd behavior of displaying incomplete graphs in IJulia
|
||||
|
||||
# # TODO: how the hell can I use PyQt4??
|
||||
# "pyqt4"=>:qt_pyqt4
|
||||
# PyPlot.backend[1] = "pyqt4"
|
||||
# PyPlot.gui[1] = :qt_pyqt4
|
||||
# PyPlot.switch_backend("Qt4Agg")
|
||||
# # # TODO: how the hell can I use PyQt4??
|
||||
# # "pyqt4"=>:qt_pyqt4
|
||||
# # PyPlot.backend[1] = "pyqt4"
|
||||
# # PyPlot.gui[1] = :qt_pyqt4
|
||||
# # PyPlot.switch_backend("Qt4Agg")
|
||||
|
||||
# only turn on the gui if we want it
|
||||
if PyPlot.gui != :none
|
||||
PyPlot.pygui(true)
|
||||
end
|
||||
end
|
||||
# # only turn on the gui if we want it
|
||||
# if PyPlot.gui != :none
|
||||
# PyPlot.pygui(true)
|
||||
# end
|
||||
# end
|
||||
end
|
||||
|
||||
# --------------------------------------------------------------------------------------
|
||||
@ -1196,20 +1196,15 @@ end
|
||||
# -----------------------------------------------------------------
|
||||
# display/output
|
||||
|
||||
# function Base.display(::PlotsDisplay, plt::Plot{PyPlotBackend})
|
||||
# finalizePlot(plt)
|
||||
# if isa(Base.Multimedia.displays[end], Base.REPL.REPLDisplay)
|
||||
# display(getfig(plt.o))
|
||||
# end
|
||||
# getfig(plt.o)[:show]()
|
||||
# end
|
||||
|
||||
function _display(plt::Plot{PyPlotBackend})
|
||||
# finalizePlot(plt)
|
||||
if isa(Base.Multimedia.displays[end], Base.REPL.REPLDisplay)
|
||||
display(getfig(plt.o))
|
||||
end
|
||||
getfig(plt.o)[:show]()
|
||||
# if isa(Base.Multimedia.displays[end], Base.REPL.REPLDisplay)
|
||||
# display(plt.o)
|
||||
# end
|
||||
# PyPlot.ion()
|
||||
PyPlot.pygui(false)
|
||||
plt.o[:show]()
|
||||
PyPlot.pygui(true)
|
||||
# PyPlot.ioff()
|
||||
end
|
||||
|
||||
|
||||
@ -1225,10 +1220,8 @@ const _pyplot_mimeformats = Dict(
|
||||
|
||||
|
||||
for (mime, fmt) in _pyplot_mimeformats
|
||||
# @eval function Base.writemime(io::IO, ::MIME{Symbol($mime)}, plt::Plot{PyPlotBackend})
|
||||
@eval function _writemime(io::IO, ::MIME{Symbol($mime)}, plt::Plot{PyPlotBackend})
|
||||
# finalizePlot(plt)
|
||||
fig = getfig(plt.o)
|
||||
fig = plt.o
|
||||
fig.o["canvas"][:print_figure](
|
||||
io,
|
||||
format=$fmt,
|
||||
|
||||
@ -754,8 +754,8 @@ end
|
||||
|
||||
# function apply_series_recipe(d::KW, ::Type{Val{:quiver}})
|
||||
function quiver_using_hack(d::KW)
|
||||
label := ""
|
||||
seriestype := :shape
|
||||
d[:label] = ""
|
||||
d[:seriestype] = :shape
|
||||
|
||||
velocity = error_zipit(d[:quiver])
|
||||
xorig, yorig = d[:x], d[:y]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user