Mercurial > octave-nkf
annotate scripts/image/pink.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 |
rev | line source |
---|---|
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
16465
diff
changeset
|
1 ## Copyright (C) 2000-2013 Kai Habel |
6788 | 2 ## |
3 ## This file is part of Octave. | |
4 ## | |
5 ## Octave is free software; you can redistribute it and/or modify it | |
6 ## under the terms of the GNU General Public License as published by | |
7016 | 7 ## the Free Software Foundation; either version 3 of the License, or (at |
8 ## your option) any later version. | |
6788 | 9 ## |
10 ## Octave is distributed in the hope that it will be useful, but | |
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 ## General Public License for more details. | |
14 ## | |
15 ## You should have received a copy of the GNU General Public License | |
7016 | 16 ## along with Octave; see the file COPYING. If not, see |
17 ## <http://www.gnu.org/licenses/>. | |
6788 | 18 |
19 ## -*- texinfo -*- | |
11420
466ba499eff5
Update docstrings for colormap files.
Rik <octave@nomad.inbox5.com>
parents:
9751
diff
changeset
|
20 ## @deftypefn {Function File} {@var{map} =} pink () |
466ba499eff5
Update docstrings for colormap files.
Rik <octave@nomad.inbox5.com>
parents:
9751
diff
changeset
|
21 ## @deftypefnx {Function File} {@var{map} =} pink (@var{n}) |
466ba499eff5
Update docstrings for colormap files.
Rik <octave@nomad.inbox5.com>
parents:
9751
diff
changeset
|
22 ## Create color colormap. This colormap varies from black to white with |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
23 ## shades of gray-pink. It gives a sepia tone when used on grayscale images. |
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
24 ## The argument @var{n} must be a scalar. |
11420
466ba499eff5
Update docstrings for colormap files.
Rik <octave@nomad.inbox5.com>
parents:
9751
diff
changeset
|
25 ## If unspecified, the length of the current colormap, or 64, is used. |
6788 | 26 ## @seealso{colormap} |
27 ## @end deftypefn | |
28 | |
29 ## Author: Kai Habel <kai.habel@gmx.de> | |
30 | |
14640
b9c02ee24de1
new colormap options
Carnë Draug <carandraug+dev@gmail.com>
parents:
14279
diff
changeset
|
31 ## PKG_ADD: colormap ("register", "pink"); |
b9c02ee24de1
new colormap options
Carnë Draug <carandraug+dev@gmail.com>
parents:
14279
diff
changeset
|
32 ## PKG_DEL: colormap ("unregister", "pink"); |
b9c02ee24de1
new colormap options
Carnë Draug <carandraug+dev@gmail.com>
parents:
14279
diff
changeset
|
33 |
19647
e8e3a89fa370
Fix colormap functions when N is not of class double (bug #44070)
Carnë Draug <carandraug@octave.org>
parents:
17744
diff
changeset
|
34 function map = pink (n = rows (colormap ())) |
6788 | 35 |
19647
e8e3a89fa370
Fix colormap functions when N is not of class double (bug #44070)
Carnë Draug <carandraug@octave.org>
parents:
17744
diff
changeset
|
36 if (nargin > 1) |
6788 | 37 print_usage (); |
19647
e8e3a89fa370
Fix colormap functions when N is not of class double (bug #44070)
Carnë Draug <carandraug@octave.org>
parents:
17744
diff
changeset
|
38 elseif (! isscalar (n)) |
e8e3a89fa370
Fix colormap functions when N is not of class double (bug #44070)
Carnë Draug <carandraug@octave.org>
parents:
17744
diff
changeset
|
39 error ("pink: N must be a scalar"); |
6788 | 40 endif |
41 | |
11420
466ba499eff5
Update docstrings for colormap files.
Rik <octave@nomad.inbox5.com>
parents:
9751
diff
changeset
|
42 if (n == 1) |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14641
diff
changeset
|
43 map = sqrt ([1/3, 1/3, 1/3]); |
16439
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
44 elseif (n == 2) |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
45 map = sqrt ([1/3, 1/3, 1/6 |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
46 1 1 1 ]); |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
47 elseif (n > 2) |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
48 x = [0:(n-1)]' / (n-1); |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
49 idx = floor (3/8 * n); |
16465
e09e58e44c80
pink.m: Simplify calculation in colormap.
Rik <rik@octave.org>
parents:
16439
diff
changeset
|
50 base = 1 / (3 * idx); |
16439
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
51 |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
52 nel = idx; # number of elements |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
53 r(1:idx,1) = linspace (base, 2/3*x(idx) + 1/3, nel); |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
54 r(idx+1:n,1) = 2/3*x(idx+1:n) + 1/3; |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
55 |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
56 g(1:idx,1) = 2/3*x(1:idx); |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
57 g(idx:2*idx,1) = linspace (2/3*x(idx), 2/3*x(2*idx) + 1/3, nel+1); |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
58 g(2*idx+1:n,1) = 2/3*x(2*idx+1:n) + 1/3; |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
59 |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
60 nel = n - 2*idx + 1; |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
61 b(1:2*idx,1) = 2/3*x(1:2*idx); |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
62 b(2*idx:n,1) = linspace (2/3*x(2*idx), 1, nel); |
7762d56dbc8a
pink.m: Make colormap compatible with Matlab (bug #36473).
Rik <rik@octave.org>
parents:
15720
diff
changeset
|
63 |
6788 | 64 map = sqrt ([r, g, b]); |
65 else | |
14641
5f1d4def40e1
improve compatibility of colormap functions
Carnë Draug <carandraug+dev@gmail.com>
parents:
14640
diff
changeset
|
66 map = zeros (0, 3); |
6788 | 67 endif |
68 | |
69 endfunction | |
9751
2b0cc0b6db61
Add demos for colormap functions
Soren Hauberg <hauberg@gmail.com>
parents:
8920
diff
changeset
|
70 |
2b0cc0b6db61
Add demos for colormap functions
Soren Hauberg <hauberg@gmail.com>
parents:
8920
diff
changeset
|
71 %!demo |
2b0cc0b6db61
Add demos for colormap functions
Soren Hauberg <hauberg@gmail.com>
parents:
8920
diff
changeset
|
72 %! ## Show the 'pink' colormap as an image |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
73 %! image (1:64, linspace (0, 1, 64), repmat ((1:64)', 1, 64)); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
74 %! axis ([1, 64, 0, 1], "ticy", "xy"); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
75 %! colormap (pink (64)); |
9751
2b0cc0b6db61
Add demos for colormap functions
Soren Hauberg <hauberg@gmail.com>
parents:
8920
diff
changeset
|
76 |