diff --git a/docs/example_generation.jl b/docs/example_generation.jl index 0ee3ffac..62df6f5f 100644 --- a/docs/example_generation.jl +++ b/docs/example_generation.jl @@ -35,8 +35,11 @@ const examples = PlotExample[ "Mix arguments that apply to all series with arguments unique to each series.", [:(plot(Vector[rand(10), rand(20)]; marker=:ellipse, markersize=8, colors=[:red,:blue]))]), PlotExample("Build plot in pieces", - "You can add to a plot at any time.", - [:(plot(rand(100)/3; reg=true, fillto=0)), :(scatter!(rand(100); markersize=6, color=:blue))]), + "Start with a base plot...", + [:(plot(rand(100)/3; reg=true, fillto=0))]), + PlotExample("", + "and add to it later.", + [:(scatter!(rand(100); markersize=6, color=:blue))]), PlotExample("Heatmaps", "", [:(heatmap(randn(10000),randn(10000); nbins=200))]), diff --git a/docs/gadfly_examples.md b/docs/gadfly_examples.md index 460956cf..ed1a8fe5 100644 --- a/docs/gadfly_examples.md +++ b/docs/gadfly_examples.md @@ -50,15 +50,24 @@ plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue] ### Build plot in pieces -You can add to a plot at any time. +Start with a base plot... ```julia plot(rand(100) / 3; reg=true,fillto=0) -scatter!(rand(100); markersize=6,color=:blue) ``` ![](../img/gadfly_example_6.png) +### + +and add to it later. + +```julia +scatter!(rand(100); markersize=6,color=:blue) +``` + +![](../img/gadfly_example_7.png) + ### Heatmaps @@ -67,7 +76,7 @@ scatter!(rand(100); markersize=6,color=:blue) heatmap(randn(10000),randn(10000); nbins=200) ``` -![](../img/gadfly_example_7.png) +![](../img/gadfly_example_8.png) ### Lots of line types @@ -78,7 +87,7 @@ Note: some may not work with all backends plot(rand(20,4); linetypes=[:line,:step,:sticks,:dots]) ``` -![](../img/gadfly_example_8.png) +![](../img/gadfly_example_9.png) ### Bar @@ -88,7 +97,7 @@ x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints bar(randn(1000)) ``` -![](../img/gadfly_example_9.png) +![](../img/gadfly_example_10.png) ### Histogram @@ -98,7 +107,7 @@ note: fillto isn't supported on all backends histogram(randn(1000); nbins=50,fillto=20) ``` -![](../img/gadfly_example_10.png) +![](../img/gadfly_example_11.png) ### Subplots @@ -113,7 +122,7 @@ histogram(randn(1000); nbins=50,fillto=20) subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:dots,:step,:bar],nbins=10,legend=false) ``` -![](../img/gadfly_example_11.png) +![](../img/gadfly_example_12.png) ### Adding to subplots @@ -123,7 +132,7 @@ Note here the automatic grid layout, as well as the order in which new series ar subplot(randn(100,5); n=4) ``` -![](../img/gadfly_example_12.png) +![](../img/gadfly_example_13.png) ### @@ -133,5 +142,5 @@ subplot(randn(100,5); n=4) subplot!(randn(100,3)) ``` -![](../img/gadfly_example_13.png) +![](../img/gadfly_example_14.png) diff --git a/docs/qwt_examples.md b/docs/qwt_examples.md index 667dea34..3cbea9de 100644 --- a/docs/qwt_examples.md +++ b/docs/qwt_examples.md @@ -50,15 +50,24 @@ plot(Vector[rand(10),rand(20)]; marker=:ellipse,markersize=8,colors=[:red,:blue] ### Build plot in pieces -You can add to a plot at any time. +Start with a base plot... ```julia plot(rand(100) / 3; reg=true,fillto=0) -scatter!(rand(100); markersize=6,color=:blue) ``` ![](../img/qwt_example_6.png) +### + +and add to it later. + +```julia +scatter!(rand(100); markersize=6,color=:blue) +``` + +![](../img/qwt_example_7.png) + ### Heatmaps @@ -67,7 +76,7 @@ scatter!(rand(100); markersize=6,color=:blue) heatmap(randn(10000),randn(10000); nbins=200) ``` -![](../img/qwt_example_7.png) +![](../img/qwt_example_8.png) ### Lots of line types @@ -78,7 +87,7 @@ Note: some may not work with all backends plot(rand(20,4); linetypes=[:line,:step,:sticks,:dots]) ``` -![](../img/qwt_example_8.png) +![](../img/qwt_example_9.png) ### Bar @@ -88,7 +97,7 @@ x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints bar(randn(1000)) ``` -![](../img/qwt_example_9.png) +![](../img/qwt_example_10.png) ### Histogram @@ -98,7 +107,7 @@ note: fillto isn't supported on all backends histogram(randn(1000); nbins=50,fillto=20) ``` -![](../img/qwt_example_10.png) +![](../img/qwt_example_11.png) ### Subplots @@ -113,7 +122,7 @@ histogram(randn(1000); nbins=50,fillto=20) subplot(randn(100,5); layout=[1,1,3],linetypes=[:line,:hist,:dots,:step,:bar],nbins=10,legend=false) ``` -![](../img/qwt_example_11.png) +![](../img/qwt_example_12.png) ### Adding to subplots @@ -123,7 +132,7 @@ Note here the automatic grid layout, as well as the order in which new series ar subplot(randn(100,5); n=4) ``` -![](../img/qwt_example_12.png) +![](../img/qwt_example_13.png) ### @@ -133,5 +142,5 @@ subplot(randn(100,5); n=4) subplot!(randn(100,3)) ``` -![](../img/qwt_example_13.png) +![](../img/qwt_example_14.png) diff --git a/img/gadfly_example_1.png b/img/gadfly_example_1.png index c3e31590..a945509c 100644 Binary files a/img/gadfly_example_1.png and b/img/gadfly_example_1.png differ diff --git a/img/gadfly_example_10.png b/img/gadfly_example_10.png index a7359ff7..bcb43962 100644 Binary files a/img/gadfly_example_10.png and b/img/gadfly_example_10.png differ diff --git a/img/gadfly_example_11.png b/img/gadfly_example_11.png index 61ebb7c0..1bde9ac9 100644 Binary files a/img/gadfly_example_11.png and b/img/gadfly_example_11.png differ diff --git a/img/gadfly_example_12.png b/img/gadfly_example_12.png index 3589fd88..56df3863 100644 Binary files a/img/gadfly_example_12.png and b/img/gadfly_example_12.png differ diff --git a/img/gadfly_example_13.png b/img/gadfly_example_13.png index 31032ff0..f32cca27 100644 Binary files a/img/gadfly_example_13.png and b/img/gadfly_example_13.png differ diff --git a/img/gadfly_example_3.png b/img/gadfly_example_3.png index 2c87058c..e8adfe80 100644 Binary files a/img/gadfly_example_3.png and b/img/gadfly_example_3.png differ diff --git a/img/gadfly_example_4.png b/img/gadfly_example_4.png index 7e73af94..7362467e 100644 Binary files a/img/gadfly_example_4.png and b/img/gadfly_example_4.png differ diff --git a/img/gadfly_example_5.png b/img/gadfly_example_5.png index 904df1eb..23323834 100644 Binary files a/img/gadfly_example_5.png and b/img/gadfly_example_5.png differ diff --git a/img/gadfly_example_6.png b/img/gadfly_example_6.png index 10c40f45..392050b8 100644 Binary files a/img/gadfly_example_6.png and b/img/gadfly_example_6.png differ diff --git a/img/gadfly_example_7.png b/img/gadfly_example_7.png index 734aa198..e7f63115 100644 Binary files a/img/gadfly_example_7.png and b/img/gadfly_example_7.png differ diff --git a/img/gadfly_example_8.png b/img/gadfly_example_8.png index a0f2fb5c..82f0e08e 100644 Binary files a/img/gadfly_example_8.png and b/img/gadfly_example_8.png differ diff --git a/img/gadfly_example_9.png b/img/gadfly_example_9.png index ab68eb37..6898c679 100644 Binary files a/img/gadfly_example_9.png and b/img/gadfly_example_9.png differ diff --git a/img/qwt_example_1.png b/img/qwt_example_1.png index 69be9d02..1510df50 100644 Binary files a/img/qwt_example_1.png and b/img/qwt_example_1.png differ diff --git a/img/qwt_example_10.png b/img/qwt_example_10.png index 1d1fab98..e645f3c2 100644 Binary files a/img/qwt_example_10.png and b/img/qwt_example_10.png differ diff --git a/img/qwt_example_11.png b/img/qwt_example_11.png index 9055965e..3a39e4cf 100644 Binary files a/img/qwt_example_11.png and b/img/qwt_example_11.png differ diff --git a/img/qwt_example_12.png b/img/qwt_example_12.png index d78b8c0b..ddb1be2e 100644 Binary files a/img/qwt_example_12.png and b/img/qwt_example_12.png differ diff --git a/img/qwt_example_13.png b/img/qwt_example_13.png index 92cdaf37..d7194169 100644 Binary files a/img/qwt_example_13.png and b/img/qwt_example_13.png differ diff --git a/img/qwt_example_3.png b/img/qwt_example_3.png index 38228824..6195d0bf 100644 Binary files a/img/qwt_example_3.png and b/img/qwt_example_3.png differ diff --git a/img/qwt_example_4.png b/img/qwt_example_4.png index 4a539880..6185d49a 100644 Binary files a/img/qwt_example_4.png and b/img/qwt_example_4.png differ diff --git a/img/qwt_example_5.png b/img/qwt_example_5.png index b2d9de4d..d0b2a0c2 100644 Binary files a/img/qwt_example_5.png and b/img/qwt_example_5.png differ diff --git a/img/qwt_example_6.png b/img/qwt_example_6.png index 525963ea..53386ec6 100644 Binary files a/img/qwt_example_6.png and b/img/qwt_example_6.png differ diff --git a/img/qwt_example_7.png b/img/qwt_example_7.png index 4423ee6d..400423bd 100644 Binary files a/img/qwt_example_7.png and b/img/qwt_example_7.png differ diff --git a/img/qwt_example_8.png b/img/qwt_example_8.png index b79432ab..e99e13e9 100644 Binary files a/img/qwt_example_8.png and b/img/qwt_example_8.png differ diff --git a/img/qwt_example_9.png b/img/qwt_example_9.png index 343d32cd..97f73b29 100644 Binary files a/img/qwt_example_9.png and b/img/qwt_example_9.png differ