Mercurial > octave-nkf
comparison scripts/image/lines.m @ 19647:e8e3a89fa370
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 ## @end deftypefn | 28 ## @end deftypefn |
29 | 29 |
30 ## PKG_ADD: colormap ("register", "lines"); | 30 ## PKG_ADD: colormap ("register", "lines"); |
31 ## PKG_DEL: colormap ("unregister", "lines"); | 31 ## PKG_DEL: colormap ("unregister", "lines"); |
32 | 32 |
33 function map = lines (n) | 33 function map = lines (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 ("lines: N must be a scalar"); | |
40 endif | |
41 else | |
42 print_usage (); | 36 print_usage (); |
37 elseif (! isscalar (n)) | |
38 error ("lines: N must be a scalar"); | |
43 endif | 39 endif |
44 | 40 |
45 if (n == 1) | 41 if (n == 1) |
46 map = [0, 0, 1]; | 42 map = [0, 0, 1]; |
47 elseif (n > 1) | 43 elseif (n > 1) |
52 map = zeros (0, 3); | 48 map = zeros (0, 3); |
53 endif | 49 endif |
54 | 50 |
55 endfunction | 51 endfunction |
56 | 52 |
57 | |
58 %!demo | 53 %!demo |
59 %! ## Show the 'lines' colormap as an image | 54 %! ## Show the 'lines' colormap as an image |
60 %! image (1:64, linspace (0, 1, 64), repmat ((1:64)', 1, 64)); | 55 %! image (1:64, linspace (0, 1, 64), repmat ((1:64)', 1, 64)); |
61 %! axis ([1, 64, 0, 1], "ticy", "xy"); | 56 %! axis ([1, 64, 0, 1], "ticy", "xy"); |
62 %! colormap (lines (64)); | 57 %! colormap (lines (64)); |