Mercurial > octave-nkf

comparison scripts/image/hsv.m @ 19647:e8e3a89fa370

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix colormap functions when N is not of class double (bug #44070) * autumn.m, bone.m, cool.m, copper.m, cubehelix.m, gray.m, hsv.m, ocean.m, rainbow.m, spring.m, summer.m, winter.m: cast N to double since in this colormap functions, N is used directly used in the operations and ends up casting colormap to something else. Note that a colormap MUST be of class double. Also, if N is an integer class, all values in colormap end up 0 or 1. Also simplify code for input checking by declaring default on function signature line. * flag.m, gmap40.m, hot.m, jet.m, lines.m, pink.m, prism.m, white.m: simplify input check like the other colormap functions. * test/colormaps.tst: add new test file to test all colormaps at once. * test/Makefile.am: add new test file to build system. used to create the colormap and if less
author Carnë Draug <carandraug@octave.org>
date Fri, 23 Jan 2015 15:37:56 +0000
parents d63878346099
children 4197fc428c7d
comparison
equal deleted inserted replaced
19646:68cc16969f78 19647:e8e3a89fa370
33 ## Author: Kai Habel <kai.habel@gmx.de> 33 ## Author: Kai Habel <kai.habel@gmx.de>
34 34
35 ## PKG_ADD: colormap ("register", "hsv"); 35 ## PKG_ADD: colormap ("register", "hsv");
36 ## PKG_DEL: colormap ("unregister", "hsv"); 36 ## PKG_DEL: colormap ("unregister", "hsv");
37 37
38 function map = hsv (n) 38 function map = hsv (n = rows (colormap ()))
39 39
40 if (nargin == 0) 40 if (nargin > 1)
41 n = rows (colormap);
42 elseif (nargin == 1)
43 if (! isscalar (n))
44 error ("hsv: N must be a scalar");
45 endif
46 else
47 print_usage (); 41 print_usage ();
42 elseif (! isscalar (n))
43 error ("hsv: N must be a scalar");
48 endif 44 endif
45 n = double (n);
49 46
50 if (n == 1) 47 if (n == 1)
51 map = [1, 0, 0]; 48 map = [1, 0, 0];
52 elseif (n > 1) 49 elseif (n > 1)
53 hue = [0:n-1]' / n; 50 hue = [0:n-1]' / n;
56 map = zeros (0, 3); 53 map = zeros (0, 3);
57 endif 54 endif
58 55
59 endfunction 56 endfunction
60 57
61
62 %!demo 58 %!demo
63 %! ## Show the 'hsv' colormap as an image 59 %! ## Show the 'hsv' colormap as an image
64 %! image (1:64, linspace (0, 1, 64), repmat ((1:64)', 1, 64)); 60 %! image (1:64, linspace (0, 1, 64), repmat ((1:64)', 1, 64));
65 %! axis ([1, 64, 0, 1], "ticy", "xy"); 61 %! axis ([1, 64, 0, 1], "ticy", "xy");
66 %! colormap (hsv (64)); 62 %! colormap (hsv (64));