Skip to content

Commit

Permalink
maint: Merge default to bytecode-interpreter.
Browse files Browse the repository at this point in the history
  • Loading branch information
NRJank committed Oct 14, 2024
2 parents cd434b8 + e2f3bc7 commit c227669
Show file tree
Hide file tree
Showing 7 changed files with 272 additions and 188 deletions.
7 changes: 4 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3068,7 +3068,7 @@ if test $link_all_deps = yes; then
OCT_GUI_LINK_DEPS="libgui/liboctgui.la $OCT_LINK_DEPS"

MKOCTFILE_OCTAVE_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS $MKOCTFILE_LIBOCTAVE_LINK_DEPS"
MKOCTFILE_OCT_LINK_DEPS="$LIBOCTINTERP $LIBOCTAVE"
MKOCTFILE_OCT_LINK_DEPS="-L${octlibdir} $LIBOCTINTERP $LIBOCTAVE"

LIBOCTINTERP_LINK_DEPS="$LIBOCTINTERP_LINK_DEPS $LIBOCTAVE_LINK_DEPS"
LIBOCTINTERP_LINK_OPTS="$LIBOCTINTERP_LINK_OPTS $LIBOCTAVE_LINK_OPTS"
Expand All @@ -3082,7 +3082,7 @@ else
OCT_LTLINK_DEPS="$OCT_LINK_DEPS"
OCT_GUI_LINK_DEPS="libgui/liboctgui.la $OCT_LINK_DEPS"

MKOCTFILE_OCT_LINK_DEPS="$LIBOCTINTERP $LIBOCTAVE"
MKOCTFILE_OCT_LINK_DEPS="-L${octlibdir} $LIBOCTINTERP $LIBOCTAVE"
;;
darwin*)
dnl Contains variables that are defined and undefined at this point,
Expand Down Expand Up @@ -3220,10 +3220,11 @@ AC_CONFIG_COMMANDS_PRE([
eval man1ext="\"$man1ext\""
eval infofile="\"$infofile\""
## Also expand MKOCTFILE_DL_LDFLAGS, because it may depend on the values
## Also expand the following variables because they may depend on the values
## of variables expanded above.
eval MKOCTFILE_DL_LDFLAGS="\"$MKOCTFILE_DL_LDFLAGS\""
eval MKOCTFILE_OCT_LINK_DEPS="\"$MKOCTFILE_OCT_LINK_DEPS\""
])

