Mercurial > octave
changeset 28595:4deb794d85e2
Resolve further number of argument mismatch in graphics callbacks (bug #58821)
* legend.m, __gnuplot_legend__.m, area.m, colorbar.m, plotmatrix.m,
__gnuplot_scatter__.m, subplot.m: Add missing second input '~' to graphics
callback functions.
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 24 Jul 2020 10:49:44 -0700 |
| parents | 6e8d14f4fb2f |
| children | b81238f3ecdb |
| files | scripts/plot/appearance/legend.m scripts/plot/appearance/private/__gnuplot_legend__.m scripts/plot/draw/area.m scripts/plot/draw/colorbar.m scripts/plot/draw/plotmatrix.m scripts/plot/draw/private/__gnuplot_scatter__.m scripts/plot/util/subplot.m |
| diffstat | 7 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/appearance/legend.m Fri Jul 24 10:22:54 2020 -0700 +++ b/scripts/plot/appearance/legend.m Fri Jul 24 10:49:44 2020 -0700 @@ -314,7 +314,7 @@ endfunction -function update_box_cb (hl) +function update_box_cb (hl, ~) if (strcmp (get (hl, "box"), "on")) if (strcmp (get (hl, "color"), "none")) @@ -399,7 +399,7 @@ endfunction -function reset_cb (ht, evt, hl, deletelegend = true) +function reset_cb (ht, ~, hl, deletelegend = true) if (ishghandle (hl)) listeners = getappdata (hl, "__listeners__"); @@ -479,7 +479,7 @@ endfunction -function maybe_update_layout_cb (h, d, hl) +function maybe_update_layout_cb (h, ~, hl) persistent updating = false; @@ -523,7 +523,7 @@ endfunction -function legend_autoupdate_cb (hax, d, hl) +function legend_autoupdate_cb (hax, ~, hl) ## Get all current children including eventual peer plotyy axes children try @@ -1284,7 +1284,7 @@ endswitch endfunction -function pos = boxposition (axpos, pba) +function pos = boxposition (axpos, pba, ~) pos = axpos; pbratio = pba(1)/pba(2); posratio = axpos(3)/axpos(4);
--- a/scripts/plot/appearance/private/__gnuplot_legend__.m Fri Jul 24 10:22:54 2020 -0700 +++ b/scripts/plot/appearance/private/__gnuplot_legend__.m Fri Jul 24 10:49:44 2020 -0700 @@ -1241,11 +1241,11 @@ endfunction ## The legend "location" property has changed. -function cb_legend_location (hleg, d) +function cb_legend_location (hleg, []) - ## If it isn't "none", which means manual positioning, then rebuild . + ## If it isn't "none", which means manual positioning, then rebuild. if (! strcmp (get (hleg, "location"), "none")) - cb_legend_update (hleg, d); + cb_legend_update (hleg, []); endif endfunction
--- a/scripts/plot/draw/area.m Fri Jul 24 10:22:54 2020 -0700 +++ b/scripts/plot/draw/area.m Fri Jul 24 10:49:44 2020 -0700 @@ -206,7 +206,7 @@ set (kids, prop, get (h, prop)); endfunction -function move_baseline (h, d) +function move_baseline (h, ~) persistent recursion = false; ## Don't allow recursion @@ -224,7 +224,7 @@ endif endif endfor - update_data (h, d); + update_data (h, []); unwind_protect_cleanup recursion = false; end_unwind_protect @@ -232,7 +232,7 @@ endfunction -function update_data (h, d) +function update_data (h, ~) hlist = get (h, "areagroup"); bv = get (h, "basevalue");
--- a/scripts/plot/draw/colorbar.m Fri Jul 24 10:22:54 2020 -0700 +++ b/scripts/plot/draw/colorbar.m Fri Jul 24 10:49:44 2020 -0700 @@ -469,7 +469,7 @@ endfunction ## Update colorbar when changes to axes or figure colormap have occurred. -function cb_colormap (h, d, hax, hcb, hi, init_sz) +function cb_colormap (h, ~, hax, hcb, hi, init_sz) persistent sz = init_sz; if (ishghandle (h))
--- a/scripts/plot/draw/plotmatrix.m Fri Jul 24 10:22:54 2020 -0700 +++ b/scripts/plot/draw/plotmatrix.m Fri Jul 24 10:49:44 2020 -0700 @@ -121,7 +121,7 @@ %! title ("plotmatrix() demo #1"); -function plotmatrixdelete (h, d, ax) +function plotmatrixdelete (h, ~, ax) for i = 1 : numel (ax) hc = ax(i);
--- a/scripts/plot/draw/private/__gnuplot_scatter__.m Fri Jul 24 10:22:54 2020 -0700 +++ b/scripts/plot/draw/private/__gnuplot_scatter__.m Fri Jul 24 10:49:44 2020 -0700 @@ -231,7 +231,7 @@ endfunction -function update_props (h, d) +function update_props (h, ~) lw = get (h, "linewidth"); m = get (h, "marker"); @@ -245,7 +245,7 @@ endfunction ## FIXME: This callback routine doesn't handle the case where N > 100. -function update_data (h, d) +function update_data (h, ~) x = get (h, "xdata"); y = get (h, "ydata");
--- a/scripts/plot/util/subplot.m Fri Jul 24 10:22:54 2020 -0700 +++ b/scripts/plot/util/subplot.m Fri Jul 24 10:49:44 2020 -0700 @@ -394,7 +394,7 @@ endfunction -function subplot_align (h, d, rmupdate = false) +function subplot_align (h, ~, rmupdate = false) persistent updating = false; if (! updating)