annotate scripts/plot/private/__add_datasource__.m @ 17394:6dbc866379e2

Replace cellfun() occurrences with faster code where possible. * scripts/help/doc_cache_create.m: Use built-in "isclass" rather than ischar. Use addpath and rmpath with multiple inputs rather than cellfun. * scripts/image/imformats.m: Use isfield with cell string list rather than cellfun. * scripts/image/private/__imread__.m: Use ismember to replace cellfun/strcmpi combo. * scripts/miscellaneous/what.m: Re-order if/elseif tree. * scripts/pkg/private/rebuild.m: Replace cellfun with strcat call. * scripts/plot/axis.m: Use comma-separated lists to replace cellfun. * scripts/plot/pareto.m: Use cellstr on char array to replace cellfun. * scripts/plot/private/__gnuplot_print__.m: Use @times, rather than anonymous function, in cellfun call. * scripts/plot/private/__line__.m: White space cleanup. * scripts/plot/private/__patch__.m: Use ismember to replace cellfun/strcmpi combo. Use in-place '|=' operator for performance. * scripts/plot/struct2hdl.m: Use ismember to replace cellfun/strcmp combo. * scripts/polynomial/splinefit.m: Use built-in "isclass" rather than ischar. * scripts/special-matrix/gallery.m: Remove anonymous functions inside cellfuns. * scripts/strings/strsplit.m: Correct comment character to '#' from '%'. * scripts/strings/untabify.m: Use multiple argument form of cellfun to get rid of anonymous function. * scripts/testfun/__run_test_suite__.m: Remove anonymous function from within cellfun. * scripts/ui/inputdlg.m: Use built-in "isclass" rather than ischar.
author Rik <rik@octave.org>
date Fri, 06 Sep 2013 14:08:42 -0700
parents 1c89599167a6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14138
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1 ## Copyright (C) 2008-2012 David Bateman
9902
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
2 ##
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
3 ## This file is part of Octave.
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
4 ##
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
5 ## Octave is free software; you can redistribute it and/or modify it
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
6 ## under the terms of the GNU General Public License as published by
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
7 ## the Free Software Foundation; either version 3 of the License, or (at
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
8 ## your option) any later version.
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
9 ##
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
10 ## Octave is distributed in the hope that it will be useful, but
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
13 ## General Public License for more details.
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
14 ##
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
15 ## You should have received a copy of the GNU General Public License
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
16 ## along with Octave; see the file COPYING. If not, see
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
17 ## <http://www.gnu.org/licenses/>.
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
18
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
19 ## -*- texinfo -*-
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
20 ## @deftypefn {Function File} {@var{newargs} =} __add_datasource__ (@var{fcn}, @var{h}, @var{data}, @var{varargin})
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
21 ## Undocumented internal function.
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
22 ## @end deftypefn
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
23
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
24 function newargs = __add_datasource__ (fcn, h, data, varargin)
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
25
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
26 if (ischar (data))
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
27 data = {data};
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
28 endif
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
29
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
30 for i = 1 : numel (data)
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
31 addproperty (strcat (data{i}, "datasource"), h, "string", "");
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
32 endfor
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
33
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
34 i = 0;
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
35 newargs = {};
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
36 while (i < numel (varargin))
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
37 arg = varargin{++i};
14868
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
38 if (i != numel (varargin) && ischar (arg)
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 9902
diff changeset
39 && length (arg) > 9 && strcmpi (arg(end-9:end), "datasource"))
9902
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
40 arg = tolower (arg);
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
41 val = varargin{++i};
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
42 if (ischar (val))
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 9902
diff changeset
43 set (h, arg, val);
9902
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
44 else
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 9902
diff changeset
45 error ("%s: expecting data source to be a string", fcn);
9902
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
46 endif
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
47 else
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
48 newargs{end + 1} = arg;
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
49 endif
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
50 endwhile
2929c453af8f omissions from 9899:9f25290a35e8
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
51 endfunction
17346
1c89599167a6 maint: End m-files with 1 blank line.
Rik <rik@octave.org>
parents: 17184
diff changeset
52