Mercurial > octave-nkf

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