Mercurial > octave-nkf

comparison scripts/image/gmap40.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 68cc16969f78
children 4197fc428c7d
comparison
equal deleted inserted replaced
19646:68cc16969f78 19647:e8e3a89fa370
29 ## @end deftypefn 29 ## @end deftypefn
30 30
31 ## PKG_ADD: colormap ("register", "gmap40"); 31 ## PKG_ADD: colormap ("register", "gmap40");
32 ## PKG_DEL: colormap ("unregister", "gmap40"); 32 ## PKG_DEL: colormap ("unregister", "gmap40");
33 33
34 function map = gmap40 (n) 34 function map = gmap40 (n = rows (colormap ()))
35 35
36 if (nargin == 0) 36 if (nargin > 1)
37 n = 6;
38 elseif (nargin == 1)
39 if (! isscalar (n))
40 error ("gmap40: N must be a scalar");
41 endif
42 else
43 print_usage (); 37 print_usage ();
38 elseif (! isscalar (n))
39 error ("gmap40: N must be a scalar");
44 endif 40 endif
45 41
46 if (n > 0) 42 if (n > 0)
47 C = [1, 0, 0; 0, 1, 0; 0, 0, 1; 1, 1, 0; 1, 0, 1; 0, 1, 1]; 43 C = [1, 0, 0; 0, 1, 0; 0, 0, 1; 1, 1, 0; 1, 0, 1; 0, 1, 1];
48 map = C(rem (0:(n-1), 6) + 1, :); 44 map = C(rem (0:(n-1), 6) + 1, :);
50 map = zeros (0, 3); 46 map = zeros (0, 3);
51 endif 47 endif
52 48
53 endfunction 49 endfunction
54 50
55
56 %!demo 51 %!demo
57 %! ## Show the 'gmap40' colormap as an image 52 %! ## Show the 'gmap40' colormap as an image
58 %! image (1:6, linspace (0, 1, 6), repmat ((1:6)', 1, 6)); 53 %! image (1:6, linspace (0, 1, 6), repmat ((1:6)', 1, 6));
59 %! axis ([1, 6, 0, 1], "ticy", "xy"); 54 %! axis ([1, 6, 0, 1], "ticy", "xy");
60 %! colormap (gmap40 (6)); 55 %! colormap (gmap40 (6));