diff --git a/docs/example_generation.jl b/docs/example_generation.jl index 65e7abb3..cd74616e 100644 --- a/docs/example_generation.jl +++ b/docs/example_generation.jl @@ -30,7 +30,7 @@ const examples = PlotExample[ [:(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π))]), + [:(plot(sin, x->sin(2x), 0, 2π, legend=false))]), PlotExample("Global", "Change the guides/background without a separate call.", [:(plot(rand(10); title="TITLE", xlabel="XLABEL", ylabel="YLABEL", background_color = RGB(0.5,0.5,0.5)))]), @@ -61,7 +61,7 @@ const examples = PlotExample[ [:(styles = setdiff(supportedStyles(), [:auto])), :(plot(rand(20,length(styles)); linestyle=:auto, labels=map(string,styles)))]), PlotExample("Supported marker types", "All options: (:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :star2, :hexagon)", - [:(markers = setdiff(supportedMarkers(), [:none,:auto])), :(plot(0.5:9.5, [fill(i-0.5,10) for i=length(markers):-1:1]; marker=:auto, labels=map(string,markers), markersize=10))]), + [:(markers = setdiff(supportedMarkers(), [:none,:auto])), :(scatter(0.5:9.5, [fill(i-0.5,10) for i=length(markers):-1:1]; 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)))]), diff --git a/docs/immerse_examples.md b/docs/immerse_examples.md index 2037dbd7..73b5b2c5 100644 --- a/docs/immerse_examples.md +++ b/docs/immerse_examples.md @@ -4,7 +4,7 @@ - Supported values for axis: `:auto`, `:left` - Supported values for linetype: `:none`, `:line`, `:step`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`, `:hline`, `:vline`, `:ohlc` - Supported values for linestyle: `:auto`, `:solid` -- Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:cross` +- Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`, `:star2`, `:hexagon` - Is `subplot`/`subplot!` supported? Yes ### Initialize @@ -149,7 +149,7 @@ All options: (:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, : ```julia markers = setdiff(supportedMarkers(),[:none,:auto]) -plot([fill(i,10) for i = 1:length(markers)]; marker=:auto,labels=map(string,markers),markersize=10) +plot(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,labels=map(string,markers),markersize=10) ``` ![](../img/immerse/immerse_example_13.png) diff --git a/docs/pyplot_examples.md b/docs/pyplot_examples.md index e1cdc9ad..4bf0e6e7 100644 --- a/docs/pyplot_examples.md +++ b/docs/pyplot_examples.md @@ -4,7 +4,7 @@ - Supported values for axis: `:auto`, `:left`, `:right` - Supported values for linetype: `:none`, `:line`, `:step`, `:stepinverted`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar` - Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot` -- Supported values for marker: `:none`, `:auto`, `:ellipse`, `:rect`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`, `:hexagon` +- Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`, `:hexagon` - Is `subplot`/`subplot!` supported? No ### Initialize @@ -51,7 +51,7 @@ Or make a parametric plot (i.e. plot: (fx(u), fy(u))) with plot(fx, fy, umin, um ```julia plot(sin,(x->begin # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, line 33: sin(2x) - end),0,2π) + end),0,2π,legend=false) ``` ![](../img/pyplot/pyplot_example_4.png) @@ -149,7 +149,7 @@ All options: (:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, : ```julia markers = setdiff(supportedMarkers(),[:none,:auto]) -plot([fill(i,10) for i = 1:length(markers)]; marker=:auto,labels=map(string,markers),markersize=10) +scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,labels=map(string,markers),markersize=10) ``` ![](../img/pyplot/pyplot_example_13.png) diff --git a/docs/qwt_examples.md b/docs/qwt_examples.md index b308e8a9..81de2c55 100644 --- a/docs/qwt_examples.md +++ b/docs/qwt_examples.md @@ -149,7 +149,7 @@ All options: (:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, : ```julia markers = setdiff(supportedMarkers(),[:none,:auto]) -plot([fill(i,10) for i = 1:length(markers)]; marker=:auto,labels=map(string,markers),markersize=10) +plot(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,labels=map(string,markers),markersize=10) ``` ![](../img/qwt/qwt_example_13.png) diff --git a/docs/winston_examples.md b/docs/winston_examples.md index 0c3906d0..1dd98a27 100644 --- a/docs/winston_examples.md +++ b/docs/winston_examples.md @@ -3,8 +3,8 @@ - Supported arguments: `args`, `axis`, `color`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markersize`, `nbins`, `reg`, `size`, `title`, `width`, `windowtitle`, `xlabel`, `ylabel`, `yrightlabel` - Supported values for axis: `:auto`, `:left` - Supported values for linetype: `:none`, `:line`, `:sticks`, `:scatter`, `:hist`, `:bar` -- Supported values for linestyle: `:auto`, `:solid`, `:dashdotdot`, `:dot`, `:dash`, `:dashdot` -- Supported values for marker: `:auto`, `:hexagon`, `:none`, `:dtriangle`, `:ellipse`, `:xcross`, `:rect`, `:star1`, `:star2`, `:cross`, `:utriangle`, `:diamond` +- 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 @@ -139,7 +139,7 @@ All options: (:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, : ```julia markers = setdiff(supportedMarkers(),[:none,:auto]) -plot([fill(i,10) for i = 1:length(markers)]; marker=:auto,labels=map(string,markers),markersize=10) +scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,labels=map(string,markers),markersize=10) ``` ![](../img/winston/winston_example_13.png) diff --git a/img/gadfly/gadfly_example_1.png b/img/gadfly/gadfly_example_1.png index 8d004919..8ba93af5 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 1044c028..d9ff4154 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 5d2448a5..632107d1 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 8c1b961d..214a5c7c 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_14.png b/img/gadfly/gadfly_example_14.png index f5e3f8a4..bc0abbeb 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 1ea7d014..a11ca5da 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 0d2687be..8676b4bf 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 407b4f0c..20f0ca0f 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 3268161e..87cd3bf3 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_19.png b/img/gadfly/gadfly_example_19.png index c108a04b..41d50083 100644 Binary files a/img/gadfly/gadfly_example_19.png and b/img/gadfly/gadfly_example_19.png differ diff --git a/img/gadfly/gadfly_example_2.png b/img/gadfly/gadfly_example_2.png index 28515e94..8ccf63bf 100644 Binary files a/img/gadfly/gadfly_example_2.png and b/img/gadfly/gadfly_example_2.png differ diff --git a/img/gadfly/gadfly_example_3.png b/img/gadfly/gadfly_example_3.png index d137d591..98229a7d 100644 Binary files a/img/gadfly/gadfly_example_3.png and b/img/gadfly/gadfly_example_3.png differ diff --git a/img/gadfly/gadfly_example_4.png b/img/gadfly/gadfly_example_4.png index c995d521..0a10a9ef 100644 Binary files a/img/gadfly/gadfly_example_4.png and b/img/gadfly/gadfly_example_4.png differ diff --git a/img/gadfly/gadfly_example_5.png b/img/gadfly/gadfly_example_5.png index b1650ef9..1291d149 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 b57befc0..9853de3d 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 daf5fdf6..d4d4e0a7 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 7f000260..a4d29b76 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 6f885420..2885d844 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 f21c688a..dcb2ef85 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 0a81bb27..e6dd9aaa 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 e2e4d312..d7f55da5 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 d95282ad..cc4d41ec 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 f745c100..0086868f 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 4e7355f1..be5fdd8e 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 3e1eb069..de94db4f 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 5fc5ab13..1d37e1f3 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 37ef04b3..114ccd1b 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 0d339425..b037a7f3 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_19.png b/img/immerse/immerse_example_19.png index f0b56823..35f2e0d4 100644 Binary files a/img/immerse/immerse_example_19.png and b/img/immerse/immerse_example_19.png differ diff --git a/img/immerse/immerse_example_2.png b/img/immerse/immerse_example_2.png index 28515e94..8ccf63bf 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..98229a7d 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..0a10a9ef 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 18d4790c..4d8e39e5 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 15352352..803669bf 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 dff2e929..31a77c7c 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 6e8e793a..daf6a271 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 554c67b6..ce4b59bd 100644 Binary files a/img/immerse/immerse_example_9.png and b/img/immerse/immerse_example_9.png differ diff --git a/img/pyplot/pyplot_example_1.png b/img/pyplot/pyplot_example_1.png index eca4e8d6..f0d2e97b 100644 Binary files a/img/pyplot/pyplot_example_1.png and b/img/pyplot/pyplot_example_1.png differ diff --git a/img/pyplot/pyplot_example_10.png b/img/pyplot/pyplot_example_10.png index d431e1dc..8a03771d 100644 Binary files a/img/pyplot/pyplot_example_10.png and b/img/pyplot/pyplot_example_10.png differ diff --git a/img/pyplot/pyplot_example_11.png b/img/pyplot/pyplot_example_11.png index 560e0c60..45c0073f 100644 Binary files a/img/pyplot/pyplot_example_11.png and b/img/pyplot/pyplot_example_11.png differ diff --git a/img/pyplot/pyplot_example_12.png b/img/pyplot/pyplot_example_12.png index 4dc34662..4212bdee 100644 Binary files a/img/pyplot/pyplot_example_12.png and b/img/pyplot/pyplot_example_12.png differ diff --git a/img/pyplot/pyplot_example_13.png b/img/pyplot/pyplot_example_13.png index 5185737f..f9496bec 100644 Binary files a/img/pyplot/pyplot_example_13.png and b/img/pyplot/pyplot_example_13.png differ diff --git a/img/pyplot/pyplot_example_14.png b/img/pyplot/pyplot_example_14.png index 41f9c767..c39ba1c8 100644 Binary files a/img/pyplot/pyplot_example_14.png and b/img/pyplot/pyplot_example_14.png differ diff --git a/img/pyplot/pyplot_example_15.png b/img/pyplot/pyplot_example_15.png index 5efadac4..efd5b973 100644 Binary files a/img/pyplot/pyplot_example_15.png and b/img/pyplot/pyplot_example_15.png differ diff --git a/img/pyplot/pyplot_example_2.png b/img/pyplot/pyplot_example_2.png index e7b1a1e5..ede439b0 100644 Binary files a/img/pyplot/pyplot_example_2.png and b/img/pyplot/pyplot_example_2.png differ diff --git a/img/pyplot/pyplot_example_3.png b/img/pyplot/pyplot_example_3.png index b80caaff..5e74e075 100644 Binary files a/img/pyplot/pyplot_example_3.png and b/img/pyplot/pyplot_example_3.png differ diff --git a/img/pyplot/pyplot_example_4.png b/img/pyplot/pyplot_example_4.png index a1bdda0d..db7a1175 100644 Binary files a/img/pyplot/pyplot_example_4.png and b/img/pyplot/pyplot_example_4.png differ diff --git a/img/pyplot/pyplot_example_5.png b/img/pyplot/pyplot_example_5.png index 02c0a35d..e1dbeffe 100644 Binary files a/img/pyplot/pyplot_example_5.png and b/img/pyplot/pyplot_example_5.png differ diff --git a/img/pyplot/pyplot_example_6.png b/img/pyplot/pyplot_example_6.png index f5a83fd2..93e07a98 100644 Binary files a/img/pyplot/pyplot_example_6.png and b/img/pyplot/pyplot_example_6.png differ diff --git a/img/pyplot/pyplot_example_7.png b/img/pyplot/pyplot_example_7.png index 0980e86f..767877ce 100644 Binary files a/img/pyplot/pyplot_example_7.png and b/img/pyplot/pyplot_example_7.png differ diff --git a/img/pyplot/pyplot_example_8.png b/img/pyplot/pyplot_example_8.png index a5703961..3912070b 100644 Binary files a/img/pyplot/pyplot_example_8.png and b/img/pyplot/pyplot_example_8.png differ diff --git a/img/pyplot/pyplot_example_9.png b/img/pyplot/pyplot_example_9.png index 88b1cd5e..68117f02 100644 Binary files a/img/pyplot/pyplot_example_9.png and b/img/pyplot/pyplot_example_9.png differ diff --git a/img/qwt/qwt_example_1.png b/img/qwt/qwt_example_1.png index d52a7a56..4da574b2 100644 Binary files a/img/qwt/qwt_example_1.png and b/img/qwt/qwt_example_1.png differ diff --git a/img/qwt/qwt_example_10.png b/img/qwt/qwt_example_10.png index 73aac902..d9e01751 100644 Binary files a/img/qwt/qwt_example_10.png and b/img/qwt/qwt_example_10.png differ diff --git a/img/qwt/qwt_example_11.png b/img/qwt/qwt_example_11.png index 55b07016..335a7302 100644 Binary files a/img/qwt/qwt_example_11.png and b/img/qwt/qwt_example_11.png differ diff --git a/img/qwt/qwt_example_12.png b/img/qwt/qwt_example_12.png index 5fbd9ed9..702cd863 100644 Binary files a/img/qwt/qwt_example_12.png and b/img/qwt/qwt_example_12.png differ diff --git a/img/qwt/qwt_example_13.png b/img/qwt/qwt_example_13.png index 424cadee..263ca9be 100644 Binary files a/img/qwt/qwt_example_13.png and b/img/qwt/qwt_example_13.png differ diff --git a/img/qwt/qwt_example_14.png b/img/qwt/qwt_example_14.png index 4c34e4d2..29b171ca 100644 Binary files a/img/qwt/qwt_example_14.png and b/img/qwt/qwt_example_14.png differ diff --git a/img/qwt/qwt_example_15.png b/img/qwt/qwt_example_15.png index 5c16779b..c452edeb 100644 Binary files a/img/qwt/qwt_example_15.png and b/img/qwt/qwt_example_15.png differ diff --git a/img/qwt/qwt_example_16.png b/img/qwt/qwt_example_16.png index 6f747513..16b12654 100644 Binary files a/img/qwt/qwt_example_16.png and b/img/qwt/qwt_example_16.png differ diff --git a/img/qwt/qwt_example_17.png b/img/qwt/qwt_example_17.png index 18f924ef..1e58fcb3 100644 Binary files a/img/qwt/qwt_example_17.png and b/img/qwt/qwt_example_17.png differ diff --git a/img/qwt/qwt_example_18.png b/img/qwt/qwt_example_18.png index 642be957..951a9df9 100644 Binary files a/img/qwt/qwt_example_18.png and b/img/qwt/qwt_example_18.png differ diff --git a/img/qwt/qwt_example_2.png b/img/qwt/qwt_example_2.png index 82d3ce64..c372e095 100644 Binary files a/img/qwt/qwt_example_2.png and b/img/qwt/qwt_example_2.png differ diff --git a/img/qwt/qwt_example_3.png b/img/qwt/qwt_example_3.png index a4250f2b..56262684 100644 Binary files a/img/qwt/qwt_example_3.png and b/img/qwt/qwt_example_3.png differ diff --git a/img/qwt/qwt_example_4.png b/img/qwt/qwt_example_4.png index 068809e4..9e4e354d 100644 Binary files a/img/qwt/qwt_example_4.png and b/img/qwt/qwt_example_4.png differ diff --git a/img/qwt/qwt_example_5.png b/img/qwt/qwt_example_5.png index 60dbcf9a..7a27e1aa 100644 Binary files a/img/qwt/qwt_example_5.png and b/img/qwt/qwt_example_5.png differ diff --git a/img/qwt/qwt_example_6.png b/img/qwt/qwt_example_6.png index b5331c0d..5f31d543 100644 Binary files a/img/qwt/qwt_example_6.png and b/img/qwt/qwt_example_6.png differ diff --git a/img/qwt/qwt_example_7.png b/img/qwt/qwt_example_7.png index 64583d14..dadfd0fe 100644 Binary files a/img/qwt/qwt_example_7.png and b/img/qwt/qwt_example_7.png differ diff --git a/img/qwt/qwt_example_8.png b/img/qwt/qwt_example_8.png index bfb0f916..f49733ae 100644 Binary files a/img/qwt/qwt_example_8.png and b/img/qwt/qwt_example_8.png differ diff --git a/img/qwt/qwt_example_9.png b/img/qwt/qwt_example_9.png index efe060a0..169f701a 100644 Binary files a/img/qwt/qwt_example_9.png and b/img/qwt/qwt_example_9.png differ diff --git a/img/winston/winston_example_1.png b/img/winston/winston_example_1.png index c277cc99..d5fa409e 100644 Binary files a/img/winston/winston_example_1.png and b/img/winston/winston_example_1.png differ diff --git a/img/winston/winston_example_11.png b/img/winston/winston_example_11.png index add04b33..1be9caae 100644 Binary files a/img/winston/winston_example_11.png and b/img/winston/winston_example_11.png differ diff --git a/img/winston/winston_example_12.png b/img/winston/winston_example_12.png index 97f85a3e..de348cbf 100644 Binary files a/img/winston/winston_example_12.png and b/img/winston/winston_example_12.png differ diff --git a/img/winston/winston_example_13.png b/img/winston/winston_example_13.png index 67ed99d8..e2abddad 100644 Binary files a/img/winston/winston_example_13.png and b/img/winston/winston_example_13.png differ diff --git a/img/winston/winston_example_14.png b/img/winston/winston_example_14.png index 476a62da..78890831 100644 Binary files a/img/winston/winston_example_14.png and b/img/winston/winston_example_14.png differ diff --git a/img/winston/winston_example_15.png b/img/winston/winston_example_15.png index 3884cff2..fd0d6046 100644 Binary files a/img/winston/winston_example_15.png and b/img/winston/winston_example_15.png differ diff --git a/img/winston/winston_example_2.png b/img/winston/winston_example_2.png index 0eda683d..a1b85587 100644 Binary files a/img/winston/winston_example_2.png and b/img/winston/winston_example_2.png differ diff --git a/img/winston/winston_example_3.png b/img/winston/winston_example_3.png index 76e9a3dc..bab4213c 100644 Binary files a/img/winston/winston_example_3.png and b/img/winston/winston_example_3.png differ diff --git a/img/winston/winston_example_4.png b/img/winston/winston_example_4.png index cad6bac9..c14366b0 100644 Binary files a/img/winston/winston_example_4.png and b/img/winston/winston_example_4.png differ diff --git a/img/winston/winston_example_5.png b/img/winston/winston_example_5.png index f72c6ef1..52f731fa 100644 Binary files a/img/winston/winston_example_5.png and b/img/winston/winston_example_5.png differ diff --git a/img/winston/winston_example_6.png b/img/winston/winston_example_6.png index d00c450f..029517a5 100644 Binary files a/img/winston/winston_example_6.png and b/img/winston/winston_example_6.png differ diff --git a/img/winston/winston_example_7.png b/img/winston/winston_example_7.png index ce0a7e7e..ce5808d5 100644 Binary files a/img/winston/winston_example_7.png and b/img/winston/winston_example_7.png differ diff --git a/img/winston/winston_example_8.png b/img/winston/winston_example_8.png index e9071f42..2a56eb6a 100644 Binary files a/img/winston/winston_example_8.png and b/img/winston/winston_example_8.png differ diff --git a/img/winston/winston_example_9.png b/img/winston/winston_example_9.png index 1e229465..29dc586f 100644 Binary files a/img/winston/winston_example_9.png and b/img/winston/winston_example_9.png differ diff --git a/src/args.jl b/src/args.jl index f577be91..ef9ba397 100644 --- a/src/args.jl +++ b/src/args.jl @@ -206,7 +206,7 @@ function getPlotKeywordArgs(pkg::PlottingPackage, kw, idx::Int, n::Int) # set label label = d[:label] - label = (label == "AUTO" ? "y_$n" : label) + label = (label == "AUTO" ? "y$n" : label) if d[:axis] == :right && length(label) >= 4 && label[end-3:end] != " (R)" label = string(label, " (R)") end diff --git a/src/backends/pyplot.jl b/src/backends/pyplot.jl index a313192f..69eb378d 100644 --- a/src/backends/pyplot.jl +++ b/src/backends/pyplot.jl @@ -122,9 +122,12 @@ function plot(pkg::PyPlotPackage; kw...) end -function plot!(::PyPlotPackage, plt::Plot; kw...) +function plot!(pkg::PyPlotPackage, plt::Plot; kw...) d = Dict(kw) + if !(d[:linetype] in supportedTypes(pkg)) + error("linetype $(d[:linetype]) is unsupported in PyPlot. Choose from: $(supportedTypes(pkg))") + end if d[:linetype] == :sticks d,_ = sticksHack(;d...) diff --git a/src/backends/winston.jl b/src/backends/winston.jl index dc8b155d..93e1e426 100644 --- a/src/backends/winston.jl +++ b/src/backends/winston.jl @@ -15,8 +15,7 @@ winston!() = plotter!(:winston) const winston_linestyle = Dict(:solid=>"solid", :dash=>"dash", :dot=>"dotted", - :dashdot=>"dotdashed", - # :dashdotdot=>"dotdashed" + :dashdot=>"dotdashed" ) const winston_marker = Dict(:none=>".", @@ -25,19 +24,17 @@ const winston_marker = Dict(:none=>".", :diamond=>"diamond", :utriangle=>"triangle", :dtriangle=>"down-triangle", - :cross => "cross", - # :xcross => "cross", - :star1 => "asterisk", - # :star2 => "filled circle", - # :hexagon => "asterisk" - ) + :cross => "plus", + :xcross => "cross", + :star1 => "asterisk" + ) supportedArgs(::WinstonPackage) = setdiff(ARGS, [:heatmap_c, :fillto, :pos, :markercolor, :background_color]) supportedAxes(::WinstonPackage) = [:auto, :left] supportedTypes(::WinstonPackage) = [:none, :line, :sticks, :scatter, :hist, :bar] -supportedStyles(::WinstonPackage) = [:auto, :solid, :dash, :dot, :dashdot] -supportedMarkers(::WinstonPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :star1] +supportedStyles(::WinstonPackage) = intersect(ALL_STYLES, collect(keys(winston_linestyle))) # [:auto, :solid, :dash, :dot, :dashdot] +supportedMarkers(::WinstonPackage) = intersect(ALL_MARKERS, collect(keys(winston_marker))) # [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1] subplotSupported(::WinstonPackage) = false # --------------------------------------------------------------------------- @@ -140,7 +137,7 @@ function plot!(::WinstonPackage, plt::Plot; kw...) ## lintype :line, :step, :stepinverted, :sticks, :dots, :none, :heatmap, :hexbin, :hist, :bar if d[:linetype] == :none - Winston.add(wplt, Winston.Points(d[:x], d[:y]; copy_remove(e, :kind)...)) + Winston.add(wplt, Winston.Points(d[:x], d[:y]; copy_remove(e, :kind)...)) elseif d[:linetype] == :line x, y = d[:x], d[:y]