diff --git a/docs/example_generation.jl b/docs/example_generation.jl index 8927c96b..97029227 100644 --- a/docs/example_generation.jl +++ b/docs/example_generation.jl @@ -132,10 +132,10 @@ end # run it! # note: generate separately so it's easy to comment out # generate_markdown(:qwt) -generate_markdown(:gadfly) +# generate_markdown(:gadfly) # @osx_only generate_markdown(:unicodeplots) # generate_markdown(:pyplot) -# generate_markdown(:immerse) +generate_markdown(:immerse) end # module diff --git a/docs/gadfly_examples.md b/docs/gadfly_examples.md index e69de29b..9cb046ac 100644 --- a/docs/gadfly_examples.md +++ b/docs/gadfly_examples.md @@ -0,0 +1,192 @@ +### Lines + +A simple line plot of the 3 columns. + +```julia +plot(rand(100,3)) +``` + +![](../img/gadfly/gadfly_example_1.png) + +### Functions + +Plot multiple functions. + +```julia +plot(0:0.01:4π,[sin,cos]) +``` + +![](../img/gadfly/gadfly_example_2.png) + +### + +You can also call it with plot(f, xmin, xmax). + +```julia +plot([sin,cos],0,4π) +``` + +![](../img/gadfly/gadfly_example_3.png) + +### + +Or make a parametric plot with plot(fx, fy, umin, umax). + +```julia +plot(sin,(x->begin # /Users/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33: + sin(2x) + end),0,2π) +``` + +![](../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.5,0.5,0.5)) +``` + +![](../img/gadfly/gadfly_example_5.png) + +### Two-axis + +Use the `axis` or `axiss` arguments. + +Note: This is only supported with Qwt right now + +```julia +plot(Vector[randn(100),randn(100) * 100]; axiss=[:left,:right],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,color=:blue) +``` + +![](../img/gadfly/gadfly_example_9.png) + +### Heatmaps + + + +```julia +heatmap(randn(10000),randn(10000); nbins=100) +``` + +![](../img/gadfly/gadfly_example_10.png) + +### Lots of line types + +Options: (:line, :step, :stepinverted, :sticks, :dots, :none, :heatmap, :hexbin, :hist, :bar) +Note: some may not work with all backends + +```julia +plot(rand(20,4); linetypes=[:line,:step,:sticks,:dots],labels=["line","step","sticks","dots"]) +``` + +![](../img/gadfly/gadfly_example_11.png) + +### Lots of line styles + +Options: (:solid, :dash, :dot, :dashdot, :dashdotdot) +Note: some may not work with all backends + +```julia +plot(rand(20,5); linestyles=[:solid,:dash,:dot,:dashdot,:dashdotdot],labels=["solid","dash","dot","dashdot","dashdotdot"]) +``` + +![](../img/gadfly/gadfly_example_12.png) + +### Lots of marker types + +Options: (:none, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon) +Note: some may not work with all backends + +```julia +plot(repmat(collect(1:10)',10,1); markers=[:ellipse,:rect,:diamond,:utriangle,:dtriangle,:cross,:xcross,:star1,:star2,:hexagon],labels=["ellipse","rect","diamond","utriangle","dtriangle","cross","xcross","star1","star2","hexagon"],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 + +note: fillto isn't supported on all backends + +```julia +histogram(randn(1000); nbins=50,fillto=20) +``` + +![](../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,:dots,: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) + diff --git a/docs/immerse_examples.md b/docs/immerse_examples.md index 08fd5c20..6f73e2f8 100644 --- a/docs/immerse_examples.md +++ b/docs/immerse_examples.md @@ -33,7 +33,7 @@ plot([sin,cos],0,4π) Or make a parametric plot with plot(fx, fy, umin, umax). ```julia -plot(sin,(x->begin # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33: +plot(sin,(x->begin # /Users/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33: sin(2x) end),0,2π) ``` @@ -130,7 +130,7 @@ Options: (:none, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcr Note: some may not work with all backends ```julia -plot(repmat(collect(1:10)',10,1); markers=[:ellipse,:rect,:diamond,:utriangle,:dtriangle,:cross,:xcross,:star1,:star2,:hexagon],labels=["ellipse","rect","diamond","utriangle","dtriangle","cross","xcross","star1","star2","hexagon"],linetype=:none,markersize=10) +plot(repmat(collect(1:10)',10,1); markers=[:ellipse,:rect,:diamond,:utriangle,:dtriangle,:cross,:xcross,:star1,:star2,:hexagon],labels=["ellipse","rect","diamond","utriangle","dtriangle","cross","xcross","star1","star2","hexagon"],markersize=10) ``` ![](../img/immerse/immerse_example_13.png) diff --git a/img/gadfly/gadfly_example_1.png b/img/gadfly/gadfly_example_1.png index 590c17a0..b5f7cfb0 100644 Binary files a/img/gadfly/gadfly_example_1.png and b/img/gadfly/gadfly_example_1.png differ diff --git a/img/gadfly/gadfly_example_10.png b/img/gadfly/gadfly_example_10.png index e69de29b..560dcdbd 100644 Binary files a/img/gadfly/gadfly_example_10.png and b/img/gadfly/gadfly_example_10.png differ diff --git a/img/gadfly/gadfly_example_11.png b/img/gadfly/gadfly_example_11.png index abeea86b..c1dd5d6d 100644 Binary files a/img/gadfly/gadfly_example_11.png and b/img/gadfly/gadfly_example_11.png differ diff --git a/img/gadfly/gadfly_example_12.png b/img/gadfly/gadfly_example_12.png index 33a7f049..81d374c9 100644 Binary files a/img/gadfly/gadfly_example_12.png and b/img/gadfly/gadfly_example_12.png differ diff --git a/img/gadfly/gadfly_example_13.png b/img/gadfly/gadfly_example_13.png index a79e6ffa..19088f2e 100644 Binary files a/img/gadfly/gadfly_example_13.png and b/img/gadfly/gadfly_example_13.png differ diff --git a/img/gadfly/gadfly_example_14.png b/img/gadfly/gadfly_example_14.png index 6dbcbf17..5303d22c 100644 Binary files a/img/gadfly/gadfly_example_14.png and b/img/gadfly/gadfly_example_14.png differ diff --git a/img/gadfly/gadfly_example_15.png b/img/gadfly/gadfly_example_15.png index 6b208fc3..7c0759aa 100644 Binary files a/img/gadfly/gadfly_example_15.png and b/img/gadfly/gadfly_example_15.png differ diff --git a/img/gadfly/gadfly_example_16.png b/img/gadfly/gadfly_example_16.png index 11dc2b9a..72de083f 100644 Binary files a/img/gadfly/gadfly_example_16.png and b/img/gadfly/gadfly_example_16.png differ diff --git a/img/gadfly/gadfly_example_17.png b/img/gadfly/gadfly_example_17.png index 792dc20d..4f39d156 100644 Binary files a/img/gadfly/gadfly_example_17.png and b/img/gadfly/gadfly_example_17.png differ diff --git a/img/gadfly/gadfly_example_18.png b/img/gadfly/gadfly_example_18.png index 792dc20d..8425bc6a 100644 Binary files a/img/gadfly/gadfly_example_18.png and b/img/gadfly/gadfly_example_18.png differ diff --git a/img/gadfly/gadfly_example_5.png b/img/gadfly/gadfly_example_5.png index e8473831..30198f22 100644 Binary files a/img/gadfly/gadfly_example_5.png and b/img/gadfly/gadfly_example_5.png differ diff --git a/img/gadfly/gadfly_example_6.png b/img/gadfly/gadfly_example_6.png index 280fb254..7b429985 100644 Binary files a/img/gadfly/gadfly_example_6.png and b/img/gadfly/gadfly_example_6.png differ diff --git a/img/gadfly/gadfly_example_7.png b/img/gadfly/gadfly_example_7.png index bef28b65..c4840acf 100644 Binary files a/img/gadfly/gadfly_example_7.png and b/img/gadfly/gadfly_example_7.png differ diff --git a/img/gadfly/gadfly_example_8.png b/img/gadfly/gadfly_example_8.png index 046a6c67..f4f1f7fd 100644 Binary files a/img/gadfly/gadfly_example_8.png and b/img/gadfly/gadfly_example_8.png differ diff --git a/img/gadfly/gadfly_example_9.png b/img/gadfly/gadfly_example_9.png index 9b67cb64..5cfe44d3 100644 Binary files a/img/gadfly/gadfly_example_9.png and b/img/gadfly/gadfly_example_9.png differ diff --git a/img/immerse/immerse_example_1.png b/img/immerse/immerse_example_1.png index afe99f92..ac1be05d 100644 Binary files a/img/immerse/immerse_example_1.png and b/img/immerse/immerse_example_1.png differ diff --git a/img/immerse/immerse_example_10.png b/img/immerse/immerse_example_10.png index b0f10744..3d40d5f8 100644 Binary files a/img/immerse/immerse_example_10.png and b/img/immerse/immerse_example_10.png differ diff --git a/img/immerse/immerse_example_11.png b/img/immerse/immerse_example_11.png index 0a32b0a5..a73361c8 100644 Binary files a/img/immerse/immerse_example_11.png and b/img/immerse/immerse_example_11.png differ diff --git a/img/immerse/immerse_example_12.png b/img/immerse/immerse_example_12.png index 11442bc2..67ce63ef 100644 Binary files a/img/immerse/immerse_example_12.png and b/img/immerse/immerse_example_12.png differ diff --git a/img/immerse/immerse_example_13.png b/img/immerse/immerse_example_13.png index b9f27010..62d5505d 100644 Binary files a/img/immerse/immerse_example_13.png and b/img/immerse/immerse_example_13.png differ diff --git a/img/immerse/immerse_example_14.png b/img/immerse/immerse_example_14.png index 7be71863..30be7389 100644 Binary files a/img/immerse/immerse_example_14.png and b/img/immerse/immerse_example_14.png differ diff --git a/img/immerse/immerse_example_15.png b/img/immerse/immerse_example_15.png index b85a4c70..3abf4672 100644 Binary files a/img/immerse/immerse_example_15.png and b/img/immerse/immerse_example_15.png differ diff --git a/img/immerse/immerse_example_16.png b/img/immerse/immerse_example_16.png index 61efce71..ba53e413 100644 Binary files a/img/immerse/immerse_example_16.png and b/img/immerse/immerse_example_16.png differ diff --git a/img/immerse/immerse_example_17.png b/img/immerse/immerse_example_17.png index 34020fae..c9106c14 100644 Binary files a/img/immerse/immerse_example_17.png and b/img/immerse/immerse_example_17.png differ diff --git a/img/immerse/immerse_example_18.png b/img/immerse/immerse_example_18.png index 6dec1665..6e18c7d9 100644 Binary files a/img/immerse/immerse_example_18.png and b/img/immerse/immerse_example_18.png differ diff --git a/img/immerse/immerse_example_2.png b/img/immerse/immerse_example_2.png index 28515e94..efa14361 100644 Binary files a/img/immerse/immerse_example_2.png and b/img/immerse/immerse_example_2.png differ diff --git a/img/immerse/immerse_example_3.png b/img/immerse/immerse_example_3.png index d137d591..6c59403e 100644 Binary files a/img/immerse/immerse_example_3.png and b/img/immerse/immerse_example_3.png differ diff --git a/img/immerse/immerse_example_4.png b/img/immerse/immerse_example_4.png index c995d521..5ee60f33 100644 Binary files a/img/immerse/immerse_example_4.png and b/img/immerse/immerse_example_4.png differ diff --git a/img/immerse/immerse_example_5.png b/img/immerse/immerse_example_5.png index 009e8463..100a93be 100644 Binary files a/img/immerse/immerse_example_5.png and b/img/immerse/immerse_example_5.png differ diff --git a/img/immerse/immerse_example_6.png b/img/immerse/immerse_example_6.png index 195656d6..6f5f4d79 100644 Binary files a/img/immerse/immerse_example_6.png and b/img/immerse/immerse_example_6.png differ diff --git a/img/immerse/immerse_example_7.png b/img/immerse/immerse_example_7.png index 11073fbc..3a57d96f 100644 Binary files a/img/immerse/immerse_example_7.png and b/img/immerse/immerse_example_7.png differ diff --git a/img/immerse/immerse_example_8.png b/img/immerse/immerse_example_8.png index 7ef075d3..26eba4ff 100644 Binary files a/img/immerse/immerse_example_8.png and b/img/immerse/immerse_example_8.png differ diff --git a/img/immerse/immerse_example_9.png b/img/immerse/immerse_example_9.png index 13defff3..7603f88d 100644 Binary files a/img/immerse/immerse_example_9.png and b/img/immerse/immerse_example_9.png differ