octave-lyh: scripts/plot/private/__pltopt_

annotate scripts/plot/private/pltopt.m @ 11188:4cb1522e4d0f

Use function handle as input to cellfun, rather than quoted function name or anonymous function wrapper.

author	Rik <octave@nomad.inbox5.com>
date	Wed, 03 Nov 2010 17:20:56 -0700
parents	1479b93ee655
children	fd0a3ac60b0e

rev	line source
7017 a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	1 ## Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2002, 2004, 2005,
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8812 diff changeset	2 ## 2006, 2007, 2009 John W. Eaton
2313 5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	3 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	4 ## This file is part of Octave.
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	5 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	6 ## Octave is free software; you can redistribute it and/or modify it
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	7 ## under the terms of the GNU General Public License as published by
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6895 diff changeset	8 ## the Free Software Foundation; either version 3 of the License, or (at
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6895 diff changeset	9 ## your option) any later version.
2313 5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	10 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	11 ## Octave is distributed in the hope that it will be useful, but
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	12 ## WITHOUT ANY WARRANTY; without even the implied warranty of
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	13 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	14 ## General Public License for more details.
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	15 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	16 ## You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6895 diff changeset	17 ## along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6895 diff changeset	18 ## <http://www.gnu.org/licenses/>.
933 598a3aa40360 [project @ 1994-11-17 04:23:41 by jwe] jwe parents: diff changeset	19
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	20 ## -- texinfo --
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	21 ## @deftypefn {Function File} {} __pltopt__ (@var{caller}, @var{opt})
6895 76e3d985ae56 [project @ 2007-09-13 18:22:38 by jwe] jwe parents: 6459 diff changeset	22 ## Undocumented internal function.
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	23 ## @end deftypefn
6895 76e3d985ae56 [project @ 2007-09-13 18:22:38 by jwe] jwe parents: 6459 diff changeset	24
3500 7923abdeb4e5 [project @ 2000-01-31 06:35:00 by jwe] jwe parents: 3449 diff changeset	25 ## @deftypefn {Function File} {} __pltopt__ (@var{caller}, @var{opt})
6895 76e3d985ae56 [project @ 2007-09-13 18:22:38 by jwe] jwe parents: 6459 diff changeset	26 ##
2311 2b5788792cad [project @ 1996-07-11 20:18:38 by jwe] jwe parents: 2303 diff changeset	27 ## Decode plot option strings.
2b5788792cad [project @ 1996-07-11 20:18:38 by jwe] jwe parents: 2303 diff changeset	28 ##
3449 858695b3ed62 [project @ 2000-01-18 04:08:59 by jwe] jwe parents: 3426 diff changeset	29 ## @var{opt} can currently be some combination of the following:
2311 2b5788792cad [project @ 1996-07-11 20:18:38 by jwe] jwe parents: 2303 diff changeset	30 ##
3449 858695b3ed62 [project @ 2000-01-18 04:08:59 by jwe] jwe parents: 3426 diff changeset	31 ## @table @code
858695b3ed62 [project @ 2000-01-18 04:08:59 by jwe] jwe parents: 3426 diff changeset	32 ## @item "-"
6267 0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	33 ## For solid linestyle (default).
3717 e3501697c995 [project @ 2000-09-08 06:27:44 by jwe] jwe parents: 3500 diff changeset	34 ##
6267 0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	35 ## @item "--"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	36 ## For dashed line style.
3717 e3501697c995 [project @ 2000-09-08 06:27:44 by jwe] jwe parents: 3500 diff changeset	37 ##
6267 0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	38 ## @item "-."
3717 e3501697c995 [project @ 2000-09-08 06:27:44 by jwe] jwe parents: 3500 diff changeset	39 ## For linespoints plot style.
e3501697c995 [project @ 2000-09-08 06:27:44 by jwe] jwe parents: 3500 diff changeset	40 ##
6267 0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	41 ## @item ":"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	42 ## For dots plot style.
3717 e3501697c995 [project @ 2000-09-08 06:27:44 by jwe] jwe parents: 3500 diff changeset	43 ##
6267 0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	44 ## @item "r"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	45 ## Red line color.
3717 e3501697c995 [project @ 2000-09-08 06:27:44 by jwe] jwe parents: 3500 diff changeset	46 ##
6267 0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	47 ## @item "g"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	48 ## Green line color.
3717 e3501697c995 [project @ 2000-09-08 06:27:44 by jwe] jwe parents: 3500 diff changeset	49 ##
6267 0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	50 ## @item "b"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	51 ## Blue line color.
3717 e3501697c995 [project @ 2000-09-08 06:27:44 by jwe] jwe parents: 3500 diff changeset	52 ##
6267 0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	53 ## @item "c"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	54 ## Cyan line color.
3717 e3501697c995 [project @ 2000-09-08 06:27:44 by jwe] jwe parents: 3500 diff changeset	55 ##
6267 0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	56 ## @item "m"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	57 ## Magenta line color.
4006 efac4b97bb09 [project @ 2002-07-26 01:20:46 by jwe] jwe parents: 3717 diff changeset	58 ##
6267 0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	59 ## @item "y"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	60 ## Yellow line color.
3717 e3501697c995 [project @ 2000-09-08 06:27:44 by jwe] jwe parents: 3500 diff changeset	61 ##
6267 0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	62 ## @item "k"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	63 ## Black line color.
3717 e3501697c995 [project @ 2000-09-08 06:27:44 by jwe] jwe parents: 3500 diff changeset	64 ##
6267 0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	65 ## @item "w"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	66 ## White line color.
3717 e3501697c995 [project @ 2000-09-08 06:27:44 by jwe] jwe parents: 3500 diff changeset	67 ##
3449 858695b3ed62 [project @ 2000-01-18 04:08:59 by jwe] jwe parents: 3426 diff changeset	68 ## @item ";title;"
858695b3ed62 [project @ 2000-01-18 04:08:59 by jwe] jwe parents: 3426 diff changeset	69 ## Here @code{"title"} is the label for the key.
3717 e3501697c995 [project @ 2000-09-08 06:27:44 by jwe] jwe parents: 3500 diff changeset	70 ##
6267 0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	71 ## @item "+"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	72 ## @itemx "o"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	73 ## @itemx "*"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	74 ## @itemx "."
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	75 ## @itemx "x"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	76 ## @itemx "s"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	77 ## @itemx "d"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	78 ## @itemx "^"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	79 ## @itemx "v"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	80 ## @itemx ">"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	81 ## @itemx "<"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	82 ## @itemx "p"
0078497b3b0b [project @ 2007-02-01 10:34:14 by jwe] jwe parents: 6264 diff changeset	83 ## @itemx "h"
3717 e3501697c995 [project @ 2000-09-08 06:27:44 by jwe] jwe parents: 3500 diff changeset	84 ## Used in combination with the points or linespoints styles, set the point
e3501697c995 [project @ 2000-09-08 06:27:44 by jwe] jwe parents: 3500 diff changeset	85 ## style.
3449 858695b3ed62 [project @ 2000-01-18 04:08:59 by jwe] jwe parents: 3426 diff changeset	86 ## @end table
2311 2b5788792cad [project @ 1996-07-11 20:18:38 by jwe] jwe parents: 2303 diff changeset	87 ##
3449 858695b3ed62 [project @ 2000-01-18 04:08:59 by jwe] jwe parents: 3426 diff changeset	88 ## The legend may be fixed to include the name of the variable
858695b3ed62 [project @ 2000-01-18 04:08:59 by jwe] jwe parents: 3426 diff changeset	89 ## plotted in some future version of Octave.
933 598a3aa40360 [project @ 1994-11-17 04:23:41 by jwe] jwe parents: diff changeset	90
3162 7c96e85c76db [project @ 1998-04-08 18:19:35 by jwe] jwe parents: 3101 diff changeset	91 ## Author: jwe
2314 949ab8eba8bc [project @ 1996-07-12 03:58:02 by jwe] jwe parents: 2313 diff changeset	92
6459 5dc550e1f419 [project @ 2007-03-26 18:11:58 by jwe] jwe parents: 6267 diff changeset	93 function [options, valid] = __pltopt__ (caller, opt, err_on_invalid)
5dc550e1f419 [project @ 2007-03-26 18:11:58 by jwe] jwe parents: 6267 diff changeset	94
5dc550e1f419 [project @ 2007-03-26 18:11:58 by jwe] jwe parents: 6267 diff changeset	95 valid = true;
5dc550e1f419 [project @ 2007-03-26 18:11:58 by jwe] jwe parents: 6267 diff changeset	96 options = __default_plot_options__ ();
933 598a3aa40360 [project @ 1994-11-17 04:23:41 by jwe] jwe parents: diff changeset	97
6459 5dc550e1f419 [project @ 2007-03-26 18:11:58 by jwe] jwe parents: 6267 diff changeset	98 if ((nargin == 2 \|\| nargin == 3) && (nargout == 1 \|\| nargout == 2))
5dc550e1f419 [project @ 2007-03-26 18:11:58 by jwe] jwe parents: 6267 diff changeset	99 if (nargin == 2)
5dc550e1f419 [project @ 2007-03-26 18:11:58 by jwe] jwe parents: 6267 diff changeset	100 err_on_invalid = true;
5dc550e1f419 [project @ 2007-03-26 18:11:58 by jwe] jwe parents: 6267 diff changeset	101 endif
6146 1a6d826e92b5 [project @ 2006-11-09 03:13:11 by jwe] jwe parents: 6046 diff changeset	102 if (ischar (opt))
1a6d826e92b5 [project @ 2006-11-09 03:13:11 by jwe] jwe parents: 6046 diff changeset	103 nel = rows (opt);
1a6d826e92b5 [project @ 2006-11-09 03:13:11 by jwe] jwe parents: 6046 diff changeset	104 elseif (iscellstr (opt))
1a6d826e92b5 [project @ 2006-11-09 03:13:11 by jwe] jwe parents: 6046 diff changeset	105 nel = numel (opt);
1a6d826e92b5 [project @ 2006-11-09 03:13:11 by jwe] jwe parents: 6046 diff changeset	106 else
1a6d826e92b5 [project @ 2006-11-09 03:13:11 by jwe] jwe parents: 6046 diff changeset	107 error ("__pltopt__: expecting argument to be character string or cell array of character strings");
1a6d826e92b5 [project @ 2006-11-09 03:13:11 by jwe] jwe parents: 6046 diff changeset	108 endif
1a6d826e92b5 [project @ 2006-11-09 03:13:11 by jwe] jwe parents: 6046 diff changeset	109 if (ischar (opt))
1a6d826e92b5 [project @ 2006-11-09 03:13:11 by jwe] jwe parents: 6046 diff changeset	110 opt = cellstr (opt);
1a6d826e92b5 [project @ 2006-11-09 03:13:11 by jwe] jwe parents: 6046 diff changeset	111 endif
6264 cc2bee854d23 [project @ 2007-02-01 10:00:05 by jwe] jwe parents: 6146 diff changeset	112 for i = nel:-1:1
6459 5dc550e1f419 [project @ 2007-03-26 18:11:58 by jwe] jwe parents: 6267 diff changeset	113 [options(i), valid] = __pltopt1__ (caller, opt{i}, err_on_invalid);
5dc550e1f419 [project @ 2007-03-26 18:11:58 by jwe] jwe parents: 6267 diff changeset	114 if (! err_on_invalid && ! valid)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	115 return;
6459 5dc550e1f419 [project @ 2007-03-26 18:11:58 by jwe] jwe parents: 6267 diff changeset	116 endif
6146 1a6d826e92b5 [project @ 2006-11-09 03:13:11 by jwe] jwe parents: 6046 diff changeset	117 endfor
1a6d826e92b5 [project @ 2006-11-09 03:13:11 by jwe] jwe parents: 6046 diff changeset	118 else
6046 34f96dd5441b [project @ 2006-10-10 16:10:25 by jwe] jwe parents: 5642 diff changeset	119 print_usage ();
933 598a3aa40360 [project @ 1994-11-17 04:23:41 by jwe] jwe parents: diff changeset	120 endif
598a3aa40360 [project @ 1994-11-17 04:23:41 by jwe] jwe parents: diff changeset	121
598a3aa40360 [project @ 1994-11-17 04:23:41 by jwe] jwe parents: diff changeset	122 endfunction
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	123
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	124 ## Really decode plot option strings.
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	125
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	126 ## Author: Rick Niles <niles@axp745.gsfc.nasa.gov>
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	127 ## Adapted-By: jwe
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	128 ## Maintainer: jwe
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	129
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	130 function [options, valid] = __pltopt1__ (caller, opt, err_on_invalid)
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	131
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	132 options = __default_plot_options__ ();
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	133 valid = true;
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	134
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	135 more_opts = 1;
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	136
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	137 if (nargin != 2 && nargin != 3)
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	138 print_usage ();
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	139 endif
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	140
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	141 if (! ischar (opt))
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	142 return;
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	143 endif
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	144
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	145 have_linestyle = false;
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	146 have_marker = false;
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	147
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	148 ## If called by __errplot__, extract the linestyle before proceeding.
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	149 if (strcmp (caller,"__errplot__"))
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	150 if (strncmp (opt, "#~>", 3))
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	151 n = 3;
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	152 elseif (strncmp (opt, "#~", 2) \|\| strncmp (opt, "~>", 2))
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	153 n = 2;
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	154 elseif (strncmp (opt, "~", 1) \|\| strncmp (opt, ">", 1)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	155 \|\| strncmp (opt, "#", 1))
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	156 n = 1;
10575 3eba2cc7cbda Allow matlab style linestyles in errorbar plots David Bateman <dbateman@free.fr> parents: 10549 diff changeset	157 else
3eba2cc7cbda Allow matlab style linestyles in errorbar plots David Bateman <dbateman@free.fr> parents: 10549 diff changeset	158 n = 0;
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	159 endif
10580 1479b93ee655 Respect linestyleorder in errorbar plots David Bateman <dbateman@free.fr> parents: 10575 diff changeset	160 options.errorstyle = opt(1:n);
10135 4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter. David Bateman <dbateman@free.fr> parents: 10121 diff changeset	161 opt(1:n) = [];
10580 1479b93ee655 Respect linestyleorder in errorbar plots David Bateman <dbateman@free.fr> parents: 10575 diff changeset	162 else
1479b93ee655 Respect linestyleorder in errorbar plots David Bateman <dbateman@free.fr> parents: 10575 diff changeset	163 options.errorstyle = "~";
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	164 endif
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	165
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	166 while (! isempty (opt))
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	167 if (strncmp (opt, "--", 2) \|\| strncmp (opt, "-.", 2))
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	168 options.linestyle = opt(1:2);
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	169 have_linestyle = true;
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	170 n = 2;
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	171 else
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	172 topt = opt(1);
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	173 n = 1;
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	174 if (topt == "-" \|\| topt == ":")
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	175 have_linestyle = true;
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	176 options.linestyle = topt;
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	177 elseif (topt == "+" \|\| topt == "o" \|\| topt == "*"
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	178 \|\| topt == "." \|\| topt == "x" \|\| topt == "s"
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	179 \|\| topt == "d" \|\| topt == "^" \|\| topt == "v"
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	180 \|\| topt == ">" \|\| topt == "<" \|\| topt == "p"
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	181 \|\| topt == "h" \|\| topt == "@")
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	182 have_marker = true;
10135 4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter. David Bateman <dbateman@free.fr> parents: 10121 diff changeset	183 ## Backward compatibility. Leave undocumented.
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	184 if (topt == "@")
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	185 topt = "+";
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	186 endif
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	187 options.marker = topt;
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	188 ### Numeric color specs for backward compatibility. Leave undocumented.
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	189 elseif (topt == "k" \|\| topt == "0")
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	190 options.color = [0, 0, 0];
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	191 elseif (topt == "r" \|\| topt == "1")
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	192 options.color = [1, 0, 0];
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	193 elseif (topt == "g" \|\| topt == "2")
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	194 options.color = [0, 1, 0];
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	195 elseif (topt == "b" \|\| topt == "3")
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	196 options.color = [0, 0, 1];
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	197 elseif (topt == "y")
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	198 options.color = [1, 1, 0];
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	199 elseif (topt == "m" \|\| topt == "4")
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	200 options.color = [1, 0, 1];
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	201 elseif (topt == "c" \|\| topt == "5")
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	202 options.color = [0, 1, 1];
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	203 elseif (topt == "w" \|\| topt == "6")
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	204 options.color = [1, 1, 1];
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	205 elseif (isspace (topt))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	206 ## Do nothing.
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	207 elseif (topt == ";")
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	208 t = index (opt(2:end), ";");
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	209 if (t)
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	210 options.key = undo_string_escapes (opt(2:t));
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	211 n = t+1;
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	212 else
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	213 if (err_on_invalid)
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	214 error ("%s: unfinished key label", caller);
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	215 else
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	216 valid = false;
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	217 options = __default_plot_options__ ();
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	218 return;
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	219 endif
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	220 endif
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	221 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	222 if (err_on_invalid)
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	223 error ("%s: unrecognized format character: `%s'", caller, topt);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	224 else
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	225 valid = false;
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	226 options = __default_plot_options__ ();
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	227 return;
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	228 endif
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	229 endif
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	230 endif
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	231 opt(1:n) = [];
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	232 endwhile
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	233
10135 4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter. David Bateman <dbateman@free.fr> parents: 10121 diff changeset	234 if (! have_linestyle && have_marker)
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	235 options.linestyle = "none";
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	236 endif
1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	237
10135 4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter. David Bateman <dbateman@free.fr> parents: 10121 diff changeset	238 if (have_linestyle && ! have_marker)
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter. David Bateman <dbateman@free.fr> parents: 10121 diff changeset	239 options.marker = "none";
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter. David Bateman <dbateman@free.fr> parents: 10121 diff changeset	240 endif
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter. David Bateman <dbateman@free.fr> parents: 10121 diff changeset	241
9896 1aeb39118764 convert some plot functions to subfunctions or make some them private John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	242 endfunction

Mercurial > hg > octave-lyh

annotate scripts/plot/private/__pltopt__.m @ 11188:4cb1522e4d0f

annotate scripts/plot/private/pltopt.m @ 11188:4cb1522e4d0f