diff --git a/docs/pyplot_examples.md b/docs/pyplot_examples.md index 7ec5ff2d..39ddee0f 100644 --- a/docs/pyplot_examples.md +++ b/docs/pyplot_examples.md @@ -1,8 +1,8 @@ # Examples for backend: pyplot -- Supported arguments: `args`, `axis`, `color`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markercolor`, `markersize`, `nbins`, `size`, `title`, `width`, `windowtitle`, `xlabel`, `ylabel`, `yrightlabel` +- Supported arguments: `args`, `axis`, `background_color`, `color`, `foreground_color`, `group`, `kwargs`, `label`, `legend`, `linestyle`, `linetype`, `marker`, `markercolor`, `markersize`, `nbins`, `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`, `:step`, `:stepinverted`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar` - Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot` - Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`, `:hexagon` - Is `subplot`/`subplot!` supported? No @@ -19,7 +19,7 @@ pyplot!() A simple line plot of the 3 columns. ```julia -plot(rand(100,3)) +plot(rand(50,5),w=3) ``` ![](../img/pyplot/pyplot_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/pyplot/pyplot_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/pyplot/pyplot_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/pyplot/pyplot_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/pyplot/pyplot_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/pyplot/pyplot_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/pyplot/pyplot_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/pyplot/pyplot_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/pyplot/pyplot_example_15.png) diff --git a/img/pyplot/pyplot_example_1.png b/img/pyplot/pyplot_example_1.png index f0d2e97b..25dca2f6 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 8a03771d..9499782e 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 45c0073f..1b4ea657 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 4212bdee..38250ae9 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 f9496bec..1339517e 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 c39ba1c8..bbf7f0e3 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 efd5b973..97d2274b 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 ede439b0..7910a0f0 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 5e74e075..daf515cb 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 db7a1175..3889371d 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 e1dbeffe..38953109 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 93e07a98..af6df78e 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 767877ce..ac259d1e 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 3912070b..406e3b43 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 68117f02..f12826f2 100644 Binary files a/img/pyplot/pyplot_example_9.png and b/img/pyplot/pyplot_example_9.png differ diff --git a/src/backends/pyplot.jl b/src/backends/pyplot.jl index c4225e86..0529c575 100644 --- a/src/backends/pyplot.jl +++ b/src/backends/pyplot.jl @@ -67,7 +67,7 @@ function getPyPlotFunction(plt::Plot, axis::Symbol, linetype::Symbol) # in the 2-axis case we need to get: [:] if axis == :right - ax = getRightAxis(plt.o) + ax = getRightAxis(plt.o[1]) ax[:set_ylabel](plt.initargs[:yrightlabel]) fmap = Dict( :hist => :hist, @@ -221,7 +221,14 @@ function updatePlotItems(plt::Plot{PyPlotPackage}, d::Dict) makePyPlotCurrent(plt) haskey(d, :title) && PyPlot.title(d[:title]) haskey(d, :xlabel) && PyPlot.xlabel(d[:xlabel]) - haskey(d, :ylabel) && PyPlot.ylabel(d[:ylabel]) + if haskey(d, :ylabel) + ax = getLeftAxis(plt.o[1]) + ax[:set_ylabel](d[:ylabel]) + end + if haskey(d, :yrightlabel) + ax = getRightAxis(plt.o[1]) + ax[:set_ylabel](d[:yrightlabel]) + end end