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

fixed gadfly hline/vline constructors

Browse Source
This commit is contained in:
Thomas Breloff 2015-11-16 15:37:55 -05:00
parent 55e388513c
commit 121640b1b3
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backends/gadfly.jl
View File

@ -36,9 +36,9 @@ function getLineGeom(d::Dict)
elseif lt == :steppre elseif lt == :steppre
Gadfly.Geom.step(direction = :vh) Gadfly.Geom.step(direction = :vh)
elseif lt == :hline elseif lt == :hline
Gadfly.Geom.hline(color = getColor(d[:linecolor]), size = d[:linewidth] * Gadfly.px) Gadfly.Geom.hline
elseif lt == :vline elseif lt == :vline
Gadfly.Geom.vline(color = getColor(d[:linecolor]), size = d[:linewidth] * Gadfly.px) Gadfly.Geom.vline
elseif lt == :contour elseif lt == :contour
Gadfly.Geom.contour(levels = d[:nlevels]) Gadfly.Geom.contour(levels = d[:nlevels])
else else

20
test/imgcomp.jl
View File

@ -54,20 +54,20 @@ end
"Show a Gtk popup with both images and a confirmation whether we should replace the new image with the old one" "Show a Gtk popup with both images and a confirmation whether we should replace the new image with the old one"
function compareToReferenceImage(tmpfn, reffn) function compareToReferenceImage(tmpfn, reffn)
println("here000") # println("here000")
# @eval import Gtk # @eval import Gtk
# Gtk.gtk_main() # Gtk.gtk_main()
println("huh0") # println("huh0")
# sleep(2) # sleep(2)
# add the images # add the images
imgbox = Gtk.GtkBoxLeaf(:h) imgbox = Gtk.GtkBoxLeaf(:h)
println("huh") # println("huh")
push!(imgbox, makeImageWidget(tmpfn)) push!(imgbox, makeImageWidget(tmpfn))
println("huh2") # println("huh2")
push!(imgbox, makeImageWidget(reffn)) push!(imgbox, makeImageWidget(reffn))
println("here00") # println("here00")
# add the buttons # add the buttons
# doNothingButton = Gtk.GtkButtonLeaf("Skip") # doNothingButton = Gtk.GtkButtonLeaf("Skip")
@ -83,7 +83,7 @@ function compareToReferenceImage(tmpfn, reffn)
win = Gtk.GtkWindowLeaf("Should we make this the new reference image?") win = Gtk.GtkWindowLeaf("Should we make this the new reference image?")
push!(win, Gtk.GtkFrameLeaf(imgbox)) push!(win, Gtk.GtkFrameLeaf(imgbox))
println("here01") # println("here01")
# ################ # ################
# # TODO: remove this when it's fixed in Gtk... see http://stackoverflow.com/questions/33549485/julia-gtk-windows-do-not-display-outside-repl # # TODO: remove this when it's fixed in Gtk... see http://stackoverflow.com/questions/33549485/julia-gtk-windows-do-not-display-outside-repl
@ -92,19 +92,19 @@ function compareToReferenceImage(tmpfn, reffn)
# end # end
# ################ # ################
println("here02") # println("here02")
showall(win) showall(win)
println("here1") # println("here1")
# now ask the question # now ask the question
if Gtk.ask_dialog("Should we make this the new reference image?", "No", "Yes") if Gtk.ask_dialog("Should we make this the new reference image?", "No", "Yes")
replaceReferenceImage(tmpfn, reffn) replaceReferenceImage(tmpfn, reffn)
end end
println("here2") # println("here2")
destroy(win) destroy(win)
println("here3") # println("here3")
# # we'll wait on this condition # # we'll wait on this condition
# c = Condition() # c = Condition()