reference images; gadfly markersize fix

docs/example_generation.jl

@@ -31,7 +31,7 @@ const examples = PlotExample[
               [
                 :(p = plot([sin,cos], zeros(0), leg=false)),
                 :(anim = Animation()),
-                :(for x in linspace(0, 10π, 200)
+                :(for x in linspace(0, 10π, 100)
                     push!(p, x, Float64[sin(x), cos(x)])
                     frame(anim)
                   end)
@@ -63,7 +63,8 @@ const examples = PlotExample[
   PlotExample("Arguments",
               "Plot multiple series with different numbers of points.  Mix arguments that apply to all series (marker/markersize) with arguments unique to each series (colors).  Special arguments `line`, `marker`, and `fill` will automatically figure out what arguments to set (for example, we are setting the `linestyle`, `linewidth`, and `color` arguments with `line`.)  Note that we pass a matrix of colors, and this applies the colors to each series.",
               [
-                :(plot(Vector[rand(10), rand(20)], marker=(:ellipse,8), line=(:dot,3,[:black :orange])))
+                :(ys = Vector[rand(10), rand(20)]),
+                :(plot(ys, line=(:dot,4,[:black :orange]), marker=([:hex :d],12,0.8,stroke(3,:gray))))
               ]),
   PlotExample("Build plot in pieces",
               "Start with a base plot...",

src/backends/gadfly.jl

@@ -140,10 +140,18 @@ function getGadflyMarkerTheme(d::Dict, plotargs::Dict)
     c = RGBA(RGB(c), α)
   end
 
+  ms = d[:markersize]
+  ms = if typeof(ms) <: AVec
+    warn("Gadfly doesn't support variable marker sizes... using the average: $(mean(ms))")
+    mean(ms) * Gadfly.px
+  else
+    ms * Gadfly.px
+  end
+
   # fg = getColor(plotargs[:foreground_color])
   Gadfly.Theme(;
       default_color = c,
-      default_point_size = d[:markersize] * Gadfly.px,
+      default_point_size = ms,
       discrete_highlight_color = c -> RGB(getColor(d[:markerstrokecolor])),
       highlight_width = d[:markerstrokewidth] * Gadfly.px,
       # get_extra_theme_args(d, :markerstrokestyle)...

test/imgcomp.jl

@@ -56,9 +56,9 @@ end
 function compareToReferenceImage(tmpfn, reffn)
   println("here000")
   # @eval import Gtk
-  Gtk.gtk_main()
+  # Gtk.gtk_main()
   println("huh0")
-  sleep(2)
+  # sleep(2)
 
   # add the images
   imgbox = Gtk.GtkBoxLeaf(:h)
@@ -85,12 +85,12 @@ function compareToReferenceImage(tmpfn, reffn)
 
   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
-  signal_connect(win, :destroy) do widget
+  # signal_connect(win, :destroy) do widget
-      Gtk.gtk_quit()
+  #     Gtk.gtk_quit()
-  end
+  # end
-  ################
+  # ################
 
   println("here02")
   showall(win)