Merge branch 'master' of https://github.com/sswatson/Plots.jl

REQUIRE

@@ -13,4 +13,4 @@ JSON
 NaNMath
 Requires
 Contour
-GR 0.35.0
+GR 0.37.0

src/Plots.jl

@@ -5,7 +5,7 @@ _current_plots_version = v"0.20.6"
 using Reexport
 
 import StaticArrays
-using Dates, Printf, Statistics, Base64, LinearAlgebra
+using Dates, Printf, Statistics, Base64, LinearAlgebra, Random
 import SparseArrays: findnz
 
 @reexport using RecipesBase

src/axes.jl

@@ -459,7 +459,7 @@ const _widen_seriestypes = (:line, :path, :steppre, :steppost, :sticks, :scatter
 
 function default_should_widen(axis::Axis)
     should_widen = false
-    if !is_2tuple(axis[:lims])
+    if !(is_2tuple(axis[:lims]) || axis[:lims] == :round)
         for sp in axis.sps
             for series in series_list(sp)
                 if series.plotattributes[:seriestype] in _widen_seriestypes

src/backends/gr.jl

@@ -1029,16 +1029,13 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             else
                 h = series[:levels] > 1 ? range(zmin, stop=zmax, length=series[:levels]) : [(zmin + zmax) / 2]
             end
-            if series[:fillrange] != nothing
-                GR.surface(x, y, z, GR.OPTION_CELL_ARRAY)
-            else
             GR.setlinetype(gr_linetype[get_linestyle(series)])
             GR.setlinewidth(max(0, get_linewidth(series) / (sum(gr_plot_size) * 0.001)))
-                if plot_color(series[:linecolor]) == [plot_color(:black)]
+            if series[:fillrange] != nothing
-                    GR.contour(x, y, h, z, 0 + (series[:contour_labels] == true ? 1 : 0))
+                GR.contourf(x, y, h, z, series[:contour_labels] == true ? 1 : 0)
             else
-                    GR.contour(x, y, h, z, 1000 + (series[:contour_labels] == true ? 1 : 0))
+                coff = plot_color(series[:linecolor]) == [plot_color(:black)] ? 0 : 1000
-                end
+                GR.contour(x, y, h, z, coff + (series[:contour_labels] == true ? 1 : 0))
             end
 
             # create the colorbar of contour levels

src/components.jl

@@ -600,7 +600,7 @@ function process_annotation(sp::Subplot, xs, ys, labs, font = font())
             alphabet = "abcdefghijklmnopqrstuvwxyz"
             push!(anns, (x, y, text(string("(", alphabet[sp[:subplot_index]], ")"), font)))
         else
-            push!(anns, (x, y, isa(lab, PlotText) ? lab : text(lab, font)))
+            push!(anns, (x, y, isa(lab, PlotText) ? lab : isa(lab, Tuple) ? text(lab...) : text(lab, font)))
         end
     end
     anns
@@ -615,7 +615,7 @@ function process_annotation(sp::Subplot, positions::Union{AVec{Symbol},Symbol},
             alphabet = "abcdefghijklmnopqrstuvwxyz"
             push!(anns, (pos, text(string("(", alphabet[sp[:subplot_index]], ")"), font)))
         else
-            push!(anns, (pos, isa(lab, PlotText) ? lab : text(lab, font)))
+            push!(anns, (pos, isa(lab, PlotText) ? lab : isa(lab, Tuple) ? text(lab...) : text(lab, font)))
         end
     end
     anns

src/themes.jl

@@ -100,7 +100,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
         end
     end
 
-    srand(1)
+    Random.seed!(1)
 
     label := ""
     colorbar := false