more fixes

Author: BeastyBlacksmith

PlotsBase/ext/PGFPlotsXExt.jl

@@ -1271,15 +1271,25 @@ end
 function pgfx_fillrange_attrs(fillrange, x, y)
     n = length(x)
     x_fill = [x; x[n:-1:1]; x[1]]
-    y_fill = [y; _getvalue(fillrange, n:-1:1); y[1]]
+    fr_vals = if fillrange isa Number
+        fill(fillrange, n)
+    else
+        _getvalue(fillrange, n:-1:1)
+    end
+    y_fill = [y; fr_vals; y[1]]
     return PGFPlotsX.Coordinates(x_fill, y_fill)
 end
 
 function pgfx_fillrange_attrs(fillrange, x, y, z)
     n = length(x)
     x_fill = [x; x[n:-1:1]; x[1]]
-    y_fill = [y; y[n:-1:1]; x[1]]
-    z_fill = [z; _getvalue(fillrange, n:-1:1); z[1]]
+    y_fill = [y; y[n:-1:1]; y[1]]
+    fr_vals = if fillrange isa Number
+        fill(fillrange, n)
+    else
+        _getvalue(fillrange, n:-1:1)
+    end
+    z_fill = [z; fr_vals; z[1]]
     return PGFPlotsX.Coordinates(x_fill, y_fill, z_fill)
 end
 

PlotsBase/src/Commons/Commons.jl

@@ -293,11 +293,7 @@ end
 
 # helpers to figure out if there are NaN values in a list of array types
 anynan(i::Int, args::Tuple) = any(
-    a -> try
-        isnan(_getvalue(a, i))
-    catch MethodError
-        false
-    end, args
+    a -> isnan(_getvalue(a, i)), args
 )
 anynan(args::Tuple) = i -> anynan(i, args)
 anynan(istart::Int, iend::Int, args::Tuple) = any(anynan(args), istart:iend)

PlotsBase/src/DataSeries.jl

@@ -153,7 +153,10 @@ for comp in (:line, :fill, :marker)
                 isa(c, PlotUtils.ColorGradient) ? c : PlotUtils.plot_color(c)
             else
                 grad = _getattr(series, $Symbol($compcolor))  # series[:linecolor], series[:fillcolor], series[:markercolor]
-                if s ≡ :identity
+                if !(grad isa PlotUtils.ColorGradient)
+                    # z-coloring requires a gradient; if a plain color, just return it
+                    PlotUtils.plot_color(grad)
+                elseif s ≡ :identity
                     get(grad, z, (cmin, cmax))
                 else
                     base = _log_scale_bases[s]

PlotsBase/src/Subplots.jl

