diff --git a/README.md b/README.md index f7fa3cd2..55722581 100644 --- a/README.md +++ b/README.md @@ -213,10 +213,12 @@ Keyword | Default | Type | Aliases `:fillrange` | `nothing` | Series | `:fillranges`, `:fillrng` `:foreground_color` | `auto` | Plot | `:fg`, `:fg_color`, `:fgcolor`, `:foreground` `:group` | `nothing` | Series | `:g`, `:groups` +`:guidefont` | `Plots.Font("Helvetica",16,:hcenter,:vcenter,0.0,RGB{U8}(0.0,0.0,0.0))` | Plot | `:heatmap_c` | `(0.15,0.5)` | Series | `:heatmap_cs` `:label` | `AUTO` | Series | `:lab`, `:labels` `:layout` | `nothing` | Plot | `:legend` | `true` | Plot | `:leg` +`:legendfont` | `Plots.Font("Helvetica",10,:hcenter,:vcenter,0.0,RGB{U8}(0.0,0.0,0.0))` | Plot | `:line` | `nothing` | Series | `:l` `:linestyle` | `solid` | Series | `:linestyles`, `:ls`, `:s`, `:style` `:linetype` | `path` | Series | `:linetypes`, `:lt`, `:t`, `:type` @@ -234,9 +236,10 @@ Keyword | Default | Type | Aliases `:nc` | `-1` | Plot | `:nr` | `-1` | Plot | `:pos` | `(0,0)` | Plot | -`:reg` | `false` | Series | `:regression`, `:regs` `:show` | `false` | Plot | `:display`, `:gui` `:size` | `(600,400)` | Plot | `:windowsize`, `:wsize` +`:smooth` | `false` | Series | `:reg`, `:regression`, `:smooths` +`:tickfont` | `Plots.Font("Helvetica",13,:hcenter,:vcenter,0.0,RGB{U8}(0.0,0.0,0.0))` | Plot | `:title` | `` | Plot | `:windowtitle` | `Plots.jl` | Plot | `:wtitle` `:xaxis` | `nothing` | Plot | diff --git a/docs/immerse_examples.md b/docs/immerse_examples.md index 0557893c..9cac3af7 100644 --- a/docs/immerse_examples.md +++ b/docs/immerse_examples.md @@ -1,10 +1,10 @@ # Examples for backend: immerse -- Supported arguments: `annotation`, `background_color`, `color`, `color_palette`, `fillrange`, `fillcolor`, `group`, `label`, `layout`, `legend`, `linestyle`, `linetype`, `linewidth`, `markershape`, `markercolor`, `markersize`, `n`, `nbins`, `nc`, `nr`, `reg`, `show`, `size`, `title`, `windowtitle`, `x`, `xlabel`, `xlims`, `xticks`, `y`, `ylabel`, `ylims`, `yticks`, `xscale`, `yscale`, `xflip`, `yflip`, `z` +- Supported arguments: `annotation`, `background_color`, `color`, `color_palette`, `fillrange`, `fillcolor`, `foreground_color`, `group`, `label`, `layout`, `legend`, `linestyle`, `linetype`, `linewidth`, `markershape`, `markercolor`, `markersize`, `n`, `nbins`, `nc`, `nr`, `smooth`, `show`, `size`, `title`, `windowtitle`, `x`, `xlabel`, `xlims`, `xticks`, `y`, `ylabel`, `ylims`, `yticks`, `xscale`, `yscale`, `xflip`, `yflip`, `z`, `tickfont`, `guidefont`, `legendfont` - Supported values for axis: `:auto`, `:left` -- Supported values for linetype: `:none`, `:line`, `:path`, `:steppost`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`, `:hline`, `:vline`, `:ohlc` +- Supported values for linetype: `:none`, `:line`, `:path`, `:steppre`, `:steppost`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`, `:hline`, `:vline`, `:ohlc` - Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot`, `:dashdotdot` -- Supported values for marker: `:none`, `:auto`, `:rect`, `:ellipse`, `:diamond`, `:utriangle`, `:dtriangle`, `:cross`, `:xcross`, `:star1`, `:star2`, `:hexagon`, `:octagon` +- Supported values for marker: `:none`, `:auto`, `:cross`, `:diamond`, `:dtriangle`, `:ellipse`, `:heptagon`, `:hexagon`, `:octagon`, `:pentagon`, `:rect`, `:star4`, `:star5`, `:star6`, `:star7`, `:star8`, `:utriangle`, `:xcross`, `:Plots.Shape` - Is `subplot`/`subplot!` supported? Yes ### Initialize @@ -150,8 +150,11 @@ plot(cumsum(randn(20,length(styles)),1); style=:auto,label=map(string,styles),w= ```julia -markers = setdiff(supportedMarkers(),[:none,:auto])' -scatter(0.5:9.5,[fill(i - 0.5,10) for i = length(markers):-1:1]; marker=:auto,label=map(string,markers),ms=12) +markers = setdiff(supportedMarkers(),[:none,:auto,Shape])' +n = length(markers) +x = (linspace(0,10,n + 2))[2:end - 1] +y = repmat(reverse(x)',n,1) +scatter(x,y,m=(12,:auto),lab=map(string,markers),bg=:linen) ``` ![](../img/immerse/immerse_example_13.png) @@ -209,30 +212,14 @@ subplot!(fakedata(100,10)) ![](../img/immerse/immerse_example_18.png) -### Open/High/Low/Close - -Create an OHLC chart. Pass in a vector of OHLC objects as your `y` argument. Adjust the tick width with arg `markersize`. - -```julia -n = 20 -hgt = rand(n) + 1 -bot = randn(n) -openpct = rand(n) -closepct = rand(n) -y = [OHLC(openpct[i] * hgt[i] + bot[i],bot[i] + hgt[i],bot[i],closepct[i] * hgt[i] + bot[i]) for i = 1:n] -ohlc(y; markersize=8) -``` - -![](../img/immerse/immerse_example_19.png) - ### Annotations Currently only text annotations are supported. Pass in a tuple or vector-of-tuples: (x,y,text). `annotate!(ann)` is shorthand for `plot!(; annotation=ann)` ```julia y = rand(10) -plot(y,ann=(3,y[3],"this is #3")) -annotate!([(5,y[5],"this is #5"),(9,y[10],"this is #10")]) +plot(y,ann=(3,y[3],text("this is #3",:left))) +annotate!([(5,y[5],text("this is #5",16,:red,:center)),(10,y[10],text("this is #10",:right,20,"courier"))]) ``` ![](../img/immerse/immerse_example_20.png) diff --git a/img/immerse/immerse_example_1.png b/img/immerse/immerse_example_1.png index 4ea7d606..a06e42e9 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 bbefe94d..e1d4550b 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 3931a79e..c0fa0be1 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 c491f919..539bce4a 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 7b2d114c..9721d445 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 c1adabae..7e3466c7 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 0f07dc33..6b85a465 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 97d9b0f4..57e27cb9 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 d6184689..a94dd3f8 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 0d5e63f4..8cd1397d 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_2.png b/img/immerse/immerse_example_2.png index f28693a4..68d78902 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_20.png b/img/immerse/immerse_example_20.png index 288c78a4..42e2798b 100644 Binary files a/img/immerse/immerse_example_20.png and b/img/immerse/immerse_example_20.png differ diff --git a/img/immerse/immerse_example_3.png b/img/immerse/immerse_example_3.png index 5d66f615..ba25ea9d 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 69f15fd2..925dc86f 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 3cec95ce..2fa91efb 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 05062c95..7c5911b2 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 78ec0d2f..9858dc70 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 f968f4cf..d5b3b292 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 f2d2bb73..737f0a02 100644 Binary files a/img/immerse/immerse_example_9.png and b/img/immerse/immerse_example_9.png differ diff --git a/img/supported/Plots.supportGraphArgs.png b/img/supported/Plots.supportGraphArgs.png index d448aa6a..03ee624e 100644 Binary files a/img/supported/Plots.supportGraphArgs.png and b/img/supported/Plots.supportGraphArgs.png differ diff --git a/img/supported/Plots.supportGraphAxes.png b/img/supported/Plots.supportGraphAxes.png index 72a0a9e8..ad70384b 100644 Binary files a/img/supported/Plots.supportGraphAxes.png and b/img/supported/Plots.supportGraphAxes.png differ diff --git a/img/supported/Plots.supportGraphMarkers.png b/img/supported/Plots.supportGraphMarkers.png index f4bc5195..c6321878 100644 Binary files a/img/supported/Plots.supportGraphMarkers.png and b/img/supported/Plots.supportGraphMarkers.png differ diff --git a/img/supported/Plots.supportGraphScales.png b/img/supported/Plots.supportGraphScales.png index 379b7194..7fab0d00 100644 Binary files a/img/supported/Plots.supportGraphScales.png and b/img/supported/Plots.supportGraphScales.png differ diff --git a/img/supported/Plots.supportGraphStyles.png b/img/supported/Plots.supportGraphStyles.png index b7f4d365..e0679a13 100644 Binary files a/img/supported/Plots.supportGraphStyles.png and b/img/supported/Plots.supportGraphStyles.png differ diff --git a/img/supported/Plots.supportGraphTypes.png b/img/supported/Plots.supportGraphTypes.png index 954c39c4..e417265c 100644 Binary files a/img/supported/Plots.supportGraphTypes.png and b/img/supported/Plots.supportGraphTypes.png differ