maint: Merge stable to default.

gnu-octave · Oct 16, 2024 · ccbb17d · ccbb17d
2 parents 79bd745 + a045c40
commit ccbb17d
Show file tree

Hide file tree

Showing 4 changed files with 132 additions and 1 deletion.
diff --git a/etc/NEWS.9.md b/etc/NEWS.9.md
@@ -27,7 +27,9 @@ Summary of bugs fixed for version 9.3.0 (tbd):
   patch and surface graphics objects (bug #66314).
 - `barh` properties now better match equivalent `bar` plot.  Changing
   `horizontal` property for a bar or barh plot now consistently updates
-  properties to match redrawn plot (bug #65671).
+  properties to match redrawn plot (bug #65671).  
+- Tick mark labels are now correctly updated after changing x or y data for
+  `bar` and `barh` plots (bug #65734).
 
 ### GUI
 

diff --git a/scripts/plot/draw/bar.m b/scripts/plot/draw/bar.m
@@ -863,6 +863,67 @@
 %!   close (hf);
 %! end_unwind_protect
 
+## Ensure x tick labels are updated with xdata changes.
+%!test <*65734>
+%! hf = figure ("visible", "off");
+%! unwind_protect
+%!   hax = axes ("parent", hf);
+%!   hb = bar (hax, 2:4);
+%!   hp = get (hb, "children");
+%!
+%!   assert (get (hb, "xdata"), [1:3]');
+%!   assert (get (hax, {"xlim", "xtick","xticklabel"}), ...
+%!           {[0.5, 3.5], 1:3, {"1"; "2"; "3"}});
+%!   assert (get (hax, {"ylim", "ytick", "yticklabel"}), ...
+%!           {[0, 4], [0:4], {"0"; "1"; "2"; "3"; "4"}});
+%!
+%!   set (hb, "xdata", [3:5]');  # column vector input.
+%!   assert (get (hax, {"xlim", "xtick","xticklabel"}), ...
+%!           {[2.5, 5.5], 3:5, {"3"; "4"; "5"}});
+%!   assert (get (hax, {"ylim", "ytick", "yticklabel"}), ...
+%!           {[0, 4], [0:4], {"0"; "1"; "2"; "3"; "4"}});
+%!
+%!   set (hb, "xdata", [9:11]);  # row vector input.
+%!   assert (get (hax, {"xlim", "xtick","xticklabel"}), ...
+%!           {[8.5, 11.5], 9:11, {"9"; "10"; "11"}});
+%!   assert (get (hax, {"ylim", "ytick", "yticklabel"}), ...
+%!           {[0, 4], [0:4], {"0"; "1"; "2"; "3"; "4"}});
+%!
+%! unwind_protect_cleanup
+%!   close (hf);
+%! end_unwind_protect
+
+#### Ensure y tick labels are updated with ydata changes.
+%!test <*65734>
+%! hf = figure ("visible", "off");
+%! unwind_protect
+%!   hax = axes ("parent", hf);
+%!   hb = bar (hax, 2:4);
+%!   hp = get (hb, "children");
+%!
+%!   assert (get (hb, "xdata"), [1:3]');
+%!   assert (get (hax, {"xlim", "xtick","xticklabel"}), ...
+%!           {[0.5, 3.5], 1:3, {"1"; "2"; "3"}});
+%!   assert (get (hax, {"ylim", "ytick", "yticklabel"}), ...
+%!           {[0, 4], [0:4], {"0"; "1"; "2"; "3"; "4"}});
+%!
+%!   set (hb, "ydata", [5:7]');  # column vector input.
+%!   assert (get (hax, {"xlim", "xtick","xticklabel"}), ...
+%!           {[0.5, 3.5], 1:3, {"1"; "2"; "3"}});
+%!   assert (get (hax, {"ylim", "ytick", "yticklabel"}), ...
+%!           {[0, 7], [0:7], {"0"; "1"; "2"; "3"; "4"; "5"; "6"; "7"}});
+%!
+%!   set (hb, "ydata", [-4:-2]);  # row vector input.
+%!   assert (get (hax, {"xlim", "xtick","xticklabel"}), ...
+%!           {[0.5, 3.5], 1:3, {"1"; "2"; "3"}});
+%!   assert (get (hax, {"ylim", "ytick", "yticklabel"}), ...
+%!           {[-4, 0], [-4:0], {"-4"; "-3"; "-2"; "-1"; "0"}});
+%!
+%! unwind_protect_cleanup
+%!   close (hf);
+%! end_unwind_protect
+
+
 %% Test input validation
 %!error <Invalid call> bar ()
 %!error <Y must be numeric> bar ("foo")

diff --git a/scripts/plot/draw/barh.m b/scripts/plot/draw/barh.m
@@ -842,6 +842,66 @@
 %!   close (hf);
 %! end_unwind_protect
 
+## Ensure x tick labels are updated with xdata changes.
+%!test <*65734>
+%! hf = figure ("visible", "off");
+%! unwind_protect
+%!   hax = axes ("parent", hf);
+%!   hb = barh (hax, 2:4);
+%!   hp = get (hb, "children");
+%!
+%!   assert (get (hb, "xdata"), [1:3]');
+%!   assert (get (hax, {"xlim", "xtick","xticklabel"}), ...
+%!           {[0, 4], [0:4], {"0"; "1"; "2"; "3"; "4"}});
+%!   assert (get (hax, {"ylim", "ytick", "yticklabel"}), ...
+%!           {[0.5, 3.5], 1:3, {"1"; "2"; "3"}});
+%!
+%!   set (hb, "xdata", [3:5]');  # column vector input.
+%!   assert (get (hax, {"xlim", "xtick","xticklabel"}), ...
+%!           {[0, 4], [0:4], {"0"; "1"; "2"; "3"; "4"}});
+%!   assert (get (hax, {"ylim", "ytick", "yticklabel"}), ...
+%!           {[2.5, 5.5], 3:5, {"3"; "4"; "5"}});
+%!
+%!   set (hb, "xdata", [9:11]);  # row vector input.
+%!   assert (get (hax, {"xlim", "xtick","xticklabel"}), ...
+%!           {[0, 4], [0:4], {"0"; "1"; "2"; "3"; "4"}});
+%!   assert (get (hax, {"ylim", "ytick", "yticklabel"}), ...
+%!           {[8.5, 11.5], 9:11, {"9"; "10"; "11"}});
+%!
+%! unwind_protect_cleanup
+%!   close (hf);
+%! end_unwind_protect
+
+#### Ensure y tick labels are updated with ydata changes.
+%!test <*65734>
+%! hf = figure ("visible", "off");
+%! unwind_protect
+%!   hax = axes ("parent", hf);
+%!   hb = barh (hax, 2:4);
+%!   hp = get (hb, "children");
+%!
+%!   assert (get (hb, "xdata"), [1:3]');
+%!   assert (get (hax, {"xlim", "xtick","xticklabel"}), ...
+%!           {[0, 4], [0:4], {"0"; "1"; "2"; "3"; "4"}});
+%!   assert (get (hax, {"ylim", "ytick", "yticklabel"}), ...
+%!           {[0.5, 3.5], 1:3, {"1"; "2"; "3"}});
+%!
+%!   set (hb, "ydata", [5:7]');  # column vector input.
+%!   assert (get (hax, {"xlim", "xtick","xticklabel"}), ...
+%!           {[0, 7], [0:7], {"0"; "1"; "2"; "3"; "4"; "5"; "6"; "7"}});
+%!   assert (get (hax, {"ylim", "ytick", "yticklabel"}), ...
+%!           {[0.5, 3.5], 1:3, {"1"; "2"; "3"}});%!
+%!
+%!   set (hb, "ydata", [-4:-2]);  # row vector input.
+%!   assert (get (hax, {"xlim", "xtick","xticklabel"}), ...
+%!           {[-4, 0], [-4:0], {"-4"; "-3"; "-2"; "-1"; "0"}});
+%!   assert (get (hax, {"ylim", "ytick", "yticklabel"}), ...
+%!           {[0.5, 3.5], 1:3, {"1"; "2"; "3"}});
+%!
+%! unwind_protect_cleanup
+%!   close (hf);
+%! end_unwind_protect
+
 
 %% Test input validation
 %!error <Invalid call> bar ()

diff --git a/scripts/plot/draw/private/__bar__.m b/scripts/plot/draw/private/__bar__.m
@@ -623,6 +623,14 @@ function update_axes_limits (hax, x, vertical, ishistc)
     ## a small number of integers.
     ## Then temporarily set to auto to reset limits around patch elements and
     ## baseline component parallel to bars.
+
+    ## Vector x inputs to bar are forced to be column vectors.  x inputs from
+    ## set command may be forced to row vectors.  Ensure column vector for
+    ## bar tick processing.  See bug #65734.
+    if (isrow (x))
+      x = x(:);
+    endif
+
     if (vertical)
       set (hax, "xtick", x(:,1));
       set (hax, "xlimmode", "auto");