moved PyPlot to first priority

gadfly ref imgs
fixed gadfly hline/vline constructors
2015-11-16 16:06:48 -05:00 · 2015-11-16 15:50:02 -05:00 · 2015-11-16 15:37:55 -05:00 · 2015-11-12 17:30:55 -05:00 · 2015-11-11 21:47:53 -05:00 · 2015-11-11 17:46:44 -05:00
190 changed files with 5483 additions and 2905 deletions
@@ -1,4 +1,6 @@
 *.jl.cov
 *.jl.*.cov
 *.jl.mem
-.DS_Store
+.DS_Store
+examples/.ipynb_checkpoints/*
+examples/meetup/.ipynb_checkpoints/*
@@ -5,9 +5,16 @@ os:
  - osx
 julia:
  - 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
- - julia -e 'Pkg.clone(pwd()); Pkg.build("Plots"); Pkg.add("Gadfly"); Pkg.test("Plots"; coverage=true)'
+ - julia -e 'Pkg.clone("https://github.com/tbreloff/Images.jl.git"); Pkg.checkout("Images","tom_imgcompare");'
+ - julia -e 'Pkg.clone("ImageMagick"); Pkg.build("ImageMagick")'
+ - julia -e 'Pkg.clone("Cairo"); Pkg.build("Cairo")'
+ - julia -e 'ENV["PYTHON"] = ""; Pkg.clone("PyPlot"); Pkg.build("PyPlot")'
+ - julia -e 'Pkg.clone(pwd()); Pkg.build("Plots")'
+ - julia -e 'Pkg.test("Plots"; coverage=false)'
+ # - julia -e 'cd(Pkg.dir("Plots")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'
@@ -1,26 +1,35 @@
 # 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)
+<!-- [![Coverage Status](https://coveralls.io/repos/tbreloff/Plots.jl/badge.svg?branch=master)](https://coveralls.io/r/tbreloff/Plots.jl?branch=master) -->
+<!-- [![codecov.io](http://codecov.io/github/tbreloff/Plots.jl/coverage.svg?branch=master)](http://codecov.io/github/tbreloff/Plots.jl?branch=master) -->

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

-Plots is a plotting interface and wrapper for several plotting packages.  My goals with the package are:
+Plots is a plotting API and toolset.  My goals with the package are:

- Simple.  The interface should be intuitive enough that someone coming from Matlab, Python, etc can immediately start generating complex plots without reading volumes of documentation.
- Automatic (if you want).  There should be smart defaults for the most common functionality, and simple, high-level ways to override complex functionality.
- Flexible.  You should be able to produce your favorite plot in your favorite package, but quicker and simpler.
- Consistent.  Don't commit to one graphics package.  One command will switch your backend, and the exact same plotting commands will work with a very different underlying backend.
+- **Intuitive**.  Start generating complex plots without reading volumes of documentation.  Commands should "just work".
+- **Concise**.  Less code means fewer mistakes and more efficient development/analysis.
+- **Flexible**.  Produce your favorite plots from your favorite package, but quicker and simpler.
+- **Consistent**.  Don't commit to one graphics package.  Use the same code and access the strengths of all backends.
+- **Lightweight**.  Very few dependencies, since backends are loaded and initialized dynamically.
+
+Use the preprocessing pipeline in Plots to fully describe your visualization before it calls the backend code.  This maintains modularity and allows for efficient separation of front end code, algorithms, and backend graphics.  New graphical backends can be added with minimal effort.
+
+Check out the [summary graphs](img/supported/supported.md) for the features that each backend supports.

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

 ## Examples for each implemented backend:

- [Qwt.jl](docs/qwt_examples.md)
- [Gadfly.jl](docs/gadfly_examples.md)
- [UnicodePlots.jl](docs/unicodeplots_examples.md)
- [PyPlot.jl](docs/pyplot_examples.md)
- [Immerse.jl](docs/immerse_examples.md)
- [Winston.jl](docs/winston_examples.md)
+- [Gadfly.jl/Immerse.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/gadfly_examples.md)
+- [PyPlot.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/pyplot_examples.md)
+- [UnicodePlots.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/unicodeplots_examples.md)
+- [Qwt.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/qwt_examples.md)
+
+Also check out the many [IJulia notebooks](http://nbviewer.ipython.org/github/tbreloff/ExamplePlots.jl/tree/master/examples/) with many examples.

 ## Installation

@@ -28,65 +37,72 @@ 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):
+then get any plotting packages you need (obviously, you should get at least one backend).

 ```julia
 Pkg.add("Gadfly")
 Pkg.add("Immerse")
+Pkg.add("PyPlot")
 Pkg.add("UnicodePlots")
-Pkg.add("PyPlot")                                    # requires python and matplotlib
-Pkg.clone("https://github.com/tbreloff/Qwt.jl.git")  # requires pyqt and pyqwt
-Pkg.add("Winston")
+Pkg.add("Qwt")
+Pkg.add("Bokeh")
 ```

 ## 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.

 ```julia
 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), smooth=0.99, bg=:black)

-# 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.
-
 ## 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 +114,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 +134,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,46 +194,82 @@ 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 arguments:

 Keyword | Default | Type | Aliases 
 ---- | ---- | ---- | ----
-`:args` | `Any[]` | Series | `:argss`  
+`:annotation` | `nothing` | Series | `:ann`, `:annotate`, `:annotations`, `:anns`  
 `:axis` | `left` | Series | `:axiss`  
-`:color` | `auto` | Series | `:c`, `:colors`  
-`:fillto` | `nothing` | Series | `:area`, `:fill`, `:filltos`  
+`:background_color` | `RGB{U8}(1.0,1.0,1.0)` | Plot | `:background`, `:background_colour`, `:bg`, `:bg_color`, `:bgcolor`  
+`:color_palette` | `auto` | Plot | `:palette`  
+`:fill` | `nothing` | Series | `:area`, `:f`  
+`:fillalpha` | `nothing` | Series | `:fa`, `:fillalphas`, `:fillopacity`  
+`:fillcolor` | `match` | Series | `:fc`, `:fcolor`, `:fillcolors`, `:fillcolour`  
+`:fillrange` | `nothing` | Series | `:fillranges`, `:fillrng`  
+`:foreground_color` | `auto` | Plot | `:fg`, `:fg_color`, `:fgcolor`, `:foreground`, `:foreground_colour`  
+`:grid` | `true` | Plot |   
 `:group` | `nothing` | Series | `:g`, `:groups`  
-`:heatmap_c` | `(0.15,0.5)` | Series | `:heatmap_cs`  
-`:kwargs` | `Any[]` | Series | `:kwargss`  
+`:guidefont` | `Plots.Font("Helvetica",11,:hcenter,:vcenter,0.0,RGB{U8}(0.0,0.0,0.0))` | Plot |   
 `:label` | `AUTO` | Series | `:lab`, `:labels`  
+`:layout` | `nothing` | Plot |   
+`:legend` | `true` | Plot | `:leg`  
+`:legendfont` | `Plots.Font("Helvetica",8,:hcenter,:vcenter,0.0,RGB{U8}(0.0,0.0,0.0))` | Plot |   
+`:line` | `nothing` | Series | `:l`  
+`:linealpha` | `nothing` | Series | `:la`, `:linealphas`, `:lineopacity`  
+`:linecolor` | `auto` | Series | `:c`, `:color`, `:colour`, `:linecolors`  
 `:linestyle` | `solid` | Series | `:linestyles`, `:ls`, `:s`, `:style`  
 `:linetype` | `path` | Series | `:linetypes`, `:lt`, `:t`, `:type`  
-`:marker` | `none` | Series | `:m`, `:markers`  
-`:markercolor` | `match` | Series | `:markercolors`, `:mc`, `:mcolor`  
+`:linewidth` | `1` | Series | `:linewidths`, `:lw`, `:w`, `:width`  
+`:link` | `false` | Plot |   
+`:linkfunc` | `nothing` | Plot |   
+`:linkx` | `false` | Plot | `:xlink`  
+`:linky` | `false` | Plot | `:ylink`  
+`:marker` | `nothing` | Series | `:m`, `:mark`  
+`:markeralpha` | `nothing` | Series | `:alpha`, `:ma`, `:markeralphas`, `:markeropacity`, `:opacity`  
+`:markercolor` | `match` | Series | `:markercolors`, `:markercolour`, `:mc`, `:mcolor`  
+`:markershape` | `none` | Series | `:markershapes`, `:shape`  
 `:markersize` | `6` | Series | `:markersizes`, `:ms`, `:msize`  
-`: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`  
+`:markerstrokealpha` | `nothing` | Series | `:markerstrokealphas`  
+`:markerstrokecolor` | `match` | Series | `:markerstrokecolors`  
+`:markerstrokestyle` | `solid` | Series | `:markerstrokestyles`  
+`:markerstrokewidth` | `1` | Series | `:markerstrokewidths`  
+`:n` | `-1` | Plot |   
+`:nbins` | `30` | Series | `:nb`, `:nbin`, `:nbinss`  
+`:nc` | `-1` | Plot |   
+`:nlevels` | `15` | Series | `:nlevelss`  
+`:nr` | `-1` | Plot |   
+`:pos` | `(0,0)` | Plot |   
+`:show` | `false` | Plot | `:display`, `:gui`  
+`:size` | `(500,300)` | Plot | `:windowsize`, `:wsize`  
+`:smooth` | `false` | Series | `:reg`, `:regression`, `:smooths`  
+`:surface` | `nothing` | Series | `:surfaces`  
+`:tickfont` | `Plots.Font("Helvetica",8,:hcenter,:vcenter,0.0,RGB{U8}(0.0,0.0,0.0))` | Plot |   
 `: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` | `false` | 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:
+### Plot types:

 Type | Desc | Aliases
 ---- | ---- | ----
@@ -226,9 +287,12 @@ Type | Desc | Aliases
 `:hline` | Horizontal line (doesn't use x) |   
 `:vline` | Vertical line (doesn't use x) |   
 `:ohlc` | Open/High/Low/Close chart (expects y is AbstractVector{Plots.OHLC}) |   
+`:contour` | Contour lines (uses z) |   
+`:path3d` | 3D path (uses z) | `:line3d`  
+`:scatter3d` | 3D scatter plot (uses z) |   


-Line styles:
+### Line styles:

 Type | Aliases
 ---- | ----
@@ -240,33 +304,53 @@ Type | Aliases
 `:dashdotdot` | `:ddd`  


-Markers:
+### Markers:

 Type | Aliases
 ---- | ----
 `:none` | `:n`, `:no`  
 `:auto` | `:a`  
-`:ellipse` | `:c`, `:circle`  
-`:rect` | `:r`, `:sq`, `:square`  
-`:diamond` | `:d`  
-`:utriangle` | `:^`, `:uptri`, `:uptriangle`, `:ut`, `:utri`  
-`:dtriangle` | `:V`, `:downtri`, `:downtriangle`, `:dt`, `:dtri`, `:v`  
 `:cross` | `:+`, `:plus`  
-`:xcross` | `:X`, `:x`  
-`:star1` | `:s`, `:star`  
-`:star2` | `:s2`  
+`:diamond` | `:d`  
+`:dtriangle` | `:V`, `:downtri`, `:downtriangle`, `:dt`, `:dtri`, `:v`  
+`:ellipse` | `:c`, `:circle`  
+`:heptagon` | `:hep`  
 `:hexagon` | `:h`, `:hex`  
 `:octagon` | `:o`, `:oct`  
+`:pentagon` | `:p`, `:pent`  
+`:rect` | `:r`, `:sq`, `:square`  
+`:star4` |   
+`:star5` | `:s`, `:star`, `:star1`  
+`:star6` |   
+`:star7` |   
+`:star8` | `:s2`, `:star2`  
+`:utriangle` | `:^`, `:uptri`, `:uptriangle`, `:ut`, `:utri`  
+`:xcross` | `:X`, `:x`  


+__Tip__: With supported backends, you can pass a `Plots.Shape` object for the `marker`/`markershape` arguments.  `Shape` takes a vector of 2-tuples in the constructor, defining the points of the polygon's shape in a unit-scaled coordinate space.  To make a square, for example, you could do `Shape([(1,1),(1,-1),(-1,-1),(-1,1)])`

-__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, :star]   # (Vector) ALL lines are passed the vector [:rect, :star1]
                  width = 5)                     # all lines have a width of 5
 ```

@@ -274,16 +358,28 @@ __Tip__: Not all features are supported for each backend, but you can see what's

 __Tip__: Call `gui()` to display the plot in a window.  Interactivity depends on backend.  Plotting at the REPL (without semicolon) implicitly calls `gui()`.

+### Animations
+
+Animations are created in 3 steps (see example #2):
+- Initialize an `Animation` object.
+- Save each frame of the animation with `frame(anim)`.
+- Convert the frames to an animated gif with `gif(anim, filename, fps=15)`
+
+
 ## TODO features:

 - [x] Plot vectors/matrices/functions
 - [x] Plot DataFrames
- [ ] Scales
- [ ] Categorical Inputs (strings, etc... for hist, bar? or can split one series into multiple?)
- [ ] Custom markers
- [ ] Special plots (boxplot, ohlc?)
- [x] Subplots
 - [x] Histograms
+- [x] Grouping
+- [x] Annotations
+- [x] Scales
+- [x] Categorical Inputs (strings, etc... for hist, bar? or can split one series into multiple?)
+- [x] Custom markers
+- [x] Animations
+- [x] Subplots
+- [ ] Contours
+- [ ] Boxplots
 - [ ] 3D plotting
 - [ ] Scenes/Drawing
 - [ ] Graphs
@@ -296,7 +392,7 @@ __Tip__: Call `gui()` to display the plot in a window.  Interactivity depends on
 - [x] PyPlot.jl
 - [x] UnicodePlots.jl
 - [x] Qwt.jl
- [x] Winston.jl
+- [x] Winston.jl (deprecated)
 - [ ] GLPlot.jl
 - [ ] Bokeh.jl
 - [ ] Vega.jl
@@ -1,4 +1,5 @@
-julia 0.4-
+julia 0.4

 Colors
 Reexport
+Compat
@@ -3,105 +3,186 @@ 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


+
 # 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))]),
-  PlotExample("Functions",
-              "Plot multiple functions.  You can also put the function first.",
-              [:(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))]),
+              "A simple line plot of the columns.",
+              [
+                :(plot(Plots.fakedata(50,5), w=3))
+              ]),
+  PlotExample("Functions, adding data, and animations",
+              "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}.\n\nGet series data: `x, y = plt[i]`.  Set series data: `plt[i] = (x,y)`. Add to the series with `push!`/`append!`.\n\nEasily build animations.  (`convert` or `ffmpeg` must be available to generate the animation.)  Use command `gif(anim, filename, fps=15)` to save the animation.",
+              [
+                :(p = plot([sin,cos], zeros(0), leg=false)),
+                :(anim = Animation()),
+                :(for x in linspace(0, 10π, 100)
+                    push!(p, x, Float64[sin(x), cos(x)])
+                    frame(anim)
+                  end)
+              ]),
+  PlotExample("Parametric plots",
+              "Plot function pair (x(u), y(u)).",
+              [
+                :(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, zcolor=abs(y-.5), m=(:heat,0.8,stroke(3,:green)), ms=10*abs(y-0.5)+3, 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!`",
+              [
+                :(y = rand(20,3)),
+                :(plot(y, xaxis=("XLABEL",(-5,30),0:2:20,:flip), background_color = RGB(0.2,0.2,0.2), leg=false)),
+                :(hline!(mean(y,1)+rand(1,3), line=(4,:dash,0.6,[:lightgreen :green :darkgreen]))),
+                :(vline!([5,10])),
+                :(title!("TITLE")),
+                :(yaxis!("YLABEL", :log10))
+              ]),
  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.",
+              [
+                :(ys = Vector[rand(10), rand(20)]),
+                :(plot(ys, line=(:dot,4,[:black :orange]), marker=([:hex :d],12,0.8,stroke(3,:gray))))
+              ]),
  PlotExample("Build plot in pieces",
              "Start with a base plot...",
-              [:(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=20))
+              ]),
  PlotExample("Line types",
              "",
-              [:(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)))]),
+              [
+                :(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, 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,Shape])'),
+                :(n = length(markers)),
+                :(x = linspace(0,10,n+2)[2:end-1]),
+                :(y = repmat(reverse(x)', n, 1)),
+                :(scatter(x, y, m=(8,:auto), lab=map(string,markers), bg=:linen))
+              ]),
  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=20))
+              ]),
  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(Plots.fakedata(100,10), n=4, palette=[:grays :blues :heat :lightrainbow], bg=[:orange :pink :darkblue :black]))
+              ]),
  PlotExample("",
              "",
-              [:(subplot!(randn(100,3)))]),
+              [
+                :(subplot!(Plots.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`.",
-              [:(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))]),
-
+              "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],text("this is #3",:left)))),
+                :(annotate!([(5,y[5],text("this is #5",16,:red,:center)),
+                             (10,y[10],text("this is #10",:right,20,"courier"))]))
+              ]),
+  PlotExample("Custom Markers",
+              "A `Plots.Shape` is a light wrapper around vertices of a polygon.  For supported backends, pass arbitrary polygons as the marker shapes.  Note: The center is (0,0) and the size is expected to be rougly the area of the unit circle.",
+              [
+                :(verts = [(-1.0,1.0),(-1.28,0.6),(-0.2,-1.4),(0.2,-1.4),(1.28,0.6),(1.0,1.0),
+                           (-1.0,1.0),(-0.2,-0.6),(0.0,-0.2),(-0.4,0.6),(1.28,0.6),(0.2,-1.4),
+                           (-0.2,-1.4),(0.6,0.2),(-0.2,0.2),(0.0,-0.2),(0.2,0.2),(-0.2,-0.6)])
+                :(plot(0.1:0.2:0.9, 0.7rand(5)+0.15,
+                       l=(3,:dash,:lightblue), 
+                       m=(Shape(verts),30,RGBA(0,0,0,0.2)),
+                       bg=:pink, fg=:darkblue,
+                       xlim = (0,1), ylim=(0,1), leg=false))
+              ])
  
 ]


 function createStringOfMarkDownCodeValues(arr, prefix = "")
-  string("`", prefix, join(arr, "`, `$prefix"), "`")
+  string("`", prefix, join(sort(map(string, arr)), "`, `$prefix"), "`")
 end
 createStringOfMarkDownSymbols(arr) = isempty(arr) ? "" : createStringOfMarkDownCodeValues(arr, ":")


 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
@@ -111,15 +192,9 @@ function generate_markdown(pkgname::Symbol)
  # open the markdown file
  md = open("$DOCDIR/$(pkgname)_examples.md", "w")

-  write(md, "# Examples for backend: $pkgname\n\n")
-  write(md, "- Supported arguments: $(createStringOfMarkDownCodeValues(supportedArgs(pkg)))\n")
-  write(md, "- Supported values for axis: $(createStringOfMarkDownSymbols(supportedAxes(pkg)))\n")
-  write(md, "- Supported values for linetype: $(createStringOfMarkDownSymbols(supportedTypes(pkg)))\n")
-  write(md, "- Supported values for linestyle: $(createStringOfMarkDownSymbols(supportedStyles(pkg)))\n")
-  write(md, "- Supported values for marker: $(createStringOfMarkDownSymbols(supportedMarkers(pkg)))\n")
-  write(md, "- Is `subplot`/`subplot!` supported? $(subplotSupported(pkg) ? "Yes" : "No")\n\n")
+  write(md, "## Examples for backend: $pkgname\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)
@@ -132,11 +207,17 @@ function generate_markdown(pkgname::Symbol)
      # run the code
      map(eval, example.exprs)

-      # save the png
-      imgname = "$(pkgname)_example_$i.png"
+      # # save the png
+      # imgname = "$(pkgname)_example_$i.png"

      # NOTE: uncomment this to overwrite the images as well
-      savepng("$IMGDIR/$pkgname/$imgname")
+      if i == 2
+        imgname = "$(pkgname)_example_$i.gif"
+        gif(anim, "$IMGDIR/$pkgname/$imgname", fps=15)
+      else
+        imgname = "$(pkgname)_example_$i.png"
+        png("$IMGDIR/$pkgname/$imgname")
+      end

      # write out the header, description, code block, and image link
      write(md, "### $(example.header)\n\n")
@@ -152,32 +233,42 @@ function generate_markdown(pkgname::Symbol)
    #
  end

+  write(md, "- Supported arguments: $(createStringOfMarkDownCodeValues(supportedArgs(pkg)))\n")
+  write(md, "- Supported values for axis: $(createStringOfMarkDownSymbols(supportedAxes(pkg)))\n")
+  write(md, "- Supported values for linetype: $(createStringOfMarkDownSymbols(supportedTypes(pkg)))\n")
+  write(md, "- Supported values for linestyle: $(createStringOfMarkDownSymbols(supportedStyles(pkg)))\n")
+  write(md, "- Supported values for marker: $(createStringOfMarkDownSymbols(supportedMarkers(pkg)))\n")
+  write(md, "- Is `subplot`/`subplot!` supported? $(subplotSupported(pkg) ? "Yes" : "No")\n\n")
+
+  write(md, "(Automatically generated: $(now()))")
  close(md)

 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 +291,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,21 +304,24 @@ end



-const _ltdesc = Dict(
-    :none => "No line",
-    :line => "Lines with sorted x-axis",
-    :path => "Lines",
-    :steppre => "Step plot (vertical then horizontal)",
-    :steppost => "Step plot (horizontal then vertical)",
-    :sticks => "Vertical lines",
-    :scatter => "Points, no lines",
-    :heatmap => "Colored regions by density",
-    :hexbin => "Similar to heatmap",
-    :hist => "Histogram (doesn't use x)",
-    :bar => "Bar plot (centered on x values)",
-    :hline => "Horizontal line (doesn't use x)",
-    :vline => "Vertical line (doesn't use x)",
-    :ohlc => "Open/High/Low/Close chart (expects y is AbstractVector{Plots.OHLC})",
+@compat const _ltdesc = Dict(
+    :none       => "No line",
+    :line       => "Lines with sorted x-axis",
+    :path       => "Lines",
+    :steppre    => "Step plot (vertical then horizontal)",
+    :steppost   => "Step plot (horizontal then vertical)",
+    :sticks     => "Vertical lines",
+    :scatter    => "Points, no lines",
+    :heatmap    => "Colored regions by density",
+    :hexbin     => "Similar to heatmap",
+    :hist       => "Histogram (doesn't use x)",
+    :bar        => "Bar plot (centered on x values)",
+    :hline      => "Horizontal line (doesn't use x)",
+    :vline      => "Vertical line (doesn't use x)",
+    :ohlc       => "Open/High/Low/Close chart (expects y is AbstractVector{Plots.OHLC})",
+    :contour    => "Contour lines (uses z)",
+    :path3d     => "3D path (uses z)",
+    :scatter3d  => "3D scatter plot (uses z)",
  )

 function buildReadme()
@@ -235,11 +329,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 +369,13 @@ function buildReadme()
  f = open(readme_fn, "w")
  write(f, readme)
  close(f)
+
+  gadfly()
+  Plots.dumpSupportGraphs()
 end

+default(size=(500,300))
+
 # run it!
 # note: generate separately so it's easy to comment out
 # @osx_only generate_markdown(:unicodeplots)
@@ -1,227 +0,0 @@
-# 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 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`
- Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`, `:star2`, `:hexagon`, `:octagon`
- Is `subplot`/`subplot!` supported? Yes
-
-### Initialize
-
-```julia
-using Plots
-gadfly!()
-```
-
-### Lines
-
-A simple line plot of the 3 columns.
-
-```julia
-plot(rand(50,5),w=3)
-```
-
-![](../img/gadfly/gadfly_example_1.png)
-
-### Functions
-
-Plot multiple functions.  You can also put the function first.
-
-```julia
-plot(0:0.01:4π,[sin,cos])
-```
-
-![](../img/gadfly/gadfly_example_2.png)
-
-### 
-
-You can also call it with plot(f, xmin, xmax).
-
-```julia
-plot([sin,cos],0,4π)
-```
-
-![](../img/gadfly/gadfly_example_3.png)
-
-### 
-
-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
-
-```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)
-```
-
-![](../img/gadfly/gadfly_example_4.png)
-
-### Global
-
-Change the guides/background without a separate call.
-
-```julia
-plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RGB(0.2,0.2,0.2))
-```
-
-![](../img/gadfly/gadfly_example_5.png)
-
-### Two-axis
-
-Use the `axis` or `axiss` arguments.
-
-Note: Currently only supported with Qwt and PyPlot
-
-```julia
-plot(Vector[randn(100),randn(100) * 100]; axis=[:l,:r],ylabel="LEFT",yrightlabel="RIGHT")
-```
-
-![](../img/gadfly/gadfly_example_6.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_7.png)
-
-### Build plot in pieces
-
-Start with a base plot...
-
-```julia
-plot(rand(100) / 3; reg=true,fillto=0)
-```
-
-![](../img/gadfly/gadfly_example_8.png)
-
-### 
-
-and add to it later.
-
-```julia
-scatter!(rand(100); markersize=6,c=:blue)
-```
-
-![](../img/gadfly/gadfly_example_9.png)
-
-### Heatmaps
-
-
-
-```julia
-heatmap(randn(10000),randn(10000); nbins=100)
-```
-
-![](../img/gadfly/gadfly_example_10.png)
-
-### Line types
-
-
-
-```julia
-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))
-```
-
-![](../img/gadfly/gadfly_example_11.png)
-
-### Line styles
-
-
-
-```julia
-styles = setdiff(supportedStyles(),[:auto])
-plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5)
-```
-
-![](../img/gadfly/gadfly_example_12.png)
-
-### Marker types
-
-
-
-```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)
-```
-
-![](../img/gadfly/gadfly_example_13.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_14.png)
-
-### Histogram
-
-
-
-```julia
-histogram(randn(1000); nbins=50)
-```
-
-![](../img/gadfly/gadfly_example_15.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,:scatter,:step,:bar],nbins=10,legend=false)
-```
-
-![](../img/gadfly/gadfly_example_16.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_17.png)
-
-### 
-
-
-
-```julia
-subplot!(randn(100,3))
-```
-
-![](../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`.
-
-```julia
-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 = 1:n]
-ohlc(y; markersize=8)
-```
-
-![](../img/gadfly/gadfly_example_19.png)
-
@@ -1,227 +0,0 @@
-# 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 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`
- Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`, `:star2`, `:hexagon`, `:octagon`
- Is `subplot`/`subplot!` supported? Yes
-
-### Initialize
-
-```julia
-using Plots
-immerse!()
-```
-
-### Lines
-
-A simple line plot of the 3 columns.
-
-```julia
-plot(rand(50,5),w=3)
-```
-
-![](../img/immerse/immerse_example_1.png)
-
-### Functions
-
-Plot multiple functions.  You can also put the function first.
-
-```julia
-plot(0:0.01:4π,[sin,cos])
-```
-
-![](../img/immerse/immerse_example_2.png)
-
-### 
-
-You can also call it with plot(f, xmin, xmax).
-
-```julia
-plot([sin,cos],0,4π)
-```
-
-![](../img/immerse/immerse_example_3.png)
-
-### 
-
-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
-
-```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)
-```
-
-![](../img/immerse/immerse_example_4.png)
-
-### Global
-
-Change the guides/background without a separate call.
-
-```julia
-plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RGB(0.2,0.2,0.2))
-```
-
-![](../img/immerse/immerse_example_5.png)
-
-### Two-axis
-
-Use the `axis` or `axiss` arguments.
-
-Note: Currently only supported with Qwt and PyPlot
-
-```julia
-plot(Vector[randn(100),randn(100) * 100]; axis=[:l,:r],ylabel="LEFT",yrightlabel="RIGHT")
-```
-
-![](../img/immerse/immerse_example_6.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/immerse/immerse_example_7.png)
-
-### Build plot in pieces
-
-Start with a base plot...
-
-```julia
-plot(rand(100) / 3; reg=true,fillto=0)
-```
-
-![](../img/immerse/immerse_example_8.png)
-
-### 
-
-and add to it later.
-
-```julia
-scatter!(rand(100); markersize=6,c=:blue)
-```
-
-![](../img/immerse/immerse_example_9.png)
-
-### Heatmaps
-
-
-
-```julia
-heatmap(randn(10000),randn(10000); nbins=100)
-```
-
-![](../img/immerse/immerse_example_10.png)
-
-### Line types
-
-
-
-```julia
-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))
-```
-
-![](../img/immerse/immerse_example_11.png)
-
-### Line styles
-
-
-
-```julia
-styles = setdiff(supportedStyles(),[:auto])
-plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5)
-```
-
-![](../img/immerse/immerse_example_12.png)
-
-### Marker types
-
-
-
-```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)
-```
-
-![](../img/immerse/immerse_example_13.png)
-
-### Bar
-
-x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)
-
-```julia
-bar(randn(1000))
-```
-
-![](../img/immerse/immerse_example_14.png)
-
-### Histogram
-
-
-
-```julia
-histogram(randn(1000); nbins=50)
-```
-
-![](../img/immerse/immerse_example_15.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,:scatter,:step,:bar],nbins=10,legend=false)
-```
-
-![](../img/immerse/immerse_example_16.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/immerse/immerse_example_17.png)
-
-### 
-
-
-
-```julia
-subplot!(randn(100,3))
-```
-
-![](../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`.
-
-```julia
-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 = 1:n]
-ohlc(y; markersize=8)
-```
-
-![](../img/immerse/immerse_example_19.png)
-
@@ -1,176 +0,0 @@
-# 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 values for axis: `:auto`, `:left`, `:right`
- Supported values for linetype: `:none`, `:line`, `:path`, `:step`, `:stepinverted`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`
- 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
-
-### Initialize
-
-```julia
-using Plots
-pyplot!()
-```
-
-### Lines
-
-A simple line plot of the 3 columns.
-
-```julia
-plot(rand(50,5),w=3)
-```
-
-![](../img/pyplot/pyplot_example_1.png)
-
-### Functions
-
-Plot multiple functions.  You can also put the function first.
-
-```julia
-plot(0:0.01:4π,[sin,cos])
-```
-
-![](../img/pyplot/pyplot_example_2.png)
-
-### 
-
-You can also call it with plot(f, xmin, xmax).
-
-```julia
-plot([sin,cos],0,4π)
-```
-
-![](../img/pyplot/pyplot_example_3.png)
-
-### 
-
-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
-
-```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)
-```
-
-![](../img/pyplot/pyplot_example_4.png)
-
-### Global
-
-Change the guides/background without a separate call.
-
-```julia
-plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RGB(0.2,0.2,0.2))
-```
-
-![](../img/pyplot/pyplot_example_5.png)
-
-### Two-axis
-
-Use the `axis` or `axiss` arguments.
-
-Note: Currently only supported with Qwt and PyPlot
-
-```julia
-plot(Vector[randn(100),randn(100) * 100]; axis=[:l,:r],ylabel="LEFT",yrightlabel="RIGHT")
-```
-
-![](../img/pyplot/pyplot_example_6.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/pyplot/pyplot_example_7.png)
-
-### Build plot in pieces
-
-Start with a base plot...
-
-```julia
-plot(rand(100) / 3; reg=true,fillto=0)
-```
-
-![](../img/pyplot/pyplot_example_8.png)
-
-### 
-
-and add to it later.
-
-```julia
-scatter!(rand(100); markersize=6,c=:blue)
-```
-
-![](../img/pyplot/pyplot_example_9.png)
-
-### Heatmaps
-
-
-
-```julia
-heatmap(randn(10000),randn(10000); nbins=100)
-```
-
-![](../img/pyplot/pyplot_example_10.png)
-
-### Line types
-
-
-
-```julia
-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))
-```
-
-![](../img/pyplot/pyplot_example_11.png)
-
-### Line styles
-
-
-
-```julia
-styles = setdiff(supportedStyles(),[:auto])
-plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5)
-```
-
-![](../img/pyplot/pyplot_example_12.png)
-
-### Marker types
-
-
-
-```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)
-```
-
-![](../img/pyplot/pyplot_example_13.png)
-
-### Bar
-
-x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)
-
-```julia
-bar(randn(1000))
-```
-
-![](../img/pyplot/pyplot_example_14.png)
-
-### Histogram
-
-
-
-```julia
-histogram(randn(1000); nbins=50)
-```
-
-![](../img/pyplot/pyplot_example_15.png)
-
@@ -1,211 +0,0 @@
-# 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 values for axis: `:auto`, `:left`, `:right`
- Supported values for linetype: `:none`, `:line`, `:path`, `:steppre`, `:steppost`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`
- 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
-
-### Initialize
-
-```julia
-using Plots
-qwt!()
-```
-
-### Lines
-
-A simple line plot of the 3 columns.
-
-```julia
-plot(rand(50,5),w=3)
-```
-
-![](../img/qwt/qwt_example_1.png)
-
-### Functions
-
-Plot multiple functions.  You can also put the function first.
-
-```julia
-plot(0:0.01:4π,[sin,cos])
-```
-
-![](../img/qwt/qwt_example_2.png)
-
-### 
-
-You can also call it with plot(f, xmin, xmax).
-
-```julia
-plot([sin,cos],0,4π)
-```
-
-![](../img/qwt/qwt_example_3.png)
-
-### 
-
-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
-
-```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)
-```
-
-![](../img/qwt/qwt_example_4.png)
-
-### Global
-
-Change the guides/background without a separate call.
-
-```julia
-plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RGB(0.2,0.2,0.2))
-```
-
-![](../img/qwt/qwt_example_5.png)
-
-### Two-axis
-
-Use the `axis` or `axiss` arguments.
-
-Note: Currently only supported with Qwt and PyPlot
-
-```julia
-plot(Vector[randn(100),randn(100) * 100]; axis=[:l,:r],ylabel="LEFT",yrightlabel="RIGHT")
-```
-
-![](../img/qwt/qwt_example_6.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/qwt/qwt_example_7.png)
-
-### Build plot in pieces
-
-Start with a base plot...
-
-```julia
-plot(rand(100) / 3; reg=true,fillto=0)
-```
-
-![](../img/qwt/qwt_example_8.png)
-
-### 
-
-and add to it later.
-
-```julia
-scatter!(rand(100); markersize=6,c=:blue)
-```
-
-![](../img/qwt/qwt_example_9.png)
-
-### Heatmaps
-
-
-
-```julia
-heatmap(randn(10000),randn(10000); nbins=100)
-```
-
-![](../img/qwt/qwt_example_10.png)
-
-### Line types
-
-
-
-```julia
-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))
-```
-
-![](../img/qwt/qwt_example_11.png)
-
-### Line styles
-
-
-
-```julia
-styles = setdiff(supportedStyles(),[:auto])
-plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5)
-```
-
-![](../img/qwt/qwt_example_12.png)
-
-### Marker types
-
-
-
-```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)
-```
-
-![](../img/qwt/qwt_example_13.png)
-
-### Bar
-
-x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)
-
-```julia
-bar(randn(1000))
-```
-
-![](../img/qwt/qwt_example_14.png)
-
-### Histogram
-
-
-
-```julia
-histogram(randn(1000); nbins=50)
-```
-
-![](../img/qwt/qwt_example_15.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,:scatter,:step,:bar],nbins=10,legend=false)
-```
-
-![](../img/qwt/qwt_example_16.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/qwt/qwt_example_17.png)
-
-### 
-
-
-
-```julia
-subplot!(randn(100,3))
-```
-
-![](../img/qwt/qwt_example_18.png)
-
@@ -1,26 +1,35 @@
 # 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)
+<!-- [![Coverage Status](https://coveralls.io/repos/tbreloff/Plots.jl/badge.svg?branch=master)](https://coveralls.io/r/tbreloff/Plots.jl?branch=master) -->
+<!-- [![codecov.io](http://codecov.io/github/tbreloff/Plots.jl/coverage.svg?branch=master)](http://codecov.io/github/tbreloff/Plots.jl?branch=master) -->

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

-Plots is a plotting interface and wrapper for several plotting packages.  My goals with the package are:
+Plots is a plotting API and toolset.  My goals with the package are:

- Simple.  The interface should be intuitive enough that someone coming from Matlab, Python, etc can immediately start generating complex plots without reading volumes of documentation.
- Automatic (if you want).  There should be smart defaults for the most common functionality, and simple, high-level ways to override complex functionality.
- Flexible.  You should be able to produce your favorite plot in your favorite package, but quicker and simpler.
- Consistent.  Don't commit to one graphics package.  One command will switch your backend, and the exact same plotting commands will work with a very different underlying backend.
+- **Intuitive**.  Start generating complex plots without reading volumes of documentation.  Commands should "just work".
+- **Concise**.  Less code means fewer mistakes and more efficient development/analysis.
+- **Flexible**.  Produce your favorite plots from your favorite package, but quicker and simpler.
+- **Consistent**.  Don't commit to one graphics package.  Use the same code and access the strengths of all backends.
+- **Lightweight**.  Very few dependencies, since backends are loaded and initialized dynamically.
+
+Use the preprocessing pipeline in Plots to fully describe your visualization before it calls the backend code.  This maintains modularity and allows for efficient separation of front end code, algorithms, and backend graphics.  New graphical backends can be added with minimal effort.
+
+Check out the [summary graphs](img/supported/supported.md) for the features that each backend supports.

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

 ## Examples for each implemented backend:

- [Qwt.jl](docs/qwt_examples.md)
- [Gadfly.jl](docs/gadfly_examples.md)
- [UnicodePlots.jl](docs/unicodeplots_examples.md)
- [PyPlot.jl](docs/pyplot_examples.md)
- [Immerse.jl](docs/immerse_examples.md)
- [Winston.jl](docs/winston_examples.md)
+- [Gadfly.jl/Immerse.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/gadfly_examples.md)
+- [PyPlot.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/pyplot_examples.md)
+- [UnicodePlots.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/unicodeplots_examples.md)
+- [Qwt.jl](https://github.com/tbreloff/ExamplePlots.jl/tree/master/docs/qwt_examples.md)
+
+Also check out the many [IJulia notebooks](http://nbviewer.ipython.org/github/tbreloff/ExamplePlots.jl/tree/master/examples/) with many examples.

 ## Installation

@@ -28,65 +37,72 @@ 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):
+then get any plotting packages you need (obviously, you should get at least one backend).

 ```julia
 Pkg.add("Gadfly")
 Pkg.add("Immerse")
+Pkg.add("PyPlot")
 Pkg.add("UnicodePlots")
-Pkg.add("PyPlot")                                    # requires python and matplotlib
-Pkg.clone("https://github.com/tbreloff/Qwt.jl.git")  # requires pyqt and pyqwt
-Pkg.add("Winston")
+Pkg.add("Qwt")
+Pkg.add("Bokeh")
 ```

 ## 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.

 ```julia
 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), smooth=0.99, bg=:black)

-# 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.
-
 ## 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 +114,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 +134,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,32 +194,52 @@ 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 arguments:

 [[KEYWORD_ARGS_TABLE]]

-Plot types:
+### Plot types:

 [[LINETYPES_TABLE]]

-Line styles:
+### Line styles:

 [[LINESTYLES_TABLE]]

-Markers:
+### Markers:

 [[MARKERS_TABLE]]

+__Tip__: With supported backends, you can pass a `Plots.Shape` object for the `marker`/`markershape` arguments.  `Shape` takes a vector of 2-tuples in the constructor, defining the points of the polygon's shape in a unit-scaled coordinate space.  To make a square, for example, you could do `Shape([(1,1),(1,-1),(-1,-1),(-1,1)])`

-__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, :star]   # (Vector) ALL lines are passed the vector [:rect, :star1]
                  width = 5)                     # all lines have a width of 5
 ```

@@ -202,16 +247,28 @@ __Tip__: Not all features are supported for each backend, but you can see what's

 __Tip__: Call `gui()` to display the plot in a window.  Interactivity depends on backend.  Plotting at the REPL (without semicolon) implicitly calls `gui()`.

+### Animations
+
+Animations are created in 3 steps (see example #2):
+- Initialize an `Animation` object.
+- Save each frame of the animation with `frame(anim)`.
+- Convert the frames to an animated gif with `gif(anim, filename, fps=15)`
+
+
 ## TODO features:

 - [x] Plot vectors/matrices/functions
 - [x] Plot DataFrames
- [ ] Scales
- [ ] Categorical Inputs (strings, etc... for hist, bar? or can split one series into multiple?)
- [ ] Custom markers
- [ ] Special plots (boxplot, ohlc?)
- [x] Subplots
 - [x] Histograms
+- [x] Grouping
+- [x] Annotations
+- [x] Scales
+- [x] Categorical Inputs (strings, etc... for hist, bar? or can split one series into multiple?)
+- [x] Custom markers
+- [x] Animations
+- [x] Subplots
+- [ ] Contours
+- [ ] Boxplots
 - [ ] 3D plotting
 - [ ] Scenes/Drawing
 - [ ] Graphs
@@ -224,7 +281,7 @@ __Tip__: Call `gui()` to display the plot in a window.  Interactivity depends on
 - [x] PyPlot.jl
 - [x] UnicodePlots.jl
 - [x] Qwt.jl
- [x] Winston.jl
+- [x] Winston.jl (deprecated)
 - [ ] GLPlot.jl
 - [ ] Bokeh.jl
 - [ ] Vega.jl
@@ -1,211 +0,0 @@
-# Examples for backend: unicodeplots
-
- Supported arguments: `args`, `axis`, `color`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markercolor`, `markersize`, `nbins`, `size`, `title`, `width`, `windowtitle`, `xlabel`, `ylabel`, `yrightlabel`
- Supported values for axis: `:auto`, `:left`
- Supported values for linetype: `:none`, `:line`, `:step`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`
- Supported values for linestyle: `:auto`, `:solid`
- Supported values for marker: `:none`, `:auto`, `:ellipse`
- Is `subplot`/`subplot!` supported? Yes
-
-### Initialize
-
-```julia
-using Plots
-unicodeplots!()
-```
-
-### Lines
-
-A simple line plot of the 3 columns.
-
-```julia
-plot(rand(100,3))
-```
-
-![](../img/unicodeplots/unicodeplots_example_1.png)
-
-### Functions
-
-Plot multiple functions.  You can also put the function first.
-
-```julia
-plot(0:0.01:4π,[sin,cos])
-```
-
-![](../img/unicodeplots/unicodeplots_example_2.png)
-
-### 
-
-You can also call it with plot(f, xmin, xmax).
-
-```julia
-plot([sin,cos],0,4π)
-```
-
-![](../img/unicodeplots/unicodeplots_example_3.png)
-
-### 
-
-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
-
-```julia
-plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33:
-            sin(2x)
-        end),0,2π)
-```
-
-![](../img/unicodeplots/unicodeplots_example_4.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/unicodeplots/unicodeplots_example_5.png)
-
-### Two-axis
-
-Use the `axis` or `axiss` arguments.
-
-Note: Currently only supported with Qwt and PyPlot
-
-```julia
-plot(Vector[randn(100),randn(100) * 100]; axiss=[:left,:right],ylabel="LEFT",yrightlabel="RIGHT")
-```
-
-![](../img/unicodeplots/unicodeplots_example_6.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/unicodeplots/unicodeplots_example_7.png)
-
-### Build plot in pieces
-
-Start with a base plot...
-
-```julia
-plot(rand(100) / 3; reg=true,fillto=0)
-```
-
-![](../img/unicodeplots/unicodeplots_example_8.png)
-
-### 
-
-and add to it later.
-
-```julia
-scatter!(rand(100); markersize=6,color=:blue)
-```
-
-![](../img/unicodeplots/unicodeplots_example_9.png)
-
-### Heatmaps
-
-
-
-```julia
-heatmap(randn(10000),randn(10000); nbins=100)
-```
-
-![](../img/unicodeplots/unicodeplots_example_10.png)
-
-### Suported line types
-
-All options: (:line, :orderedline, :step, :stepinverted, :sticks, :scatter, :none, :heatmap, :hexbin, :hist, :bar)
-
-```julia
-types = intersect(supportedTypes(),[:line,:step,:stepinverted,:sticks,:scatter])
-n = length(types)
-x = Vector[sort(rand(20)) for i = 1:n]
-y = rand(20,n)
-plot(x,y; linetypes=types,labels=map(string,types))
-```
-
-![](../img/unicodeplots/unicodeplots_example_11.png)
-
-### Supported line styles
-
-All options: (:solid, :dash, :dot, :dashdot, :dashdotdot)
-
-```julia
-styles = setdiff(supportedStyles(),[:auto])
-plot(rand(20,length(styles)); linestyle=:auto,labels=map(string,styles))
-```
-
-![](../img/unicodeplots/unicodeplots_example_12.png)
-
-### Supported marker types
-
-All options: (:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)
-
-```julia
-markers = setdiff(supportedMarkers(),[:none,:auto])
-plot([fill(i,10) for i = 1:length(markers)]; marker=:auto,labels=map(string,markers),markersize=10)
-```
-
-![](../img/unicodeplots/unicodeplots_example_13.png)
-
-### Bar
-
-x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)
-
-```julia
-bar(randn(1000))
-```
-
-![](../img/unicodeplots/unicodeplots_example_14.png)
-
-### Histogram
-
-note: fillto isn't supported on all backends
-
-```julia
-histogram(randn(1000); nbins=50,fillto=20)
-```
-
-![](../img/unicodeplots/unicodeplots_example_15.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,:scatter,:step,:bar],nbins=10,legend=false)
-```
-
-![](../img/unicodeplots/unicodeplots_example_16.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/unicodeplots/unicodeplots_example_17.png)
-
-### 
-
-
-
-```julia
-subplot!(randn(100,3))
-```
-
-![](../img/unicodeplots/unicodeplots_example_18.png)
-
@@ -1,166 +0,0 @@
-# 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 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`
- Is `subplot`/`subplot!` supported? No
-
-### Initialize
-
-```julia
-using Plots
-winston!()
-```
-
-### Lines
-
-A simple line plot of the 3 columns.
-
-```julia
-plot(rand(50,5),w=3)
-```
-
-![](../img/winston/winston_example_1.png)
-
-### Functions
-
-Plot multiple functions.  You can also put the function first.
-
-```julia
-plot(0:0.01:4π,[sin,cos])
-```
-
-![](../img/winston/winston_example_2.png)
-
-### 
-
-You can also call it with plot(f, xmin, xmax).
-
-```julia
-plot([sin,cos],0,4π)
-```
-
-![](../img/winston/winston_example_3.png)
-
-### 
-
-Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, umax).
-
-```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)
-```
-
-![](../img/winston/winston_example_4.png)
-
-### Global
-
-Change the guides/background without a separate call.
-
-```julia
-plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RGB(0.2,0.2,0.2))
-```
-
-![](../img/winston/winston_example_5.png)
-
-### Two-axis
-
-Use the `axis` or `axiss` arguments.
-
-Note: Currently only supported with Qwt and PyPlot
-
-```julia
-plot(Vector[randn(100),randn(100) * 100]; axis=[:l,:r],ylabel="LEFT",yrightlabel="RIGHT")
-```
-
-![](../img/winston/winston_example_6.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/winston/winston_example_7.png)
-
-### Build plot in pieces
-
-Start with a base plot...
-
-```julia
-plot(rand(100) / 3; reg=true,fillto=0)
-```
-
-![](../img/winston/winston_example_8.png)
-
-### 
-
-and add to it later.
-
-```julia
-scatter!(rand(100); markersize=6,c=:blue)
-```
-
-![](../img/winston/winston_example_9.png)
-
-### Line types
-
-
-
-```julia
-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))
-```
-
-![](../img/winston/winston_example_11.png)
-
-### Line styles
-
-
-
-```julia
-styles = setdiff(supportedStyles(),[:auto])
-plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5)
-```
-
-![](../img/winston/winston_example_12.png)
-
-### Marker types
-
-
-
-```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)
-```
-
-![](../img/winston/winston_example_13.png)
-
-### Bar
-
-x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)
-
-```julia
-bar(randn(1000))
-```
-
-![](../img/winston/winston_example_14.png)
-
-### Histogram
-
-
-
-```julia
-histogram(randn(1000); nbins=50)
-```
-
-![](../img/winston/winston_example_15.png)
-
@@ -0,0 +1,23 @@
+## Supported keyword arguments
+
+![args](Plots.supportGraphArgs.png)
+
+## Supported plot types
+
+![types](Plots.supportGraphTypes.png)
+
+## Supported markers
+
+![markers](Plots.supportGraphMarkers.png)
+
+## Supported line styles
+
+![styles](Plots.supportGraphStyles.png)
+
+## Supported scales
+
+![scales](Plots.supportGraphScales.png)
+
+## Supported axes
+
+![axes](Plots.supportGraphAxes.png)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Breloff	3bd9e70fa9	moved PyPlot to first priority	2015-11-16 16:06:48 -05:00
Thomas Breloff	54bd2c620e	gadfly ref imgs	2015-11-16 15:50:02 -05:00
Thomas Breloff	121640b1b3	fixed gadfly hline/vline constructors	2015-11-16 15:37:55 -05:00
Thomas Breloff	55e388513c	fixes for gadfly and unicodeplots	2015-11-12 17:30:55 -05:00
Thomas Breloff	b153dcbd63	reference images; gadfly markersize fix	2015-11-11 21:47:53 -05:00
Thomas Breloff	242cbe5ecb	z/zcolor	2015-11-11 17:46:44 -05:00
Thomas Breloff	f1cca13796	fix pyplot alpha and added stroke support	2015-11-11 16:27:21 -05:00
Thomas Breloff	918ba72107	readme	2015-11-10 16:41:26 -05:00
Thomas Breloff	e596f27666	fixed numeric array without numeric type; updated readme; closes #64	2015-11-10 16:38:47 -05:00
Thomas Breloff	a40d0000c5	fixed pyplot	2015-11-09 09:19:00 -05:00
Thomas Breloff	fb82da74a1	gadfly layer order; fixes #63	2015-11-07 21:58:04 -05:00
Thomas Breloff	b0991a0624	working on args	2015-11-06 15:58:15 -05:00
Thomas Breloff	6236acea02	working on markerstroke, name changes, and arg improvements	2015-11-06 15:49:27 -05:00
Thomas Breloff	391c7e8570	name changes; require to 0.4	2015-11-06 11:46:24 -05:00
Thomas Breloff	58041cc64e	working on big renaming	2015-11-05 16:39:04 -05:00
Thomas Breloff	8c7d3a6e92	working on stroke/fill	2015-11-05 11:52:22 -05:00
Thomas Breloff	ae1982369c	working on bokeh	2015-11-03 15:48:04 -05:00
Thomas Breloff	5f85ac01f7	working on bokeh backend	2015-11-03 13:45:23 -05:00
Thomas Breloff	cca263fb2b	with method fix	2015-10-30 12:47:48 -04:00
Thomas Breloff	809ed02b85	gadfly/immerse downgrade fix	2015-10-30 10:03:10 -04:00
Thomas Breloff	9eab1083ab	working on with	2015-10-29 17:18:14 -04:00
Thomas Breloff	60523bef80	working on 3d plotting	2015-10-29 15:44:07 -04:00
Thomas Breloff	46b959ff3c	color reorg	2015-10-29 14:31:36 -04:00
Thomas Breloff	42c3827ded	0.3 fix	2015-10-29 13:26:40 -04:00
Thomas Breloff	26e4b4efda	back to 0.3; working on fixes	2015-10-29 12:57:07 -04:00
Thomas Breloff	2169ab3bb8	ref imgs	2015-10-29 12:50:25 -04:00
Thomas Breloff	85dad8db88	removed gitattributes	2015-10-29 11:25:08 -04:00
Thomas Breloff	8120c34064	added smooth and opacity args for pyplot; fixes in regressionXY, replaceAliases	2015-10-28 12:14:58 -04:00
Thomas Breloff	1f1d1f70a1	fix for group arg	2015-10-28 01:37:52 -04:00
Thomas Breloff	373d868a17	gadfly color fixes; pyplot grid support	2015-10-28 01:12:20 -04:00
Thomas Breloff	834ba9bc61	fix imgcmp	2015-10-27 23:37:58 -04:00
Thomas Breloff	3ffec5aed9	fixed colors from subplot changes; fix imgcmp; new refimgs	2015-10-27 23:03:30 -04:00
Thomas Breloff	ef20c1d684	subplot initargs fix	2015-10-27 22:08:47 -04:00
Thomas Breloff	697a59568c	fixes	2015-10-27 20:08:33 -04:00
Thomas Breloff	e58fb935b0	several fixes, plus qwt pos/size	2015-10-27 19:25:27 -04:00
Thomas Breloff	044d23f8a5	working on fixing problems with subplots and contours	2015-10-27 18:03:37 -04:00
Thomas Breloff	1604d867c3	cleared out examples markdown	2015-10-27 13:43:49 -04:00
Thomas Breloff	011db481c3	cleaned out examples and img directories	2015-10-27 13:42:29 -04:00
Thomas Breloff	c404cdc38a	qwt subplot pos/size	2015-10-27 13:38:16 -04:00
Thomas Breloff	20689af7dd	alpha kw for colors; pyplot fix, debugshow	2015-10-27 12:40:38 -04:00
Thomas Breloff	9ea0585d71	support for contours in gadfly/immerse/pyplot	2015-10-26 18:07:22 -04:00
Thomas Breloff	614c5f694b	readme	2015-10-26 15:58:26 -04:00
Thomas Breloff	fa36aae068	readme	2015-10-26 15:52:44 -04:00
Thomas Breloff	3e85232310	readme	2015-10-26 15:46:34 -04:00
Thomas Breloff	894928d7ca	fixes, examples, and readme; also deprecated winston	2015-10-26 14:03:06 -04:00
Thomas Breloff	afb1486f86	tests and readme	2015-10-26 13:18:22 -04:00
Thomas Breloff	2799bd18e1	moved refimg dirs	2015-10-26 12:44:16 -04:00
Thomas Breloff	43c2a885b9	travis and 0.3 fixes	2015-10-26 12:25:09 -04:00
Thomas Breloff	be7feb0eaa	travis and readme	2015-10-26 11:43:30 -04:00
Thomas Breloff	e3d653a8d9	tests	2015-10-26 11:38:33 -04:00
Thomas Breloff	b9f9d8160d	working on tests	2015-10-26 11:28:49 -04:00
Thomas Breloff	141b5c604d	pyplot test fixes; pyplot ref imgs; travis fix	2015-10-26 10:52:29 -04:00
Thomas Breloff	8a0fc00435	imgcmp and travis	2015-10-26 09:59:26 -04:00
Thomas Breloff	a3a8cb9368	nnet	2015-10-26 01:40:12 -04:00
Thomas Breloff	96c66b33a2	nnet	2015-10-26 00:11:43 -04:00
Thomas Breloff	62fad3724f	pyplot push and nnet	2015-10-25 17:08:42 -04:00
Thomas Breloff	ca2b6c87ef	enabled lfs	2015-10-25 13:53:09 -04:00
Thomas Breloff	20348645a3	pyplot fixes	2015-10-25 00:44:18 -04:00
Thomas Breloff	a9b39fad64	pyplot gui fixes and background/foreground fixes with writemime	2015-10-25 00:34:20 -04:00
Thomas Breloff	1c556ade57	more subplot fixes	2015-10-24 22:29:27 -04:00
Thomas Breloff	e08957f5ec	cleanup and fixes for subplot logic	2015-10-24 20:59:42 -04:00
Thomas Breloff	e76ded69e6	some fixes for subplots and imgcmp	2015-10-24 16:11:55 -04:00
Thomas Breloff	7e740861d8	palette fixes and working on imgcmp	2015-10-24 15:09:13 -04:00
Thomas Breloff	f28e65a26c	meetup	2015-10-24 00:00:26 -04:00
Thomas Breloff	a29f0c820b	nnet	2015-10-23 17:05:35 -04:00
Thomas Breloff	b2bc30cfed	qwt fix	2015-10-23 15:58:42 -04:00
Thomas Breloff	6ce235bb68	immerse gui fix	2015-10-23 13:53:13 -04:00
Thomas Breloff	479ab989df	immerse subplot gui fix; pyplot colorbars; subplot creation fix	2015-10-23 13:26:34 -04:00
Thomas Breloff	8d490b9e52	meetup nnet	2015-10-22 16:53:39 -04:00
Thomas Breloff	949f11a8c9	meetup	2015-10-22 15:10:15 -04:00
Thomas Breloff	d4896e1978	improved color palette generation; removed some predefined gradients	2015-10-22 12:16:00 -04:00
Thomas Breloff	c4020080b3	nnet	2015-10-22 00:40:41 -04:00
Thomas Breloff	5a68003d16	fixed empty plots	2015-10-21 21:30:05 -04:00
Thomas Breloff	9fcc3cdc24	pre/post processing subplots	2015-10-21 13:52:58 -04:00
Thomas Breloff	ee80ce5ae6	subplots and colors	2015-10-21 12:27:13 -04:00
Thomas Breloff	456c4019c4	misc	2015-10-21 01:34:50 -04:00
Thomas Breloff	f65627a505	travis; wine	2015-10-21 00:44:48 -04:00
Thomas Breloff	38d1fc15fe	travis; wine	2015-10-21 00:29:53 -04:00
Thomas Breloff	5eead5b0fa	travis; wine	2015-10-21 00:21:55 -04:00
Thomas Breloff	4223bd57f1	travis; wine	2015-10-21 00:15:11 -04:00
Thomas Breloff	5bfa653858	travis; wine	2015-10-20 23:57:18 -04:00
Thomas Breloff	5342764caf	travis	2015-10-20 23:23:38 -04:00
Thomas Breloff	04a44a82c9	tests	2015-10-20 23:07:47 -04:00
Thomas Breloff	c28820f39c	colors and tests	2015-10-20 17:11:21 -04:00
Thomas Breloff	546955a78b	working on colors and tests	2015-10-20 14:49:01 -04:00
Thomas Breloff	d1e9cc5800	palettes notebook	2015-10-20 12:55:36 -04:00
Thomas Breloff	4ef2fb9933	palettes notebook	2015-10-20 12:23:45 -04:00
Thomas Breloff	d7bc8adf21	palettes notebook	2015-10-20 12:15:13 -04:00
Thomas Breloff	b5f44efc69	palettes notebook	2015-10-20 11:56:06 -04:00
Thomas Breloff	5e8abea222	palettes notebook	2015-10-20 11:53:02 -04:00
Thomas Breloff	f291454ccb	palettes notebook	2015-10-20 10:40:49 -04:00
Thomas Breloff	bac6637b46	messing with colors	2015-10-20 08:24:58 -04:00
Thomas Breloff	866ac9fb72	working on test framework	2015-10-19 17:53:17 -04:00
Thomas Breloff	8208f6947f	pdf/ps/svg outputs	2015-10-19 14:11:22 -04:00
Thomas Breloff	dcd50a7c62	started work on imgcomp tests	2015-10-19 00:31:43 -04:00
Thomas Breloff	781aa86568	started work on imgcomp tests	2015-10-19 00:24:04 -04:00
Thomas Breloff	3facc116c8	gadfly examples	2015-10-18 00:56:38 -04:00
Thomas Breloff	9178c3b087	winston examples	2015-10-18 00:50:30 -04:00
Thomas Breloff	5c6c85a22f	qwt fixes and examples	2015-10-18 00:41:04 -04:00
Thomas Breloff	b8adb4d229	unicodeplots examples	2015-10-18 00:08:42 -04:00
Thomas Breloff	093118da8b	unicodeplots examples	2015-10-17 23:52:07 -04:00
Thomas Breloff	0aa760119f	examples	2015-10-17 23:43:52 -04:00
Thomas Breloff	60b3a1583d	examples	2015-10-17 23:31:50 -04:00
Thomas Breloff	593c47b938	examples	2015-10-17 23:29:03 -04:00
Thomas Breloff	0f6bb7ce6f	examples	2015-10-17 23:10:45 -04:00
Thomas Breloff	048c2541e6	readme	2015-10-17 23:07:35 -04:00
Thomas Breloff	f3e7d1a43b	examples	2015-10-17 22:43:36 -04:00
Thomas Breloff	5df24d6683	custom markers example; pyplot markers	2015-10-17 22:16:06 -04:00
Thomas Breloff	73779898b7	pyplot fonts and fixes; examples	2015-10-17 16:49:45 -04:00
Thomas Breloff	7200b6adc6	pyplot set/get data; examples	2015-10-17 16:17:18 -04:00
Thomas Breloff	d48f15ab4d	examples	2015-10-17 15:22:00 -04:00
Thomas Breloff	2747671935	readme	2015-10-17 14:07:53 -04:00
Thomas Breloff	d86f24dd35	pyplot fixes	2015-10-17 01:26:58 -04:00
Thomas Breloff	60edccade5	readme	2015-10-16 17:46:20 -04:00
Thomas Breloff	540460cae9	readme	2015-10-16 17:37:30 -04:00
Thomas Breloff	df44d86f46	examples and readme	2015-10-16 17:25:54 -04:00
Thomas Breloff	c287b446c9	fixes and examples	2015-10-16 17:21:28 -04:00
Thomas Breloff	1db36c05a8	animations	2015-10-16 16:36:40 -04:00
Thomas Breloff	2c884ab5ab	animations	2015-10-16 12:03:40 -04:00
Thomas Breloff	cd0dfc956d	gadfly cleanup	2015-10-16 11:03:34 -04:00
Thomas Breloff	03392a5f03	gadfly cleanup	2015-10-16 10:58:44 -04:00
Thomas Breloff	a7da999bd7	Font and tick/guide/legend fonts	2015-10-16 10:52:36 -04:00
Thomas Breloff	47f21b1652	fixes; changed reg to smooth, added loess smoothing in gadfly	2015-10-16 00:47:46 -04:00
Thomas Breloff	7c91d10c79	several fixes after gadfly reorg	2015-10-16 00:21:37 -04:00
Thomas Breloff	fac2f5494b	gadfly overhaul	2015-10-15 23:11:17 -04:00
Thomas Breloff	bfcdb7e840	example	2015-10-15 17:30:44 -04:00
Thomas Breloff	21d55db3b4	slides	2015-10-15 17:19:57 -04:00
Thomas Breloff	18e49888fe	jpg	2015-10-15 16:51:48 -04:00
Thomas Breloff	7ba2f61361	0.3 fix	2015-10-15 16:50:57 -04:00
Thomas Breloff	407df158ef	PlotText/text for annotations; fixes	2015-10-15 14:46:29 -04:00
Thomas Breloff	eab46ba9c4	fixes	2015-10-15 01:34:06 -04:00
Thomas Breloff	39318e5e61	working on shapes	2015-10-14 20:53:44 -04:00
Thomas Breloff	ac1ce03fe5	working on shapes overhaul	2015-10-14 20:46:17 -04:00
Thomas Breloff	4fa697ec75	big shapes overhaul; gadfly ShapeGeometry; some reorg and cleanup... still working on it	2015-10-14 18:14:44 -04:00
Thomas Breloff	027961bffa	various fixes	2015-10-14 12:11:20 -04:00
Thomas Breloff	7dfcbabe0c	wine	2015-10-13 17:35:10 -04:00
Thomas Breloff	dfc7658426	misc	2015-10-13 16:51:19 -04:00
Thomas Breloff	04c6726b76	pyplot cleanup	2015-10-13 15:56:14 -04:00
Thomas Breloff	8fdbbe4c16	pyplot subplots	2015-10-13 15:30:25 -04:00
Thomas Breloff	09fceab75b	pyplot subplots	2015-10-13 15:02:27 -04:00
Thomas Breloff	8df4c27285	pyplot, corrplot, and nba	2015-10-13 01:16:11 -04:00
Thomas Breloff	e38820b74a	working on pyplot	2015-10-12 18:16:55 -04:00
Thomas Breloff	c052e731f8	fix links to keep separate lims per row/column	2015-10-12 16:42:34 -04:00
Thomas Breloff	3636860262	subplot linkfunc, fixes, cleanup	2015-10-12 14:31:27 -04:00
Thomas Breloff	ce7421bef4	immerse fix	2015-10-12 10:42:29 -04:00
Thomas Breloff	23b51c4c3e	working on pyplot subplots	2015-10-10 00:57:48 -04:00
Thomas Breloff	48d802fc40	qwt subplots	2015-10-10 00:03:23 -04:00
Thomas Breloff	51e8f3ff6e	working on subplots	2015-10-09 23:21:45 -04:00
Thomas Breloff	7917397bf3	working on corrplot and recipes	2015-10-09 17:08:17 -04:00
Thomas Breloff	e0c0052b63	working on corrplot and recipes	2015-10-09 17:08:06 -04:00
Thomas Breloff	15a4b50ce4	working on corrplot and recipes	2015-10-09 17:03:54 -04:00
Thomas Breloff	a51a8abf27	working on subplots and recipes	2015-10-09 16:00:24 -04:00
Thomas Breloff	45747e3635	working on recipes	2015-10-09 14:35:00 -04:00
Thomas Breloff	64b8e15918	working on subplots and recipes	2015-10-09 13:12:40 -04:00
Thomas Breloff	f4b716b255	working on linked subplots	2015-10-08 17:44:00 -04:00
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