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

immerse gui fix

Browse Source
This commit is contained in:
Thomas Breloff 2015-10-23 13:53:13 -04:00
parent 479ab989df
commit 6ce235bb68
3 changed files with 17 additions and 4865 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4854
examples/meetup/nnet.ipynb
View File

File diff suppressed because one or more lines are too long

2
src/args.jl
View File

@ -150,7 +150,7 @@ _plotDefaults[:xscale] = :identity
_plotDefaults[:yscale] = :identity _plotDefaults[:yscale] = :identity
_plotDefaults[:xflip] = false _plotDefaults[:xflip] = false
_plotDefaults[:yflip] = true _plotDefaults[:yflip] = true
_plotDefaults[:size] = (800,600) _plotDefaults[:size] = (600,400)
_plotDefaults[:pos] = (0,0) _plotDefaults[:pos] = (0,0)
_plotDefaults[:windowtitle] = "Plots.jl" _plotDefaults[:windowtitle] = "Plots.jl"
_plotDefaults[:show] = false _plotDefaults[:show] = false

26
src/backends/immerse.jl
View File

@ -143,24 +143,13 @@ end
getGadflyContext(plt::Plot{ImmersePackage}) = plt.o[2] getGadflyContext(plt::Plot{ImmersePackage}) = plt.o[2]
getGadflyContext(subplt::Subplot{ImmersePackage}) = buildGadflySubplotContext(subplt) getGadflyContext(subplt::Subplot{ImmersePackage}) = buildGadflySubplotContext(subplt)
# function Base.writemime(io::IO, ::MIME"image/png", plt::Plot{ImmersePackage})
# gplt = getGadflyContext(plt)
# setGadflyDisplaySize(plt.initargs[:size]...)
# Gadfly.draw(Gadfly.PNG(io, Compose.default_graphic_width, Compose.default_graphic_height), gplt)
# end
# function Base.writemime(io::IO, ::MIME"image/svg+xml", plt::Plot{ImmersePackage})
# gplt = getGadflyContext(plt)
# setGadflyDisplaySize(plt.initargs[:size]...)
# Gadfly.draw(Gadfly.SVG(io, Compose.default_graphic_width, Compose.default_graphic_height), gplt)
# end
function Base.display(::PlotsDisplay, plt::Plot{ImmersePackage}) function Base.display(::PlotsDisplay, plt::Plot{ImmersePackage})
fig, gplt = plt.o fig, gplt = plt.o
if fig == nothing if fig == nothing
fig = createImmerseFigure(plt.initargs) fig = createImmerseFigure(plt.initargs)
Gtk.on_signal_destroy((x...) -> (Immerse.dropfig(Immerse._display, fig.figno); plt.o = (nothing,gplt)), fig.canvas)
plt.o = (fig, gplt) plt.o = (fig, gplt)
end end
@ -169,19 +158,6 @@ function Base.display(::PlotsDisplay, plt::Plot{ImmersePackage})
end end
# function Base.writemime(io::IO, ::MIME"image/png", plt::Subplot{ImmersePackage})
# gplt = getGadflyContext(plt)
# setGadflyDisplaySize(plt.initargs[1][:size]...)
# Gadfly.draw(Gadfly.PNG(io, Compose.default_graphic_width, Compose.default_graphic_height), gplt)
# end
# function Base.writemime(io::IO, ::MIME"image/svg+xml", plt::Subplot{ImmersePackage})
# gplt = getGadflyContext(plt)
# setGadflyDisplaySize(plt.initargs[1][:size]...)
# Gadfly.draw(Gadfly.SVG(io, Compose.default_graphic_width, Compose.default_graphic_height), gplt)
# end
function Base.display(::PlotsDisplay, subplt::Subplot{ImmersePackage}) function Base.display(::PlotsDisplay, subplt::Subplot{ImmersePackage})
# if we haven't created the window yet, do it # if we haven't created the window yet, do it