changeset 7290:7c0a18b10c8e

[project @ 2007-12-11 18:02:06 by jwe]
author jwe
date Tue, 11 Dec 2007 18:02:06 +0000
parents e5055ed23f52
children de593fd63ecf
files scripts/ChangeLog scripts/plot/__plt2__.m
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Tue Dec 11 17:36:20 2007 +0000
+++ b/scripts/ChangeLog	Tue Dec 11 18:02:06 2007 +0000
@@ -1,3 +1,8 @@
+2007-12-11  John W. Eaton  <jwe@octave.org>
+
+	* plot/__plt2vs__.m, plot/__plt2sv__.m: New functions.
+	* plot/__plt2__.m: Handle scalar-vector and vector-scalar cases.
+
 2007-12-11  David Bateman  <dbateman@free.fr>
 
 	* miscelleaneous/fullfile.m: Ignore empty arguments.
--- a/scripts/plot/__plt2__.m	Tue Dec 11 17:36:20 2007 +0000
+++ b/scripts/plot/__plt2__.m	Tue Dec 11 18:02:06 2007 +0000
@@ -51,11 +51,15 @@
   if (isscalar (x1))
     if (isscalar (x2))
       retval = __plt2ss__ (h, x1, x2, options, properties);
+    elseif (isvector (x2))
+      retval = __plt2sv__ (h, x1, x2, options, properties);
     else
       error ("__plt2__: invalid data for plotting");
     endif
   elseif (isvector (x1))
-    if (isvector (x2))
+    if (isscalar (x2))
+      retval = __plt2vs__ (h, x1, x2, options, properties);
+    elseif (isvector (x2))
       retval = __plt2vv__ (h, x1, x2, options, properties);
     elseif (ismatrix (x2))
       retval = __plt2vm__ (h, x1, x2, options, properties);