examples, fixes, and reorg img dir

docs/example_generation.jl

@@ -81,6 +81,11 @@ function generate_markdown(pkgname::Symbol)
   plotter!(pkgname)
   plotDefault!(:show, false)
 
+  # mkdir if necessary
+  try
+    mkdir("$IMGDIR/$pkgname")
+  end
+
   # open the markdown file
   md = open("$DOCDIR/$(pkgname)_examples.md", "w")
 
@@ -93,13 +98,13 @@ function generate_markdown(pkgname::Symbol)
 
       # save the png
       imgname = "$(pkgname)_example_$i.png"
-      savepng("$IMGDIR/$imgname")
+      savepng("$IMGDIR/$pkgname/$imgname")
 
       # write out the header, description, code block, and image link
       write(md, "### $(example.header)\n\n")
       write(md, "$(example.desc)\n\n")
       write(md, "```julia\n$(join(map(string, example.exprs), "\n"))\n```\n\n")
-      write(md, "![](../img/$imgname)\n\n")
+      write(md, "![](../img/$pkgname/$imgname)\n\n")
 
     catch ex
       # TODO: put error info into markdown?
@@ -114,8 +119,10 @@ function generate_markdown(pkgname::Symbol)
 end
 
 # run it!
-# map(generate_markdown, (:qwt, :gadfly))
-generate_markdown(:unicodeplots) # generate separately so it's easy to comment out
+# note: generate separately so it's easy to comment out
+# generate_markdown(:qwt)
+generate_markdown(:gadfly)
+# generate_markdown(:unicodeplots) 
 
 
 end # module

docs/gadfly_examples.md

@@ -1,3 +1,151 @@
+### Lines
+
+A simple line plot of the 3 columns.
+
+```julia
+plot(rand(100,3))
+```
+
+![](../img/gadfly/gadfly_example_1.png)
+
+### Functions
+
+Plot multiple functions.
+
+```julia
+plot(0:0.01:4π,[sin,cos])
+```
+
+![](../img/gadfly/gadfly_example_2.png)
+
+### 
+
+You can also call it with (xmin, xmax).
+
+```julia
+plot([sin,cos],0,4π)
+```
+
+![](../img/gadfly/gadfly_example_3.png)
+
+### Global
+
+Change the guides/background without a separate call.
+
+```julia
+plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RGB(0.5,0.5,0.5))
+```
+
+![](../img/gadfly/gadfly_example_4.png)
+
+### Two-axis
+
+Use the `axis` or `axiss` arguments.
+
+Note: This is only supported with Qwt right now
+
+```julia
+plot(Vector[randn(100),randn(100) * 100]; axiss=[:left,:right])
+```
+
+![](../img/gadfly/gadfly_example_5.png)
+
+### Vectors w/ pluralized args
+
+Plot multiple series with different numbers of points.  Mix arguments that apply to all series (singular... see `marker`) with arguments unique to each series (pluralized... see `colors`).
+
+```julia
+plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue])
+```
+
+![](../img/gadfly/gadfly_example_6.png)
+
+### Build plot in pieces
+
+Start with a base plot...
+
+```julia
+plot(rand(100) / 3; reg=true,fillto=0)
+```
+
+![](../img/gadfly/gadfly_example_7.png)
+
+### 
+
+and add to it later.
+
+```julia
+scatter!(rand(100); markersize=6,color=:blue)
+```
+
+![](../img/gadfly/gadfly_example_8.png)
+
+### Heatmaps
+
+
+
+```julia
+heatmap(randn(10000),randn(10000); nbins=200)
+```
+
+![](../img/gadfly/gadfly_example_9.png)
+
+### Lots of line types
+
+Options: (:line, :step, :stepinverted, :sticks, :dots, :none, :heatmap, :hexbin, :hist, :bar)  
+Note: some may not work with all backends
+
+```julia
+plot(rand(20,4); linetypes=[:line,:step,:sticks,:dots],labels=["line","step","sticks","dots"])
+```
+
+![](../img/gadfly/gadfly_example_10.png)
+
+### Bar
+
+x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)
+
+```julia
+bar(randn(1000))
+```
+
+![](../img/gadfly/gadfly_example_11.png)
+
+### Histogram
+
+note: fillto isn't supported on all backends
+
+```julia
+histogram(randn(1000); nbins=50,fillto=20)
+```
+
+![](../img/gadfly/gadfly_example_12.png)
+
+### Subplots
+
+  subplot and subplot! are distinct commands which create many plots and add series to them in a circular fashion.
+  You can define the layout with keyword params... either set the number of plots `n` (and optionally number of rows `nr` or 
+  number of columns `nc`), or you can set the layout directly with `layout`.  
+
+  Note: Gadfly is not very friendly here, and although you can create a plot and save a PNG, I haven't been able to actually display it.
+
+
+```julia
+subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:dots,:step,:bar],nbins=10,legend=false)
+```
+
+![](../img/gadfly/gadfly_example_13.png)
+
+### Adding to subplots
+
+Note here the automatic grid layout, as well as the order in which new series are added to the plots.
+
+```julia
+subplot(randn(100,5); n=4)
+```
+
+![](../img/gadfly/gadfly_example_14.png)
+
 ### 
 
 
