fixes, examples, and readme; also deprecated winston

.travis.yml

@@ -18,4 +18,4 @@ script:
  - julia -e 'ENV["PYTHON"] = ""; Pkg.clone("PyPlot"); Pkg.build("PyPlot")'
  - julia -e 'Pkg.clone(pwd()); Pkg.build("Plots")'
  - julia -e 'Pkg.test("Plots"; coverage=true)'
- - julia -e 'cd(Pkg.dir("Plots")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'
+ # - julia -e 'cd(Pkg.dir("Plots")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'

README.md

@@ -4,7 +4,7 @@
 [![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)
+<!-- [![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)
 
@@ -28,7 +28,6 @@ Please add wishlist items, bugs, or any other comments/questions to the issues l
 - [PyPlot.jl](docs/pyplot_examples.md)
 - [UnicodePlots.jl](docs/unicodeplots_examples.md)
 - [Qwt.jl](docs/qwt_examples.md)
-- [Winston.jl](docs/winston_examples.md)
 
 Also check out the many [IJulia notebooks](http://nbviewer.ipython.org/github/tbreloff/Plots.jl/tree/master/examples/) with many examples.
 
@@ -54,7 +53,6 @@ Pkg.add("Immerse")
 Pkg.add("PyPlot")
 Pkg.add("UnicodePlots")
 Pkg.clone("https://github.com/tbreloff/Qwt.jl.git")
-Pkg.add("Winston")
 ```
 
 ## Use
@@ -384,7 +382,7 @@ Animations are created in 3 steps (see example #2):
 - [x] PyPlot.jl
 - [x] UnicodePlots.jl
 - [x] Qwt.jl
-- [x] Winston.jl
+- [x] Winston.jl (deprecated)
 - [ ] GLPlot.jl
 - [ ] Bokeh.jl
 - [ ] Vega.jl

docs/gadfly_examples.md

@@ -12,7 +12,7 @@ gadfly()
 A simple line plot of the columns.
 
 ```julia
-plot(fakedata(50,5),w=3)
+plot(Plots.fakedata(50,5),w=3)
 ```
 
 ![](../img/gadfly/gadfly_example_1.png)
@@ -28,8 +28,8 @@ Easily build animations.  (`convert` or `ffmpeg` must be available to generate t
 ```julia
 p = plot([sin,cos],zeros(0),leg=false)
 anim = Animation()
-for x = linspace(0,10π,200) # /Users/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 43:
+for x = linspace(0,10π,200) # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 35:
-    push!(p,x,Float64[sin(x),cos(x)]) # /Users/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 44:
+    push!(p,x,Float64[sin(x),cos(x)]) # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 36:
     frame(anim)
 end
 ```
@@ -41,7 +41,7 @@ end
 Plot function pair (x(u), y(u)).
 
 ```julia
-plot(sin,(x->begin  # /Users/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 50:
+plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 42:
             sin(2x)
         end),0,2π,line=4,leg=false,fill=(0,:orange))
 ```
@@ -201,7 +201,7 @@ subplot(randn(100,5),layout=[1,1,3],t=[:line :hist :scatter :step :bar],nbins=10
 Note here the automatic grid layout, as well as the order in which new series are added to the plots.
 
 ```julia
-subplot(fakedata(100,10),n=4,palette=[:grays :blues :heat :lightrainbow],bg=[:orange :pink :darkblue :black])
+subplot(Plots.fakedata(100,10),n=4,palette=[:grays :blues :heat :lightrainbow],bg=[:orange :pink :darkblue :black])
 ```
 
 ![](../img/gadfly/gadfly_example_17.png)
@@ -211,7 +211,7 @@ subplot(fakedata(100,10),n=4,palette=[:grays :blues :heat :lightrainbow],bg=[:or
 
 
 ```julia
-subplot!(fakedata(100,10))
+subplot!(Plots.fakedata(100,10))
 ```
 
 ![](../img/gadfly/gadfly_example_18.png)
@@ -246,4 +246,4 @@ plot(0.1:0.2:0.9,0.7 * rand(5) + 0.15,l=(3,:dash,:lightblue),m=(Shape(verts),30,
 - Supported values for marker: `:Plots.Shape`, `:auto`, `:cross`, `:diamond`, `:dtriangle`, `:ellipse`, `:heptagon`, `:hexagon`, `:none`, `:octagon`, `:pentagon`, `:rect`, `:star4`, `:star5`, `:star6`, `:star7`, `:star8`, `:utriangle`, `:xcross`
 - Is `subplot`/`subplot!` supported? Yes
 
-(Automatically generated: 2015-10-18T00:56:22)
+(Automatically generated: 2015-10-26T13:59:43)

docs/pyplot_examples.md

@@ -12,7 +12,7 @@ pyplot()
 A simple line plot of the columns.
 
 ```julia
-plot(fakedata(50,5),w=3)
+plot(Plots.fakedata(50,5),w=3)
 ```
 
 ![](../img/pyplot/pyplot_example_1.png)
@@ -28,8 +28,8 @@ Easily build animations.  (`convert` or `ffmpeg` must be available to generate t
 ```julia
 p = plot([sin,cos],zeros(0),leg=false)
 anim = Animation()
-for x = linspace(0,10π,200) # /Users/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 43:
+for x = linspace(0,10π,200) # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 35:
-    push!(p,x,Float64[sin(x),cos(x)]) # /Users/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 44:
+    push!(p,x,Float64[sin(x),cos(x)]) # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 36:
     frame(anim)
 end
 ```
@@ -41,7 +41,7 @@ end
 Plot function pair (x(u), y(u)).
 
 ```julia
-plot(sin,(x->begin  # /Users/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 50:
+plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 42:
             sin(2x)
         end),0,2π,line=4,leg=false,fill=(0,:orange))
 ```
@@ -201,7 +201,7 @@ subplot(randn(100,5),layout=[1,1,3],t=[:line :hist :scatter :step :bar],nbins=10
 Note here the automatic grid layout, as well as the order in which new series are added to the plots.
 
 ```julia
-subplot(fakedata(100,10),n=4,palette=[:grays :blues :heat :lightrainbow],bg=[:orange :pink :darkblue :black])
+subplot(Plots.fakedata(100,10),n=4,palette=[:grays :blues :heat :lightrainbow],bg=[:orange :pink :darkblue :black])
 ```
 
 ![](../img/pyplot/pyplot_example_17.png)
@@ -211,7 +211,7 @@ subplot(fakedata(100,10),n=4,palette=[:grays :blues :heat :lightrainbow],bg=[:or
 
 
 ```julia
-subplot!(fakedata(100,10))
+subplot!(Plots.fakedata(100,10))
 ```
 
 ![](../img/pyplot/pyplot_example_18.png)
@@ -246,4 +246,4 @@ plot(0.1:0.2:0.9,0.7 * rand(5) + 0.15,l=(3,:dash,:lightblue),m=(Shape(verts),30,
 - Supported values for marker: `:Plots.Shape`, `:auto`, `:cross`, `:diamond`, `:dtriangle`, `:ellipse`, `:heptagon`, `:hexagon`, `:none`, `:octagon`, `:pentagon`, `:rect`, `:star4`, `:star5`, `:star6`, `:star7`, `:star8`, `:utriangle`, `:xcross`
 - Is `subplot`/`subplot!` supported? Yes
 
-(Automatically generated: 2015-10-17T23:43:13)
+(Automatically generated: 2015-10-26T14:00:57)

docs/qwt_examples.md

@@ -12,7 +12,7 @@ qwt()
 A simple line plot of the columns.
 
 ```julia
-plot(fakedata(50,5),w=3)
+plot(Plots.fakedata(50,5),w=3)
 ```
 
 ![](../img/qwt/qwt_example_1.png)
@@ -28,8 +28,8 @@ Easily build animations.  (`convert` or `ffmpeg` must be available to generate t
 ```julia
 p = plot([sin,cos],zeros(0),leg=false)
 anim = Animation()
-for x = linspace(0,10π,200) # /Users/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 43:
+for x = linspace(0,10π,200) # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 35:
-    push!(p,x,Float64[sin(x),cos(x)]) # /Users/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 44:
+    push!(p,x,Float64[sin(x),cos(x)]) # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 36:
     frame(anim)
 end
 ```
@@ -41,7 +41,7 @@ end
 Plot function pair (x(u), y(u)).
 
 ```julia
-plot(sin,(x->begin  # /Users/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 50:
+plot(sin,(x->begin  # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 42:
             sin(2x)
         end),0,2π,line=4,leg=false,fill=(0,:orange))
 ```
@@ -201,7 +201,7 @@ subplot(randn(100,5),layout=[1,1,3],t=[:line :hist :scatter :step :bar],nbins=10
 Note here the automatic grid layout, as well as the order in which new series are added to the plots.
 
 ```julia
-subplot(fakedata(100,10),n=4,palette=[:grays :blues :heat :lightrainbow],bg=[:orange :pink :darkblue :black])
+subplot(Plots.fakedata(100,10),n=4,palette=[:grays :blues :heat :lightrainbow],bg=[:orange :pink :darkblue :black])
 ```
 
 ![](../img/qwt/qwt_example_17.png)
@@ -211,7 +211,7 @@ subplot(fakedata(100,10),n=4,palette=[:grays :blues :heat :lightrainbow],bg=[:or
 
 
 ```julia
-subplot!(fakedata(100,10))
+subplot!(Plots.fakedata(100,10))
 ```
 
 ![](../img/qwt/qwt_example_18.png)
@@ -235,4 +235,4 @@ annotate!([(5,y[5],text("this is #5",16,:red,:center)),(10,y[10],text("this is #
 - Supported values for marker: `:auto`, `:cross`, `:diamond`, `:dtriangle`, `:ellipse`, `:hexagon`, `:none`, `:rect`, `:star5`, `:star8`, `:utriangle`, `:xcross`
 - Is `subplot`/`subplot!` supported? Yes
 
-(Automatically generated: 2015-10-18T00:40:24)
+(Automatically generated: 2015-10-26T14:02:19)

docs/readme_template.md

@@ -4,7 +4,7 @@
 [![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)
+<!-- [![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)
 
@@ -28,7 +28,6 @@ Please add wishlist items, bugs, or any other comments/questions to the issues l
 - [PyPlot.jl](docs/pyplot_examples.md)
 - [UnicodePlots.jl](docs/unicodeplots_examples.md)
 - [Qwt.jl](docs/qwt_examples.md)
-- [Winston.jl](docs/winston_examples.md)
 
 Also check out the many [IJulia notebooks](http://nbviewer.ipython.org/github/tbreloff/Plots.jl/tree/master/examples/) with many examples.
 
@@ -54,7 +53,6 @@ Pkg.add("Immerse")
 Pkg.add("PyPlot")
 Pkg.add("UnicodePlots")
 Pkg.clone("https://github.com/tbreloff/Qwt.jl.git")
-Pkg.add("Winston")
 ```
 
 ## Use
@@ -282,7 +280,7 @@ Animations are created in 3 steps (see example #2):
 - [x] PyPlot.jl
 - [x] UnicodePlots.jl
 - [x] Qwt.jl
-- [x] Winston.jl
+- [x] Winston.jl (deprecated)
 - [ ] GLPlot.jl
 - [ ] Bokeh.jl
 - [ ] Vega.jl

src/args.jl

@@ -583,11 +583,11 @@ getArgValue(v, idx) = v
 
 # given an argument key (k), we want to extract the argument value for this index.
 # if nothing is set (or container is empty), return the default.
-function setDictValue(d::Dict, k::Symbol, idx::Int, defaults::Dict)
+function setDictValue(d_in::Dict, d_out::Dict, k::Symbol, idx::Int, defaults::Dict)
-  if haskey(d, k) && !(typeof(d[k]) <: @compat(Union{AbstractArray, Tuple}) && isempty(d[k]))
+  if haskey(d_in, k) && !(typeof(d_in[k]) <: @compat(Union{AbstractArray, Tuple}) && isempty(d_in[k]))
-    d[k] = getArgValue(d[k], idx)
+    d_out[k] = getArgValue(d_in[k], idx)
   else
-    d[k] = defaults[k]
+    d_out[k] = defaults[k]
   end
 end
 
@@ -595,11 +595,12 @@ end
 
 # build the argument dictionary for the plot
 function getPlotArgs(pkg::PlottingPackage, kw, idx::Int)
-  d = Dict(kw)
+  kwdict = Dict(kw)
+  d = Dict()
 
   # add defaults?
   for k in keys(_plotDefaults)
-    setDictValue(d, k, idx, _plotDefaults)
+    setDictValue(kwdict, d, k, idx, _plotDefaults)
   end
 
   for k in (:xscale, :yscale)
@@ -622,11 +623,12 @@ end
 
 # build the argument dictionary for a series
 function getSeriesArgs(pkg::PlottingPackage, initargs::Dict, kw, commandIndex::Int, plotIndex::Int, globalIndex::Int)  # TODO, pass in initargs, not plt
-  d = Dict(kw)
+  kwdict = Dict(kw)
+  d = Dict()
 
   # add defaults?
   for k in keys(_seriesDefaults)
-    setDictValue(d, k, commandIndex, _seriesDefaults)
+    setDictValue(kwdict, d, k, commandIndex, _seriesDefaults)
   end
   
   if haskey(_typeAliases, d[:linetype])

src/backends/pyplot.jl

@@ -84,7 +84,6 @@ getfig(wrap::@compat(Union{PyPlotAxisWrapper,PyPlotFigWrapper})) = wrap.fig
 
 # get a reference to the correct axis
 function getLeftAxis(wrap::PyPlotFigWrapper)
-  # @show wrap.fig.o[:axes]
   axes = wrap.fig.o[:axes]
   if isempty(axes)
     return wrap.fig.o[:add_subplot](111)
@@ -226,7 +225,6 @@ function plot!(pkg::PyPlotPackage, plt::Plot; kw...)
 
     extraargs[:linestyle] = getPyPlotLineStyle(lt, d[:linestyle])
     extraargs[:marker] = getPyPlotMarker(d[:markershape])
-    dump(extraargs[:marker])
 
     if lt == :scatter
       extraargs[:s] = d[:markersize]^2

src/backends/qwt.jl

@@ -73,6 +73,7 @@ end
 function plot(pkg::QwtPackage; kw...)
   d = Dict(kw)
   fixcolors(d)
+  dumpdict(d,"\n\n!!! plot")
   o = Qwt.plot(zeros(0,0); d..., show=false)
   plt = Plot(o, pkg, 0, d, Dict[])
   plt
@@ -81,6 +82,7 @@ end
 function plot!(::QwtPackage, plt::Plot; kw...)
   d = adjustQwtKeywords(plt, false; kw...)
   fixcolors(d)
+  dumpdict(d,"\n\n!!! plot!")
   Qwt.oplot(plt.o; d...)
   push!(plt.seriesargs, d)
   plt

src/plotter.jl

@@ -49,7 +49,7 @@ subplot!(pkg::PlottingPackage, subplt::Subplot; kw...) = error("subplot!($pkg, s
 # ---------------------------------------------------------
 
 
-const BACKENDS = [:qwt, :gadfly, :unicodeplots, :pyplot, :immerse, :winston]
+const BACKENDS = [:qwt, :gadfly, :unicodeplots, :pyplot, :immerse]
 const INITIALIZED_BACKENDS = Set{Symbol}()
 backends() = BACKENDS
 
@@ -184,6 +184,7 @@ function backend()
       end
 
     elseif currentBackendSymbol == :winston
+      warn("Winston support is deprecated and broken.  Try another backend: $BACKENDS")
       try
         @eval ENV["WINSTON_OUTPUT"] = "gtk"
         @eval import Winston, Gtk