From 121640b1b38a8cf633f87d470c0df167acf0a749 Mon Sep 17 00:00:00 2001 From: Thomas Breloff Date: Mon, 16 Nov 2015 15:37:55 -0500 Subject: [PATCH] fixed gadfly hline/vline constructors --- src/backends/gadfly.jl | 4 ++-- test/imgcomp.jl | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/backends/gadfly.jl b/src/backends/gadfly.jl index 39abf507..127c791a 100644 --- a/src/backends/gadfly.jl +++ b/src/backends/gadfly.jl @@ -36,9 +36,9 @@ function getLineGeom(d::Dict) elseif lt == :steppre Gadfly.Geom.step(direction = :vh) elseif lt == :hline - Gadfly.Geom.hline(color = getColor(d[:linecolor]), size = d[:linewidth] * Gadfly.px) + Gadfly.Geom.hline elseif lt == :vline - Gadfly.Geom.vline(color = getColor(d[:linecolor]), size = d[:linewidth] * Gadfly.px) + Gadfly.Geom.vline elseif lt == :contour Gadfly.Geom.contour(levels = d[:nlevels]) else diff --git a/test/imgcomp.jl b/test/imgcomp.jl index e696ae4b..98e3390f 100644 --- a/test/imgcomp.jl +++ b/test/imgcomp.jl @@ -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" function compareToReferenceImage(tmpfn, reffn) - println("here000") + # println("here000") # @eval import Gtk # Gtk.gtk_main() - println("huh0") + # println("huh0") # sleep(2) # add the images imgbox = Gtk.GtkBoxLeaf(:h) - println("huh") + # println("huh") push!(imgbox, makeImageWidget(tmpfn)) - println("huh2") + # println("huh2") push!(imgbox, makeImageWidget(reffn)) - println("here00") + # println("here00") # add the buttons # doNothingButton = Gtk.GtkButtonLeaf("Skip") @@ -83,7 +83,7 @@ function compareToReferenceImage(tmpfn, reffn) win = Gtk.GtkWindowLeaf("Should we make this the new reference image?") 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 @@ -92,19 +92,19 @@ function compareToReferenceImage(tmpfn, reffn) # end # ################ - println("here02") + # println("here02") showall(win) - println("here1") + # println("here1") # now ask the question if Gtk.ask_dialog("Should we make this the new reference image?", "No", "Yes") replaceReferenceImage(tmpfn, reffn) end - println("here2") + # println("here2") destroy(win) - println("here3") + # println("here3") # # we'll wait on this condition # c = Condition()