Mercurial > hg > octave-lyh
view scripts/plot/private/__fltk_ginput__.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 | fc3845c63458 |
children |
line wrap: on
line source
## Copyright (C) 2010-2012 Shai Ayal ## ## This file is part of Octave. ## ## Octave is free software; you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or (at ## your option) any later version. ## ## Octave is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- ## @deftypefn {Function File} {[@var{x}, @var{y}, @var{buttons}] =} __fltk_ginput__ (@var{f}, @var{n}) ## Undocumented internal function. ## @end deftypefn ## This is ginput.m implementation for fltk. function [x, y, button] = __fltk_ginput__ (f, n = -1) if (isempty (get (f, "currentaxes"))) error ("ginput: must have at least one axes"); endif x = y = button = []; ginput_accumulator (0, 0, 0, 0); # initialize accumulator unwind_protect orig_windowbuttondownfcn = get (f, "windowbuttondownfcn"); set (f, "windowbuttondownfcn", @ginput_windowbuttondownfcn); orig_ginput_keypressfcn = get (f, "keypressfcn"); set (f, "keypressfcn", @ginput_keypressfcn); do __fltk_redraw__ (); ## Release CPU. sleep (0.01); [x, y, n0, button] = ginput_accumulator (-1, 0, 0, 0); until (n0 == n || n0 < 0) unwind_protect_cleanup set (f, "windowbuttondownfcn", orig_windowbuttondownfcn); set (f, "keypressfcn", orig_ginput_keypressfcn); end_unwind_protect endfunction function [x, y, n, button] = ginput_accumulator (mode, xn, yn, btn) persistent x y n button; if (mode == 0) ## Initialize. x = y = button = []; n = 0; elseif (mode == 1) ## Append mouse button or key press. x = [x; xn]; y = [y; yn]; button = [button; btn]; n += 1; elseif (mode == 2) ## The end due to Enter. n = -1; endif endfunction function ginput_windowbuttondownfcn (src, data) point = get (get (src,"currentaxes"), "currentpoint"); button = data; ginput_accumulator (1, point(1,1), point(2,1), button); endfunction function ginput_keypressfcn (src, evt) point = get (get (src, "currentaxes"), "currentpoint"); key = evt.Key; if (key == 10) ## Enter key stops ginput. ginput_accumulator (2, NaN, NaN, NaN); else ginput_accumulator (1, point(1,1), point(2,1), key); endif endfunction