Mercurial > hg > octave-lojdl

changeset 17165:d74e2b5bdeb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fplot.m: Accept an axis handle as first input. * scripts/plot/fplot.m: Use __plt_axis_get_arg__ to accept an axis handle as first input.
author Rik <rik@octave.org>
date Fri, 02 Aug 2013 17:35:14 -0700
parents b491ef539071
children 6e8c621c3496
files scripts/plot/fplot.m
diffstat 1 files changed, 17 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/plot/fplot.m
+++ b/scripts/plot/fplot.m
@@ -40,6 +40,9 @@
 ## The @var{fmt} argument specifies the linestyle to be used by the plot
 ## command.
 ##
+## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## rather than the current axes returned by @code{gca}.
+##
 ## With no output arguments the results are immediately plotted.  With two
 ## output arguments the 2-D plot data is returned.  The data can subsequently
 ## be plotted manually with @code{plot (@var{x}, @var{y})}.
@@ -61,12 +64,18 @@
 
 ## Author: Paul Kienzle <pkienzle@users.sf.net>
 
-function [X, Y] = fplot (fn, limits, varargin)
+function [X, Y] = fplot (varargin)
+
+  [hax, varargin, nargin] = __plt_get_axis_arg__ ("fplot", varargin{:});
 
   if (nargin < 2 || nargin > 5)
     print_usage ();
   endif
 
+  fn = varargin{1};
+  limits = varargin{2};
+  varargin = varargin(3:end);
+
   if (strcmp (typeinfo (fn), "inline function"))
     fn = vectorize (fn);
     nam = formula (fn);
@@ -154,15 +163,18 @@
     X = x;
     Y = y;
   else
-    plot (x, y, fmt);
-    axis (limits);
+    if (isempty (hax))
+      hax = gca ();
+    endif
+    plot (hax, x, y, fmt);
+    axis (hax, limits);
     if (isvector (y))
-      legend (nam);
+      legend (hax, nam);
     else
       for i = 1:columns (y)
         nams{i} = sprintf ("%s(:,%i)", nam, i);
       endfor
-      legend (nams{:});
+      legend (hax, nams{:});
     endif
   endif