Mercurial > octave-nkf

annotate scripts/image/lines.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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
17744
d63878346099 maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents: 17281
diff changeset
1 ## Copyright (C) 2012-2013 Rik Wehbring
14272
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
2 ##
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
3 ## This file is part of Octave.
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
4 ##
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
5 ## Octave is free software; you can redistribute it and/or modify it
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
6 ## under the terms of the GNU General Public License as published by
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
7 ## the Free Software Foundation; either version 3 of the License, or (at
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
8 ## your option) any later version.
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
9 ##
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
10 ## Octave is distributed in the hope that it will be useful, but
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
13 ## General Public License for more details.
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
14 ##
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
15 ## You should have received a copy of the GNU General Public License
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
16 ## along with Octave; see the file COPYING. If not, see
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
17 ## <http://www.gnu.org/licenses/>.
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
18
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
19 ## -*- texinfo -*-
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
20 ## @deftypefn {Function File} {@var{map} =} lines ()
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
21 ## @deftypefnx {Function File} {@var{map} =} lines (@var{n})
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
22 ## Create color colormap. This colormap is composed of the list of colors
17281
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 15720
diff changeset
23 ## in the current axes @qcode{"ColorOrder"} property. The default is blue,
14272
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
24 ## green, red, cyan, pink, yellow, and gray.
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
25 ## The argument @var{n} must be a scalar.
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
26 ## If unspecified, the length of the current colormap, or 64, is used.
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
27 ## @seealso{colormap}
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
28 ## @end deftypefn
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
29
14640
b9c02ee24de1 new colormap options
Carnë Draug <carandraug+dev@gmail.com>
parents: 14279
diff changeset
30 ## PKG_ADD: colormap ("register", "lines");
b9c02ee24de1 new colormap options
Carnë Draug <carandraug+dev@gmail.com>
parents: 14279
diff changeset
31 ## PKG_DEL: colormap ("unregister", "lines");
b9c02ee24de1 new colormap options
Carnë Draug <carandraug+dev@gmail.com>
parents: 14279
diff changeset
32
19647
e8e3a89fa370 Fix colormap functions when N is not of class double (bug #44070)
Carnë Draug <carandraug@octave.org>
parents: 17744
diff changeset
33 function map = lines (n = rows (colormap ()))
14272
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
34
19647
e8e3a89fa370 Fix colormap functions when N is not of class double (bug #44070)
Carnë Draug <carandraug@octave.org>
parents: 17744
diff changeset
35 if (nargin > 1)
14272
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
36 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
37 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
38 error ("lines: N must be a scalar");
14272
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
39 endif
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
40
14641
5f1d4def40e1 improve compatibility of colormap functions
Carnë Draug <carandraug+dev@gmail.com>
parents: 14640
diff changeset
41 if (n == 1)
5f1d4def40e1 improve compatibility of colormap functions
Carnë Draug <carandraug+dev@gmail.com>
parents: 14640
diff changeset
42 map = [0, 0, 1];
5f1d4def40e1 improve compatibility of colormap functions
Carnë Draug <carandraug+dev@gmail.com>
parents: 14640
diff changeset
43 elseif (n > 1)
5f1d4def40e1 improve compatibility of colormap functions
Carnë Draug <carandraug+dev@gmail.com>
parents: 14640
diff changeset
44 C = get (gca, "colororder");
5f1d4def40e1 improve compatibility of colormap functions
Carnë Draug <carandraug+dev@gmail.com>
parents: 14640
diff changeset
45 nr = rows (C);
5f1d4def40e1 improve compatibility of colormap functions
Carnë Draug <carandraug+dev@gmail.com>
parents: 14640
diff changeset
46 map = C(rem (0:(n-1), nr) + 1, :);
5f1d4def40e1 improve compatibility of colormap functions
Carnë Draug <carandraug+dev@gmail.com>
parents: 14640
diff changeset
47 else
5f1d4def40e1 improve compatibility of colormap functions
Carnë Draug <carandraug+dev@gmail.com>
parents: 14640
diff changeset
48 map = zeros (0, 3);
5f1d4def40e1 improve compatibility of colormap functions
Carnë Draug <carandraug+dev@gmail.com>
parents: 14640
diff changeset
49 endif
14272
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
50
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
51 endfunction
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
52
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
53 %!demo
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
54 %! ## Show the 'lines' colormap as an image
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
55 %! image (1:64, linspace (0, 1, 64), repmat ((1:64)', 1, 64));
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
56 %! axis ([1, 64, 0, 1], "ticy", "xy");
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
57 %! colormap (lines (64));
4f8d2931f886 lines.m: Add new colormap corresponding to ColorOrder property.
Rik <octave@nomad.inbox5.com>
parents:
diff changeset
58