@@ -88,12 +88,14 @@ Commons.get_ticks(sp::Subplot, s::Symbol) = get_ticks(sp, sp[get_attr_symbol(s,
 # converts a symbol or string into a Colorant or ColorGradient
 # and assigns a color automatically
 function get_series_color(c, sp::Subplot, n::Int, seriestype)
+    # Ensure valid index (n can be 0 for non-primary series before any primary series)
+    idx = max(1, n)
     c = if c ≡ :auto
-        Commons.like_surface(seriestype) ? PlotsBase.cgrad() : _getattr(sp, :color_palette, n)
+        Commons.like_surface(seriestype) ? PlotsBase.cgrad() : _getattr(sp, :color_palette, idx)
     elseif isa(c, Int)
         _getattr(sp, :color_palette, c)
     elseif c isa RecipesBase.CyclingAttribute
-        c[n]
+        c[idx]
     else
         c
     end

PlotsBase/src/recipes.jl

@@ -682,24 +682,30 @@ end
 
     # create a secondary series for the markers
     if plotattributes[:markershape] ≢ :none
+        # create the primary path series first
         @series begin
-            seriestype := :scatter
-            x := _bin_centers(edge)
-            y := weights
-            fillrange := nothing
-            label := ""
-            primary := false
+            x := xpts
+            y := ypts
+            seriestype := :path
+            markershape := :none
+            xerror := :none
+            yerror := :none
             ()
         end
-        markershape := :none
-        xerror := :none
-        yerror := :none
+        # then the non-primary scatter series for markers
+        seriestype := :scatter
+        x := _bin_centers(edge)
+        y := weights
+        fillrange := nothing
+        label := ""
+        primary := false
+        ()
+    else
+        x := xpts
+        y := ypts
+        seriestype := :path
+        ()
     end
-
-    x := xpts
-    y := ypts
-    seriestype := :path
-    ()
 end
 @deps stepbins path
 

PlotsBase/test/test_pgfplotsx.jl

@@ -1,4 +1,5 @@
 using Test, PlotsBase, Unitful, LaTeXStrings
+using RecipesBase: cycle
 const PGFPlotsX = Base.get_extension(PlotsBase, :PGFPlotsXExt).PGFPlotsX
 
 function create_plot(args...; kwargs...)
@@ -71,7 +72,7 @@ with(:pgfplotsx) do
             rand(11, 4),
             lab = "lines",
             w = 3,
-            palette = :grays,
+            palette = cycle(:grays),
             fill = 0,
             α = 0.6,
         )
@@ -134,7 +135,7 @@ with(:pgfplotsx) do
         @test plot(
             PlotsBase.fakedata(100, 10),
             layout = 4,
-            palette = [:grays :blues :hot :rainbow],
+            palette = cycle.([:grays :blues :hot :rainbow]),
             bg_inside = [:orange :pink :darkblue :black],
         ) isa PlotsBase.Plot
     end
@@ -347,9 +348,9 @@ with(:pgfplotsx) do
     @testset "Markers and Paths" begin
         pl = plot(
             5 .- ones(9),
-            markershape = [:utriangle, :rect],
+            markershape = cycle([:utriangle, :rect]),
             markersize = 8,
-            color = [:red, :black],
+            color = cycle([:red, :black]),
         )
         axis_contents = first(get_pgf_axes(pl)).contents
         plots = filter(x -> x isa PGFPlotsX.Plot, axis_contents)

PlotsBase/test/test_utils.jl

@@ -155,7 +155,7 @@ end
     @test segments([nan10; 1:5]) == [11:15]
     @test segments([1:5; nan10]) == [1:5]
     @test segments([nan10; 1:5; nan10; 1:5; nan10]) == [11:15, 26:30]
-    @test segments([NaN; 1], 1:10) == [2:2, 4:4, 6:6, 8:8, 10:10]
+    @test segments(RecipesBase.cycle([NaN; 1]), 1:10) == [2:2, 4:4, 6:6, 8:8, 10:10]
     @test segments([nan10; 1:15], [1:15; nan10]) == [11:15]
 end
 
@@ -265,7 +265,7 @@ end
 
     # test cycling indexes
     x = 0.0:0.1:1
-    y = [1, 2, 3]
+    y = RecipesBase.cycle([1, 2, 3])
     pl = scatter(x, y)
     @test PlotsBase._guess_best_legend_position(:best, pl) ≡ :topright
 

RecipesBase/src/RecipesBase.jl

@@ -95,6 +95,10 @@ for op in (:+, :-, :/, :*)
 end
 Base.:-(a::CyclingAttribute) = CyclingAttribute(-a.value)
 Base.:(==)(a::CyclingAttribute, b::CyclingAttribute) = a.value == b.value
+Base.firstindex(c::CyclingAttribute) = firstindex(c.value)
+Base.lastindex(c::CyclingAttribute) = lastindex(c.value)
+Base.length(c::CyclingAttribute) = length(c.value)
+Base.size(c::CyclingAttribute, args...) = size(c.value, args...)
 # --------------------------------------------------------------------------
 
 @inline to_symbol(s::Symbol) = s

RecipesPipeline/src/series.jl

@@ -32,6 +32,7 @@ _prepare_series_data(s::Surface{<:AMat{<:MaybeNumber}}) =
 _prepare_series_data(s::Surface) = s  # non-numeric Surface, such as an image
 _prepare_series_data(v::Volume) =
     Volume(_prepare_series_data(v.v), v.x_extents, v.y_extents, v.z_extents)
+_prepare_series_data(c::RecipesBase.CyclingAttribute) = c
 
 # default: assume x represents a single series
 _series_data_vector(x, plotattributes) = [_prepare_series_data(x)]