Mercurial > octave-nkf

comparison scripts/image/rainbow.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
32 ## colormap map but with a continuous map 32 ## colormap map but with a continuous map
33 33
34 ## PKG_ADD: colormap ("register", "rainbow"); 34 ## PKG_ADD: colormap ("register", "rainbow");
35 ## PKG_DEL: colormap ("unregister", "rainbow"); 35 ## PKG_DEL: colormap ("unregister", "rainbow");
36 36
37 function map = rainbow (n) 37 function map = rainbow (n = rows (colormap ()))
38 38
39 if (nargin == 0) 39 if (nargin > 1)
40 n = rows (colormap);
41 elseif (nargin == 1)
42 if (! isscalar (n))
43 error ("rainbow: N must be a scalar");
44 endif
45 else
46 print_usage (); 40 print_usage ();
41 elseif (! isscalar (n))
42 error ("rainbow: N must be a scalar");
47 endif 43 endif
44 n = double (n);
48 45
49 if (n == 1) 46 if (n == 1)
50 map = [1, 0, 0]; 47 map = [1, 0, 0];
51 elseif (n > 1) 48 elseif (n > 1)
52 x = [0:(n-1)]' / (n - 1); 49 x = [0:(n-1)]' / (n - 1);
67 map = zeros (0, 3); 64 map = zeros (0, 3);
68 endif 65 endif
69 66
70 endfunction 67 endfunction
71 68
72
73 %!demo 69 %!demo
74 %! ## Show the 'rainbow' colormap as an image 70 %! ## Show the 'rainbow' colormap as an image
75 %! image (1:64, linspace (0, 1, 64), repmat ((1:64)', 1, 64)); 71 %! image (1:64, linspace (0, 1, 64), repmat ((1:64)', 1, 64));
76 %! axis ([1, 64, 0, 1], "ticy", "xy"); 72 %! axis ([1, 64, 0, 1], "ticy", "xy");
77 %! colormap (rainbow (64)); 73 %! colormap (rainbow (64));