bump version [skip ci]

fix infinite objects with log scale

Project.toml

@@ -1,7 +1,7 @@
 name = "Plots"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 author = ["Tom Breloff (@tbreloff)"]
-version = "1.3.5"
+version = "1.3.6"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

src/recipes.jl

@@ -112,7 +112,7 @@ end
 
 @recipe function f(::Type{Val{:hline}}, x, y, z)
     n = length(y)
-    newx = repeat(Float64[-1, 1, NaN], n)
+    newx = repeat(Float64[1, 2,  NaN], n)
     newy = vec(Float64[yi for i = 1:3, yi in y])
     x := newx
     y := newy
@@ -124,7 +124,7 @@ end
 @recipe function f(::Type{Val{:vline}}, x, y, z)
     n = length(y)
     newx = vec(Float64[yi for i = 1:3, yi in y])
-    newy = repeat(Float64[-1, 1, NaN], n)
+    newy = repeat(Float64[1, 2, NaN], n)
     x := newx
     y := newy
     seriestype := :straightline
@@ -1028,7 +1028,7 @@ end
 
 function error_style!(plotattributes::AKW)
     plotattributes[:seriestype] = :path
-    plotattributes[:markercolor] = plotattributes[:markerstrokecolor] 
+    plotattributes[:markercolor] = plotattributes[:markerstrokecolor]
     plotattributes[:linewidth] = plotattributes[:markerstrokewidth]
     plotattributes[:label] = ""
 end

src/utils.jl

@@ -420,7 +420,7 @@ ylims(sp_idx::Int = 1) = ylims(current(), sp_idx)
 zlims(sp_idx::Int = 1) = zlims(current(), sp_idx)
 
 # These functions return an operator for use in `get_clims(::Seres, op)`
-process_clims(lims::NTuple{2,<:Number}) = (zlims -> ifelse.(isfinite.(lims), lims, zlims)) ∘ ignorenan_extrema
+process_clims(lims::Tuple{<:Number,<:Number}) = (zlims -> ifelse.(isfinite.(lims), lims, zlims)) ∘ ignorenan_extrema
 process_clims(s::Union{Symbol,Nothing,Missing}) = ignorenan_extrema
 # don't specialize on ::Function otherwise python functions won't work
 process_clims(f) = f
@@ -1079,10 +1079,21 @@ end
 function straightline_data(series, expansion_factor = 1)
     sp = series[:subplot]
     xl, yl = isvertical(series) ? (xlims(sp), ylims(sp)) : (ylims(sp), xlims(sp))
-    x, y = series[:x], series[:y]
+
+    # handle axes scales
+    xscale = sp[:xaxis][:scale]
+    xf = RecipesPipeline.scale_func(xscale)
+    xinvf = RecipesPipeline.inverse_scale_func(xscale)
+    yscale = sp[:yaxis][:scale]
+    yf = RecipesPipeline.scale_func(yscale)
+    yinvf = RecipesPipeline.inverse_scale_func(yscale)
+
+    xl, yl = xf.(xl), yf.(yl)
+    x, y = xf.(series[:x]), yf.(series[:y])
     n = length(x)
-    if n == 2
-        return straightline_data(xl, yl, x, y, expansion_factor)
+
+    xdata, ydata = if n == 2
+        straightline_data(xl, yl, x, y, expansion_factor)
     else
         k, r = divrem(n, 3)
         if r == 0
@@ -1091,11 +1102,13 @@ function straightline_data(series, expansion_factor = 1)
                 inds = (3 * i - 2):(3 * i - 1)
                 xdata[inds], ydata[inds] = straightline_data(xl, yl, x[inds], y[inds], expansion_factor)
             end
-            return xdata, ydata
+            xdata, ydata
         else
             error("Misformed data. `straightline_data` either accepts vectors of length 2 or 3k. The provided series has length $n")
         end
     end
+
+    return xinvf.(xdata), yinvf.(ydata)
 end
 
 function straightline_data(xl, yl, x, y, expansion_factor = 1)
@@ -1127,20 +1140,28 @@ end
 function shape_data(series, expansion_factor = 1)
     sp = series[:subplot]
     xl, yl = isvertical(series) ? (xlims(sp), ylims(sp)) : (ylims(sp), xlims(sp))
+
+    # handle axes scales
+    xscale = sp[:xaxis][:scale]
+    xf = RecipesPipeline.scale_func(xscale)
+    xinvf = RecipesPipeline.inverse_scale_func(xscale)
+    yscale = sp[:yaxis][:scale]
+    yf = RecipesPipeline.scale_func(yscale)
+    yinvf = RecipesPipeline.inverse_scale_func(yscale)
+
     x, y = copy(series[:x]), copy(series[:y])
-    factor = 100
     for i in eachindex(x)
         if x[i] == -Inf
-            x[i] = xl[1] - expansion_factor * (xl[2] - xl[1])
+            x[i] = xinvf(xf(xl[1]) - expansion_factor * (xf(xl[2]) - xf(xl[1])))
         elseif x[i] == Inf
-            x[i] = xl[2] + expansion_factor * (xl[2] - xl[1])
+            x[i] = xinvf(xf(xl[2]) + expansion_factor * (xf(xl[2]) - xf(xl[1])))
         end
     end
     for i in eachindex(y)
         if y[i] == -Inf
-            y[i] = yl[1] - expansion_factor * (yl[2] - yl[1])
+            y[i] = yinvf(yf(yl[1]) - expansion_factor * (yf(yl[2]) - yf(yl[1])))
         elseif y[i] == Inf
-            y[i] = yl[2] + expansion_factor * (yl[2] - yl[1])
+            y[i] = yinvf(yf(yl[2]) + expansion_factor * (yf(yl[2]) - yf(yl[1])))
         end
     end
     return x, y

test/runtests.jl

@@ -179,4 +179,9 @@ end
         @test isequal(collect(zip(Plots.unzip(z)...)), z)
         @test isequal(collect(zip(Plots.unzip(GeometryTypes.Point.(z))...)), z)
     end
+    op1 = Plots.process_clims((1.0, 2.0))
+    op2 = Plots.process_clims((1, 2.0))
+    data = randn(100, 100)
+    @test op1(data) == op2(data)
+    @test Plots.process_clims(nothing) == Plots.process_clims(missing) == Plots.process_clims(:auto)
 end