Mercurial > octave-nkf
diff src/graphics.cc @ 14846:460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Example: func() => func ()
* dynamic.txi, func.txi, oop.txi, var.txi, embedded.cc, fortdemo.cc,
funcdemo.cc, paramdemo.cc, stringdemo.cc, unwinddemo.cc, Array.cc, Array.h,
CColVector.cc, CDiagMatrix.h, CMatrix.cc, CNDArray.cc, CRowVector.cc,
CSparse.cc, CmplxGEPBAL.cc, EIG.cc, MSparse.cc, MatrixType.cc,
Sparse-op-defs.h, Sparse-perm-op-defs.h, Sparse.cc, Sparse.h,
SparseCmplxCHOL.cc, SparseCmplxCHOL.h, SparseCmplxLU.cc, SparseCmplxQR.cc,
SparseCmplxQR.h, SparseQR.cc, SparseQR.h, SparsedbleCHOL.cc, SparsedbleCHOL.h,
SparsedbleLU.cc, SparsedbleLU.h, base-lu.cc, cmd-hist.cc, dColVector.cc,
dDiagMatrix.h, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, dbleCHOL.cc,
dbleGEPBAL.cc, dim-vector.cc, eigs-base.cc, f2c-main.c, fCColVector.cc,
fCDiagMatrix.h, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fCmplxGEPBAL.cc,
fColVector.cc, fDiagMatrix.h, fEIG.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc,
file-ops.cc, file-stat.cc, floatCHOL.cc, floatGEPBAL.cc, idx-vector.h,
lo-specfun.cc, lo-sysdep.cc, mx-inlines.cc, oct-binmap.h, oct-convn.cc,
oct-md5.cc, oct-mem.h, oct-rand.cc, oct-syscalls.cc, randgamma.c, randmtzig.c,
sparse-base-chol.cc, sparse-base-chol.h, sparse-base-lu.cc, sparse-dmsolve.cc,
tempname.c, curl.m, divergence.m, randi.m, dlmwrite.m, edit.m, getappdata.m,
what.m, getarchdir.m, install.m, installed_packages.m, repackage.m,
unload_packages.m, colorbar.m, figure.m, isosurface.m, legend.m, loglog.m,
plot.m, plot3.m, plotyy.m, polar.m, __errplot__.m, __ghostscript__.m,
__marching_cube__.m, __plt__.m, __scatter__.m, semilogx.m, semilogy.m,
trimesh.m, trisurf.m, demo.m, test.m, datetick.m, __delaunayn__.cc,
__dsearchn__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc,
__lin_interpn__.cc, __magick_read__.cc, __pchip_deriv__.cc, balance.cc,
bsxfun.cc, ccolamd.cc, cellfun.cc, chol.cc, daspk.cc, dasrt.cc, dassl.cc,
dmperm.cc, eig.cc, eigs.cc, fftw.cc, filter.cc, find.cc, kron.cc, lookup.cc,
lsode.cc, matrix_type.cc, md5sum.cc, mgorth.cc, qr.cc, quad.cc, rand.cc,
regexp.cc, symbfact.cc, tril.cc, urlwrite.cc, op-bm-bm.cc, op-cdm-cdm.cc,
op-cell.cc, op-chm.cc, op-cm-cm.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-scm.cc,
op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-fcdm-fcdm.cc,
op-fcm-fcm.cc, op-fdm-fdm.cc, op-fm-fm.cc, op-int.h, op-m-m.cc, op-m-scm.cc,
op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-range.cc, op-s-scm.cc,
op-s-sm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc,
op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc,
op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-str.cc, op-struct.cc, bitfcns.cc,
data.cc, debug.cc, dynamic-ld.cc, error.cc, gl-render.cc, graphics.cc,
graphics.in.h, load-path.cc, ls-hdf5.cc, ls-mat5.cc, ls-mat5.h,
ls-oct-ascii.cc, ls-oct-ascii.h, mex.cc, mk-errno-list, oct-map.cc, oct-obj.h,
oct-parse.yy, octave-config.in.cc, ov-base-int.cc, ov-base-mat.cc, ov-base.cc,
ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc, ov-class.cc,
ov-class.h, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-flt-cx-mat.cc,
ov-flt-re-mat.cc, ov-intx.h, ov-range.h, ov-re-mat.cc, ov-re-sparse.cc,
ov-str-mat.cc, ov-struct.cc, ov-usr-fcn.h, ov.h, pr-output.cc, pt-id.cc,
pt-id.h, pt-mat.cc, pt-select.cc, sparse.cc, symtab.cc, symtab.h, syscalls.cc,
toplev.cc, txt-eng-ft.cc, variables.cc, zfstream.cc, zfstream.h, Dork.m,
getStash.m, myStash.m, Gork.m, Pork.m, myStash.m, getStash.m, myStash.m,
getStash.m, myStash.m, fntests.m: Use Octave coding convention for
cuddled parenthis in function calls with empty argument lists.
author | Rik <octave@nomad.inbox5.com> |
---|---|
date | Sun, 08 Jul 2012 11:28:50 -0700 |
parents | fce841c941a5 |
children | f7afecdd87ef |
line wrap: on
line diff
--- a/src/graphics.cc Fri Jul 06 14:00:25 2012 -0700 +++ b/src/graphics.cc Sun Jul 08 11:28:50 2012 -0700 @@ -1037,7 +1037,7 @@ { double tmp_rgb[3] = {0, 0, 0}; bool retval = true; - unsigned int len = str.length(); + unsigned int len = str.length (); std::transform (str.begin (), str.end (), str.begin (), tolower); @@ -1271,7 +1271,7 @@ } \ } - if (data.is_double_type() || data.is_bool_type ()) + if (data.is_double_type () || data.is_bool_type ()) CHECK_ARRAY_EQUAL (double, , NDArray) else if (data.is_single_type ()) CHECK_ARRAY_EQUAL (float, float_, FloatNDArray) @@ -1428,7 +1428,7 @@ // complete validation will be done at execution-time return true; else if (v.is_cell () && v.length () > 0 - && (v.rows() == 1 || v.columns () == 1) + && (v.rows () == 1 || v.columns () == 1) && v.cell_value ()(0).is_function_handle ()) return true; else if (v.is_empty ()) @@ -5629,7 +5629,7 @@ bool ignore_vertical = false; if (only_text_height) { - double text_rotation = text_props.get_rotation(); + double text_rotation = text_props.get_rotation (); if (text_rotation == 0. || text_rotation == 180.) ignore_horizontal = true; else if (text_rotation == 90. || text_rotation == 270.) @@ -5677,9 +5677,9 @@ graphics_object obj = gh_manager::get_object (get_parent ()); Matrix parent_bb = obj.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2); caseless_str new_units = get_units (); - position.set (octave_value (convert_position (get_position().matrix_value(), old_units, new_units, parent_bb)), false); - outerposition.set (octave_value (convert_position (get_outerposition().matrix_value(), old_units, new_units, parent_bb)), false); - tightinset.set (octave_value (convert_position (get_tightinset().matrix_value(), old_units, new_units, parent_bb)), false); + position.set (octave_value (convert_position (get_position ().matrix_value (), old_units, new_units, parent_bb)), false); + outerposition.set (octave_value (convert_position (get_outerposition ().matrix_value (), old_units, new_units, parent_bb)), false); + tightinset.set (octave_value (convert_position (get_tightinset ().matrix_value (), old_units, new_units, parent_bb)), false); } void @@ -6168,7 +6168,7 @@ hmax = std::max (hmax, ext(1)); #else //FIXME: find a better approximation - int len = ticklabels(i).length(); + int len = ticklabels(i).length (); wmax = std::max (wmax, 0.5*fontsize*len); hmax = fontsize; #endif @@ -6286,7 +6286,7 @@ double val; #define FIX_LIMITS \ - if (limits.numel() == 4) \ + if (limits.numel () == 4) \ { \ val = limits(0); \ if (! (xisinf (val) || xisnan (val))) \ @@ -6841,7 +6841,7 @@ v (0) = fmod(v(0) - delta_az + 720,360); set_view(v); - update_transform(); + update_transform (); } void @@ -6997,7 +6997,7 @@ renderer.text_to_pixels (sv.join ("\n"), pixels, bbox, halign, valign, get_rotation ()); /* The bbox is relative to the text's position. - We'll leave it that way, because get_position() does not return + We'll leave it that way, because get_position () does not return valid results when the text is first constructed. Conversion to proper coordinates is performed in get_extent. */ set_extent (bbox); @@ -7077,7 +7077,7 @@ octave_value patch::properties::get_color_data (void) const { - octave_value fvc = get_facevertexcdata(); + octave_value fvc = get_facevertexcdata (); if (fvc.is_undefined () || fvc.is_empty ()) return Matrix (); else @@ -7257,7 +7257,7 @@ update_type = 'a'; } - if (limits.numel() == 4) + if (limits.numel () == 4) { val = limits(0); if (! (xisinf (val) || xisnan (val))) @@ -7480,7 +7480,7 @@ void uicontrol::properties::set_style (const octave_value& st) { - if (get___object__ ().is_empty()) + if (get___object__ ().is_empty ()) style = st; else error ("set: cannot change the style of a uicontrol object after creation."); @@ -8515,7 +8515,7 @@ if (nargin == 1 || nargin == 2) { - if (args(0).is_empty()) + if (args(0).is_empty ()) { retval = Matrix (); return retval; @@ -8918,7 +8918,7 @@ if ((go.isa ("line") || go.isa ("patch")) && ! go.get("zdata").is_empty ()) nd = 3; - Matrix kids = go.get_properties().get_children (); + Matrix kids = go.get_properties ().get_children (); for (octave_idx_type i = 0; i < kids.length (); i++) { @@ -8928,7 +8928,7 @@ { const graphics_object& kid = gh_manager::get_object(hnd); - if (kid.valid_object()) + if (kid.valid_object ()) nd = calc_dimensions (kid); if (nd == 3) @@ -9857,7 +9857,7 @@ if (obj) retval = obj.get (caseless_str (property)); else - error ("%s: invalid handle (= %g)", func.c_str(), handle); + error ("%s: invalid handle (= %g)", func.c_str (), handle); return retval; } @@ -9879,7 +9879,7 @@ ret = true; } else - error ("%s: invalid handle (= %g)", func.c_str(), handle); + error ("%s: invalid handle (= %g)", func.c_str (), handle); return ret; }