@@ -6,5 +154,5 @@
 subplot!(randn(100,3))
 ```
 
-![](../img/gadfly_example_15.png)
+![](../img/gadfly/gadfly_example_15.png)
 

docs/qwt_examples.md

@@ -6,7 +6,7 @@ A simple line plot of the 3 columns.
 plot(rand(100,3))
 ```
 
-![](../img/qwt_example_1.png)
+![](../img/qwt/qwt_example_1.png)
 
 ### Functions
 
@@ -16,7 +16,7 @@ Plot multiple functions.
 plot(0:0.01:4π,[sin,cos])
 ```
 
-![](../img/qwt_example_2.png)
+![](../img/qwt/qwt_example_2.png)
 
 ### 
 
@@ -26,7 +26,7 @@ You can also call it with (xmin, xmax).
 plot([sin,cos],0,4π)
 ```
 
-![](../img/qwt_example_3.png)
+![](../img/qwt/qwt_example_3.png)
 
 ### Global
 
@@ -36,7 +36,7 @@ Change the guides/background without a separate call.
 plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RGB(0.5,0.5,0.5))
 ```
 
-![](../img/qwt_example_4.png)
+![](../img/qwt/qwt_example_4.png)
 
 ### Two-axis
 
@@ -48,7 +48,7 @@ Note: This is only supported with Qwt right now
 plot(Vector[randn(100),randn(100) * 100]; axiss=[:left,:right])
 ```
 
-![](../img/qwt_example_5.png)
+![](../img/qwt/qwt_example_5.png)
 
 ### Vectors w/ pluralized args
 
@@ -58,7 +58,7 @@ Plot multiple series with different numbers of points.  Mix arguments that apply
 plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue])
 ```
 
-![](../img/qwt_example_6.png)
+![](../img/qwt/qwt_example_6.png)
 
 ### Build plot in pieces
 
@@ -68,7 +68,7 @@ Start with a base plot...
 plot(rand(100) / 3; reg=true,fillto=0)
 ```
 
-![](../img/qwt_example_7.png)
+![](../img/qwt/qwt_example_7.png)
 
 ### 
 
@@ -78,7 +78,7 @@ and add to it later.
 scatter!(rand(100); markersize=6,color=:blue)
 ```
 
-![](../img/qwt_example_8.png)
+![](../img/qwt/qwt_example_8.png)
 
 ### Heatmaps
 
@@ -88,7 +88,7 @@ scatter!(rand(100); markersize=6,color=:blue)
 heatmap(randn(10000),randn(10000); nbins=200)
 ```
 
-![](../img/qwt_example_9.png)
+![](../img/qwt/qwt_example_9.png)
 
 ### Lots of line types
 
@@ -96,10 +96,10 @@ Options: (:line, :step, :stepinverted, :sticks, :dots, :none, :heatmap, :hexbin,
 Note: some may not work with all backends
 
 ```julia
-plot(rand(20,4); linetypes=[:line,:step,:sticks,:dots])
+plot(rand(20,4); linetypes=[:line,:step,:sticks,:dots],labels=["line","step","sticks","dots"])
 ```
 
-![](../img/qwt_example_10.png)
+![](../img/qwt/qwt_example_10.png)
 
 ### Bar
 
@@ -109,7 +109,7 @@ x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints
 bar(randn(1000))
 ```
 
-![](../img/qwt_example_11.png)
+![](../img/qwt/qwt_example_11.png)
 
 ### Histogram
 
@@ -119,7 +119,7 @@ note: fillto isn't supported on all backends
 histogram(randn(1000); nbins=50,fillto=20)
 ```
 
-![](../img/qwt_example_12.png)
+![](../img/qwt/qwt_example_12.png)
 
 ### Subplots
 
@@ -134,7 +134,7 @@ histogram(randn(1000); nbins=50,fillto=20)
 subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:dots,:step,:bar],nbins=10,legend=false)
 ```
 
-![](../img/qwt_example_13.png)
+![](../img/qwt/qwt_example_13.png)
 
 ### Adding to subplots
 
@@ -144,7 +144,7 @@ Note here the automatic grid layout, as well as the order in which new series ar
 subplot(randn(100,5); n=4)
 ```
 
-![](../img/qwt_example_14.png)
+![](../img/qwt/qwt_example_14.png)
 
 ### 
 
@@ -154,5 +154,5 @@ subplot(randn(100,5); n=4)
 subplot!(randn(100,3))
 ```
 
-![](../img/qwt_example_15.png)
+![](../img/qwt/qwt_example_15.png)
 

docs/unicodeplots_examples.md

@@ -6,7 +6,7 @@ A simple line plot of the 3 columns.
 plot(rand(100,3))
 ```
 
