Mercurial > octave-nkf

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