Fix bar plot vector attribute with missing values (#4736)

* Fix bar plot vector attribute with missing values

* format

---------

Co-authored-by: Simon Christ <[email protected]>

Author: yha

src/examples.jl

@@ -198,8 +198,9 @@ const _examples = PlotExample[
     ),
     PlotExample( # 14
         "Bar",
-        "`x` is the midpoint of the bar. (todo: allow passing of edges instead of midpoints)",
-        :(bar(randn(99))),
+        "`bar(x, y)` plots bars with heights `y` and centers at `x`.
+        `x` defaults to `eachindex(y)`.",
+        :(plot(bar(randn(10)), bar([0, 3, 5], [1, 2, 6]), legend = false)),
     ),
     PlotExample( # 15
         "Histogram",
@@ -1235,6 +1236,16 @@ const _examples = PlotExample[
             end
         end,
     ),
+    PlotExample( # 66
+        "Bars: specifying edges and missing values",
+        "In `bar(x, y)`, `x` may be the same length as `y` to specify bar centers,
+        or one longer to specify bar edges.",
+        :(plot(
+            bar(-5:5, randn(10)),                  # bar edges at -5:5
+            bar(-2:2, [2, -2, NaN, -1, 1], color = 1:5), # bar centers at -2:2, one missing value
+            legend = false,
+        )),
+    ),
 ]
 
 # Some constants for PlotDocs and PlotReferenceImages
@@ -1256,6 +1267,7 @@ _backend_skips = Dict(
         63,  # twin axes unsupported
         64,  # legend pos unsupported
         65,  # legend pos unsupported
+        66,  # bar: vector-valued `color` unsupported
     ],
     :pgfplotsx => [
         6,  # images

src/recipes.jl

@@ -442,8 +442,10 @@ end
     end
 
     xseg, yseg = map(_ -> Segments(), 1:2)
+    valid_i = isfinite.(procx) .& isfinite.(procy)
     for i in 1:ny
-        (yi = procy[i]) |> isnan && continue
+        valid_i[i] || continue
+        yi = procy[i]
         center = procx[i]
         hwi = _cycle(hw, i)
         fi = _cycle(fillto, i)
@@ -477,8 +479,9 @@ end
                     @warn "Indices $(eachindex(v)) of attribute `$k` do not match data indices $(eachindex(y))."
                 end
                 # Each segment is 6 elements long, including the NaN separator.
+                # One segment is created for each non-NaN element of `procy`.
                 # There is no trailing NaN, so the last repetition is dropped.
-                plotattributes[k] = @view repeat(v; inner = 6)[1:(end - 1)]
+                plotattributes[k] = @views repeat(v[valid_i]; inner = 6)[1:(end - 1)]
             end
         end
         ()
@@ -490,8 +493,8 @@ end
     markersize := 0
     markeralpha := 0
     fillrange := nothing
-    x := x
-    y := y
+    x := procx
+    y := procy
     ()
 end
 @deps bar shape