-![](../img/unicodeplots_example_1.png)
+![](../img/unicodeplots/unicodeplots_example_1.png)
 
 ### Functions
 
@@ -16,7 +16,7 @@ Plot multiple functions.
 plot(0:0.01:4π,[sin,cos])
 ```
 
-![](../img/unicodeplots_example_2.png)
+![](../img/unicodeplots/unicodeplots_example_2.png)
 
 ### 
 
@@ -26,7 +26,7 @@ You can also call it with (xmin, xmax).
 plot([sin,cos],0,4π)
 ```
 
-![](../img/unicodeplots_example_3.png)
+![](../img/unicodeplots/unicodeplots_example_3.png)
 
 ### Global
 
@@ -36,7 +36,7 @@ Change the guides/background without a separate call.
 plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RGB(0.5,0.5,0.5))
 ```
 
-![](../img/unicodeplots_example_4.png)
+![](../img/unicodeplots/unicodeplots_example_4.png)
 
 ### Two-axis
 
@@ -48,7 +48,7 @@ Note: This is only supported with Qwt right now
 plot(Vector[randn(100),randn(100) * 100]; axiss=[:left,:right])
 ```
 
-![](../img/unicodeplots_example_5.png)
+![](../img/unicodeplots/unicodeplots_example_5.png)
 
 ### Vectors w/ pluralized args
 
@@ -58,7 +58,7 @@ Plot multiple series with different numbers of points.  Mix arguments that apply
 plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue])
 ```
 
-![](../img/unicodeplots_example_6.png)
+![](../img/unicodeplots/unicodeplots_example_6.png)
 
 ### Build plot in pieces
 
@@ -68,7 +68,7 @@ Start with a base plot...
 plot(rand(100) / 3; reg=true,fillto=0)
 ```
 
-![](../img/unicodeplots_example_7.png)
+![](../img/unicodeplots/unicodeplots_example_7.png)
 
 ### 
 
@@ -78,7 +78,7 @@ and add to it later.
 scatter!(rand(100); markersize=6,color=:blue)
 ```
 
-![](../img/unicodeplots_example_8.png)
+![](../img/unicodeplots/unicodeplots_example_8.png)
 
 ### Lots of line types
 
@@ -89,7 +89,7 @@ Note: some may not work with all backends
 plot(rand(20,4); linetypes=[:line,:step,:sticks,:dots],labels=["line","step","sticks","dots"])
 ```
 
-![](../img/unicodeplots_example_10.png)
+![](../img/unicodeplots/unicodeplots_example_10.png)
 
 ### Bar
 
@@ -99,7 +99,7 @@ x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints
 bar(randn(1000))
 ```
 
-![](../img/unicodeplots_example_11.png)
+![](../img/unicodeplots/unicodeplots_example_11.png)
 
 ### Histogram
 
@@ -109,7 +109,7 @@ note: fillto isn't supported on all backends
 histogram(randn(1000); nbins=50,fillto=20)
 ```
 
-![](../img/unicodeplots_example_12.png)
+![](../img/unicodeplots/unicodeplots_example_12.png)
 
 ### Subplots
 
@@ -124,7 +124,7 @@ histogram(randn(1000); nbins=50,fillto=20)
 subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:dots,:step,:bar],nbins=10,legend=false)
 ```
 
-![](../img/unicodeplots_example_13.png)
+![](../img/unicodeplots/unicodeplots_example_13.png)
 
 ### Adding to subplots
 
@@ -134,7 +134,7 @@ Note here the automatic grid layout, as well as the order in which new series ar
 subplot(randn(100,5); n=4)
 ```
 
-![](../img/unicodeplots_example_14.png)
+![](../img/unicodeplots/unicodeplots_example_14.png)
 
 ### 
 
@@ -144,5 +144,5 @@ subplot(randn(100,5); n=4)
 subplot!(randn(100,3))
 ```
 
-![](../img/unicodeplots_example_15.png)
+![](../img/unicodeplots/unicodeplots_example_15.png)
 

src/backends/gadfly.jl

@@ -27,7 +27,7 @@ function plot(pkg::GadflyPackage; kw...)
 
   plt.theme = Gadfly.Theme(background_color = (haskey(d, :background_color) ? d[:background_color] : colorant"white"))
   
-  Plot(plt, pkg, 0, kw, Dict[])
+  Plot(plt, pkg, 0, d, Dict[])
 end
 
 function getGeomFromLineType(linetype::Symbol, nbins::Int)
@@ -96,7 +96,7 @@ function plot!(::GadflyPackage, plt::Plot; kw...)
   end
 
   # save the kw args
-  plt.push!(plt.seriesargs, d)
+  push!(plt.seriesargs, d)
 
   # add the layer to the Gadfly.Plot
   prepend!(plt.o.layers, Gadfly.layer(unique(gfargs)...; x = x, y = d[:y]))