diff --git a/docs/qwt_examples.md b/docs/qwt_examples.md index 1b04264d..74c3d75b 100644 --- a/docs/qwt_examples.md +++ b/docs/qwt_examples.md @@ -1,10 +1,10 @@ # Examples for backend: qwt -- Supported arguments: `args`, `axis`, `color`, `fillto`, `heatmap_c`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markercolor`, `markersize`, `nbins`, `reg`, `size`, `title`, `width`, `windowtitle`, `xlabel`, `ylabel`, `yrightlabel` +- Supported arguments: `args`, `axis`, `background_color`, `color`, `fillto`, `foreground_color`, `group`, `heatmap_c`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markercolor`, `markersize`, `nbins`, `reg`, `ribbon`, `show`, `size`, `title`, `width`, `windowtitle`, `xlabel`, `xticks`, `ylabel`, `yrightlabel`, `yticks` - Supported values for axis: `:auto`, `:left`, `:right` -- Supported values for linetype: `:none`, `:line`, `:step`, `:stepinverted`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar` +- Supported values for linetype: `:none`, `:line`, `:path`, `:steppre`, `:steppost`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar` - Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot`, `:dashdotdot` -- Supported values for marker: `:none`, `:auto`, `:ellipse`, `:rect`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`, `:star2`, `:hexagon` +- Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`, `:star2`, `:hexagon` - Is `subplot`/`subplot!` supported? Yes ### Initialize @@ -19,7 +19,7 @@ qwt!() A simple line plot of the 3 columns. ```julia -plot(rand(100,3)) +plot(rand(50,5),w=3) ``` ![](../img/qwt/qwt_example_1.png) @@ -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π,legend=false) + end),0,2π,legend=false,fillto=0) ``` ![](../img/qwt/qwt_example_4.png) @@ -61,7 +61,7 @@ plot(sin,(x->begin # /home/tom/.julia/v0.4/Plots/docs/example_generation.jl, li 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)) +plot(rand(10); title="TITLE",xlabel="XLABEL",ylabel="YLABEL",background_color=RGB(0.2,0.2,0.2)) ``` ![](../img/qwt/qwt_example_5.png) @@ -73,7 +73,7 @@ Use the `axis` or `axiss` arguments. Note: Currently only supported with Qwt and PyPlot ```julia -plot(Vector[randn(100),randn(100) * 100]; axiss=[:left,:right],ylabel="LEFT",yrightlabel="RIGHT") +plot(Vector[randn(100),randn(100) * 100]; axis=[:l,:r],ylabel="LEFT",yrightlabel="RIGHT") ``` ![](../img/qwt/qwt_example_6.png) @@ -103,7 +103,7 @@ plot(rand(100) / 3; reg=true,fillto=0) and add to it later. ```julia -scatter!(rand(100); markersize=6,color=:blue) +scatter!(rand(100); markersize=6,c=:blue) ``` ![](../img/qwt/qwt_example_9.png) @@ -123,11 +123,11 @@ heatmap(randn(10000),randn(10000); nbins=100) ```julia -types = intersect(supportedTypes(),[:line,:step,:stepinverted,:sticks,:scatter]) +types = intersect(supportedTypes(),[:line,:path,:steppre,:steppost,:sticks,:scatter]) n = length(types) x = Vector[sort(rand(20)) for i = 1:n] y = rand(20,n) -plot(x,y; linetypes=types,labels=map(string,types)) +plot(x,y; t=types,lab=map(string,types)) ``` ![](../img/qwt/qwt_example_11.png) @@ -138,7 +138,7 @@ plot(x,y; linetypes=types,labels=map(string,types)) ```julia styles = setdiff(supportedStyles(),[:auto]) -plot(rand(20,length(styles)); linestyle=:auto,labels=map(string,styles)) +plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w=5) ``` ![](../img/qwt/qwt_example_12.png) @@ -149,7 +149,7 @@ plot(rand(20,length(styles)); linestyle=:auto,labels=map(string,styles)) ```julia 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) +scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,label=map(string,markers),markersize=10) ``` ![](../img/qwt/qwt_example_13.png) @@ -166,10 +166,10 @@ bar(randn(1000)) ### Histogram -note: fillto isn't supported on all backends + ```julia -histogram(randn(1000); nbins=50,fillto=20) +histogram(randn(1000); nbins=50) ``` ![](../img/qwt/qwt_example_15.png) diff --git a/img/qwt/qwt_example_1.png b/img/qwt/qwt_example_1.png index 4da574b2..2e20fe38 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 d9e01751..5d2df3a8 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 335a7302..e68b2913 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 702cd863..5e1b3bcb 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 263ca9be..37deb057 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 29b171ca..a35a9fa6 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 c452edeb..67f6a74d 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 16b12654..4e31cab2 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 1e58fcb3..b1d8798c 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 951a9df9..a5913dce 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 c372e095..1063e62a 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 56262684..08fa43d5 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 9e4e354d..ec2944a3 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 7a27e1aa..24e7a667 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 5f31d543..4277adc4 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 dadfd0fe..a2734199 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 f49733ae..adbd05b7 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 169f701a..a53b6da0 100644 Binary files a/img/qwt/qwt_example_9.png and b/img/qwt/qwt_example_9.png differ diff --git a/src/backends/qwt.jl b/src/backends/qwt.jl index 8bf15897..9854a27d 100644 --- a/src/backends/qwt.jl +++ b/src/backends/qwt.jl @@ -39,7 +39,6 @@ function adjustQwtKeywords(iscreating::Bool; kw...) end replaceLinetypeAlias(d) - show(d) d end