Mercurial > octave-nkf

comparison scripts/image/autumn.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
29 ## Author: Kai Habel <kai.habel@gmx.de> 29 ## Author: Kai Habel <kai.habel@gmx.de>
30 30
31 ## PKG_ADD: colormap ("register", "autumn"); 31 ## PKG_ADD: colormap ("register", "autumn");
32 ## PKG_DEL: colormap ("unregister", "autumn"); 32 ## PKG_DEL: colormap ("unregister", "autumn");
33 33
34 function map = autumn (n) 34 function map = autumn (n = rows (colormap ()))
35 35
36 if (nargin == 0) 36 if (nargin > 1)
37 n = rows (colormap);
38 elseif (nargin == 1)
39 if (! isscalar (n))
40 error ("autumn: N must be a scalar");
41 endif
42 else
43 print_usage (); 37 print_usage ();
38 elseif (! isscalar (n))
39 error ("autumn: N must be a scalar");
44 endif 40 endif
41 n = double (n);
45 42
46 if (n == 1) 43 if (n == 1)
47 map = [1, 0, 0]; 44 map = [1, 0, 0];
48 elseif (n > 1) 45 elseif (n > 1)
49 r = ones (n, 1); 46 r = ones (n, 1);
54 map = zeros (0, 3); 51 map = zeros (0, 3);
55 endif 52 endif
56 53
57 endfunction 54 endfunction
58 55
59
60 %!demo 56 %!demo
61 %! ## Show the 'autumn' colormap as an image 57 %! ## Show the 'autumn' colormap as an image
62 %! image (1:64, linspace (0, 1, 64), repmat ((1:64)', 1, 64)); 58 %! image (1:64, linspace (0, 1, 64), repmat ((1:64)', 1, 64));
63 %! axis ([1, 64, 0, 1], "ticy", "xy"); 59 %! axis ([1, 64, 0, 1], "ticy", "xy");
64 %! colormap (autumn (64)); 60 %! colormap (autumn (64));