Mercurial > octave-nkf

comparison libinterp/corefcn/graphics.cc @ 20267:a9574e3c6e9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deprecate Array::length() and Sparse::length() in favour of ::numel(). * liboctave/array/Array.h (Array::length): deprecate for ::numel. * liboctave/array/Sparse.h (Sparse::length): deprecate for ::numel. * libgui/graphics/QtHandlesUtils.cc, libgui/src/octave-qt-link.cc, libinterp/corefcn/Cell.cc, libinterp/corefcn/__contourc__.cc, libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/__qp__.cc, libinterp/corefcn/cellfun.cc, libinterp/corefcn/daspk.cc, libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc, libinterp/corefcn/data.cc, libinterp/corefcn/filter.cc, libinterp/corefcn/find.cc, libinterp/corefcn/gl-render.cc, libinterp/corefcn/gl-render.h, libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h, libinterp/corefcn/help.cc, libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc, libinterp/corefcn/load-path.cc, libinterp/corefcn/load-save.cc, libinterp/corefcn/ls-oct-ascii.h, libinterp/corefcn/lsode.cc, libinterp/corefcn/matrix_type.cc, libinterp/corefcn/oct-hist.cc, libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-map.h, libinterp/corefcn/oct-obj.h, libinterp/corefcn/oct-stream.cc, libinterp/corefcn/oct-stream.h, libinterp/corefcn/pr-output.cc, libinterp/corefcn/quadcc.cc, libinterp/corefcn/rand.cc, libinterp/corefcn/regexp.cc, libinterp/corefcn/strfns.cc, libinterp/corefcn/sub2ind.cc, libinterp/corefcn/symtab.h, libinterp/corefcn/syscalls.cc, libinterp/corefcn/tsearch.cc, libinterp/corefcn/urlwrite.cc, libinterp/corefcn/utils.cc, libinterp/corefcn/variables.cc, libinterp/corefcn/xdiv.cc, libinterp/corefcn/xpow.cc, libinterp/dldfcn/__glpk__.cc, libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/__magick_read__.cc, libinterp/dldfcn/audiodevinfo.cc, libinterp/dldfcn/ccolamd.cc, libinterp/dldfcn/colamd.cc, libinterp/octave-value/ov-cell.cc, libinterp/octave-value/ov-class.cc, libinterp/octave-value/ov-class.h, libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-java.cc, libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-struct.cc, libinterp/octave-value/ov-typeinfo.cc, libinterp/octave-value/ov.cc, libinterp/operators/op-int.h, libinterp/parse-tree/pt-pr-code.cc, liboctave/array/Array-util.cc, liboctave/array/Array.cc, liboctave/array/CColVector.cc, liboctave/array/CDiagMatrix.cc, liboctave/array/CMatrix.cc, liboctave/array/CRowVector.cc, liboctave/array/DiagArray2.cc, liboctave/array/DiagArray2.h, liboctave/array/MArray.cc, liboctave/array/PermMatrix.cc, liboctave/array/PermMatrix.h, liboctave/array/Sparse.cc, liboctave/array/boolMatrix.cc, liboctave/array/chMatrix.cc, liboctave/array/chNDArray.cc, liboctave/array/dColVector.cc, liboctave/array/dDiagMatrix.cc, liboctave/array/dMatrix.cc, liboctave/array/dRowVector.cc, liboctave/array/fCColVector.cc, liboctave/array/fCDiagMatrix.cc, liboctave/array/fCMatrix.cc, liboctave/array/fCRowVector.cc, liboctave/array/fColVector.cc, liboctave/array/fDiagMatrix.cc, liboctave/array/fMatrix.cc, liboctave/array/fRowVector.cc, liboctave/array/idx-vector.cc, liboctave/array/intNDArray.cc, liboctave/numeric/CmplxCHOL.cc, liboctave/numeric/CmplxLU.cc, liboctave/numeric/CmplxQR.cc, liboctave/numeric/DASPK.cc, liboctave/numeric/DASRT.cc, liboctave/numeric/DASSL.cc, liboctave/numeric/LSODE.cc, liboctave/numeric/ODES.cc, liboctave/numeric/ODES.h, liboctave/numeric/base-dae.h, liboctave/numeric/base-lu.cc, liboctave/numeric/dbleCHOL.cc, liboctave/numeric/dbleLU.cc, liboctave/numeric/dbleQR.cc, liboctave/numeric/eigs-base.cc, liboctave/numeric/fCmplxCHOL.cc, liboctave/numeric/fCmplxLU.cc, liboctave/numeric/fCmplxQR.cc, liboctave/numeric/floatCHOL.cc, liboctave/numeric/floatLU.cc, liboctave/numeric/floatQR.cc, liboctave/numeric/lo-specfun.cc, liboctave/numeric/oct-rand.cc, liboctave/numeric/oct-spparms.cc, liboctave/numeric/sparse-base-chol.cc, liboctave/operators/mx-inlines.cc, liboctave/system/file-ops.cc, liboctave/util/glob-match.h, liboctave/util/kpse.cc, liboctave/util/lo-regexp.cc, liboctave/util/oct-glob.cc, liboctave/util/pathsearch.cc, liboctave/util/str-vec.cc, liboctave/util/str-vec.h, liboctave/util/url-transfer.cc: replace all usage of Array::length() and Sparse::length() with ::numel().
author Carnë Draug <carandraug@octave.org>
date Sat, 30 May 2015 03:14:07 +0100
parents aa36fb998a4d
children ce8fda51d236
comparison
equal deleted inserted replaced
20266:83792dd9bcc1 20267:a9574e3c6e9e
9564 Cell c = cb.cell_value (); 9564 Cell c = cb.cell_value ();
9565 9565
9566 fcn = c(0).function_value (); 9566 fcn = c(0).function_value ();
9567 if (! error_state) 9567 if (! error_state)
9568 { 9568 {
9569 for (int i = 1; i < c.length () ; i++) 9569 for (int i = 1; i < c.numel () ; i++)
9570 args(1+i) = c(i); 9570 args(1+i) = c(i);
9571 } 9571 }
9572 } 9572 }
9573 else 9573 else
9574 { 9574 {
9863 ColumnVector hcv (args(0).vector_value ()); 9863 ColumnVector hcv (args(0).vector_value ());
9864 9864
9865 if (! error_state) 9865 if (! error_state)
9866 { 9866 {
9867 // loop over graphics objects 9867 // loop over graphics objects
9868 for (octave_idx_type n = 0; n < hcv.length (); n++) 9868 for (octave_idx_type n = 0; n < hcv.numel (); n++)
9869 gh_manager::get_object (hcv(n)).reset_default_properties (); 9869 gh_manager::get_object (hcv(n)).reset_default_properties ();
9870 9870
9871 if (! error_state) 9871 if (! error_state)
9872 Fdrawnow (); 9872 Fdrawnow ();
9873 } 9873 }
10078 if (! error_state) 10078 if (! error_state)
10079 { 10079 {
10080 bool request_drawnow = false; 10080 bool request_drawnow = false;
10081 10081
10082 // loop over graphics objects 10082 // loop over graphics objects
10083 for (octave_idx_type n = 0; n < hcv.length (); n++) 10083 for (octave_idx_type n = 0; n < hcv.numel (); n++)
10084 { 10084 {
10085 graphics_object obj = gh_manager::get_object (hcv(n)); 10085 graphics_object obj = gh_manager::get_object (hcv(n));
10086 10086
10087 if (obj) 10087 if (obj)
10088 { 10088 {
10092 if (args(2).cell_value ().rows () == 1) 10092 if (args(2).cell_value ().rows () == 1)
10093 { 10093 {
10094 obj.set (args(1).cellstr_value (), 10094 obj.set (args(1).cellstr_value (),
10095 args(2).cell_value (), 0); 10095 args(2).cell_value (), 0);
10096 } 10096 }
10097 else if (hcv.length () == args(2).cell_value ().rows ()) 10097 else if (hcv.numel () == args(2).cell_value ().rows ())
10098 { 10098 {
10099 obj.set (args(1).cellstr_value (), 10099 obj.set (args(1).cellstr_value (),
10100 args(2).cell_value (), n); 10100 args(2).cell_value (), n);
10101 } 10101 }
10102 else 10102 else
10103 { 10103 {
10104 error ("set: number of graphics handles must match number of value rows (%d != %d)", 10104 error ("set: number of graphics handles must match number of value rows (%d != %d)",
10105 hcv.length (), args(2).cell_value ().rows ()); 10105 hcv.numel (), args(2).cell_value ().rows ());
10106 break; 10106 break;
10107 10107
10108 } 10108 }
10109 } 10109 }
10110 else if (nargin == 2 && args(1).is_map ()) 10110 else if (nargin == 2 && args(1).is_map ())
10230 10230
10231 ColumnVector hcv (args(0).vector_value ()); 10231 ColumnVector hcv (args(0).vector_value ());
10232 10232
10233 if (! error_state) 10233 if (! error_state)
10234 { 10234 {
10235 octave_idx_type len = hcv.length (); 10235 octave_idx_type len = hcv.numel ();
10236 10236
10237 if (nargin == 1 && len > 1) 10237 if (nargin == 1 && len > 1)
10238 { 10238 {
10239 std::string t0 = get_graphics_object_type (hcv(0)); 10239 std::string t0 = get_graphics_object_type (hcv(0));
10240 10240
10394 { 10394 {
10395 ColumnVector hcv (args(0).vector_value ()); 10395 ColumnVector hcv (args(0).vector_value ());
10396 10396
10397 if (! error_state) 10397 if (! error_state)
10398 { 10398 {
10399 octave_idx_type len = hcv.length (); 10399 octave_idx_type len = hcv.numel ();
10400 10400
10401 vals.resize (dim_vector (len, 1)); 10401 vals.resize (dim_vector (len, 1));
10402 10402
10403 for (octave_idx_type n = 0; n < len; n++) 10403 for (octave_idx_type n = 0; n < len; n++)
10404 { 10404 {
10628 nd = 3; 10628 nd = 3;
10629 else 10629 else
10630 { 10630 {
10631 Matrix kids = go.get_properties ().get_children (); 10631 Matrix kids = go.get_properties ().get_children ();
10632 10632
10633 for (octave_idx_type i = 0; i < kids.length (); i++) 10633 for (octave_idx_type i = 0; i < kids.numel (); i++)
10634 { 10634 {
10635 graphics_handle hnd = gh_manager::lookup (kids(i)); 10635 graphics_handle hnd = gh_manager::lookup (kids(i));
10636 10636
10637 if (hnd.ok ()) 10637 if (hnd.ok ())
10638 { 10638 {
11195 { 11195 {
11196 if (args.length () == 0 || args.length () == 1) 11196 if (args.length () == 0 || args.length () == 1)
11197 { 11197 {
11198 Matrix hlist = gh_manager::figure_handle_list (true); 11198 Matrix hlist = gh_manager::figure_handle_list (true);
11199 11199
11200 for (int i = 0; ! error_state && i < hlist.length (); i++) 11200 for (int i = 0; ! error_state && i < hlist.numel (); i++)
11201 { 11201 {
11202 graphics_handle h = gh_manager::lookup (hlist(i)); 11202 graphics_handle h = gh_manager::lookup (hlist(i));
11203 11203
11204 if (h.ok () && h != 0) 11204 if (h.ok () && h != 0)
11205 { 11205 {