octave: scripts/image/image.m annotate

annotate scripts/image/image.m @ 15764:0a27a0e157a6

Temporary fix for display of indexed images of integer class. True fix will be done later in C++ code. * image.m: Convert integer indexed images to class single and switch to 1-based indexing.

author	Rik <rik@octave.org>
date	Mon, 10 Dec 2012 15:38:38 -0800
parents	806ea52af230
children	db90efd8f32b

rev	line source
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 14001 diff changeset	1 ## Copyright (C) 1994-2012 John W. Eaton
2313 5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	2 ##
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: 6368 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: 6368 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: 6368 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: 6368 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: 10704 diff changeset	20 ## @deftypefn {Function File} {} image (@var{img})
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6164 diff changeset	21 ## @deftypefnx {Function File} {} image (@var{x}, @var{y}, @var{img})
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	22 ## @deftypefnx {Function File} {} image (@dots{}, "@var{property}", @var{value}, @dots{})
14001 5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761) Rik <octave@nomad.inbox5.com> parents: 13993 diff changeset	23 ## @deftypefnx {Function File} {@var{h} =} image (@dots{})
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	24 ## Display a matrix as an indexed color image.
3651 c2305b99fbd7 [project @ 2000-03-31 07:12:29 by jwe] jwe parents: 3457 diff changeset	25 ##
14260 1f911333ed3d doc: Update docstrings for functions in image/ directory Rik <octave@nomad.inbox5.com> parents: 14247 diff changeset	26 ## The elements of @var{img} are indices into the current colormap.
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	27 ## @var{x} and @var{y} are optional 2-element vectors, @w{@code{[min, max]}},
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	28 ## which specify the range for the axis labels. If a range is specified as
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	29 ## @w{@code{[max, min]}} then the image will be reversed along that axis. For
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	30 ## convenience, @var{x} and @var{y} may be specified as N-element vectors
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	31 ## matching the length of the data in @var{img}. However, only the first and
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	32 ## last elements will be used to determine the axis limits.
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	33 ## @strong{Warning:} @var{x} and @var{y} are ignored when using gnuplot 4.0
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	34 ## or earlier.
10817 d9147775da54 image.m: Always reverse 'ydir' property when displaying images. Rik <octave@nomad.inbox5.com> parents: 10793 diff changeset	35 ##
14260 1f911333ed3d doc: Update docstrings for functions in image/ directory Rik <octave@nomad.inbox5.com> parents: 14247 diff changeset	36 ## The optional return value @var{h} is a graphics handle to the image.
1f911333ed3d doc: Update docstrings for functions in image/ directory Rik <octave@nomad.inbox5.com> parents: 14247 diff changeset	37 ##
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	38 ## Implementation Note: The origin (0, 0) for images is located in the
10817 d9147775da54 image.m: Always reverse 'ydir' property when displaying images. Rik <octave@nomad.inbox5.com> parents: 10793 diff changeset	39 ## upper left. For ordinary plots, the origin is located in the lower
d9147775da54 image.m: Always reverse 'ydir' property when displaying images. Rik <octave@nomad.inbox5.com> parents: 10793 diff changeset	40 ## left. Octave handles this inversion by plotting the data normally,
d9147775da54 image.m: Always reverse 'ydir' property when displaying images. Rik <octave@nomad.inbox5.com> parents: 10793 diff changeset	41 ## and then reversing the direction of the y-axis by setting the
14260 1f911333ed3d doc: Update docstrings for functions in image/ directory Rik <octave@nomad.inbox5.com> parents: 14247 diff changeset	42 ## @code{ydir} property to "reverse". This has implications whenever
10817 d9147775da54 image.m: Always reverse 'ydir' property when displaying images. Rik <octave@nomad.inbox5.com> parents: 10793 diff changeset	43 ## an image and an ordinary plot need to be overlaid. The recommended
d9147775da54 image.m: Always reverse 'ydir' property when displaying images. Rik <octave@nomad.inbox5.com> parents: 10793 diff changeset	44 ## solution is to display the image and then plot the reversed ydata
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	45 ## using, for example, @code{flipud (ydata)}.
14001 5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761) Rik <octave@nomad.inbox5.com> parents: 13993 diff changeset	46 ##
11109 41d18f6342f9 remove image_viewer function John W. Eaton <jwe@octave.org> parents: 11090 diff changeset	47 ## @seealso{imshow, imagesc, colormap}
3373 36405da8e173 [project @ 1999-11-23 20:54:17 by jwe] jwe parents: 3202 diff changeset	48 ## @end deftypefn
559 4e826edfbc56 [project @ 1994-07-25 22:18:28 by jwe] jwe parents: diff changeset	49
3202 44d82b369c78 [project @ 1998-10-29 20:27:57 by jwe] jwe parents: 2847 diff changeset	50 ## Author: Tony Richardson <arichard@stark.cc.oh.us>
2312 204cc7db6f4a [project @ 1996-07-11 21:20:36 by jwe] jwe parents: 2311 diff changeset	51 ## Created: July 1994
204cc7db6f4a [project @ 1996-07-11 21:20:36 by jwe] jwe parents: 2311 diff changeset	52 ## Adapted-By: jwe
904 3470f1e25a79 [project @ 1994-11-09 21:22:15 by jwe] jwe parents: 686 diff changeset	53
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	54 function h = image (varargin)
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7074 diff changeset	55
7276 1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	56 [ax, varargin, nargin] = __plt_get_axis_arg__ ("image", varargin{:});
1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	57
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	58 chararg = find (cellfun ("isclass", varargin, "char"), 1, "first");
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	59
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	60 if (nargin == 0 \|\| chararg == 1)
10650 f0dc41c824ce Replace calls to deprecated functions. Rik <octave@nomad.inbox5.com> parents: 10433 diff changeset	61 img = imread ("default.img");
7276 1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	62 x = y = [];
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	63 elseif (nargin == 1 \|\| chararg == 2)
7276 1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	64 img = varargin{1};
1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	65 x = y = [];
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	66 elseif (nargin == 2 \|\| chararg == 3)
7276 1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	67 print_usage ();
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7074 diff changeset	68 else
7276 1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	69 x = varargin{1};
1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	70 y = varargin{2};
1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	71 img = varargin{3};
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	72 chararg = 4;
15064 489736962e80 image.m: Don't accept complex image data (bug #36866) Rik <rik@octave.org> parents: 14872 diff changeset	73 endif
489736962e80 image.m: Don't accept complex image data (bug #36866) Rik <rik@octave.org> parents: 14872 diff changeset	74
7276 1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	75 oldax = gca ();
1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	76 unwind_protect
1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	77 axes (ax);
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	78 htmp = __img__ (x, y, img, varargin{chararg:end});
7315 3ceb12c499e9 [project @ 2007-12-13 21:35:36 by jwe] jwe parents: 7276 diff changeset	79 set (ax, "layer", "top");
7276 1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	80 unwind_protect_cleanup
1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	81 axes (oldax);
1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	82 end_unwind_protect
1e8e64d71e34 [project @ 2007-12-10 20:09:59 by jwe] jwe parents: 7208 diff changeset	83
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7074 diff changeset	84 if (nargout > 0)
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	85 h = htmp;
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7074 diff changeset	86 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7074 diff changeset	87
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7074 diff changeset	88 endfunction
9899 9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	89
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	90 ## Generic image creation.
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	91 ##
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	92 ## The axis values corresponding to the matrix elements are specified in
14260 1f911333ed3d doc: Update docstrings for functions in image/ directory Rik <octave@nomad.inbox5.com> parents: 14247 diff changeset	93 ## @var{x} and @var{y}. If you're not using gnuplot 4.2 or later, these
9899 9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	94 ## variables are ignored.
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	95
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	96 ## Author: Tony Richardson <arichard@stark.cc.oh.us>
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	97 ## Created: July 1994
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	98 ## Adapted-By: jwe
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	99
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	100 function h = __img__ (x, y, img, varargin)
13980 bd2be36fd949 image.m: Warn if input coordinates are not linearly spaced. Ben Abbott <bpabbott@mac.com> parents: 13173 diff changeset	101
9899 9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	102 newplot ();
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	103
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	104 if (isempty (img))
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	105 error ("__img__: matrix is empty");
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	106 endif
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	107
15764 0a27a0e157a6 Temporary fix for display of indexed images of integer class. Rik <rik@octave.org> parents: 15683 diff changeset	108 ## FIXME: Hack for integer formats which use zero-based indexing
0a27a0e157a6 Temporary fix for display of indexed images of integer class. Rik <rik@octave.org> parents: 15683 diff changeset	109 ## Hack favors correctness of display over size of image in memory.
0a27a0e157a6 Temporary fix for display of indexed images of integer class. Rik <rik@octave.org> parents: 15683 diff changeset	110 ## True fix will be done in C++ code.
0a27a0e157a6 Temporary fix for display of indexed images of integer class. Rik <rik@octave.org> parents: 15683 diff changeset	111 if (ndims (img) == 2 && (isinteger (img) \|\| islogical (img)))
0a27a0e157a6 Temporary fix for display of indexed images of integer class. Rik <rik@octave.org> parents: 15683 diff changeset	112 img = single (img) + 1;
0a27a0e157a6 Temporary fix for display of indexed images of integer class. Rik <rik@octave.org> parents: 15683 diff changeset	113 endif
0a27a0e157a6 Temporary fix for display of indexed images of integer class. Rik <rik@octave.org> parents: 15683 diff changeset	114
9899 9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	115 if (isempty (x))
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	116 x = [1, columns(img)];
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	117 endif
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	118
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	119 if (isempty (y))
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	120 y = [1, rows(img)];
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	121 endif
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	122
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	123 xdata = x([1, end]);
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	124 ydata = y([1, end]);
9899 9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	125
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	126 if (numel (x) > 2 && numel (y) > 2)
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	127 ## Test data for non-linear spacing which is unsupported
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	128 ## FIXME: Need a better check on linearity
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	129 tol = 100*eps;
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	130 dx = diff (x);
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	131 dy = diff (y);
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	132 dx = std (dx) / mean (abs (dx));
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	133 dy = std (dy) / mean (abs (dy));
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	134 if (any (dx > tol) \|\| any (dy > tol))
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	135 warning ("image: non-linear X, Y data is ignored. IMG will be shown with linear mapping");
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	136 endif
13980 bd2be36fd949 image.m: Warn if input coordinates are not linearly spaced. Ben Abbott <bpabbott@mac.com> parents: 13173 diff changeset	137 endif
bd2be36fd949 image.m: Warn if input coordinates are not linearly spaced. Ben Abbott <bpabbott@mac.com> parents: 13173 diff changeset	138
9899 9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	139 ca = gca ();
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	140
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	141 htmp = __go_image__ (ca, "cdata", img, "xdata", xdata, "ydata", ydata,
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	142 "cdatamapping", "direct", varargin {:});
11076 b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 10952 diff changeset	143
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	144 px = __image_pixel_size__ (htmp);
11090 2adf4736dafa Do not store flipped image property values when x/ydata descends. Ben Abbott <bpabbott@mac.com> parents: 11080 diff changeset	145
2adf4736dafa Do not store flipped image property values when x/ydata descends. Ben Abbott <bpabbott@mac.com> parents: 11080 diff changeset	146 if (xdata(2) < xdata(1))
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	147 xdata = fliplr (xdata);
11090 2adf4736dafa Do not store flipped image property values when x/ydata descends. Ben Abbott <bpabbott@mac.com> parents: 11080 diff changeset	148 elseif (xdata(2) == xdata(1))
14872 c2dbdeaa25df maint: use rows() and columns() to clarify m-files. Rik <octave@nomad.inbox5.com> parents: 14260 diff changeset	149 xdata = xdata(1) + [0, columns(img)-1];
11090 2adf4736dafa Do not store flipped image property values when x/ydata descends. Ben Abbott <bpabbott@mac.com> parents: 11080 diff changeset	150 endif
2adf4736dafa Do not store flipped image property values when x/ydata descends. Ben Abbott <bpabbott@mac.com> parents: 11080 diff changeset	151 if (ydata(2) < ydata(1))
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	152 ydata = fliplr (ydata);
11090 2adf4736dafa Do not store flipped image property values when x/ydata descends. Ben Abbott <bpabbott@mac.com> parents: 11080 diff changeset	153 elseif (ydata(2) == ydata(1))
14872 c2dbdeaa25df maint: use rows() and columns() to clarify m-files. Rik <octave@nomad.inbox5.com> parents: 14260 diff changeset	154 ydata = ydata(1) + [0, rows(img)-1];
11090 2adf4736dafa Do not store flipped image property values when x/ydata descends. Ben Abbott <bpabbott@mac.com> parents: 11080 diff changeset	155 endif
11076 b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 10952 diff changeset	156 xlim = xdata + [-px(1), px(1)];
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 10952 diff changeset	157 ylim = ydata + [-px(2), px(2)];
9899 9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	158
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	159 ## FIXME -- how can we do this and also get the {x,y}limmode
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	160 ## properties to remain "auto"? I suppose this adjustment should
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	161 ## happen automatically in axes::update_axis_limits instead of
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	162 ## explicitly setting the values here. But then what information is
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	163 ## available to axes::update_axis_limits to determine that the
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	164 ## adjustment is necessary?
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	165 set (ca, "xlim", xlim, "ylim", ylim);
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	166
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	167 if (ndims (img) == 3)
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	168 if (isinteger (img))
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	169 cls = class (img);
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	170 mn = intmin (cls);
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	171 mx = intmax (cls);
9899 9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	172 set (ca, "clim", double ([mn, mx]));
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	173 endif
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	174 endif
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	175
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	176 set (ca, "view", [0, 90]);
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	177
11308 9a08fa5b33bd image.m: Only flip y-axis if nextplot property equal "replace". Ben Abbott <bpabbott@mac.com> parents: 11109 diff changeset	178 if (strcmp (get (ca, "nextplot"), "replace"))
9a08fa5b33bd image.m: Only flip y-axis if nextplot property equal "replace". Ben Abbott <bpabbott@mac.com> parents: 11109 diff changeset	179 # Always reverse y-axis for images, unless hold is on
9a08fa5b33bd image.m: Only flip y-axis if nextplot property equal "replace". Ben Abbott <bpabbott@mac.com> parents: 11109 diff changeset	180 set (ca, "ydir", "reverse");
9a08fa5b33bd image.m: Only flip y-axis if nextplot property equal "replace". Ben Abbott <bpabbott@mac.com> parents: 11109 diff changeset	181 endif
10817 d9147775da54 image.m: Always reverse 'ydir' property when displaying images. Rik <octave@nomad.inbox5.com> parents: 10793 diff changeset	182
9899 9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	183 if (nargout > 0)
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	184 h = htmp;
9899 9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	185 endif
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	186
9f25290a35e8 more private function and subfunction changes John W. Eaton <jwe@octave.org> parents: 9245 diff changeset	187 endfunction
10942 48a1812fcc3a image.m: Matlab compatible axis limits, add demo. Ben Abbott <bpabbott@mac.com> parents: 10818 diff changeset	188
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	189
10942 48a1812fcc3a image.m: Matlab compatible axis limits, add demo. Ben Abbott <bpabbott@mac.com> parents: 10818 diff changeset	190 %!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	191 %! clf;
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	192 %! colormap (jet (21));
11080 36ceff79607b image.m: Allow x/ydata to imply a flip of the image. Modify demos. Ben Abbott <bpabbott@mac.com> parents: 11076 diff changeset	193 %! img = 1 ./ hilb (11);
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	194 %! x = y = -5:5;
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	195 %! subplot (2,2,1);
15683 806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	196 %! h = image (x, y, img);
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	197 %! ylabel ("limits = [-5.5, 5.5]");
806ea52af230 Overhaul m-files in image directory to provide better support for images stored as integers. Rik <rik@octave.org> parents: 15202 diff changeset	198 %! title ("image (x, y, img)");
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	199 %! subplot (2,2,2);
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	200 %! h = image (-x, y, img);
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	201 %! title ("image (-x, y, img)");
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	202 %! subplot (2,2,3);
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	203 %! h = image (x, -y, img);
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	204 %! title ("image (x, -y, img)");
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	205 %! ylabel ("limits = [-5.5, 5.5]");
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	206 %! subplot (2,2,4);
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	207 %! h = image (-x, -y, img);
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	208 %! title ("image (-x, -y, img)");
10942 48a1812fcc3a image.m: Matlab compatible axis limits, add demo. Ben Abbott <bpabbott@mac.com> parents: 10818 diff changeset	209

Mercurial > octave

annotate scripts/image/image.m @ 15764:0a27a0e157a6