octave-nkf: scripts/image/imshow.m annotate

annotate scripts/image/imshow.m @ 20337:928e2c6f888e

imshow.m: Respect new 'parent' property when setting axis properties. * imshow.m: Apply axes properties to parent of created image. Add input validation to ensure "parent" property is an axes. Add BIST test to check input validation.

author	Rik <rik@octave.org>
date	Sun, 05 Jul 2015 21:31:46 -0700
parents	eca5aa3225f4
children	a3bf503652b2

rev	line source
19731 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19631 diff changeset	1 ## Copyright (C) 1994-2015 John W. Eaton
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2 ##
2313 5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	3 ## This file is part of Octave.
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	4 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	5 ## Octave is free software; you can redistribute it and/or modify it
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	6 ## 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: 6757 diff changeset	7 ## the Free Software Foundation; either version 3 of the License, or (at
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6757 diff changeset	8 ## your option) any later version.
2313 5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	9 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	10 ## Octave is distributed in the hope that it will be useful, but
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	13 ## General Public License for more details.
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	14 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	15 ## 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: 6757 diff changeset	16 ## along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6757 diff changeset	17 ## <http://www.gnu.org/licenses/>.
1024 56520a75b5b3 [project @ 1995-01-11 20:30:04 by jwe] jwe parents: 904 diff changeset	18
3381 69b167451491 [project @ 1999-12-15 20:48:10 by jwe] jwe parents: 3373 diff changeset	19 ## -- texinfo --
10793 be55736a0783 Grammarcheck the documentation from m-files. Rik <octave@nomad.inbox5.com> parents: 10648 diff changeset	20 ## @deftypefn {Function File} {} imshow (@var{im})
5934 8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	21 ## @deftypefnx {Function File} {} imshow (@var{im}, @var{limits})
8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	22 ## @deftypefnx {Function File} {} imshow (@var{im}, @var{map})
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	23 ## @deftypefnx {Function File} {} imshow (@var{rgb}, @dots{})
5934 8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	24 ## @deftypefnx {Function File} {} imshow (@var{filename})
6309 6a60e68fc4b1 [project @ 2007-02-15 09:49:27 by jwe] jwe parents: 6219 diff changeset	25 ## @deftypefnx {Function File} {} imshow (@dots{}, @var{string_param1}, @var{value1}, @dots{})
14001 5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761) Rik <octave@nomad.inbox5.com> parents: 13738 diff changeset	26 ## @deftypefnx {Function File} {@var{h} =} imshow (@dots{})
6368 ec2a523713b5 [project @ 2007-02-28 22:07:24 by jwe] jwe parents: 6310 diff changeset	27 ## Display the image @var{im}, where @var{im} can be a 2-dimensional
14897 8e2a6fc55787 doc: Use 'grayscale' rather than 'gray-scale' in documentation. Rik <rik@octave.org> parents: 14366 diff changeset	28 ## (grayscale image) or a 3-dimensional (RGB image) matrix.
5934 8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	29 ##
20193 7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19867 diff changeset	30 ## If @var{limits} is a 2-element vector @code{[@var{low}, @var{high}]}, the
7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19867 diff changeset	31 ## image is shown using a display range between @var{low} and @var{high}. If
7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19867 diff changeset	32 ## an empty matrix is passed for @var{limits}, the display range is computed
7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19867 diff changeset	33 ## as the range between the minimal and the maximal value in the image.
3426 f8dde1807dee [project @ 2000-01-13 08:40:00 by jwe] jwe parents: 3381 diff changeset	34 ##
5934 8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	35 ## If @var{map} is a valid color map, the image will be shown as an indexed
8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	36 ## image using the supplied color map.
8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	37 ##
20193 7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19867 diff changeset	38 ## If a file name is given instead of an image, the file will be read and shown.
3426 f8dde1807dee [project @ 2000-01-13 08:40:00 by jwe] jwe parents: 3381 diff changeset	39 ##
20216 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20193 diff changeset	40 ## If given, the parameter @var{string_param1} has value @var{value1}.
20193 7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19867 diff changeset	41 ## @var{string_param1} can be any of the following:
14366 b76f0740940e doc: Periodic grammar check of documentation. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	42 ##
11595 5ec6aa05638d Prevent doubled quotes around @table items in Info. Rik <octave@nomad.inbox5.com> parents: 11587 diff changeset	43 ## @table @asis
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 14897 diff changeset	44 ## @item @qcode{"displayrange"}
5934 8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	45 ## @var{value1} is the display range as described above.
19627 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18546 diff changeset	46 ##
18748 c79696701468 doc: Document new 'colormap' parameter to imshow. Rik <rik@octave.org> parents: 18747 diff changeset	47 ## @item @qcode{"colormap"}
c79696701468 doc: Document new 'colormap' parameter to imshow. Rik <rik@octave.org> parents: 18747 diff changeset	48 ## @var{value1} is the colormap to use when displaying an indexed image.
19630 0e1f5a750d00 maint: Periodic merge of gui-release to default. John W. Eaton <jwe@octave.org> parents: 18773 19627 diff changeset	49 ##
17753 887df64e54e4 doc: Final grammarcheck of docstrings for 3.8 release. Rik <rik@octave.org> parents: 17744 diff changeset	50 ## @item @qcode{"xdata"}
17734 64ad713b3a64 imshow.m: Add support for "xdata" and "ydata" options, make option parser case insensitive Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17281 diff changeset	51 ## If @var{value1} is a two element vector, it must contain horizontal axis
20193 7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19867 diff changeset	52 ## limits in the form [xmin xmax]; Otherwise @var{value1} must be a vector and
7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19867 diff changeset	53 ## only the first and last elements will be used for xmin and xmax respectively.
19627 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 18546 diff changeset	54 ##
17753 887df64e54e4 doc: Final grammarcheck of docstrings for 3.8 release. Rik <rik@octave.org> parents: 17744 diff changeset	55 ## @item @qcode{"ydata"}
17734 64ad713b3a64 imshow.m: Add support for "xdata" and "ydata" options, make option parser case insensitive Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17281 diff changeset	56 ## If @var{value1} is a two element vector, it must contain vertical axis
20193 7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19867 diff changeset	57 ## limits in the form [ymin ymax]; Otherwise @var{value1} must be a vector and
7503499a252b doc: Update docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19867 diff changeset	58 ## only the first and last elements will be used for ymin and ymax respectively.
17734 64ad713b3a64 imshow.m: Add support for "xdata" and "ydata" options, make option parser case insensitive Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17281 diff changeset	59 ##
5934 8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	60 ## @end table
14001 5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761) Rik <octave@nomad.inbox5.com> parents: 13738 diff changeset	61 ##
5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761) Rik <octave@nomad.inbox5.com> parents: 13738 diff changeset	62 ## The optional return value @var{h} is a graphics handle to the image.
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5443 diff changeset	63 ## @seealso{image, imagesc, colormap, gray2ind, rgb2ind}
3373 36405da8e173 [project @ 1999-11-23 20:54:17 by jwe] jwe parents: 3202 diff changeset	64 ## @end deftypefn
904 3470f1e25a79 [project @ 1994-11-09 21:22:15 by jwe] jwe parents: 559 diff changeset	65
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	66 ## Author: Stefan van der Walt <stefan@sun.ac.za>
5934 8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	67 ## Author: Soren Hauberg <hauberg at gmail dot com>
2312 204cc7db6f4a [project @ 1996-07-11 21:20:36 by jwe] jwe parents: 2311 diff changeset	68 ## Adapted-By: jwe
559 4e826edfbc56 [project @ 1994-07-25 22:18:28 by jwe] jwe parents: diff changeset	69
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	70 function h = imshow (im, varargin)
559 4e826edfbc56 [project @ 1994-07-25 22:18:28 by jwe] jwe parents: diff changeset	71
5934 8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	72 if (nargin == 0)
8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	73 print_usage ();
5318 9a72639b62a7 [project @ 2005-04-28 18:44:27 by jwe] jwe parents: 5307 diff changeset	74 endif
9a72639b62a7 [project @ 2005-04-28 18:44:27 by jwe] jwe parents: 5307 diff changeset	75
7328 d0784e593d39 [project @ 2007-12-20 07:24:02 by jwe] jwe parents: 7321 diff changeset	76 display_range = NA;
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	77 truecolor = false;
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	78 indexed = false;
17734 64ad713b3a64 imshow.m: Add support for "xdata" and "ydata" options, make option parser case insensitive Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17281 diff changeset	79 xdata = ydata = [];
20336 eca5aa3225f4 imshow.m: Add support for 'parent' property (bug #45473). Rik <rik@octave.org> parents: 20216 diff changeset	80 prop_val_args = {};
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	81
5935 01ff100fcd64 [project @ 2006-08-17 20:40:58 by jwe] jwe parents: 5934 diff changeset	82 ## Get the image.
5934 8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	83 if (ischar (im))
7931 de26beacb20f imread.m: simplify; loadimage.m: deprecate John W. Eaton <jwe@octave.org> parents: 7930 diff changeset	84 [im, map] = imread (im);
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	85 indexed = true;
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	86 colormap (map);
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	87 endif
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	88
10286 8cf666139297 imshow for logical matrices John W. Eaton <jwe@octave.org> parents: 9273 diff changeset	89 nd = ndims (im);
8cf666139297 imshow for logical matrices John W. Eaton <jwe@octave.org> parents: 9273 diff changeset	90
8cf666139297 imshow for logical matrices John W. Eaton <jwe@octave.org> parents: 9273 diff changeset	91 if (! ((isnumeric (im) \|\| islogical (im)) && (nd == 2 \|\| nd == 3)))
11472 1740012184f9 Use uppercase for variable names in error() strings to match Info documentation. Only m-files done. Rik <octave@nomad.inbox5.com> parents: 11324 diff changeset	92 error ("imshow: IM must be an image or the filename of an image");
5318 9a72639b62a7 [project @ 2005-04-28 18:44:27 by jwe] jwe parents: 5307 diff changeset	93 endif
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	94
10286 8cf666139297 imshow for logical matrices John W. Eaton <jwe@octave.org> parents: 9273 diff changeset	95 if (nd == 2)
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	96 if (! indexed)
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	97 colormap (gray ());
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	98 endif
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	99 elseif (size (im, 3) == 3)
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	100 if (ismember (class (im), {"uint8", "uint16", "double", "single"}))
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	101 truecolor = true;
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	102 else
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	103 error ("imshow: TrueColor image must be uint8, uint16, double, or single");
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	104 endif
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	105 else
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	106 error ("imshow: expecting MxN or MxNx3 matrix for image");
5318 9a72639b62a7 [project @ 2005-04-28 18:44:27 by jwe] jwe parents: 5307 diff changeset	107 endif
9a72639b62a7 [project @ 2005-04-28 18:44:27 by jwe] jwe parents: 5307 diff changeset	108
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	109 narg = 1;
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	110 while (narg <= numel (varargin))
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	111 arg = varargin{narg++};
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	112 if (isnumeric (arg))
7331 3ed85de5922c [project @ 2007-12-21 17:40:20 by jwe] jwe parents: 7328 diff changeset	113 if (numel (arg) == 2 \|\| isempty (arg))
10433 2c01d24459fb Detabify scripts in 'scripts/image/' Soren Hauberg <hauberg@gmail.com> parents: 10286 diff changeset	114 display_range = arg;
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	115 elseif (columns (arg) == 3)
10433 2c01d24459fb Detabify scripts in 'scripts/image/' Soren Hauberg <hauberg@gmail.com> parents: 10286 diff changeset	116 indexed = true;
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	117 if (iscolormap (arg))
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	118 colormap (arg);
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	119 else
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	120 error ("imshow: invalid colormap MAP");
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	121 endif
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	122 elseif (! isempty (arg))
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	123 error ("imshow: argument number %d is invalid", narg);
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	124 endif
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	125 elseif (ischar (arg))
17734 64ad713b3a64 imshow.m: Add support for "xdata" and "ydata" options, make option parser case insensitive Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17281 diff changeset	126 switch (tolower (arg))
20336 eca5aa3225f4 imshow.m: Add support for 'parent' property (bug #45473). Rik <rik@octave.org> parents: 20216 diff changeset	127 case "border"
eca5aa3225f4 imshow.m: Add support for 'parent' property (bug #45473). Rik <rik@octave.org> parents: 20216 diff changeset	128 warning ("imshow: border argument is not implemented");
eca5aa3225f4 imshow.m: Add support for 'parent' property (bug #45473). Rik <rik@octave.org> parents: 20216 diff changeset	129 narg++;
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	130 case "colormap"
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	131 map = varargin{narg++};
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	132 if (iscolormap (map))
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	133 colormap (map);
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	134 else
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	135 error ("imshow: invalid colormap");
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	136 endif
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	137 case "displayrange"
10433 2c01d24459fb Detabify scripts in 'scripts/image/' Soren Hauberg <hauberg@gmail.com> parents: 10286 diff changeset	138 display_range = varargin{narg++};
20336 eca5aa3225f4 imshow.m: Add support for 'parent' property (bug #45473). Rik <rik@octave.org> parents: 20216 diff changeset	139 case {"initialmagnification"}
20337 928e2c6f888e imshow.m: Respect new 'parent' property when setting axis properties. Rik <rik@octave.org> parents: 20336 diff changeset	140 warning ("imshow: zoom argument ignored -- use GUI features");
20336 eca5aa3225f4 imshow.m: Add support for 'parent' property (bug #45473). Rik <rik@octave.org> parents: 20216 diff changeset	141 narg++;
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	142 case "parent"
20336 eca5aa3225f4 imshow.m: Add support for 'parent' property (bug #45473). Rik <rik@octave.org> parents: 20216 diff changeset	143 prop_val_args(end+(1:2)) = {"parent", varargin{narg++}};
20337 928e2c6f888e imshow.m: Respect new 'parent' property when setting axis properties. Rik <rik@octave.org> parents: 20336 diff changeset	144 if (! isaxes (prop_val_args{end}))
928e2c6f888e imshow.m: Respect new 'parent' property when setting axis properties. Rik <rik@octave.org> parents: 20336 diff changeset	145 error ("imshow: parent must be an axes handle");
928e2c6f888e imshow.m: Respect new 'parent' property when setting axis properties. Rik <rik@octave.org> parents: 20336 diff changeset	146 endif
20336 eca5aa3225f4 imshow.m: Add support for 'parent' property (bug #45473). Rik <rik@octave.org> parents: 20216 diff changeset	147 case "reduce"
eca5aa3225f4 imshow.m: Add support for 'parent' property (bug #45473). Rik <rik@octave.org> parents: 20216 diff changeset	148 warning ("imshow: reduce argument is not implemented");
eca5aa3225f4 imshow.m: Add support for 'parent' property (bug #45473). Rik <rik@octave.org> parents: 20216 diff changeset	149 narg++;
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	150 case "xdata"
17734 64ad713b3a64 imshow.m: Add support for "xdata" and "ydata" options, make option parser case insensitive Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17281 diff changeset	151 xdata = varargin{narg++};
64ad713b3a64 imshow.m: Add support for "xdata" and "ydata" options, make option parser case insensitive Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17281 diff changeset	152 if (! isvector (xdata))
64ad713b3a64 imshow.m: Add support for "xdata" and "ydata" options, make option parser case insensitive Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17281 diff changeset	153 error ("imshow: xdata must be a vector")
64ad713b3a64 imshow.m: Add support for "xdata" and "ydata" options, make option parser case insensitive Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17281 diff changeset	154 endif
64ad713b3a64 imshow.m: Add support for "xdata" and "ydata" options, make option parser case insensitive Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17281 diff changeset	155 xdata = [xdata(1) xdata(end)];
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	156 case "ydata"
17734 64ad713b3a64 imshow.m: Add support for "xdata" and "ydata" options, make option parser case insensitive Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17281 diff changeset	157 ydata = varargin{narg++};
18546 8e384416ebb3 imshow.m: Fix bad input validation of ydata (bug #41773). Rik <rik@octave.org> parents: 17753 diff changeset	158 if (! isvector (ydata))
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	159 error ("imshow: ydata must be a vector")
17734 64ad713b3a64 imshow.m: Add support for "xdata" and "ydata" options, make option parser case insensitive Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17281 diff changeset	160 endif
64ad713b3a64 imshow.m: Add support for "xdata" and "ydata" options, make option parser case insensitive Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17281 diff changeset	161 ydata = [ydata(1) ydata(end)];
10433 2c01d24459fb Detabify scripts in 'scripts/image/' Soren Hauberg <hauberg@gmail.com> parents: 10286 diff changeset	162 otherwise
2c01d24459fb Detabify scripts in 'scripts/image/' Soren Hauberg <hauberg@gmail.com> parents: 10286 diff changeset	163 warning ("imshow: unrecognized property %s", arg);
2c01d24459fb Detabify scripts in 'scripts/image/' Soren Hauberg <hauberg@gmail.com> parents: 10286 diff changeset	164 narg++;
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	165 endswitch
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	166 else
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	167 error ("imshow: argument number %d is invalid", narg);
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	168 endif
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	169 endwhile
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	170
13738 7ee61e56eaed Periodic merge of stable to default Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13705 diff changeset	171 ## Check for complex images.
7ee61e56eaed Periodic merge of stable to default Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13705 diff changeset	172 if (iscomplex (im))
7ee61e56eaed Periodic merge of stable to default Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13705 diff changeset	173 warning ("imshow: only showing real part of complex image");
7ee61e56eaed Periodic merge of stable to default Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13705 diff changeset	174 im = real (im);
7ee61e56eaed Periodic merge of stable to default Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13705 diff changeset	175 endif
7ee61e56eaed Periodic merge of stable to default Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13705 diff changeset	176
8117 40aa36406a94 Fix for display_range in imshow Kris Thielemans parents: 7931 diff changeset	177 ## Set default display range if display_range not set yet.
7328 d0784e593d39 [project @ 2007-12-20 07:24:02 by jwe] jwe parents: 7321 diff changeset	178 if (isempty (display_range))
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	179 display_range = [min(im(:)), max(im(:))];
8117 40aa36406a94 Fix for display_range in imshow Kris Thielemans parents: 7931 diff changeset	180 elseif (isna (display_range))
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	181 t = class (im);
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	182 switch (t)
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	183 case {"double", "single", "logical"}
10433 2c01d24459fb Detabify scripts in 'scripts/image/' Soren Hauberg <hauberg@gmail.com> parents: 10286 diff changeset	184 display_range = [0, 1];
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	185 case {"uint8", "uint16", "int16"}
11597 a066673566da set clim to [0,1] so that scaled cdatamapping works as intended. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11595 diff changeset	186 display_range = [intmin(t), intmax(t)];
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	187 otherwise
10433 2c01d24459fb Detabify scripts in 'scripts/image/' Soren Hauberg <hauberg@gmail.com> parents: 10286 diff changeset	188 error ("imshow: invalid data type for image");
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	189 endswitch
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	190 endif
5934 8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	191
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	192 if (isfloat (im))
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	193 nans = isnan (im(:));
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	194 if (any (nans))
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	195 warning ("Octave:imshow-NaN",
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	196 "imshow: pixels with NaN or NA values are set to minimum pixel value");
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	197 im(nans) = display_range(1);
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	198 endif
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	199 endif
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	200
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	201 if (truecolor \|\| indexed)
20336 eca5aa3225f4 imshow.m: Add support for 'parent' property (bug #45473). Rik <rik@octave.org> parents: 20216 diff changeset	202 htmp = image (xdata, ydata, im, prop_val_args{:});
5934 8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	203 else
20336 eca5aa3225f4 imshow.m: Add support for 'parent' property (bug #45473). Rik <rik@octave.org> parents: 20216 diff changeset	204 htmp = imagesc (xdata, ydata, im, display_range, prop_val_args{:});
20337 928e2c6f888e imshow.m: Respect new 'parent' property when setting axis properties. Rik <rik@octave.org> parents: 20336 diff changeset	205 set (get (htmp, "parent"), "clim", display_range);
5934 8702f00329bf [project @ 2006-08-17 20:29:51 by jwe] jwe parents: 5642 diff changeset	206 endif
20337 928e2c6f888e imshow.m: Respect new 'parent' property when setting axis properties. Rik <rik@octave.org> parents: 20336 diff changeset	207 set (get (htmp, "parent"), "visible", "off", "view", [0, 90],
928e2c6f888e imshow.m: Respect new 'parent' property when setting axis properties. Rik <rik@octave.org> parents: 20336 diff changeset	208 "ydir", "reverse", "layer", "top");
7511 f028e7aa77a7 imshow.m: use axis ("image") John W. Eaton <jwe@octave.org> parents: 7331 diff changeset	209 axis ("image");
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	210
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	211 if (nargout > 0)
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	212 h = htmp;
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	213 endif
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	214
559 4e826edfbc56 [project @ 1994-07-25 22:18:28 by jwe] jwe parents: diff changeset	215 endfunction
4836 518e495e489f [project @ 2004-03-12 18:16:03 by jwe] jwe parents: 3457 diff changeset	216
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	217
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	218 %!demo
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	219 %! clf;
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	220 %! imshow ("default.img");
4836 518e495e489f [project @ 2004-03-12 18:16:03 by jwe] jwe parents: 3457 diff changeset	221
518e495e489f [project @ 2004-03-12 18:16:03 by jwe] jwe parents: 3457 diff changeset	222 %!demo
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	223 %! clf;
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	224 %! imshow ("default.img");
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	225 %! colormap (autumn (64));
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	226
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	227 %!demo
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	228 %! clf;
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	229 %! [I, M] = imread ("default.img");
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	230 %! imshow (I, M);
4836 518e495e489f [project @ 2004-03-12 18:16:03 by jwe] jwe parents: 3457 diff changeset	231
518e495e489f [project @ 2004-03-12 18:16:03 by jwe] jwe parents: 3457 diff changeset	232 %!demo
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	233 %! clf;
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	234 %! [I, M] = imread ("default.img");
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	235 %! [R, G, B] = ind2rgb (I, M);
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	236 %! imshow (cat (3, R, G0.5, B0.8));
5318 9a72639b62a7 [project @ 2005-04-28 18:44:27 by jwe] jwe parents: 5307 diff changeset	237
9a72639b62a7 [project @ 2005-04-28 18:44:27 by jwe] jwe parents: 5307 diff changeset	238 %!demo
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	239 %! clf;
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	240 %! imshow (rand (100, 100));
5318 9a72639b62a7 [project @ 2005-04-28 18:44:27 by jwe] jwe parents: 5307 diff changeset	241
9a72639b62a7 [project @ 2005-04-28 18:44:27 by jwe] jwe parents: 5307 diff changeset	242 %!demo
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	243 %! clf;
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	244 %! imshow (rand (100, 100, 3));
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	245
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	246 %!demo
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	247 %! clf;
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	248 %! imshow (100*rand (100, 100, 3));
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	249
87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	250 %!demo
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	251 %! clf;
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	252 %! imshow (rand (100, 100));
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	253 %! colormap (jet (64));
7074 87151f298e6a [project @ 2007-10-26 17:57:34 by jwe] jwe parents: 7017 diff changeset	254
19867 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19731 diff changeset	255 ## Test input validation
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	256 %!error imshow ()
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	257 %!error <IM must be an image> imshow ({"cell"})
18747 0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	258 %!error <TrueColor image must be uint8> imshow (ones (3,3,3, "uint32"))
0585787aa8ae imshow.m: Overhaul function and support integer images (bug #41240). Rik <rik@octave.org> parents: 18746 diff changeset	259 %!error <TrueColor image must be uint8> imshow (ones (3,3,3, "int16"))
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	260 %!error <expecting MxN or MxNx3 matrix> imshow (ones (4,4,4))
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	261
18773 0461fe1d2a01 imshow.m: Don't popup blank figure during 'make check' Rik <rik@octave.org> parents: 18753 diff changeset	262 %!test
0461fe1d2a01 imshow.m: Don't popup blank figure during 'make check' Rik <rik@octave.org> parents: 18753 diff changeset	263 %! hf = figure ("visible", "off");
0461fe1d2a01 imshow.m: Don't popup blank figure during 'make check' Rik <rik@octave.org> parents: 18753 diff changeset	264 %! unwind_protect
0461fe1d2a01 imshow.m: Don't popup blank figure during 'make check' Rik <rik@octave.org> parents: 18753 diff changeset	265 %! fail ("imshow ([1,1], [2 0 0])", "invalid colormap MAP");
19631 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19630 diff changeset	266 %! fail ("imshow ([1,1], [1 0 0 0])", "argument number 2 is invalid");
db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19630 diff changeset	267 %! fail ('imshow ([1,1], "colormap", [2 0 0])', "invalid colormap");
20337 928e2c6f888e imshow.m: Respect new 'parent' property when setting axis properties. Rik <rik@octave.org> parents: 20336 diff changeset	268 %! fail ('imshow ([1,1], "parent", -1)', "must be an axes handle");
19631 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19630 diff changeset	269 %! fail ('imshow ([1,1], "xdata", ones (2,2))', "xdata must be a vector");
db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19630 diff changeset	270 %! fail ('imshow ([1,1], "ydata", ones (2,2))', "ydata must be a vector");
18773 0461fe1d2a01 imshow.m: Don't popup blank figure during 'make check' Rik <rik@octave.org> parents: 18753 diff changeset	271 %! fail ('imshow ([1,1], "foobar")', "warning", "unrecognized property foobar")
19631 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19630 diff changeset	272 %! fail ("imshow ([1,1], {1})", "argument number 2 is invalid");
18773 0461fe1d2a01 imshow.m: Don't popup blank figure during 'make check' Rik <rik@octave.org> parents: 18753 diff changeset	273 %! fail ("imshow ([1+i,1-i])", "warning", "only showing real part of complex image");
0461fe1d2a01 imshow.m: Don't popup blank figure during 'make check' Rik <rik@octave.org> parents: 18753 diff changeset	274 %! unwind_protect_cleanup
0461fe1d2a01 imshow.m: Don't popup blank figure during 'make check' Rik <rik@octave.org> parents: 18753 diff changeset	275 %! close (hf);
0461fe1d2a01 imshow.m: Don't popup blank figure during 'make check' Rik <rik@octave.org> parents: 18753 diff changeset	276 %! end_unwind_protect
0461fe1d2a01 imshow.m: Don't popup blank figure during 'make check' Rik <rik@octave.org> parents: 18753 diff changeset	277

Mercurial > octave-nkf

annotate scripts/image/imshow.m @ 20337:928e2c6f888e