From 39318e5e61f83221add2c6b89ebedc5e41a4a126 Mon Sep 17 00:00:00 2001
From: Thomas Breloff <tom@breloff.com>
Date: Wed, 14 Oct 2015 20:53:44 -0400
Subject: [PATCH] working on shapes

---
 docs/example_generation.jl | 2 +-
 src/args.jl                | 3 ++-
 src/backends/gadfly.jl     | 2 +-
 src/types.jl               | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/example_generation.jl b/docs/example_generation.jl
index 924bc7cb..1c6224f4 100644
--- a/docs/example_generation.jl
+++ b/docs/example_generation.jl
@@ -71,7 +71,7 @@ const examples = PlotExample[
               [:(styles = setdiff(supportedStyles(), [:auto])'), :(plot(cumsum(randn(20,length(styles)),1); style=:auto, label=map(string,styles), w=5))]),
   PlotExample("Marker types",
               "",
-              [:(markers = setdiff(supportedMarkers(), [:none,:auto])'), :(scatter(0.5:9.5, [fill(i-0.5,10) for i=length(markers):-1:1]; marker=:auto, label=map(string,markers), ms=12))]),
+              [:(markers = setdiff(supportedMarkers(), [:none,:auto])'), :(scatter(0.5:9.5, [fill(i-0.5,10) for i=length(markers):-1:1]; marker=:auto, label=map(string,markers), ms=12, ylim=(0,length(markers)+1)))]),
   PlotExample("Bar",
               "x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)",
               [:(bar(randn(999)))]),
diff --git a/src/args.jl b/src/args.jl
index 19c48beb..a58d46ae 100644
--- a/src/args.jl
+++ b/src/args.jl
@@ -39,7 +39,7 @@ const _allStyles = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
 
 # const _allMarkers = [:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle,
 #                      :cross, :xcross, :star5, :star8, :hexagon, :octagon, Shape]
-const _allMarkers = hcat(:none, :auto, sortedKeys(_shapes))                     
+const _allMarkers = vcat(:none, :auto, sort(collect(keys(_shapes))))
 @compat const _markerAliases = Dict(
     :n            => :none,
     :no           => :none,
@@ -74,6 +74,7 @@ const _allMarkers = hcat(:none, :auto, sortedKeys(_shapes))
     :pent         => :pentagon,
     :h            => :hexagon,
     :hex          => :hexagon,
+    :hep          => :heptagon,
     :o            => :octagon,
     :oct          => :octagon,
   )
diff --git a/src/backends/gadfly.jl b/src/backends/gadfly.jl
index 409363be..6387d364 100644
--- a/src/backends/gadfly.jl
+++ b/src/backends/gadfly.jl
@@ -61,7 +61,7 @@ supportedAxes(::GadflyPackage) = [:auto, :left]
 supportedTypes(::GadflyPackage) = [:none, :line, :path, :steppost, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar, :hline, :vline, :ohlc]
 supportedStyles(::GadflyPackage) = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
 # supportedMarkers(::GadflyPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon, :octagon, Shape]
-supportedMarkers(::GadflyPackage) = hcat(:none, :auto, sortedKeys(_shapes))
+supportedMarkers(::GadflyPackage) = _allMarkers
 supportedScales(::GadflyPackage) = [:identity, :log, :log2, :log10, :asinh, :sqrt]
 
 
diff --git a/src/types.jl b/src/types.jl
index dadb782c..3242c4e1 100644
--- a/src/types.jl
+++ b/src/types.jl
@@ -188,7 +188,7 @@ const _shapes = Dict(
     :dtriangle => makeshape(3, offset=0.5),
     :pentagon => makeshape(5),
     :hexagon => makeshape(6),
-    :septagon => makeshape(7),
+    :heptagon => makeshape(7),
     :octagon => makeshape(8),
     :cross => makecross(offset=-0.25),
     :xcross => makecross(),