changeset 4007:31448e09d38e

[project @ 2002-07-26 01:47:32 by jwe]
author jwe
date Fri, 26 Jul 2002 01:47:32 +0000
parents efac4b97bb09
children a0e323e959cd
files scripts/ChangeLog scripts/plot/__errplot__.m scripts/plot/__pltopt1__.m scripts/plot/errorbar.m
diffstat 4 files changed, 30 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Fri Jul 26 01:20:46 2002 +0000
+++ b/scripts/ChangeLog	Fri Jul 26 01:47:32 2002 +0000
@@ -1,3 +1,11 @@
+2002-07-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* plot/loglogerr.m: Likewise.
+
+	* plot/semilogyerr.m: Likewise.
+
+	* plot/semilogxerr.m: Use varargin instead of old style varargs.
+
 2002-07-25  Teemu Ikonen <tpikonen@pcu.helsinki.fi>
 
 	* plot/__errcomm__.m: New file.  Common functionality for error plots.
--- a/scripts/plot/__errplot__.m	Fri Jul 26 01:20:46 2002 +0000
+++ b/scripts/plot/__errplot__.m	Fri Jul 26 01:47:32 2002 +0000
@@ -1,4 +1,4 @@
-## Copyright (C) 2000-2002 Teemu Ikonen
+## Copyright (C) 2000, 2001, 2002 Teemu Ikonen
 ##
 ## This file is part of Octave.
 ##
@@ -20,7 +20,7 @@
 ## -*- texinfo -*-
 ## @deftypefn {Function File} {} __errplot__ (@var{args})
 ## Really plot errorbar plots. User interface in function errorbar.
-## 
+##
 ## @example
 ## __errplot__ (@var{arg1}, @var{arg2}, ..., @var{fmt})
 ## @end example
@@ -52,12 +52,12 @@
       fstr = a;
     endif
   endwhile
-  
+
   fmt = __pltopt__ ("__errplot__", fstr);
-  
+
   nplots = size (arg1, 2);
   len = size (arg1, 1);
-  
+
   if (ndata == 2)
     for i = 1:nplots,
       tmp = [(1:len)', arg1(:,i), arg2(:,i)];
@@ -94,8 +94,8 @@
       eval (tstr);
       cmd = sprintf ("gplot tmp %s", fmt(min(i, rows(fmt)), :) );
       eval (cmd);
-    endfor    
-  else 
+    endfor
+  else
     for i = 1:nplots,
       tstr = "tmp = [arg1(:,i)";
       for j = 2:ndata,
@@ -107,9 +107,5 @@
       eval (cmd);
     endfor
   endif
-    
-endfunction    
-    
 
-
-
+endfunction
--- a/scripts/plot/__pltopt1__.m	Fri Jul 26 01:20:46 2002 +0000
+++ b/scripts/plot/__pltopt1__.m	Fri Jul 26 01:47:32 2002 +0000
@@ -72,9 +72,9 @@
     ## First get next char.
 
     if (max (size (opt)) > 1)
-#      [char, opt] = sscanf (opt, "%c %s", "C");
-       char = opt(1);
-       opt = opt(2:length(opt));
+      ## [char, opt] = sscanf (opt, "%c %s", "C");
+      char = opt(1);
+      opt = opt(2:length(opt));
     else
       char = opt;
       more_opts = 0;
@@ -106,7 +106,7 @@
     elseif (strcmp (char, "~"))
       set_yerrbars = 1;
     elseif (strcmp (char, ">"))
-      set_xerrbars = 1;  
+      set_xerrbars = 1;
     elseif (strcmp (char, "#"))
       set_boxes = 1;
     elseif (strcmp (char, "0") || strcmp (char, "1") ...
@@ -227,11 +227,11 @@
   endif
 
   if (strcmp (fmt, WITH))
-      if(strcmp (caller, "__errplot"))
-          fmt = strcat (fmt, " ", YERRORBARS);
-      else
-          fmt = strcat (fmt, " ", LINES);
-      endif      
+    if (strcmp (caller, "__errplot__"))
+      fmt = strcat (fmt, " ", YERRORBARS);
+    else
+      fmt = strcat (fmt, " ", LINES);
+    endif
   endif
 
   if (set_color)
--- a/scripts/plot/errorbar.m	Fri Jul 26 01:20:46 2002 +0000
+++ b/scripts/plot/errorbar.m	Fri Jul 26 01:47:32 2002 +0000
@@ -1,4 +1,4 @@
-## Copyright (C) 2000-2002 Teemu Ikonen
+## Copyright (C) 2000, 2001, 2002 Teemu Ikonen
 ##
 ## This file is part of Octave.
 ##
@@ -119,7 +119,9 @@
   gset nologscale x;
   gset nologscale y;
   gset nopolar;
-    
-  __errcomm__ ("errorbar", varargin);
+
+  length (varargin)
+
+  __errcomm__ ("errorbar", varargin{:});
 
 endfunction