Mercurial > octave-nkf

changeset 6861:32558239ed9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-09-05 06:15:01 by jwe]
author jwe
date Wed, 05 Sep 2007 06:15:01 +0000
parents 8057825b748f
children d63339cbb205
files scripts/ChangeLog scripts/general/isdir.m scripts/plot/__go_draw_axes__.m
diffstat 3 files changed, 16 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Tue Sep 04 16:54:19 2007 +0000
+++ b/scripts/ChangeLog	Wed Sep 05 06:15:01 2007 +0000
@@ -1,3 +1,12 @@
+2007-09-05  John W. Eaton  <jwe@octave.org>
+
+	* plot/__go_draw_axes__.m: Consistently index PARAMETRIC with
+	DATA_IDX.
+
+2007-09-04  David Bateman  <dbateman@free.fr>
+
+	* general/isdir.m: Return a logical value.
+
 2007-09-04  David Bateman  <dbateman@free.fr>
 
 	* statistics/distributions/chi2pdf.m,
--- a/scripts/general/isdir.m	Tue Sep 04 16:54:19 2007 +0000
+++ b/scripts/general/isdir.m	Wed Sep 05 06:15:01 2007 +0000
@@ -24,7 +24,8 @@
 
 function t = isdir (x)
   if (nargin == 1)
-    t = exist (x, "dir");
+    ## Exist returns an integer but isdir should return a logical.
+    t = exist (x, "dir") == 7;
   else
     print_usage ("isdir");
   endif
--- a/scripts/plot/__go_draw_axes__.m	Tue Sep 04 16:54:19 2007 +0000
+++ b/scripts/plot/__go_draw_axes__.m	Wed Sep 05 06:15:01 2007 +0000
@@ -239,6 +239,7 @@
 
 	    data_idx++;
 	    is_image_data(data_idx) = true;
+	    parametric(data_idx) = false;
 
 	    [y_dim, x_dim] = size (img_data(:,:,1));
 	    if (x_dim > 1)
@@ -301,6 +302,7 @@
 	case "line"
 	  data_idx++;
 	  is_image_data(data_idx) = false;
+	  parametric(data_idx) = true;
 	  if (isempty (obj.keylabel))
 	    titlespec{data_idx} = "title \"\"";
 	  else
@@ -315,7 +317,6 @@
 	    withclause{data_idx} = sprintf ("with %s linetype %d",
 					    style, typ);
 	  endif
-	  parametric(i) = true;
 	  if (! isempty (obj.zdata))
 	    nd = 3;
 	    xdat = obj.xdata(:);
@@ -437,6 +438,7 @@
            clim = axis_obj.clim;
 	   data_idx++;
 	   is_image_data(data_idx) = false;
+	   parametric(data_idx) = false;
            titlespec{data_idx} = "title \"\"";
 	   usingclause{data_idx} = "";
            if (isfield (obj, "facecolor") && isfield (obj, "cdata"))
@@ -459,7 +461,6 @@
            endif
 
 	   withclause{data_idx} = sprintf ("with filledcurve lc rgb \"#%02x%02x%02x\"",round (255*color));
-	   parametric(data_idx) = true;
 
 	   xdat = obj.xdata(:);
 	   ydat = obj.ydata(:);
@@ -477,8 +478,7 @@
          ## patch outline
          data_idx++;
          is_image_data(data_idx) = false;
-         ## I had to use data_idx instead of i here, not sure if o.k. (Kai)
-         parametric(data_idx) = true;
+         parametric(data_idx) = false;
          titlespec{data_idx} = "title \"\"";
 	 usingclause{data_idx} = "";
          if (isfield (obj, "edgecolor"))
@@ -506,6 +506,7 @@
 	case "surface"
 	  data_idx++;
 	  is_image_data(data_idx) = false;
+	  parametric(data_idx) = false;
 	  [style, typ, with] = do_linestyle_command (obj, data_idx, plot_stream);
 	  if (isempty (obj.keylabel))
 	    titlespec{data_idx} = "title \"\"";
@@ -520,7 +521,6 @@
 	    withclause{data_idx} = sprintf ("with %s linetype %d %s",
 					    style, typ, with);
 	  endif
-	  parametric(i) = false;
 	  nd = 3;
 	  xdat = obj.xdata;
 	  ydat = obj.ydata;