Mercurial > octave-nkf
changeset 7086:625891845df5
[project @ 2007-10-31 17:11:49 by jwe]
| author | jwe |
|---|---|
| date | Wed, 31 Oct 2007 17:16:16 +0000 |
| parents | 607b70017dab |
| children | b04f0523558d |
| files | scripts/ChangeLog scripts/plot/bar.m scripts/plot/barh.m scripts/plot/subplot.m src/ChangeLog src/graphics.cc |
| diffstat | 6 files changed, 23 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog Wed Oct 31 16:23:25 2007 +0000 +++ b/scripts/ChangeLog Wed Oct 31 17:16:16 2007 +0000 @@ -1,3 +1,9 @@ +2007-10-31 Michael goffioul <michael.goffioul@gmail.com> + + * plot/subplot.m: Ignore legend objects when parsing existing axes + objects and legend objects are implemented with a separate axes + object. + 2007-10-30 David Bateman <dbateman@free.fr> * control/base/DEMOcontrol.m: Doc fixes for small book format.
--- a/scripts/plot/bar.m Wed Oct 31 16:23:25 2007 +0000 +++ b/scripts/plot/bar.m Wed Oct 31 17:16:16 2007 +0000 @@ -18,7 +18,7 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {@var{h} =} bar (@var{x}, @var{y}, @var{style}) +## @deftypefn {Function File} {@var{h} =} bar (@var{x}, @var{y}, @var{p1}, @var{v1}, @dots{}) ## @deftypefnx {Function File} {[@var{xb}, @var{yb}] =} bar (@dots{}) ## Given two vectors of x-y data, @code{bar} produce a bar graph. ## @@ -28,7 +28,8 @@ ## If @var{y} is a matrix, then each column of @var{y} is taken to be a ## separate bar graph plotted on the same graph. By default the columns ## are plotted side-by-side. This behavior can be changed by the @var{style} -## argument, which can take the values 'group' (the default), or 'stack'. +## argument, which can take the values @code{"grouped"} (the default), +## or @code{"stacked"}. ## ## If two output arguments are specified, the data are generated but ## not plotted. For example,
--- a/scripts/plot/barh.m Wed Oct 31 16:23:25 2007 +0000 +++ b/scripts/plot/barh.m Wed Oct 31 17:16:16 2007 +0000 @@ -27,7 +27,8 @@ ## If @var{y} is a matrix, then each column of @var{y} is taken to be a ## separate bar graph plotted on the same graph. By default the columns ## are plotted side-by-side. This behavior can be changed by the @var{style} -## argument, which can take the values 'group' (the default), or 'stack'. +## argument, which can take the values @code{"grouped"} (the default), +## or @code{"stacked"}. ## ## If two output arguments are specified, the data are generated but ## not plotted. For example,
--- a/scripts/plot/subplot.m Wed Oct 31 16:23:25 2007 +0000 +++ b/scripts/plot/subplot.m Wed Oct 31 17:16:16 2007 +0000 @@ -118,14 +118,18 @@ found = false; for child = get (cf, "children") - ## Check if this child is still valid; this might not be the case - ## anymore due to the deletion of previous children (due to DeleteFcn - ## callback or for legends/colorbars that get deleted with their - ## corresponding axes) + ## Check whether this child is still valid; this might not be the + ## case anymore due to the deletion of previous children (due to + ## "deletefcn" callback or for legends/colorbars that are deleted + ## with their corresponding axes). if (! ishandle (child)) continue; endif if (strcmp (get (child, "type"), "axes")) + ## Skip legend objects. + if (strcmp (get (child, "tag"), "legend")) + continue; + endif objpos = get (child, "outerposition"); if (objpos == pos) ## If the new axes are in exactly the same position as an
--- a/src/ChangeLog Wed Oct 31 16:23:25 2007 +0000 +++ b/src/ChangeLog Wed Oct 31 17:16:16 2007 +0000 @@ -1,5 +1,8 @@ 2007-10-31 John W. Eaton <jwe@octave.org> + * graphics.cc (line::properties::get): Fix property name + (markerface -> markerfacecolor). + * Makefile.in (INCLUDES): Add debug.h to the list. 2007-10-30 John Swensen <jpswensen@comcast.net>
--- a/src/graphics.cc Wed Oct 31 16:23:25 2007 +0000 +++ b/src/graphics.cc Wed Oct 31 17:16:16 2007 +0000 @@ -1825,7 +1825,7 @@ m.assign ("linewidth", linewidth); m.assign ("marker", marker); m.assign ("markeredgecolor", markeredgecolor); - m.assign ("markerface", markerfacecolor); + m.assign ("markerfacecolor", markerfacecolor); m.assign ("markersize", markersize); m.assign ("keylabel", keylabel);