diff --git a/docs/example_generation.jl b/docs/example_generation.jl index 46108b76..b6145f9b 100644 --- a/docs/example_generation.jl +++ b/docs/example_generation.jl @@ -62,7 +62,7 @@ const examples = PlotExample[ # markersize=10))]), PlotExample("Lots of marker types", "", - [:(markers = supportedMarkers(), :(plot(repmat(collect(1:length(markers))',10,1); marker=:auto, labels=map(string,markers), markersize=10))]), + [:(markers = supportedMarkers()), :(plot([fill(i,10) for i=1:length(markers)]; marker=:auto, labels=map(string,markers), markersize=10))]), PlotExample("Bar", "x is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)", [:(bar(randn(1000)))]), @@ -135,10 +135,10 @@ end # run it! # note: generate separately so it's easy to comment out # generate_markdown(:qwt) -# generate_markdown(:gadfly) -@osx_only generate_markdown(:unicodeplots) +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 6dd8f49d..f22e5925 100644 --- a/docs/gadfly_examples.md +++ b/docs/gadfly_examples.md @@ -126,11 +126,11 @@ plot(rand(20,5); linestyles=[:solid,:dash,:dot,:dashdot,:dashdotdot],labels=["so ### 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) +markers = supportedMarkers() +plot([fill(i,10) for i = 1:length(markers)]; marker=:auto,labels=map(string,markers),markersize=10) ``` ![](../img/gadfly/gadfly_example_13.png) @@ -155,38 +155,3 @@ 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 fd544489..9e9166b2 100644 --- a/docs/immerse_examples.md +++ b/docs/immerse_examples.md @@ -126,11 +126,11 @@ plot(rand(20,5); linestyles=[:solid,:dash,:dot,:dashdot,:dashdotdot],labels=["so ### 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) +markers = supportedMarkers() +plot([fill(i,10) for i = 1:length(markers)]; marker=:auto,labels=map(string,markers),markersize=10) ``` ![](../img/immerse/immerse_example_13.png) @@ -155,38 +155,3 @@ histogram(randn(1000); nbins=50,fillto=20) ![](../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,:dots,: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) - diff --git a/img/gadfly/gadfly_example_1.png b/img/gadfly/gadfly_example_1.png index 5c291d92..23d323cc 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 a6c8c54e..2398bb92 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 a4b43b2a..a0f98162 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 334c8ff6..ac61e347 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 dd76c86f..f745c100 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 6115e3e1..72c79b6a 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 4c92cdaf..35a28fcd 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_5.png b/img/gadfly/gadfly_example_5.png index 787ef387..5ce22eb1 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 79e552d5..218edadd 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 439e0451..c366d541 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 b8d0299f..09a4f6d7 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 a59e17af..d5ac1690 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 953889e4..c8e1b0cf 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 797183de..68e84ba6 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 8909cc91..686d9d74 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 70d1c421..bc3cf1f6 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 dd76c86f..f745c100 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 73e5747a..b6d360df 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 a2d3ec2e..53ae2e7a 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_5.png b/img/immerse/immerse_example_5.png index 3175d677..19242df2 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 03bc7441..18235c01 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 6185d2bb..8614e5ab 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 2a290eb4..1763e15d 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 158b2aba..8dcfce1e 100644 Binary files a/img/immerse/immerse_example_9.png and b/img/immerse/immerse_example_9.png differ