### Do substitutions in Makefiles and other files that hold configuration info.
Expand Down
8 changes: 5 additions & 3 deletions etc/NEWS.9.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ Summary of bugs fixed for version 9.3.0 (tbd):
Improve input validation to ensure `opt` is one of 0, 1, or []. (bug #66021).
- `interp2`: Provide a meaningful error message if the input reference array
is a vector (bug #66086).
- `legend` icons now inherit the "facelalpha" property to match appearance of
patch and surface graphics objects.
- `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.

### GUI

- `legend` icons now inherit the "facelalpha" property from to match
appearance of patch and surface graphics objects.

### Build system / Tests

- `jupyter-notebook` test no longer fails if a figure window is open
Expand Down
8 changes: 3 additions & 5 deletions scripts/plot/appearance/legend.m
Original file line number Diff line number Diff line change
Expand Up @@ -2279,16 +2279,14 @@ function update_legend_position (hl, sz)

## Verify alpha parameter inherited by legend patch objects.
## Only facealpha currently implemented.
%!test <*66314>
%!testif ; any (strcmp (graphics_toolkit (), {"fltk", "qt"})) <*66314>
%! hf = figure ("visible", "off");
%! unwind_protect
%! hax = axes ("parent", hf);
%! hp = patch (hax);
%! set (hp, "facealpha", 0.5);
%! hleg = legend (hax);
%! legprops = get(hleg);
%! legpatchidx = find (strcmp (get (legprops.children, "type"), "patch"));
%! assert (get (legprops.children(legpatchidx), "facealpha"), 0.5);
%! hl = legend (hax);
%! assert (get (findobj (hl, "type", "patch"), "facealpha"), 0.5);
%! unwind_protect_cleanup
%! close (hf);
%! end_unwind_protect
Expand Down
48 changes: 28 additions & 20 deletions scripts/plot/draw/bar.m
Original file line number Diff line number Diff line change
Expand Up @@ -292,36 +292,43 @@
%! close (hf);
%! end_unwind_protect

## Style stacked (no difference for single group).
## Style "stacked" (no difference for single group).
%!test
%! hf = figure ("visible", "off");
%! hf1 = figure ("visible", "off");
%! hf2 = figure ("visible", "off");
%! unwind_protect
%! hax = axes ("parent", hf);
%! hb = bar (hax, 2:4, "grouped");
%! bardata1 = get (hb);
%! hl = bardata1.baseline;
%! baselinedata1 = get (hl);
%! hp = bardata1.children;
%! patchdata1 = get (hp);
%!
%! hb = bar (hax, 2:4, "stacked");
%! bardata2 = get (hb);
%! hl = bardata2.baseline;
%! baselinedata2 = get (hl);
%! hp = bardata2.children;
%! patchdata2 = get (hp);
%! hax1 = axes ("parent", hf1);
%! hb1 = bar (hax1, 2:4, "grouped");
%! bardata1 = get (hb1);
%! hl1 = bardata1.baseline;
%! baselinedata1 = get (hl1);
%! hp1 = bardata1.children;
%! patchdata1 = get (hp1);
%!
%! hax2 = axes ("parent", hf2);
%! hb2 = bar (hax2, 2:4, "stacked");
%! bardata2 = get (hb2);
%! hl2 = bardata2.baseline;
%! baselinedata2 = get (hl2);
%! hp2 = bardata2.children;
%! patchdata2 = get (hp2);
%!
%! assert (bardata1.barlayout, "grouped");
%! assert (bardata2.barlayout, "stacked");
%! bardata1.bargroup = [];
%! bardata1.barlayout = [];
%! bardata1.baseline = [];
%! bardata1.children = [];
%! bardata1.parent = [];
%!
%! bardata2.bargroup = [];
%! bardata2.barlayout = [];
%! bardata2.baseline = [];
%! bardata2.children = [];
%! bardata2.parent = [];
%!
%! baselinedata1.parent = [];
%! baselinedata2.parent = [];
%!
%! patchdata1.parent = [];
%! patchdata2.parent = [];
Expand All @@ -331,7 +338,8 @@
%! assert (isequaln (patchdata1, patchdata2));
%!
%! unwind_protect_cleanup
%! close (hf);
%! close (hf1);
%! close (hf2);
%! end_unwind_protect

## Style "hist"
Expand Down Expand Up @@ -627,7 +635,7 @@

## Change to horizontal:

%!test <65671> # Baseline should change to horizontal with bars.
%!test <*65671> # Baseline should change to horizontal with bars.
%! hf = figure ("visible", "off");
%! unwind_protect
%! hax = axes ("parent", hf);
Expand Down Expand Up @@ -661,7 +669,7 @@
%! close (hf);
%! end_unwind_protect

%!test <65734> # Axis ticks after change to horizontal should match barh.
%!test <*65734> # Axis ticks after change to horizontal should match barh.
%! hf = figure ("visible", "off");
%! unwind_protect
%! hax = axes ("parent", hf);
Expand Down Expand Up @@ -775,7 +783,7 @@
%! end_unwind_protect

## Updating base plot xdata.
%!test <65734> # changing xdata should update xlim/ticks for new locations.
%!test <*65734> # Changing xdata should update xlim/ticks for new locations.
%! hf = figure ("visible", "off");
%! unwind_protect
%! xd = [0.6, 1.6, 2.6; 0.6, 1.6, 2.6; 1.4, 2.4, 3.4; 1.4, 2.4, 3.4];
Expand Down
Loading

0 comments on commit c227669

Please sign in to comment.