From aec162c50e782bbe8f0e315aff64082e56ed215e Mon Sep 17 00:00:00 2001
From: Thomas Breloff <tom@breloff.com>
Date: Wed, 6 Jul 2016 16:22:11 -0400
Subject: [PATCH] fix for discrete bars; closes #365

---
 src/recipes.jl | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/recipes.jl b/src/recipes.jl
index 9136dfc1..8379c39a 100644
--- a/src/recipes.jl
+++ b/src/recipes.jl
@@ -402,15 +402,11 @@ end
         error("bar recipe: x must be same length as y (centers), or one more than y (edges).\n\t\tlength(x)=$(length(x)), length(y)=$(length(y))")
     end
 
-    # # if horizontal, switch x/y
-    # if !isvertical(d)
-    #     x, y = y, x
-    #     # nx, ny = ny, nx
-    # end
-
+    axis = d[:subplot][isvertical(d) ? :xaxis : :yaxis]
     bw = d[:bar_width]
     hw = if bw == nothing
-        0.5mean(diff(x))
+        # 0.5mean(diff(x))
+        0.5mean(diff([discrete_value!(axis, xi)[1] for xi=x]))
     else
         Float64[0.5cycle(bw,i) for i=1:length(x)]
     end
@@ -424,11 +420,12 @@ end
     # create the bar shapes by adding x/y segments
     xseg, yseg = Segments(), Segments()
     for i=1:ny
-        ci = x[i]
+        # ci = x[i]
+        center = discrete_value!(axis, x[i])[1]
         hwi = cycle(hw,i)
         yi = y[i]
         fi = cycle(fillto,i)
-        push!(xseg, ci-hwi, ci-hwi, ci+hwi, ci+hwi, ci-hwi)
+        push!(xseg, center-hwi, center-hwi, center+hwi, center+hwi, center-hwi)
         push!(yseg, yi, fi, fi, yi, yi)
     end