Mercurial > hg > octave-nkf

changeset 6424:05a48d6cf163

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-03-21 13:38:47 by jwe]
author jwe
date Wed, 21 Mar 2007 13:38:47 +0000
parents a90b54016b12
children 0cc5ca7b1e91
files scripts/ChangeLog scripts/plot/subplot.m src/ChangeLog src/graphics.cc
diffstat 4 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-21  John W. Eaton  <jwe@octave.org>
+
+	* plot/subplot.m: If we find an existing subplot region, set
+	it to be the "currentaxes" property for the current figure.
+
 2007-03-20  David Bateman  <dbateman@free.fr>
 
 	* general/Makefile.in: Include arrayfun.m in SOURCES.
--- a/scripts/plot/subplot.m
+++ b/scripts/plot/subplot.m
@@ -140,7 +140,9 @@
     endif
   endfor
 
-  if (! found)
+  if (found)
+    set (cf, "currentaxes", tmp);
+  else
     tmp = axes ("outerposition", pos);
   endif
 
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2007-03-21  John W. Eaton  <jwe@octave.org>
 
+	* graphics.cc (axes::axes_properties::set_defaults): Reverse sense
+	of mode test for setting outerposition property.
+
 	* sysdep.cc (Fpause): Also call drawnow if nargin == 0.
 	(Fkbhit, Fsleep, Fusleep): Also call drawnow here.
 
--- a/src/graphics.cc
+++ b/src/graphics.cc
@@ -1835,7 +1835,7 @@
       // FIXME -- this is not quite right; we should preserve
       // "position" and "units".
 
-      if (mode == "replace")
+      if (mode != "replace")
 	{
 	  Matrix touterposition (1, 4, 0.0);
 	  touterposition(2) = 1;