Mercurial > hg > octave-max

changeset 14434:3d4f7631baff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow plot3 to accept booleans (bug #33607) * __line__.m: Promote boolean to double before plotting.
author Rik <octave@nomad.inbox5.com>
date Mon, 05 Mar 2012 08:43:36 -0800
parents e053d1622f4e
children f312918f16d2
files scripts/plot/private/__line__.m
diffstat 1 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/plot/private/__line__.m
+++ b/scripts/plot/private/__line__.m
@@ -35,8 +35,8 @@
 
   nvargs = numel (varargin);
 
-  if (nvargs > 1 && isnumeric (varargin{1}) && isnumeric (varargin{2}))
-    if (nvargs > 2 && isnumeric (varargin{3}))
+  if (nvargs > 1 && ! ischar (varargin{1}) && ! ischar (varargin{2}))
+    if (nvargs > 2 && ! ischar (varargin{3}))
       num_data_args = 3;
     else
       num_data_args = 2;
@@ -90,11 +90,14 @@
   data = cell (1, 3);
 
   if (num_data_args > 1)
-    data(1) = varargin{1};
-    data(2) = varargin{2};
-    if (num_data_args == 3)
-      data(3) = varargin{3};
-    endif
+    data(1:num_data_args) = varargin(1:num_data_args);
+    for i = 1:num_data_args
+      if (islogical (data{i}))
+        data(i) = double (data{i});
+      elseif (iscomplex (data{i}))
+        data(i) = real (data{i});
+      endif
+    endfor
   endif
 
   data_args = reshape ({"xdata", "ydata", "zdata"; data{:}}, [1, 6]);