working on contours

0.3 fix gadfly shapes
readme and examples
2015-10-08 14:18:49 -04:00 · 2015-10-08 14:01:30 -04:00 · 2015-10-08 13:33:14 -04:00 · 2015-10-08 12:31:33 -04:00 · 2015-10-08 12:05:21 -04:00 · 2015-10-08 11:48:54 -04:00
138 changed files with 5713 additions and 851 deletions
@@ -1,4 +1,5 @@
 *.jl.cov
 *.jl.*.cov
 *.jl.mem
-.DS_Store
+.DS_Store
+examples/.ipynb_checkpoints/*
@@ -4,9 +4,11 @@ os:
  - linux
  - osx
 julia:
+  - 0.3
  - 0.4
+  - nightly
 notifications:
-  email: false
+  email: true
 # uncomment the following lines to override the default test script
 script:
 - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
@@ -1,6 +1,9 @@
 # Plots

 [![Build Status](https://travis-ci.org/tbreloff/Plots.jl.svg?branch=master)](https://travis-ci.org/tbreloff/Plots.jl)
+[![Plots](http://pkg.julialang.org/badges/Plots_0.3.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.3)
+[![Plots](http://pkg.julialang.org/badges/Plots_0.4.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.4)
+[![Plots](http://pkg.julialang.org/badges/Plots_0.5.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.5)

 #### Author: Thomas Breloff (@tbreloff)

@@ -13,6 +16,8 @@ Plots is a plotting interface and wrapper for several plotting packages.  My goa

 Please add wishlist items, bugs, or any other comments/questions to the issues list.

+Check out the [summary graphs](img/supported/supported.md) for the features that each backend supports.
+
 ## Examples for each implemented backend:

 - [Qwt.jl](docs/qwt_examples.md)
@@ -28,6 +33,12 @@ First, add the package

 ```julia
 Pkg.add("Plots")
+
+# if you want the latest features:
+Pkg.checkout("Plots")
+
+# or for the bleeding edge:
+Pkg.checkout("Plots", "dev")
 ```

 then get any plotting packages you need (obviously, you should get at least one backend):
@@ -43,7 +54,7 @@ Pkg.add("Winston")

 ## Use

-Load it in.  The underlying plotting backends are not imported until `plotter()` is called (which happens
+Load it in.  The underlying plotting backends are not imported until `backend()` is called (which happens
 on your first call to `plot` or `subplot`).  This means that you don't need any backends to be installed when you call `using Plots`.
 Plots will try to figure out a good default backend for you automatically based on what backends are installed.

@@ -51,42 +62,45 @@ Plots will try to figure out a good default backend for you automatically based
 using Plots
 ```

-Do a plot in Gadfly, then save a png:
+Do a plot in Gadfly (inspired by [this example](http://gadflyjl.org/geom_point.html)), then save a png:

 ```julia
-# switch to Gadfly as a backend
-gadfly!()
+gadfly()        # switch to Gadfly as a backend
+dataframes()    # turn on support for DataFrames inputs
+
+# load some data
+using RDatasets
+iris = dataset("datasets", "iris");

 # This will bring up a browser window with the plot. Add a semicolon at the end to skip display. 
-plot(rand(10,2); marker = :rect, markersize = [10,30], style = :auto)
+scatter(iris, :SepalLength, :SepalWidth, group=:Species, m=([:+ :d :s], 12))

-# save it as a PNG
-savepng(Plots.IMG_DIR * "gadfly1.png")
+# save a png (equivalent to png("gadfly1.png") and savefig("gadfly1.png"))
+png("gadfly1")
 ```

-which saves:
-
 ![gadfly_plt](img/gadfly1.png)

-See the examples pages for lots of examples of plots, and what those commands produce for each supported backend.
+See the examples pages for lots of examples of plots, and what those commands produce for each supported backend.  
+Also check out the [IJulia notebooks](examples) and see how it works interactively.

 ## API

-Call `plotter!(backend::Symbol)` or the shorthands (`gadfly!()`, `qwt!()`, `unicodeplots!()`, etc) to set the current plotting backend.
+Call `backend(backend::Symbol)` or the shorthands (`gadfly()`, `qwt()`, `unicodeplots()`, etc) to set the current plotting backend.
 Subsequent commands are converted into the relevant plotting commands for that package:

 ```julia
-gadfly!()
+gadfly()
 plot(1:10)    # this effectively calls `y = 1:10; Gadfly.plot(x=1:length(y), y=y)`
-qwt!()
+qwt()
 plot(1:10)    # this effectively calls `Qwt.plot(1:10)`
 ```

 Use `plot` to create a new plot object, and `plot!` to add to an existing one:

 ```julia
-plot(args...; kw...)                  # creates a new plot window, and sets it to be the `currentPlot`
-plot!(args...; kw...)                 # adds to the `currentPlot`
+plot(args...; kw...)                  # creates a new plot window, and sets it to be the `current`
+plot!(args...; kw...)                 # adds to the `current`
 plot!(plotobj, args...; kw...)        # adds to the plot `plotobj`
 ```

@@ -98,13 +112,13 @@ There are many ways to pass in data to the plot functions... some examples:
 - Vectors of Vectors
 - Functions
 - Vectors of Functions
- DataFrames with column symbols (initialize with `dataframes!()`)
+- DataFrames with column symbols (initialize with `dataframes()`)

 In general, you can pass in a `y` only, or an `x` and `y`, both of whatever type(s) you want, and Plots will slice up the data as needed.
 For matrices, data is split by columns.  For functions, data is mapped.  For DataFrames, a Symbol/Symbols in place of x/y will map to
 the relevant column(s).

-Here are some example usages... remember you can always use `plot!` to update an existing plot, and that, unless specified, you will update the `currentPlot()`.
+Here are some example usages... remember you can always use `plot!` to update an existing plot, and that, unless specified, you will update the `current()`.

 ```julia
 plot()                                    # empty plot object
@@ -118,14 +132,23 @@ plot(rand(10), sin)                       # same... y = sin(x)
 plot([sin,cos], 0:0.1:π)                  # plot 2 series, sin(x) and cos(x)
 plot([sin,cos], 0, π)                     # plot sin and cos on the range [0, π]
 plot(1:10, Any[rand(10), sin])            # plot 2 series, y = rand(10) for the first, y = sin(x) for the second... x = 1:10 for both
-plot(dataset("Ecdat", "Airline"), :Cost)  # plot from a DataFrame (call `dataframes!()` first to import DataFrames and initialize)
+plot(dataset("Ecdat", "Airline"), :Cost)  # plot from a DataFrame (call `dataframes()` first to import DataFrames and initialize)
 ```

+All plot methods accept a number of keyword arguments (see the tables below), which follow some rules:
+- Many arguments have aliases which are replaced during preprocessing.  `c` is the same as `color`, `m` is the same as `marker`, etc.  You can choose how verbose you'd like to be.  (see the tables below)
+- There are some special arguments (`xaxis`, `yaxis`, `line`, `marker`, `fill` and the aliases `l`, `m`, `f`) which magically set many related things at once.  (see the __Tip__ below)
+- If the argument is a "matrix-type", then each column will map to a series, cycling through columns if there are fewer columns than series.  Anything else will apply the argument value to every series.
+- Many arguments accept many different types... for example the `color` (also `markercolor`, `fillcolor`, etc) argument will accept strings or symbols with a color name, or any `Colors.Colorant`, or a `ColorScheme`, or a symbol representing a `ColorGradient`, or an AbstractVector of colors/symbols/etc...
+
 You can update certain plot settings after plot creation (not supported on all backends):

 ```julia
 plot!(title = "New Title", xlabel = "New xlabel", ylabel = "New ylabel")
 plot!(xlims = (0, 5.5), ylims = (-2.2, 6), xticks = 0:0.5:10, yticks = [0,1,5,10])
+
+# using shorthands:
+xaxis!("mylabel", :log10, :flip)
 ```

 With `subplot`, create multiple plots at once, with flexible layout options:
@@ -169,43 +192,63 @@ xlims!{T<:Real,S<:Real}(lims::Tuple{T,S}) = plot!(xlims = lims)
 ylims!{T<:Real,S<:Real}(lims::Tuple{T,S}) = plot!(ylims = lims)
 xticks!{T<:Real}(v::AVec{T})              = plot!(xticks = v)
 yticks!{T<:Real}(v::AVec{T})              = plot!(yticks = v)
+xflip!(flip::Bool = true)                 = plot!(xflip = flip)
+yflip!(flip::Bool = true)                 = plot!(yflip = flip)
+xaxis!(args...)                           = plot!(xaxis = args)
+yaxis!(args...)                           = plot!(yaxis = args)
+annotate!(anns)                           = plot!(annotation = anns)
 ```

 Some keyword arguments you can set:

 Keyword | Default | Type | Aliases 
 ---- | ---- | ---- | ----
-`:args` | `Any[]` | Series | `:argss`  
+`:annotation` | `nothing` | Series | `:ann`, `:annotate`, `:annotations`, `:anns`  
 `:axis` | `left` | Series | `:axiss`  
+`:background_color` | `RGB{U8}(1.0,1.0,1.0)` | Plot | `:background`, `:bg`, `:bg_color`, `:bgcolor`  
 `:color` | `auto` | Series | `:c`, `:colors`  
-`:fillto` | `nothing` | Series | `:area`, `:fill`, `:filltos`  
+`:color_palette` | `auto` | Plot | `:palette`  
+`:fill` | `nothing` | Series | `:area`, `:f`  
+`:fillcolor` | `match` | Series | `:fc`, `:fcolor`, `:fillcolors`  
+`:fillrange` | `nothing` | Series | `:fillranges`, `:fillrng`  
+`:foreground_color` | `auto` | Plot | `:fg`, `:fg_color`, `:fgcolor`, `:foreground`  
 `:group` | `nothing` | Series | `:g`, `:groups`  
 `:heatmap_c` | `(0.15,0.5)` | Series | `:heatmap_cs`  
-`:kwargs` | `Any[]` | Series | `:kwargss`  
 `:label` | `AUTO` | Series | `:lab`, `:labels`  
+`:layout` | `nothing` | Plot |   
+`:legend` | `true` | Plot | `:leg`  
+`:line` | `nothing` | Series | `:l`  
 `:linestyle` | `solid` | Series | `:linestyles`, `:ls`, `:s`, `:style`  
 `:linetype` | `path` | Series | `:linetypes`, `:lt`, `:t`, `:type`  
-`:marker` | `none` | Series | `:m`, `:markers`  
+`:linewidth` | `1` | Series | `:linewidths`, `:lw`, `:w`, `:width`  
+`:marker` | `nothing` | Series | `:m`, `:mark`  
 `:markercolor` | `match` | Series | `:markercolors`, `:mc`, `:mcolor`  
+`:markershape` | `none` | Series | `:markershapes`, `:shape`  
 `:markersize` | `6` | Series | `:markersizes`, `:ms`, `:msize`  
+`:n` | `-1` | Plot |   
 `:nbins` | `100` | Series | `:nb`, `:nbin`, `:nbinss`  
-`:reg` | `false` | Series | `:regs`  
-`:ribbon` | `nothing` | Series | `:r`, `:ribbons`  
-`:width` | `1` | Series | `:linewidth`, `:w`, `:widths`  
-`:background_color` | `RGB{U8}(1.0,1.0,1.0)` | Plot | `:background`, `:bg`, `:bg_color`, `:bgcolor`  
-`:foreground_color` | `auto` | Plot | `:fg`, `:fg_color`, `:fgcolor`, `:foreground`  
-`:legend` | `true` | Plot | `:leg`  
-`:show` | `false` | Plot | `:display`  
-`:size` | `(800,600)` | Plot | `:windowsize`, `:wsize`  
+`:nc` | `-1` | Plot |   
+`:nr` | `-1` | Plot |   
+`:pos` | `(0,0)` | Plot |   
+`:reg` | `false` | Series | `:regression`, `:regs`  
+`:show` | `false` | Plot | `:display`, `:gui`  
+`:size` | `(600,400)` | Plot | `:windowsize`, `:wsize`  
 `:title` | `` | Plot |   
 `:windowtitle` | `Plots.jl` | Plot | `:wtitle`  
+`:xaxis` | `nothing` | Plot |   
+`:xflip` | `false` | Plot |   
 `:xlabel` | `` | Plot | `:xlab`  
 `:xlims` | `auto` | Plot | `:xlim`, `:xlimit`, `:xlimits`  
+`:xscale` | `identity` | Plot |   
 `:xticks` | `auto` | Plot | `:xtick`  
+`:yaxis` | `nothing` | Plot |   
+`:yflip` | `true` | Plot |   
 `:ylabel` | `` | Plot | `:ylab`  
 `:ylims` | `auto` | Plot | `:ylim`, `:ylimit`, `:ylimits`  
 `:yrightlabel` | `` | Plot | `:y2lab`, `:y2label`, `:ylab2`, `:ylabel2`, `:ylabelright`, `:ylabr`, `:yrlab`  
+`:yscale` | `identity` | Plot |   
 `:yticks` | `auto` | Plot | `:ytick`  
+`:z` | `nothing` | Series | `:zs`  


 Plot types:
@@ -260,13 +303,27 @@ Type | Aliases



-__Tip__: You can see the default value for a given argument with `plotDefault(arg::Symbol)`, and set the default value with `plotDefault!(arg::Symbol, value)`
+__Tip__: You can see the default value for a given argument with `default(arg::Symbol)`, and set the default value with `default(arg::Symbol, value)` or `default(; kw...)`.  For example set the default window size and whether we should show a legend with `default(size=(600,400), leg=false)`.

-__Tip__: When plotting multiple lines, you can set all series to use the same value, or pass in an array to cycle through values.  Example:
+__Tip__: There are some helper arguments you can set:  `xaxis`, `yaxis`, `line`, `marker`, `fill`.  These go through special preprocessing to extract values into individual arguments.  The order doesn't matter, and if you pass a single value it's equivalent to wrapping it in a Tuple.  Examples:
+
+```
+plot(y, xaxis = ("mylabel", :log, :flip, (-1,1)))   # this sets the `xlabel`, `xscale`, `xflip`, and `xlims` arguments automatically
+plot(y, line = (:bar, :blue, :dot, 10))             # this sets the `linetype`, `color`, `linestyle`, and `linewidth` arguments automatically
+plot(y, marker = (:rect, :red, 10))                 # this sets the `markershape`, `markercolor`, and `markersize` arguments automatically
+plot(y, fill = (:green, 10))                        # this sets the `fillcolor` and `fillrange` arguments automatically
+                                                    # Note: `fillrange` can be:
+                                                              a number (fill to horizontal line)
+                                                              a vector of numbers (different for each data point)
+                                                              a tuple of vectors (fill a band)
+```
+
+__Tip__: When plotting multiple lines, you can set all series to use the same value, or pass in a matrix to cycle through values.  Example:

 ```julia
-plot(rand(100,4); color = [:red, RGB(0,0,1)],    # lines 1 and 3 are red, lines 2 and 4 are blue
+plot(rand(100,4); color = [:red RGB(0,0,1)],     # (Matrix) lines 1 and 3 are red, lines 2 and 4 are blue
                  axis = :auto,                  # lines 1 and 3 are on the left axis, lines 2 and 4 are on the right
+                  markershape = [:rect, :star1]  # (Vector) ALL lines are passed the vector [:rect, :star1]
                  width = 5)                     # all lines have a width of 5
 ```

@@ -278,8 +335,10 @@ __Tip__: Call `gui()` to display the plot in a window.  Interactivity depends on

 - [x] Plot vectors/matrices/functions
 - [x] Plot DataFrames
- [ ] Scales
- [ ] Categorical Inputs (strings, etc... for hist, bar? or can split one series into multiple?)
+- [x] Grouping
+- [x] Annotations
+- [x] Scales
+- [x] Categorical Inputs (strings, etc... for hist, bar? or can split one series into multiple?)
 - [ ] Custom markers
 - [ ] Special plots (boxplot, ohlc?)
 - [x] Subplots
@@ -1,4 +1,5 @@
-julia 0.4-
+julia 0.3

 Colors
 Reexport
+Compat
@@ -3,90 +3,104 @@ module PlotExamples

 using Plots
 using Colors
+using Compat

 const DOCDIR = Pkg.dir("Plots") * "/docs"
 const IMGDIR = Pkg.dir("Plots") * "/img"

-doc"""
+"""
 Holds all data needed for a documentation example... header, description, and plotting expression (Expr)
 """
 type PlotExample
-  header::AbstractString
-  desc::AbstractString
+  header::@compat(AbstractString)
+  desc::@compat(AbstractString)
  exprs::Vector{Expr}
 end


+function fakedata(sz...)
+  y = zeros(sz...)
+  for r in 2:size(y,1)
+    y[r,:] = 0.9 * y[r-1,:] + randn(size(y,2))'
+  end
+  y
+end
+
+
 # the examples we'll run for each
 const examples = PlotExample[
  PlotExample("Lines",
-              "A simple line plot of the 3 columns.",
-              [:(plot(rand(50,5), w=3))]),
+              "A simple line plot of the columns.",
+              [:(plot(fakedata(50,5), w=3))]),
  PlotExample("Functions",
-              "Plot multiple functions.  You can also put the function first.",
+              "Plot multiple functions.  You can also put the function first, or use the form `plot(f, xmin, xmax)` where f is a Function or AbstractVector{Function}.",
              [:(plot(0:0.01:4π, [sin,cos]))]),
-  PlotExample("",
-              "You can also call it with plot(f, xmin, xmax).",
-              [:(plot([sin,cos], 0, 4π))]),
  PlotExample("",
              "Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).",
-              [:(plot(sin, x->sin(2x), 0, 2π, legend=false, fillto=0))]),
+              [:(plot(sin, x->sin(2x), 0, 2π, line=4, leg=false, fill=(0,:orange)))]),
+  PlotExample("Colors",
+              "Access predefined palettes (or build your own with the `colorscheme` method).  Line/marker colors are auto-generated from the plot's palette, unless overridden.  Set the `z` argument to turn on series gradients.",
+              [:(y = rand(100)), :(plot(0:10:100,rand(11,4),lab="lines",w=3, palette=:grays, fill=(0.5,:auto))), :(scatter!(y, z=abs(y-.5), m=(10,:heat), lab="grad"))]),
  PlotExample("Global",
-              "Change the guides/background without a separate call.",
-              [:(plot(rand(10); title="TITLE", xlabel="XLABEL", ylabel="YLABEL", background_color = RGB(0.2,0.2,0.2)))]),
+              "Change the guides/background/limits/ticks.  Convenience args `xaxis` and `yaxis` allow you to pass a tuple or value which will be mapped to the relevant args automatically.  The `xaxis` below will be replaced with `xlabel` and `xlims` args automatically during the preprocessing step. You can also use shorthand functions: `title!`, `xaxis!`, `yaxis!`, `xlabel!`, `ylabel!`, `xlims!`, `ylims!`, `xticks!`, `yticks!`",
+              [:(plot(rand(20,3), title="TITLE", xaxis=("XLABEL",(-5,30),0:2:20,:flip), yaxis=("YLABEL",:log10), background_color = RGB(0.2,0.2,0.2), leg=false))]),
  PlotExample("Two-axis",
-              "Use the `axis` or `axiss` arguments.\n\nNote: Currently only supported with Qwt and PyPlot",
-              [:(plot(Vector[randn(100), randn(100)*100]; axis = [:l,:r], ylabel="LEFT", yrightlabel="RIGHT"))]),
-  PlotExample("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`).",
-              [:(plot(Vector[rand(10), rand(20)]; marker=:ellipse, markersize=8, colors=[:red,:blue]))]),
+              "Use the `axis` arguments.\n\nNote: Currently only supported with Qwt and PyPlot",
+              [:(plot(Vector[randn(100), randn(100)*100]; axis = [:l :r], ylabel="LEFT", yrightlabel="RIGHT"))]),
+  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])))]),
  PlotExample("Build plot in pieces",
              "Start with a base plot...",
-              [:(plot(rand(100)/3; reg=true, fillto=0))]),
+              [:(plot(rand(100)/3, reg=true, fill=(0,:green)))]),
  PlotExample("",
              "and add to it later.",
-              [:(scatter!(rand(100); markersize=6, c=:blue))]),
+              [:(scatter!(rand(100), markersize=6, c=:orange))]),
  PlotExample("Heatmaps",
              "",
-              [:(heatmap(randn(10000),randn(10000); nbins=100))]),
+              [:(heatmap(randn(10000),randn(10000), nbins=100))]),
  PlotExample("Line types",
              "",
-              [:(types = intersect(supportedTypes(), [:line, :path, :steppre, :steppost, :sticks, :scatter])),
+              [:(types = intersect(supportedTypes(), [:line, :path, :steppre, :steppost, :sticks, :scatter])'),
                  :(n = length(types)),
                  :(x = Vector[sort(rand(20)) for i in 1:n]),
                  :(y = rand(20,n)),
-                  :(plot(x, y; t=types, lab=map(string,types)))]),
+                  :(plot(x, y, line=(types,3), lab=map(string,types), ms=15))]),
  PlotExample("Line styles",
              "",
-              [:(styles = setdiff(supportedStyles(), [:auto])), :(plot(cumsum(randn(20,length(styles)),1); style=:auto, label=map(string,styles), w=5))]),
+              [:(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), markersize=10))]),
+              [:(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))]),
  PlotExample("Bar",
              "x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)",
-              [:(bar(randn(1000)))]),
+              [:(bar(randn(999)))]),
  PlotExample("Histogram",
              "",
-              [:(histogram(randn(1000); nbins=50))]),
+              [:(histogram(randn(1000), nbins=50))]),
  PlotExample("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.
+                number of columns `nc`), or you can set the layout directly with `layout`.
              """,
-              [:(subplot(randn(100,5); layout=[1,1,3], linetypes=[:line,:hist,:scatter,:step,:bar], nbins=10, legend=false))]),
+              [:(subplot(randn(100,5), layout=[1,1,3], t=[:line :hist :scatter :step :bar], nbins=10, leg=false))]),
  PlotExample("Adding to subplots",
              "Note here the automatic grid layout, as well as the order in which new series are added to the plots.",
-              [:(subplot(randn(100,5); n=4))]),
+              [:(subplot(fakedata(100,10), n=4, palette=[:grays :blues :heat :lightrainbow], bg=[:orange :pink :darkblue :black]))]),
  PlotExample("",
              "",
-              [:(subplot!(randn(100,3)))]),
+              [:(subplot!(fakedata(100,10)))]),
  PlotExample("Open/High/Low/Close",
-              "Create an OHLC chart.  Pass in a vector of 4-tuples as your `y` argument.  Adjust the tick width with arg `markersize`.",
+              "Create an OHLC chart.  Pass in a vector of OHLC objects as your `y` argument.  Adjust the tick width with arg `markersize`.",
              [:(n=20), :(hgt=rand(n)+1), :(bot=randn(n)), :(openpct=rand(n)), :(closepct=rand(n)), :(y = [OHLC(openpct[i]*hgt[i]+bot[i], bot[i]+hgt[i], bot[i], closepct[i]*hgt[i]+bot[i]) for i in 1:n]), :(ohlc(y; markersize=8))]),
-
+  PlotExample("Annotations",
+              "Currently only text annotations are supported.  Pass in a tuple or vector-of-tuples: (x,y,text).  `annotate!(ann)` is shorthand for `plot!(; annotation=ann)`",
+              [
+                :(y = rand(10)),
+                :(plot(y, ann=(3,y[3],"this is #3"))),
+                :(annotate!([(5,y[5],"this is #5"),(9,y[10],"this is #10")]))
+              ]),
  
 ]

@@ -99,9 +113,9 @@ createStringOfMarkDownSymbols(arr) = isempty(arr) ? "" : createStringOfMarkDownC

 function generate_markdown(pkgname::Symbol)

-  # set up the plotter, and don't show the plots by default
-  pkg = plotter!(pkgname)
-  # plotDefault!(:show, false)
+  # set up the backend, and don't show the plots by default
+  pkg = backend(pkgname)
+  # default(:show, false)

  # mkdir if necessary
  try
@@ -119,7 +133,7 @@ function generate_markdown(pkgname::Symbol)
  write(md, "- Supported values for marker: $(createStringOfMarkDownSymbols(supportedMarkers(pkg)))\n")
  write(md, "- Is `subplot`/`subplot!` supported? $(subplotSupported(pkg) ? "Yes" : "No")\n\n")

-  write(md, "### Initialize\n\n```julia\nusing Plots\n$(pkgname)!()\n```\n\n")
+  write(md, "### Initialize\n\n```julia\nusing Plots\n$(pkgname)()\n```\n\n")


  for (i,example) in enumerate(examples)
@@ -136,7 +150,7 @@ function generate_markdown(pkgname::Symbol)
      imgname = "$(pkgname)_example_$i.png"

      # NOTE: uncomment this to overwrite the images as well
-      savepng("$IMGDIR/$pkgname/$imgname")
+      png("$IMGDIR/$pkgname/$imgname")

      # write out the header, description, code block, and image link
      write(md, "### $(example.header)\n\n")
@@ -158,26 +172,28 @@ end


 # make and display one plot
-function test_example(pkgname::Symbol, idx::Int)
+function test_examples(pkgname::Symbol, idx::Int; debug = true)
+  Plots._debugMode.on = debug
  println("Testing plot: $pkgname:$idx:$(examples[idx].header)")
-  plotter!(pkgname)
-  plotter()
+  backend(pkgname)
+  backend()
  map(eval, examples[idx].exprs)
-  plt = currentPlot()
-  display(plt)
+  plt = current()
+  gui(plt)
  plt
 end

 # generate all plots and create a dict mapping idx --> plt
-function test_all_examples(pkgname::Symbol)
+function test_examples(pkgname::Symbol; debug = false)
+  Plots._debugMode.on = debug
  plts = Dict()
  for i in 1:length(examples)
-    if examples[i].header == "Subplots" && !subplotSupported()
-      break
-    end
+    # if examples[i].header == "Subplots" && !subplotSupported()
+    #   break
+    # end

    try
-      plt = test_example(pkgname, i)
+      plt = test_examples(pkgname, i, debug=debug)
      plts[i] = plt
    catch ex
      # TODO: put error info into markdown?
@@ -200,7 +216,7 @@ end
 # markersize      # size of the marker
 # nbins           # number of bins for heatmap/hexbin and histograms
 # heatmap_c       # color cutoffs for Qwt heatmaps
-# fillto          # fillto value for area plots
+# fill          # fill value for area plots
 # title           # string or symbol, title of the plot
 # xlabel          # string or symbol, label on the bottom (x) axis
 # ylabel          # string or symbol, label on the left (y) axis
@@ -213,7 +229,7 @@ end



-const _ltdesc = Dict(
+@compat const _ltdesc = Dict(
    :none => "No line",
    :line => "Lines with sorted x-axis",
    :path => "Lines",
@@ -235,11 +251,15 @@ function buildReadme()

  # build keyword arg table
  table = "Keyword | Default | Type | Aliases \n---- | ---- | ---- | ----\n"
-  for d in (Plots._seriesDefaults, Plots._plotDefaults)
-    for k in Plots.sortedkeys(d)
-      aliasstr = createStringOfMarkDownSymbols(aliases(Plots._keyAliases, k))
-      table = string(table, "`:$k` | `$(d[k])` | $(d==Plots._seriesDefaults ? "Series" : "Plot") | $aliasstr  \n")
-    end
+  allseries = merge(Plots._seriesDefaults, @compat(Dict(:line=>nothing, :marker=>nothing, :fill=>nothing)))
+  allplots = merge(Plots._plotDefaults, @compat(Dict(:xaxis=>nothing, :yaxis=>nothing)))
+  alldefs = merge(allseries, allplots)
+  for k in Plots.sortedkeys(alldefs)
+  # for d in (Plots._seriesDefaults, Plots._plotDefaults)
+  #   for k in Plots.sortedkeys(d)
+    aliasstr = createStringOfMarkDownSymbols(aliases(Plots._keyAliases, k))
+    table = string(table, "`:$k` | `$(alldefs[k])` | $(haskey(allseries,k) ? "Series" : "Plot") | $aliasstr  \n")
+    # end
  end
  readme = replace(readme, "[[KEYWORD_ARGS_TABLE]]", table)

@@ -271,8 +291,13 @@ function buildReadme()
  f = open(readme_fn, "w")
  write(f, readme)
  close(f)
+
+  gadfly()
+  Plots.dumpSupportGraphs()
 end

+default(size=(600,400))
+
 # run it!
 # note: generate separately so it's easy to comment out
 # @osx_only generate_markdown(:unicodeplots)
@@ -1,6 +1,6 @@
 # Examples for backend: gadfly

- Supported arguments: `args`, `axis`, `background_color`, `color`, `fillto`, `foreground_color`, `group`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markercolor`, `markersize`, `nbins`, `reg`, `ribbon`, `show`, `size`, `title`, `width`, `windowtitle`, `xlabel`, `xticks`, `ylabel`, `yrightlabel`, `yticks`
+- Supported arguments: `annotation`, `background_color`, `color`, `color_palette`, `fillrange`, `fillcolor`, `group`, `label`, `layout`, `legend`, `linestyle`, `linetype`, `linewidth`, `markershape`, `markercolor`, `markersize`, `n`, `nbins`, `nc`, `nr`, `reg`, `show`, `size`, `title`, `windowtitle`, `x`, `xlabel`, `xlims`, `xticks`, `y`, `ylabel`, `ylims`, `yticks`, `xscale`, `yscale`, `xflip`, `yflip`, `z`
 - Supported values for axis: `:auto`, `:left`
 - Supported values for linetype: `:none`, `:line`, `:path`, `:steppost`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`, `:hline`, `:vline`, `:ohlc`
 - Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot`, `:dashdotdot`
@@ -11,22 +11,22 @@

 ```julia
 using Plots
-gadfly!()
+gadfly()
 ```

 ### Lines

-A simple line plot of the 3 columns.
+A simple line plot of the columns.

 ```julia
-plot(rand(50,5),w=3)
+plot(fakedata(50,5),w=3)
 ```

 ![](../img/gadfly/gadfly_example_1.png)

 ### Functions

-Plot multiple functions.  You can also put the function first.
+Plot multiple functions.  You can also put the function first, or use the form `plot(f, xmin, xmax)` where f is a Function or AbstractVector{Function}.

 ```julia
 plot(0:0.01:4π,[sin,cos])
@@ -36,54 +36,56 @@ plot(0:0.01:4π,[sin,cos])

 ### 

-You can also call it with plot(f, xmin, xmax).
+Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).

 ```julia
-plot([sin,cos],0,4π)
+plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 40:
+            sin(2x)
+        end),0,2π,line=4,leg=false,fill=(0,:orange))
 ```

 ![](../img/gadfly/gadfly_example_3.png)

-### 
+### Colors

-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
+Access predefined palettes (or build your own with the `colorscheme` method).  Line/marker colors are auto-generated from the plot's palette, unless overridden.  Set the `z` argument to turn on series gradients.

 ```julia
-plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33:
-            sin(2x)
-        end),0,2π,legend=false,fillto=0)
+y = rand(100)
+plot(0:10:100,rand(11,4),lab="lines",w=3,palette=:grays,fill=(0.5,:auto))
+scatter!(y,z=abs(y - 0.5),m=(10,:heat),lab="grad")
 ```

 ![](../img/gadfly/gadfly_example_4.png)

 ### Global

-Change the guides/background without a separate call.
+Change the guides/background/limits/ticks.  Convenience args `xaxis` and `yaxis` allow you to pass a tuple or value which will be mapped to the relevant args automatically.  The `xaxis` below will be replaced with `xlabel` and `xlims` args automatically during the preprocessing step. You can also use shorthand functions: `title!`, `xaxis!`, `yaxis!`, `xlabel!`, `ylabel!`, `xlims!`, `ylims!`, `xticks!`, `yticks!`

 ```julia
-plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RGB(0.2,0.2,0.2))
+plot(rand(20,3),title="TITLE",xaxis=("XLABEL",(-5,30),0:2:20,:flip),yaxis=("YLABEL",:log10),background_color=RGB(0.2,0.2,0.2),leg=false)
 ```

 ![](../img/gadfly/gadfly_example_5.png)

 ### Two-axis

-Use the `axis` or `axiss` arguments.
+Use the `axis` arguments.

 Note: Currently only supported with Qwt and PyPlot

 ```julia
-plot(Vector[randn(100),randn(100) * 100]; axis=[:l,:r],ylabel="LEFT",yrightlabel="RIGHT")
+plot(Vector[randn(100),randn(100) * 100]; axis=[:l :r],ylabel="LEFT",yrightlabel="RIGHT")
 ```

 ![](../img/gadfly/gadfly_example_6.png)

-### Vectors w/ pluralized args
+### Arguments

-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`).
+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.

 ```julia
-plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue])
+plot(Vector[rand(10),rand(20)]; marker=(:ellipse,8),line=(:dot,3,[:black :orange]))
 ```

 ![](../img/gadfly/gadfly_example_7.png)
@@ -93,7 +95,7 @@ plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue]
 Start with a base plot...

 ```julia
-plot(rand(100) / 3; reg=true,fillto=0)
+plot(rand(100) / 3,reg=true,fill=(0,:green))
 ```

 ![](../img/gadfly/gadfly_example_8.png)
@@ -103,7 +105,7 @@ plot(rand(100) / 3; reg=true,fillto=0)
 and add to it later.

 ```julia
-scatter!(rand(100); markersize=6,c=:blue)
+scatter!(rand(100),markersize=6,c=:orange)
 ```

 ![](../img/gadfly/gadfly_example_9.png)
@@ -113,7 +115,7 @@ scatter!(rand(100); markersize=6,c=:blue)


 ```julia
-heatmap(randn(10000),randn(10000); nbins=100)
+heatmap(randn(10000),randn(10000),nbins=100)
 ```

 ![](../img/gadfly/gadfly_example_10.png)
@@ -123,11 +125,11 @@ heatmap(randn(10000),randn(10000); nbins=100)


 ```julia
-types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter])
+types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter])'
 n = length(types)
 x = Vector[sort(rand(20)) for i = 1:n]
 y = rand(20,n)
-plot(x,y; t=types,lab=map(string,types))
+plot(x,y,line=(types,3),lab=map(string,types),ms=15)
 ```

 ![](../img/gadfly/gadfly_example_11.png)
@@ -137,7 +139,7 @@ plot(x,y; t=types,lab=map(string,types))


 ```julia
-styles = setdiff(supportedStyles(),[:auto])
+styles = setdiff(supportedStyles(),[:auto])'
 plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5)
 ```

@@ -148,8 +150,8 @@ plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=


 ```julia
-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),markersize=10)
+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)
 ```

 ![](../img/gadfly/gadfly_example_13.png)
@@ -159,7 +161,7 @@ scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,la
 x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)

 ```julia
-bar(randn(1000))
+bar(randn(999))
 ```

 ![](../img/gadfly/gadfly_example_14.png)
@@ -169,7 +171,7 @@ bar(randn(1000))


 ```julia
-histogram(randn(1000); nbins=50)
+histogram(randn(1000),nbins=50)
 ```

 ![](../img/gadfly/gadfly_example_15.png)
@@ -178,13 +180,11 @@ histogram(randn(1000); nbins=50)

  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.
+  number of columns `nc`), or you can set the layout directly with `layout`.


 ```julia
-subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:scatter,:step,:bar],nbins=10,legend=false)
+subplot(randn(100,5),layout=[1,1,3],t=[:line :hist :scatter :step :bar],nbins=10,leg=false)
 ```

 ![](../img/gadfly/gadfly_example_16.png)
@@ -194,7 +194,7 @@ subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:scatter,:step,:bar]
 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)
+subplot(fakedata(100,10),n=4,palette=[:grays :blues :heat :lightrainbow],bg=[:orange :pink :darkblue :black])
 ```

 ![](../img/gadfly/gadfly_example_17.png)
@@ -204,14 +204,14 @@ subplot(randn(100,5); n=4)


 ```julia
-subplot!(randn(100,3))
+subplot!(fakedata(100,10))
 ```

 ![](../img/gadfly/gadfly_example_18.png)

 ### Open/High/Low/Close

-Create an OHLC chart.  Pass in a vector of 4-tuples as your `y` argument.  Adjust the tick width with arg `markersize`.
+Create an OHLC chart.  Pass in a vector of OHLC objects as your `y` argument.  Adjust the tick width with arg `markersize`.

 ```julia
 n = 20
@@ -225,3 +225,15 @@ ohlc(y; markersize=8)

 ![](../img/gadfly/gadfly_example_19.png)

+### Annotations
+
+Currently only text annotations are supported.  Pass in a tuple or vector-of-tuples: (x,y,text).  `annotate!(ann)` is shorthand for `plot!(; annotation=ann)`
+
+```julia
+y = rand(10)
+plot(y,ann=(3,y[3],"this is #3"))
+annotate!([(5,y[5],"this is #5"),(9,y[10],"this is #10")])
+```
+
+![](../img/gadfly/gadfly_example_20.png)
+
@@ -1,6 +1,6 @@
 # Examples for backend: immerse

- Supported arguments: `args`, `axis`, `background_color`, `color`, `fillto`, `foreground_color`, `group`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markercolor`, `markersize`, `nbins`, `reg`, `ribbon`, `show`, `size`, `title`, `width`, `windowtitle`, `xlabel`, `xticks`, `ylabel`, `yrightlabel`, `yticks`
+- Supported arguments: `annotation`, `background_color`, `color`, `color_palette`, `fillrange`, `fillcolor`, `group`, `label`, `layout`, `legend`, `linestyle`, `linetype`, `linewidth`, `markershape`, `markercolor`, `markersize`, `n`, `nbins`, `nc`, `nr`, `reg`, `show`, `size`, `title`, `windowtitle`, `x`, `xlabel`, `xlims`, `xticks`, `y`, `ylabel`, `ylims`, `yticks`, `xscale`, `yscale`, `xflip`, `yflip`, `z`
 - Supported values for axis: `:auto`, `:left`
 - Supported values for linetype: `:none`, `:line`, `:path`, `:steppost`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`, `:hline`, `:vline`, `:ohlc`
 - Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot`, `:dashdotdot`
@@ -11,22 +11,22 @@

 ```julia
 using Plots
-immerse!()
+immerse()
 ```

 ### Lines

-A simple line plot of the 3 columns.
+A simple line plot of the columns.

 ```julia
-plot(rand(50,5),w=3)
+plot(fakedata(50,5),w=3)
 ```

 ![](../img/immerse/immerse_example_1.png)

 ### Functions

-Plot multiple functions.  You can also put the function first.
+Plot multiple functions.  You can also put the function first, or use the form `plot(f, xmin, xmax)` where f is a Function or AbstractVector{Function}.

 ```julia
 plot(0:0.01:4π,[sin,cos])
@@ -36,54 +36,56 @@ plot(0:0.01:4π,[sin,cos])

 ### 

-You can also call it with plot(f, xmin, xmax).
+Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).

 ```julia
-plot([sin,cos],0,4π)
+plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 40:
+            sin(2x)
+        end),0,2π,line=4,leg=false,fill=(0,:orange))
 ```

 ![](../img/immerse/immerse_example_3.png)

-### 
+### Colors

-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
+Access predefined palettes (or build your own with the `colorscheme` method).  Line/marker colors are auto-generated from the plot's palette, unless overridden.  Set the `z` argument to turn on series gradients.

 ```julia
-plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33:
-            sin(2x)
-        end),0,2π,legend=false,fillto=0)
+y = rand(100)
+plot(0:10:100,rand(11,4),lab="lines",w=3,palette=:grays,fill=(0.5,:auto))
+scatter!(y,z=abs(y - 0.5),m=(10,:heat),lab="grad")
 ```

 ![](../img/immerse/immerse_example_4.png)

 ### Global

-Change the guides/background without a separate call.
+Change the guides/background/limits/ticks.  Convenience args `xaxis` and `yaxis` allow you to pass a tuple or value which will be mapped to the relevant args automatically.  The `xaxis` below will be replaced with `xlabel` and `xlims` args automatically during the preprocessing step. You can also use shorthand functions: `title!`, `xaxis!`, `yaxis!`, `xlabel!`, `ylabel!`, `xlims!`, `ylims!`, `xticks!`, `yticks!`

 ```julia
-plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RGB(0.2,0.2,0.2))
+plot(rand(20,3),title="TITLE",xaxis=("XLABEL",(-5,30),0:2:20,:flip),yaxis=("YLABEL",:log10),background_color=RGB(0.2,0.2,0.2),leg=false)
 ```

 ![](../img/immerse/immerse_example_5.png)

 ### Two-axis

-Use the `axis` or `axiss` arguments.
+Use the `axis` arguments.

 Note: Currently only supported with Qwt and PyPlot

 ```julia
-plot(Vector[randn(100),randn(100) * 100]; axis=[:l,:r],ylabel="LEFT",yrightlabel="RIGHT")
+plot(Vector[randn(100),randn(100) * 100]; axis=[:l :r],ylabel="LEFT",yrightlabel="RIGHT")
 ```

 ![](../img/immerse/immerse_example_6.png)

-### Vectors w/ pluralized args
+### Arguments

-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`).
+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.

 ```julia
-plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue])
+plot(Vector[rand(10),rand(20)]; marker=(:ellipse,8),line=(:dot,3,[:black :orange]))
 ```

 ![](../img/immerse/immerse_example_7.png)
@@ -93,7 +95,7 @@ plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue]
 Start with a base plot...

 ```julia
-plot(rand(100) / 3; reg=true,fillto=0)
+plot(rand(100) / 3,reg=true,fill=(0,:green))
 ```

 ![](../img/immerse/immerse_example_8.png)
@@ -103,7 +105,7 @@ plot(rand(100) / 3; reg=true,fillto=0)
 and add to it later.

 ```julia
-scatter!(rand(100); markersize=6,c=:blue)
+scatter!(rand(100),markersize=6,c=:orange)
 ```

 ![](../img/immerse/immerse_example_9.png)
@@ -113,7 +115,7 @@ scatter!(rand(100); markersize=6,c=:blue)


 ```julia
-heatmap(randn(10000),randn(10000); nbins=100)
+heatmap(randn(10000),randn(10000),nbins=100)
 ```

 ![](../img/immerse/immerse_example_10.png)
@@ -123,11 +125,11 @@ heatmap(randn(10000),randn(10000); nbins=100)


 ```julia
-types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter])
+types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter])'
 n = length(types)
 x = Vector[sort(rand(20)) for i = 1:n]
 y = rand(20,n)
-plot(x,y; t=types,lab=map(string,types))
+plot(x,y,line=(types,3),lab=map(string,types),ms=15)
 ```

 ![](../img/immerse/immerse_example_11.png)
@@ -137,7 +139,7 @@ plot(x,y; t=types,lab=map(string,types))


 ```julia
-styles = setdiff(supportedStyles(),[:auto])
+styles = setdiff(supportedStyles(),[:auto])'
 plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5)
 ```

@@ -148,8 +150,8 @@ plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=


 ```julia
-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),markersize=10)
+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)
 ```

 ![](../img/immerse/immerse_example_13.png)
@@ -159,7 +161,7 @@ scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,la
 x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)

 ```julia
-bar(randn(1000))
+bar(randn(999))
 ```

 ![](../img/immerse/immerse_example_14.png)
@@ -169,7 +171,7 @@ bar(randn(1000))


 ```julia
-histogram(randn(1000); nbins=50)
+histogram(randn(1000),nbins=50)
 ```

 ![](../img/immerse/immerse_example_15.png)
@@ -178,13 +180,11 @@ histogram(randn(1000); nbins=50)

  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.
+  number of columns `nc`), or you can set the layout directly with `layout`.


 ```julia
-subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:scatter,:step,:bar],nbins=10,legend=false)
+subplot(randn(100,5),layout=[1,1,3],t=[:line :hist :scatter :step :bar],nbins=10,leg=false)
 ```

 ![](../img/immerse/immerse_example_16.png)
@@ -194,7 +194,7 @@ subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:scatter,:step,:bar]
 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)
+subplot(fakedata(100,10),n=4,palette=[:grays :blues :heat :lightrainbow],bg=[:orange :pink :darkblue :black])
 ```

 ![](../img/immerse/immerse_example_17.png)
@@ -204,14 +204,14 @@ subplot(randn(100,5); n=4)


 ```julia
-subplot!(randn(100,3))
+subplot!(fakedata(100,10))
 ```

 ![](../img/immerse/immerse_example_18.png)

 ### Open/High/Low/Close

-Create an OHLC chart.  Pass in a vector of 4-tuples as your `y` argument.  Adjust the tick width with arg `markersize`.
+Create an OHLC chart.  Pass in a vector of OHLC objects as your `y` argument.  Adjust the tick width with arg `markersize`.

 ```julia
 n = 20
@@ -225,3 +225,15 @@ ohlc(y; markersize=8)

 ![](../img/immerse/immerse_example_19.png)

+### Annotations
+
+Currently only text annotations are supported.  Pass in a tuple or vector-of-tuples: (x,y,text).  `annotate!(ann)` is shorthand for `plot!(; annotation=ann)`
+
+```julia
+y = rand(10)
+plot(y,ann=(3,y[3],"this is #3"))
+annotate!([(5,y[5],"this is #5"),(9,y[10],"this is #10")])
+```
+
+![](../img/immerse/immerse_example_20.png)
+
@@ -1,8 +1,8 @@
 # Examples for backend: pyplot

- Supported arguments: `args`, `axis`, `background_color`, `color`, `foreground_color`, `group`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markercolor`, `markersize`, `nbins`, `ribbon`, `show`, `size`, `title`, `width`, `windowtitle`, `xlabel`, `xticks`, `ylabel`, `yrightlabel`, `yticks`
+- Supported arguments: `annotation`, `axis`, `background_color`, `color`, `color_palette`, `fillrange`, `fillcolor`, `foreground_color`, `group`, `label`, `layout`, `legend`, `linestyle`, `linetype`, `linewidth`, `markershape`, `markercolor`, `markersize`, `n`, `nbins`, `nc`, `nr`, `show`, `size`, `title`, `windowtitle`, `x`, `xlabel`, `xlims`, `xticks`, `y`, `ylabel`, `ylims`, `yrightlabel`, `yticks`, `xscale`, `yscale`, `xflip`, `yflip`, `z`
 - Supported values for axis: `:auto`, `:left`, `:right`
- Supported values for linetype: `:none`, `:line`, `:path`, `:step`, `:stepinverted`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`
+- Supported values for linetype: `:none`, `:line`, `:path`, `:step`, `:stepinverted`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`, `:hline`, `:vline`
 - Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot`
 - Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`, `:hexagon`
 - Is `subplot`/`subplot!` supported? No
@@ -11,22 +11,22 @@

 ```julia
 using Plots
-pyplot!()
+pyplot()
 ```

 ### Lines

-A simple line plot of the 3 columns.
+A simple line plot of the columns.

 ```julia
-plot(rand(50,5),w=3)
+plot(fakedata(50,5),w=3)
 ```

 ![](../img/pyplot/pyplot_example_1.png)

 ### Functions

-Plot multiple functions.  You can also put the function first.
+Plot multiple functions.  You can also put the function first, or use the form `plot(f, xmin, xmax)` where f is a Function or AbstractVector{Function}.

 ```julia
 plot(0:0.01:4π,[sin,cos])
@@ -36,54 +36,56 @@ plot(0:0.01:4π,[sin,cos])

 ### 

-You can also call it with plot(f, xmin, xmax).
+Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).

 ```julia
-plot([sin,cos],0,4π)
+plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 40:
+            sin(2x)
+        end),0,2π,line=4,leg=false,fill=(0,:orange))
 ```

 ![](../img/pyplot/pyplot_example_3.png)

-### 
+### Colors

-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
+Access predefined palettes (or build your own with the `colorscheme` method).  Line/marker colors are auto-generated from the plot's palette, unless overridden.  Set the `z` argument to turn on series gradients.

 ```julia
-plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33:
-            sin(2x)
-        end),0,2π,legend=false,fillto=0)
+y = rand(100)
+plot(0:10:100,rand(11,4),lab="lines",w=3,palette=:grays,fill=(0.5,:auto))
+scatter!(y,z=abs(y - 0.5),m=(10,:heat),lab="grad")
 ```

 ![](../img/pyplot/pyplot_example_4.png)

 ### Global

-Change the guides/background without a separate call.
+Change the guides/background/limits/ticks.  Convenience args `xaxis` and `yaxis` allow you to pass a tuple or value which will be mapped to the relevant args automatically.  The `xaxis` below will be replaced with `xlabel` and `xlims` args automatically during the preprocessing step. You can also use shorthand functions: `title!`, `xaxis!`, `yaxis!`, `xlabel!`, `ylabel!`, `xlims!`, `ylims!`, `xticks!`, `yticks!`

 ```julia
-plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RGB(0.2,0.2,0.2))
+plot(rand(20,3),title="TITLE",xaxis=("XLABEL",(-5,30),0:2:20,:flip),yaxis=("YLABEL",:log10),background_color=RGB(0.2,0.2,0.2),leg=false)
 ```

 ![](../img/pyplot/pyplot_example_5.png)

 ### Two-axis

-Use the `axis` or `axiss` arguments.
+Use the `axis` arguments.

 Note: Currently only supported with Qwt and PyPlot

 ```julia
-plot(Vector[randn(100),randn(100) * 100]; axis=[:l,:r],ylabel="LEFT",yrightlabel="RIGHT")
+plot(Vector[randn(100),randn(100) * 100]; axis=[:l :r],ylabel="LEFT",yrightlabel="RIGHT")
 ```

 ![](../img/pyplot/pyplot_example_6.png)

-### Vectors w/ pluralized args
+### Arguments

-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`).
+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.

 ```julia
-plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue])
+plot(Vector[rand(10),rand(20)]; marker=(:ellipse,8),line=(:dot,3,[:black :orange]))
 ```

 ![](../img/pyplot/pyplot_example_7.png)
@@ -93,7 +95,7 @@ plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue]
 Start with a base plot...

 ```julia
-plot(rand(100) / 3; reg=true,fillto=0)
+plot(rand(100) / 3,reg=true,fill=(0,:green))
 ```

 ![](../img/pyplot/pyplot_example_8.png)
@@ -103,7 +105,7 @@ plot(rand(100) / 3; reg=true,fillto=0)
 and add to it later.

 ```julia
-scatter!(rand(100); markersize=6,c=:blue)
+scatter!(rand(100),markersize=6,c=:orange)
 ```

 ![](../img/pyplot/pyplot_example_9.png)
@@ -113,7 +115,7 @@ scatter!(rand(100); markersize=6,c=:blue)


 ```julia
-heatmap(randn(10000),randn(10000); nbins=100)
+heatmap(randn(10000),randn(10000),nbins=100)
 ```

 ![](../img/pyplot/pyplot_example_10.png)
@@ -123,11 +125,11 @@ heatmap(randn(10000),randn(10000); nbins=100)


 ```julia
-types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter])
+types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter])'
 n = length(types)
 x = Vector[sort(rand(20)) for i = 1:n]
 y = rand(20,n)
-plot(x,y; t=types,lab=map(string,types))
+plot(x,y,line=(types,3),lab=map(string,types),ms=15)
 ```

 ![](../img/pyplot/pyplot_example_11.png)
@@ -137,7 +139,7 @@ plot(x,y; t=types,lab=map(string,types))


 ```julia
-styles = setdiff(supportedStyles(),[:auto])
+styles = setdiff(supportedStyles(),[:auto])'
 plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5)
 ```

@@ -148,8 +150,8 @@ plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=


 ```julia
-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),markersize=10)
+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)
 ```

 ![](../img/pyplot/pyplot_example_13.png)
@@ -159,7 +161,7 @@ scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,la
 x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)

 ```julia
-bar(randn(1000))
+bar(randn(999))
 ```

 ![](../img/pyplot/pyplot_example_14.png)
@@ -169,8 +171,20 @@ bar(randn(1000))


 ```julia
-histogram(randn(1000); nbins=50)
+histogram(randn(1000),nbins=50)
 ```

 ![](../img/pyplot/pyplot_example_15.png)

+### Annotations
+
+Currently only text annotations are supported.  Pass in a tuple or vector-of-tuples: (x,y,text).  `annotate!(ann)` is shorthand for `plot!(; annotation=ann)`
+
+```julia
+y = rand(10)
+plot(y,ann=(3,y[3],"this is #3"))
+annotate!([(5,y[5],"this is #5"),(9,y[10],"this is #10")])
+```
+
+![](../img/pyplot/pyplot_example_20.png)
+
@@ -1,8 +1,8 @@
 # Examples for backend: qwt

- Supported arguments: `args`, `axis`, `background_color`, `color`, `fillto`, `foreground_color`, `group`, `heatmap_c`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markercolor`, `markersize`, `nbins`, `reg`, `ribbon`, `show`, `size`, `title`, `width`, `windowtitle`, `xlabel`, `xticks`, `ylabel`, `yrightlabel`, `yticks`
+- Supported arguments: `annotation`, `axis`, `background_color`, `color`, `color_palette`, `fillrange`, `fillcolor`, `foreground_color`, `group`, `heatmap_c`, `label`, `layout`, `legend`, `linestyle`, `linetype`, `linewidth`, `markershape`, `markercolor`, `markersize`, `n`, `nbins`, `nc`, `nr`, `pos`, `reg`, `show`, `size`, `title`, `windowtitle`, `x`, `xlabel`, `xlims`, `xticks`, `y`, `ylabel`, `ylims`, `yrightlabel`, `yticks`, `xscale`, `yscale`
 - Supported values for axis: `:auto`, `:left`, `:right`
- Supported values for linetype: `:none`, `:line`, `:path`, `:steppre`, `:steppost`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`
+- Supported values for linetype: `:none`, `:line`, `:path`, `:steppre`, `:steppost`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`, `:hline`, `:vline`
 - Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot`, `:dashdotdot`
 - Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`, `:star2`, `:hexagon`
 - Is `subplot`/`subplot!` supported? Yes
@@ -11,22 +11,22 @@

 ```julia
 using Plots
-qwt!()
+qwt()
 ```

 ### Lines

-A simple line plot of the 3 columns.
+A simple line plot of the columns.

 ```julia
-plot(rand(50,5),w=3)
+plot(fakedata(50,5),w=3)
 ```

 ![](../img/qwt/qwt_example_1.png)

 ### Functions

-Plot multiple functions.  You can also put the function first.
+Plot multiple functions.  You can also put the function first, or use the form `plot(f, xmin, xmax)` where f is a Function or AbstractVector{Function}.

 ```julia
 plot(0:0.01:4π,[sin,cos])
@@ -36,54 +36,56 @@ plot(0:0.01:4π,[sin,cos])

 ### 

-You can also call it with plot(f, xmin, xmax).
+Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).

 ```julia
-plot([sin,cos],0,4π)
+plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 40:
+            sin(2x)
+        end),0,2π,line=4,leg=false,fill=(0,:orange))
 ```

 ![](../img/qwt/qwt_example_3.png)

-### 
+### Colors

-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
+Access predefined palettes (or build your own with the `colorscheme` method).  Line/marker colors are auto-generated from the plot's palette, unless overridden.  Set the `z` argument to turn on series gradients.

 ```julia
-plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33:
-            sin(2x)
-        end),0,2π,legend=false,fillto=0)
+y = rand(100)
+plot(0:10:100,rand(11,4),lab="lines",w=3,palette=:grays,fill=(0.5,:auto))
+scatter!(y,z=abs(y - 0.5),m=(10,:heat),lab="grad")
 ```

 ![](../img/qwt/qwt_example_4.png)

 ### Global

-Change the guides/background without a separate call.
+Change the guides/background/limits/ticks.  Convenience args `xaxis` and `yaxis` allow you to pass a tuple or value which will be mapped to the relevant args automatically.  The `xaxis` below will be replaced with `xlabel` and `xlims` args automatically during the preprocessing step. You can also use shorthand functions: `title!`, `xaxis!`, `yaxis!`, `xlabel!`, `ylabel!`, `xlims!`, `ylims!`, `xticks!`, `yticks!`

 ```julia
-plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RGB(0.2,0.2,0.2))
+plot(rand(20,3),title="TITLE",xaxis=("XLABEL",(-5,30),0:2:20,:flip),yaxis=("YLABEL",:log10),background_color=RGB(0.2,0.2,0.2),leg=false)
 ```

 ![](../img/qwt/qwt_example_5.png)

 ### Two-axis

-Use the `axis` or `axiss` arguments.
+Use the `axis` arguments.

 Note: Currently only supported with Qwt and PyPlot

 ```julia
-plot(Vector[randn(100),randn(100) * 100]; axis=[:l,:r],ylabel="LEFT",yrightlabel="RIGHT")
+plot(Vector[randn(100),randn(100) * 100]; axis=[:l :r],ylabel="LEFT",yrightlabel="RIGHT")
 ```

 ![](../img/qwt/qwt_example_6.png)

-### Vectors w/ pluralized args
+### Arguments

-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`).
+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.

 ```julia
-plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue])
+plot(Vector[rand(10),rand(20)]; marker=(:ellipse,8),line=(:dot,3,[:black :orange]))
 ```

 ![](../img/qwt/qwt_example_7.png)
@@ -93,7 +95,7 @@ plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue]
 Start with a base plot...

 ```julia
-plot(rand(100) / 3; reg=true,fillto=0)
+plot(rand(100) / 3,reg=true,fill=(0,:green))
 ```

 ![](../img/qwt/qwt_example_8.png)
@@ -103,7 +105,7 @@ plot(rand(100) / 3; reg=true,fillto=0)
 and add to it later.

 ```julia
-scatter!(rand(100); markersize=6,c=:blue)
+scatter!(rand(100),markersize=6,c=:orange)
 ```

 ![](../img/qwt/qwt_example_9.png)
@@ -113,7 +115,7 @@ scatter!(rand(100); markersize=6,c=:blue)


 ```julia
-heatmap(randn(10000),randn(10000); nbins=100)
+heatmap(randn(10000),randn(10000),nbins=100)
 ```

 ![](../img/qwt/qwt_example_10.png)
@@ -123,11 +125,11 @@ heatmap(randn(10000),randn(10000); nbins=100)


 ```julia
-types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter])
+types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter])'
 n = length(types)
 x = Vector[sort(rand(20)) for i = 1:n]
 y = rand(20,n)
-plot(x,y; t=types,lab=map(string,types))
+plot(x,y,line=(types,3),lab=map(string,types),ms=15)
 ```

 ![](../img/qwt/qwt_example_11.png)
@@ -137,7 +139,7 @@ plot(x,y; t=types,lab=map(string,types))


 ```julia
-styles = setdiff(supportedStyles(),[:auto])
+styles = setdiff(supportedStyles(),[:auto])'
 plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5)
 ```

@@ -148,8 +150,8 @@ plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=


 ```julia
-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),markersize=10)
+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)
 ```

 ![](../img/qwt/qwt_example_13.png)
@@ -159,7 +161,7 @@ scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,la
 x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)

 ```julia
-bar(randn(1000))
+bar(randn(999))
 ```

 ![](../img/qwt/qwt_example_14.png)
@@ -169,7 +171,7 @@ bar(randn(1000))


 ```julia
-histogram(randn(1000); nbins=50)
+histogram(randn(1000),nbins=50)
 ```

 ![](../img/qwt/qwt_example_15.png)
@@ -178,13 +180,11 @@ histogram(randn(1000); nbins=50)

  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.
+  number of columns `nc`), or you can set the layout directly with `layout`.


 ```julia
-subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:scatter,:step,:bar],nbins=10,legend=false)
+subplot(randn(100,5),layout=[1,1,3],t=[:line :hist :scatter :step :bar],nbins=10,leg=false)
 ```

 ![](../img/qwt/qwt_example_16.png)
@@ -194,7 +194,7 @@ subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:scatter,:step,:bar]
 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)
+subplot(fakedata(100,10),n=4,palette=[:grays :blues :heat :lightrainbow],bg=[:orange :pink :darkblue :black])
 ```

 ![](../img/qwt/qwt_example_17.png)
@@ -204,8 +204,20 @@ subplot(randn(100,5); n=4)


 ```julia
-subplot!(randn(100,3))
+subplot!(fakedata(100,10))
 ```

 ![](../img/qwt/qwt_example_18.png)

+### Annotations
+
+Currently only text annotations are supported.  Pass in a tuple or vector-of-tuples: (x,y,text).  `annotate!(ann)` is shorthand for `plot!(; annotation=ann)`
+
+```julia
+y = rand(10)
+plot(y,ann=(3,y[3],"this is #3"))
+annotate!([(5,y[5],"this is #5"),(9,y[10],"this is #10")])
+```
+
+![](../img/qwt/qwt_example_20.png)
+
@@ -1,6 +1,9 @@
 # Plots

 [![Build Status](https://travis-ci.org/tbreloff/Plots.jl.svg?branch=master)](https://travis-ci.org/tbreloff/Plots.jl)
+[![Plots](http://pkg.julialang.org/badges/Plots_0.3.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.3)
+[![Plots](http://pkg.julialang.org/badges/Plots_0.4.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.4)
+[![Plots](http://pkg.julialang.org/badges/Plots_0.5.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.5)

 #### Author: Thomas Breloff (@tbreloff)

@@ -13,6 +16,8 @@ Plots is a plotting interface and wrapper for several plotting packages.  My goa

 Please add wishlist items, bugs, or any other comments/questions to the issues list.

+Check out the [summary graphs](img/supported/supported.md) for the features that each backend supports.
+
 ## Examples for each implemented backend:

 - [Qwt.jl](docs/qwt_examples.md)
@@ -28,6 +33,12 @@ First, add the package

 ```julia
 Pkg.add("Plots")
+
+# if you want the latest features:
+Pkg.checkout("Plots")
+
+# or for the bleeding edge:
+Pkg.checkout("Plots", "dev")
 ```

 then get any plotting packages you need (obviously, you should get at least one backend):
@@ -43,7 +54,7 @@ Pkg.add("Winston")

 ## Use

-Load it in.  The underlying plotting backends are not imported until `plotter()` is called (which happens
+Load it in.  The underlying plotting backends are not imported until `backend()` is called (which happens
 on your first call to `plot` or `subplot`).  This means that you don't need any backends to be installed when you call `using Plots`.
 Plots will try to figure out a good default backend for you automatically based on what backends are installed.

@@ -51,42 +62,45 @@ Plots will try to figure out a good default backend for you automatically based
 using Plots
 ```

-Do a plot in Gadfly, then save a png:
+Do a plot in Gadfly (inspired by [this example](http://gadflyjl.org/geom_point.html)), then save a png:

 ```julia
-# switch to Gadfly as a backend
-gadfly!()
+gadfly()        # switch to Gadfly as a backend
+dataframes()    # turn on support for DataFrames inputs
+
+# load some data
+using RDatasets
+iris = dataset("datasets", "iris");

 # This will bring up a browser window with the plot. Add a semicolon at the end to skip display. 
-plot(rand(10,2); marker = :rect, markersize = [10,30], style = :auto)
+scatter(iris, :SepalLength, :SepalWidth, group=:Species, m=([:+ :d :s], 12))

-# save it as a PNG
-savepng(Plots.IMG_DIR * "gadfly1.png")
+# save a png (equivalent to png("gadfly1.png") and savefig("gadfly1.png"))
+png("gadfly1")
 ```

-which saves:
-
 ![gadfly_plt](img/gadfly1.png)

-See the examples pages for lots of examples of plots, and what those commands produce for each supported backend.
+See the examples pages for lots of examples of plots, and what those commands produce for each supported backend.  
+Also check out the [IJulia notebooks](examples) and see how it works interactively.

 ## API

-Call `plotter!(backend::Symbol)` or the shorthands (`gadfly!()`, `qwt!()`, `unicodeplots!()`, etc) to set the current plotting backend.
+Call `backend(backend::Symbol)` or the shorthands (`gadfly()`, `qwt()`, `unicodeplots()`, etc) to set the current plotting backend.
 Subsequent commands are converted into the relevant plotting commands for that package:

 ```julia
-gadfly!()
+gadfly()
 plot(1:10)    # this effectively calls `y = 1:10; Gadfly.plot(x=1:length(y), y=y)`
-qwt!()
+qwt()
 plot(1:10)    # this effectively calls `Qwt.plot(1:10)`
 ```

 Use `plot` to create a new plot object, and `plot!` to add to an existing one:

 ```julia
-plot(args...; kw...)                  # creates a new plot window, and sets it to be the `currentPlot`
-plot!(args...; kw...)                 # adds to the `currentPlot`
+plot(args...; kw...)                  # creates a new plot window, and sets it to be the `current`
+plot!(args...; kw...)                 # adds to the `current`
 plot!(plotobj, args...; kw...)        # adds to the plot `plotobj`
 ```

@@ -98,13 +112,13 @@ There are many ways to pass in data to the plot functions... some examples:
 - Vectors of Vectors
 - Functions
 - Vectors of Functions
- DataFrames with column symbols (initialize with `dataframes!()`)
+- DataFrames with column symbols (initialize with `dataframes()`)

 In general, you can pass in a `y` only, or an `x` and `y`, both of whatever type(s) you want, and Plots will slice up the data as needed.
 For matrices, data is split by columns.  For functions, data is mapped.  For DataFrames, a Symbol/Symbols in place of x/y will map to
 the relevant column(s).

-Here are some example usages... remember you can always use `plot!` to update an existing plot, and that, unless specified, you will update the `currentPlot()`.
+Here are some example usages... remember you can always use `plot!` to update an existing plot, and that, unless specified, you will update the `current()`.

 ```julia
 plot()                                    # empty plot object
@@ -118,14 +132,23 @@ plot(rand(10), sin)                       # same... y = sin(x)
 plot([sin,cos], 0:0.1:π)                  # plot 2 series, sin(x) and cos(x)
 plot([sin,cos], 0, π)                     # plot sin and cos on the range [0, π]
 plot(1:10, Any[rand(10), sin])            # plot 2 series, y = rand(10) for the first, y = sin(x) for the second... x = 1:10 for both
-plot(dataset("Ecdat", "Airline"), :Cost)  # plot from a DataFrame (call `dataframes!()` first to import DataFrames and initialize)
+plot(dataset("Ecdat", "Airline"), :Cost)  # plot from a DataFrame (call `dataframes()` first to import DataFrames and initialize)
 ```

+All plot methods accept a number of keyword arguments (see the tables below), which follow some rules:
+- Many arguments have aliases which are replaced during preprocessing.  `c` is the same as `color`, `m` is the same as `marker`, etc.  You can choose how verbose you'd like to be.  (see the tables below)
+- There are some special arguments (`xaxis`, `yaxis`, `line`, `marker`, `fill` and the aliases `l`, `m`, `f`) which magically set many related things at once.  (see the __Tip__ below)
+- If the argument is a "matrix-type", then each column will map to a series, cycling through columns if there are fewer columns than series.  Anything else will apply the argument value to every series.
+- Many arguments accept many different types... for example the `color` (also `markercolor`, `fillcolor`, etc) argument will accept strings or symbols with a color name, or any `Colors.Colorant`, or a `ColorScheme`, or a symbol representing a `ColorGradient`, or an AbstractVector of colors/symbols/etc...
+
 You can update certain plot settings after plot creation (not supported on all backends):

 ```julia
 plot!(title = "New Title", xlabel = "New xlabel", ylabel = "New ylabel")
 plot!(xlims = (0, 5.5), ylims = (-2.2, 6), xticks = 0:0.5:10, yticks = [0,1,5,10])
+
+# using shorthands:
+xaxis!("mylabel", :log10, :flip)
 ```

 With `subplot`, create multiple plots at once, with flexible layout options:
@@ -169,6 +192,11 @@ xlims!{T<:Real,S<:Real}(lims::Tuple{T,S}) = plot!(xlims = lims)
 ylims!{T<:Real,S<:Real}(lims::Tuple{T,S}) = plot!(ylims = lims)
 xticks!{T<:Real}(v::AVec{T})              = plot!(xticks = v)
 yticks!{T<:Real}(v::AVec{T})              = plot!(yticks = v)
+xflip!(flip::Bool = true)                 = plot!(xflip = flip)
+yflip!(flip::Bool = true)                 = plot!(yflip = flip)
+xaxis!(args...)                           = plot!(xaxis = args)
+yaxis!(args...)                           = plot!(yaxis = args)
+annotate!(anns)                           = plot!(annotation = anns)
 ```

 Some keyword arguments you can set:
@@ -188,13 +216,27 @@ Markers:
 [[MARKERS_TABLE]]


-__Tip__: You can see the default value for a given argument with `plotDefault(arg::Symbol)`, and set the default value with `plotDefault!(arg::Symbol, value)`
+__Tip__: You can see the default value for a given argument with `default(arg::Symbol)`, and set the default value with `default(arg::Symbol, value)` or `default(; kw...)`.  For example set the default window size and whether we should show a legend with `default(size=(600,400), leg=false)`.

-__Tip__: When plotting multiple lines, you can set all series to use the same value, or pass in an array to cycle through values.  Example:
+__Tip__: There are some helper arguments you can set:  `xaxis`, `yaxis`, `line`, `marker`, `fill`.  These go through special preprocessing to extract values into individual arguments.  The order doesn't matter, and if you pass a single value it's equivalent to wrapping it in a Tuple.  Examples:
+
+```
+plot(y, xaxis = ("mylabel", :log, :flip, (-1,1)))   # this sets the `xlabel`, `xscale`, `xflip`, and `xlims` arguments automatically
+plot(y, line = (:bar, :blue, :dot, 10))             # this sets the `linetype`, `color`, `linestyle`, and `linewidth` arguments automatically
+plot(y, marker = (:rect, :red, 10))                 # this sets the `markershape`, `markercolor`, and `markersize` arguments automatically
+plot(y, fill = (:green, 10))                        # this sets the `fillcolor` and `fillrange` arguments automatically
+                                                    # Note: `fillrange` can be:
+                                                              a number (fill to horizontal line)
+                                                              a vector of numbers (different for each data point)
+                                                              a tuple of vectors (fill a band)
+```
+
+__Tip__: When plotting multiple lines, you can set all series to use the same value, or pass in a matrix to cycle through values.  Example:

 ```julia
-plot(rand(100,4); color = [:red, RGB(0,0,1)],    # lines 1 and 3 are red, lines 2 and 4 are blue
+plot(rand(100,4); color = [:red RGB(0,0,1)],     # (Matrix) lines 1 and 3 are red, lines 2 and 4 are blue
                  axis = :auto,                  # lines 1 and 3 are on the left axis, lines 2 and 4 are on the right
+                  markershape = [:rect, :star1]  # (Vector) ALL lines are passed the vector [:rect, :star1]
                  width = 5)                     # all lines have a width of 5
 ```

@@ -206,8 +248,10 @@ __Tip__: Call `gui()` to display the plot in a window.  Interactivity depends on

 - [x] Plot vectors/matrices/functions
 - [x] Plot DataFrames
- [ ] Scales
- [ ] Categorical Inputs (strings, etc... for hist, bar? or can split one series into multiple?)
+- [x] Grouping
+- [x] Annotations
+- [x] Scales
+- [x] Categorical Inputs (strings, etc... for hist, bar? or can split one series into multiple?)
 - [ ] Custom markers
 - [ ] Special plots (boxplot, ohlc?)
 - [x] Subplots
@@ -11,7 +11,7 @@

 ```julia
 using Plots
-unicodeplots!()
+unicodeplots()
 ```

 ### Lines
@@ -1,32 +1,32 @@
 # Examples for backend: winston

- Supported arguments: `args`, `axis`, `color`, `foreground_color`, `group`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markersize`, `nbins`, `reg`, `ribbon`, `show`, `size`, `title`, `width`, `windowtitle`, `xlabel`, `xticks`, `ylabel`, `yrightlabel`, `yticks`
+- Supported arguments: `annotation`, `color`, `color_palette`, `fillrange`, `fillcolor`, `group`, `label`, `legend`, `linestyle`, `linetype`, `linewidth`, `markershape`, `markercolor`, `markersize`, `nbins`, `reg`, `show`, `size`, `title`, `windowtitle`, `x`, `xlabel`, `xlims`, `y`, `ylabel`, `ylims`, `xscale`, `yscale`
 - Supported values for axis: `:auto`, `:left`
 - Supported values for linetype: `:none`, `:line`, `:path`, `:sticks`, `:scatter`, `:hist`, `:bar`
- Supported values for linestyle: `:solid`, `:dash`, `:dot`, `:dashdot`
- Supported values for marker: `:none`, `:ellipse`, `:rect`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`
+- Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot`
+- Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`
 - Is `subplot`/`subplot!` supported? No

 ### Initialize

 ```julia
 using Plots
-winston!()
+winston()
 ```

 ### Lines

-A simple line plot of the 3 columns.
+A simple line plot of the columns.

 ```julia
-plot(rand(50,5),w=3)
+plot(fakedata(50,5),w=3)
 ```

 ![](../img/winston/winston_example_1.png)

 ### Functions

-Plot multiple functions.  You can also put the function first.
+Plot multiple functions.  You can also put the function first, or use the form `plot(f, xmin, xmax)` where f is a Function or AbstractVector{Function}.

 ```julia
 plot(0:0.01:4π,[sin,cos])
@@ -36,54 +36,56 @@ plot(0:0.01:4π,[sin,cos])

 ### 

-You can also call it with plot(f, xmin, xmax).
+Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).

 ```julia
-plot([sin,cos],0,4π)
+plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 39:
+            sin(2x)
+        end),0,2π,line=4,leg=false,fill=(0,:orange))
 ```

 ![](../img/winston/winston_example_3.png)

-### 
+### Colors

-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
+Access predefined palettes (or build your own with the `colorscheme` method).  Line/marker colors are auto-generated from the plot's palette, unless overridden.  Set the `z` argument to turn on series gradients.

 ```julia
-plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33:
-            sin(2x)
-        end),0,2π,legend=false,fillto=0)
+y = rand(100)
+plot(0:10:100,rand(11,4),lab="lines",w=3,palette=:grays,fill=(0.5,:auto))
+scatter!(y,z=abs(y - 0.5),m=(10,:heat),lab="grad")
 ```

 ![](../img/winston/winston_example_4.png)

 ### Global

-Change the guides/background without a separate call.
+Change the guides/background/limits/ticks.  Convenience args `xaxis` and `yaxis` allow you to pass a tuple or value which will be mapped to the relevant args automatically.  The `xaxis` below will be replaced with `xlabel` and `xlims` args automatically during the preprocessing step. You can also use shorthand functions: `title!`, `xaxis!`, `yaxis!`, `xlabel!`, `ylabel!`, `xlims!`, `ylims!`, `xticks!`, `yticks!`

 ```julia
-plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RGB(0.2,0.2,0.2))
+plot(rand(20,3),title="TITLE",xaxis=("XLABEL",(-5,30),0:2:20,:flip),yaxis=("YLABEL",:log10),background_color=RGB(0.2,0.2,0.2),leg=false)
 ```

 ![](../img/winston/winston_example_5.png)

 ### Two-axis

-Use the `axis` or `axiss` arguments.
+Use the `axis` arguments.

 Note: Currently only supported with Qwt and PyPlot

 ```julia
-plot(Vector[randn(100),randn(100) * 100]; axis=[:l,:r],ylabel="LEFT",yrightlabel="RIGHT")
+plot(Vector[randn(100),randn(100) * 100]; axis=[:l :r],ylabel="LEFT",yrightlabel="RIGHT")
 ```

 ![](../img/winston/winston_example_6.png)

-### Vectors w/ pluralized args
+### Arguments

-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`).
+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.

 ```julia
-plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue])
+plot(Vector[rand(10),rand(20)]; marker=(:ellipse,8),line=(:dot,3,[:black :orange]))
 ```

 ![](../img/winston/winston_example_7.png)
@@ -93,7 +95,7 @@ plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue]
 Start with a base plot...

 ```julia
-plot(rand(100) / 3; reg=true,fillto=0)
+plot(rand(100) / 3,reg=true,fill=(0,:green))
 ```

 ![](../img/winston/winston_example_8.png)
@@ -103,7 +105,7 @@ plot(rand(100) / 3; reg=true,fillto=0)
 and add to it later.

 ```julia
-scatter!(rand(100); markersize=6,c=:blue)
+scatter!(rand(100),markersize=6,c=:orange)
 ```

 ![](../img/winston/winston_example_9.png)
@@ -113,11 +115,11 @@ scatter!(rand(100); markersize=6,c=:blue)


 ```julia
-types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter])
+types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter])'
 n = length(types)
 x = Vector[sort(rand(20)) for i = 1:n]
 y = rand(20,n)
-plot(x,y; t=types,lab=map(string,types))
+plot(x,y,line=(types,3),lab=map(string,types),ms=15)
 ```

 ![](../img/winston/winston_example_11.png)
@@ -127,7 +129,7 @@ plot(x,y; t=types,lab=map(string,types))


 ```julia
-styles = setdiff(supportedStyles(),[:auto])
+styles = setdiff(supportedStyles(),[:auto])'
 plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5)
 ```

@@ -138,8 +140,8 @@ plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=


 ```julia
-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),markersize=10)
+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)
 ```

 ![](../img/winston/winston_example_13.png)
@@ -149,7 +151,7 @@ scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,la
 x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)

 ```julia
-bar(randn(1000))
+bar(randn(999))
 ```

 ![](../img/winston/winston_example_14.png)
@@ -159,8 +161,20 @@ bar(randn(1000))


 ```julia
-histogram(randn(1000); nbins=50)
+histogram(randn(1000),nbins=50)
 ```

 ![](../img/winston/winston_example_15.png)

+### Annotations
+
+Currently only text annotations are supported.  Pass in a tuple or vector-of-tuples: (x,y,text).  `annotate!(ann)` is shorthand for `plot!(; annotation=ann)`
+
+```julia
+y = rand(10)
+plot(y,ann=(3,y[3],"this is #3"))
+annotate!([(5,y[5],"this is #5"),(9,y[10],"this is #10")])
+```
+
+![](../img/winston/winston_example_20.png)
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Breloff	1115ff83bb	working on contours	2015-10-08 14:18:49 -04:00
Thomas Breloff	c24550c756	0.3 fix gadfly shapes	2015-10-08 14:01:30 -04:00
Thomas Breloff	b5cdfe30ea	readme and examples	2015-10-08 13:33:14 -04:00
Thomas Breloff	a10e594da1	tests	2015-10-08 12:31:33 -04:00
Thomas Breloff	63aee387f0	badges and test fix	2015-10-08 12:05:21 -04:00
Thomas Breloff	ab9de1e199	added 0.3 and nightly to travis; force Winston to use gtk	2015-10-08 11:48:54 -04:00
Thomas Breloff	e60c463328	0.3 support; require Compat; pyplot scatter colormaps	2015-10-08 11:30:20 -04:00
Thomas Breloff	537d74196b	working on contours	2015-10-08 07:49:26 -04:00
Thomas Breloff	a8bbbe8582	working on contours	2015-10-08 00:49:30 -04:00
Thomas Breloff	29471a7aac	readme	2015-10-07 18:18:44 -04:00
Thomas Breloff	894a4a5567	winston fixes/examples and updated readme	2015-10-07 18:09:32 -04:00
Thomas Breloff	f7cd5276f0	fixed qwt and examples	2015-10-07 17:42:08 -04:00
Thomas Breloff	95b8c71083	examples	2015-10-07 17:04:19 -04:00
Thomas Breloff	52c82e6fe2	examples	2015-10-07 16:54:42 -04:00
Thomas Breloff	cef1abd6aa	readme	2015-10-07 16:29:32 -04:00
Thomas Breloff	91da261128	working on colors/args and examples	2015-10-07 16:04:30 -04:00
Thomas Breloff	1c70346a61	bringing pyplot up to speed	2015-10-07 13:45:38 -04:00
Thomas Breloff	2de017086d	working on colors and args	2015-10-07 12:50:07 -04:00
Thomas Breloff	d6253c72d4	working on colors, args, and axis flip	2015-10-06 18:19:44 -04:00
Thomas Breloff	e5007b6c87	working on colors, args, and axis flip	2015-10-06 17:51:54 -04:00
Thomas Breloff	bbc18549b3	working on args	2015-10-06 11:37:45 -05:00
Thomas Breloff	b6855b6fba	working on args	2015-10-06 10:07:18 -05:00
Thomas Breloff	70db97d576	working on args	2015-10-06 09:49:33 -05:00
Thomas Breloff	f632f2f39e	working on args	2015-10-06 09:04:57 -05:00
Thomas Breloff	b23f968d57	working on axis/line/marker/fill overhaul	2015-10-06 08:45:53 -05:00
Thomas Breloff	ea88877a11	working on color schemes	2015-10-05 17:06:52 -05:00
Thomas Breloff	1de3decede	working on color schemes	2015-10-05 16:28:43 -05:00
Thomas Breloff	78045fd2ab	working on spy and nbins tuple	2015-10-04 21:39:32 -05:00
Thomas Breloff	7c8898158b	working on gadfly continuous colors	2015-10-04 16:52:29 -05:00
Thomas Breloff	3fc5f87388	added better error for Winston output_surface	2015-10-04 09:41:42 -05:00
Thomas Breloff	623ca1effc	winston log10 scale	2015-10-03 17:18:58 -05:00
Thomas Breloff	da05e7fe5e	qwt log10 scale	2015-10-03 17:03:13 -05:00
Thomas Breloff	f3734d4c64	added pyplot scales	2015-10-03 09:46:02 -05:00
Thomas Breloff	9ab458e109	switched gadfly heatmap to Geom.histogram2d	2015-10-01 12:55:05 -05:00
Thomas Breloff	d4c72e6f78	gadfly ribbon	2015-09-30 10:36:00 -04:00
Thomas Breloff	1f58ef5140	don't error on savefig without an ext, use default; closes #32	2015-09-30 09:55:07 -04:00
Thomas Breloff	69d574c587	added scales globally and to gadfly/immerse	2015-09-30 09:18:16 -04:00
Thomas Breloff	a027fdded7	autoload dataframes	2015-09-29 14:40:11 -04:00
Thomas Breloff	443df0501d	supported graphs	2015-09-29 14:27:18 -04:00
Thomas Breloff	d68fe5f80d	supported readme	2015-09-29 14:14:13 -04:00
Thomas Breloff	ebf868bae3	supported readme	2015-09-29 14:13:46 -04:00
Thomas Breloff	8a9b3286e9	supportedGraphs utils and pngs; removed args/kwargs from defaults	2015-09-29 14:05:24 -04:00
Thomas Breloff	a0455561b6	unicode hline/vline; supportGraph utils	2015-09-29 13:46:31 -04:00
Thomas Breloff	518ccf5a74	pyplot hline/vline	2015-09-29 12:20:58 -04:00
Thomas Breloff	54f09c58cb	unicodeplots lims	2015-09-29 12:00:48 -04:00
Thomas Breloff	029ad1045a	qwt lims/ticks	2015-09-29 11:50:02 -04:00
Thomas Breloff	2f55fb4d84	winston lims	2015-09-29 10:40:46 -04:00
Thomas Breloff	add724eee9	working on gadfly ticks	2015-09-29 09:50:53 -04:00
Thomas Breloff	07324ae892	working on gadfly ticks	2015-09-29 09:49:58 -04:00
Thomas Breloff	ffc05e971f	working on ticks	2015-09-28 23:49:03 -04:00
Thomas Breloff	30f42fd1d4	added lims/ticks for pyplot	2015-09-28 22:49:46 -04:00
Thomas Breloff	f284857438	added qwt hline/vline; working on setTicksFromStringVector	2015-09-28 17:56:32 -04:00
Thomas Breloff	06ab514472	qwt annotations and examples	2015-09-28 17:11:43 -04:00
Thomas Breloff	85b65acbe0	readme	2015-09-28 16:48:32 -04:00
Thomas Breloff	4d1d9de22f	gitignore	2015-09-28 16:43:04 -04:00
Thomas Breloff	a68ec9b191	savefig and png	2015-09-28 16:42:02 -04:00
Thomas Breloff	e386636d66	readme	2015-09-28 16:01:48 -04:00
Thomas Breloff	cc3311b8eb	examples	2015-09-28 15:49:46 -04:00
Thomas Breloff	d3d1181769	examples and readme	2015-09-28 15:44:50 -04:00
Thomas Breloff	001abf684c	examples	2015-09-28 15:35:45 -04:00
Thomas Breloff	92a65296b5	redid supportedArgs	2015-09-28 15:21:45 -04:00
Thomas Breloff	3a7887d003	working on massive naming overhaul and fixes	2015-09-28 14:58:56 -04:00
Thomas Breloff	3334c4a87a	winston annotations	2015-09-28 12:52:44 -04:00
Thomas Breloff	228ce768e0	pyplot annotations and ioff fix	2015-09-28 12:09:52 -04:00
Thomas Breloff	eafc1a784c	working on annotations	2015-09-28 11:09:45 -04:00
Thomas Breloff	fd3a4d0a0e	working on annotations	2015-09-28 10:46:53 -04:00
Thomas Breloff	77d679b63b	working on handling string input data	2015-09-27 23:46:42 -04:00
Thomas Breloff	730d764c6e	gadfly color group	2015-09-25 17:03:57 -04:00
Thomas Breloff	6f1ef82e89	gadfly color groups for line segments	2015-09-25 16:47:17 -04:00
Thomas Breloff	d4da910f19	call Gadfly.get_stroke_vector; added getindex/setindex to qwt	2015-09-25 13:33:06 -04:00
Thomas Breloff	a0a0773bd2	fix push warning	2015-09-25 09:42:16 -04:00
Thomas Breloff	9ce8d138d5	working on data updating and notebooks	2015-09-25 01:00:22 -04:00
Thomas Breloff	0041b034e0	working on various things	2015-09-24 16:47:30 -04:00
Thomas Breloff	d781c437de	started real time updates; fixes #29 (pyplot ijulia display)	2015-09-24 13:01:31 -04:00
Thomas Breloff	2fe21b8547	fixes, gadfly star shape, readme example	2015-09-24 00:35:18 -04:00
Thomas Breloff	dbc90c9417	working on groups and iris notebook	2015-09-23 23:34:54 -04:00
Thomas Breloff	431d60a58a	working on groups and iris notebook	2015-09-23 23:15:15 -04:00
Thomas Breloff	fcfcc9a94a	working on groups and iris notebook	2015-09-23 17:13:20 -04:00
Thomas Breloff	870fb4e2df	working on groups and iris notebook	2015-09-23 17:12:26 -04:00
Thomas Breloff	e3612b973f	working on groups and iris notebook	2015-09-23 16:48:49 -04:00
Thomas Breloff	75f4ca928f	working on auto-labels from dataframes meta info, and started group arg	2015-09-23 15:34:42 -04:00