Mercurial > octave
diff libinterp/corefcn/graphics.cc @ 31607:aac27ad79be6 stable
maint: Re-indent code after switch to using namespace macros.
* build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc,
__ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc,
__pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h,
besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc,
call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc,
debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc,
dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h,
error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h,
event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc,
file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h,
gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h,
graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc,
gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h,
interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h,
inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc,
latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h,
lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc,
matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h,
oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc,
oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h,
oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h,
octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc,
pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc,
settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc,
sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc,
syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h,
symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h,
text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc,
url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h,
variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc,
gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc,
cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h,
cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h,
cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc,
ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc,
ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc,
ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h,
ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc,
ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc,
ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc,
ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc,
ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h,
ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc,
ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc,
ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h,
octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc,
op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h,
anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h,
comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h,
parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h,
pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h,
pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc,
pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc,
pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h,
pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h,
pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h,
pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h,
pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h,
pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h,
pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h,
pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h,
idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h,
aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h,
gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc,
lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h,
oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc,
oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h,
randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h,
sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc,
sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h,
file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h,
lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h,
oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc,
oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h,
action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h,
cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h,
lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h,
lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc,
oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc,
oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc,
oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc,
pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc,
url-transfer.h:
Re-indent code after switch to using namespace macros.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 01 Dec 2022 18:02:15 -0800 |
| parents | e88a07dec498 |
| children | a36035adefeb 597f3ee61a48 |
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc Thu Dec 01 14:23:45 2022 -0800 +++ b/libinterp/corefcn/graphics.cc Thu Dec 01 18:02:15 2022 -0800 @@ -1072,7 +1072,7 @@ else if (cdata.is_uint64_type ()) CONVERT_CDATA_1 (uint64NDArray, uint64_, false); else if (cdata.is_double_type ()) - CONVERT_CDATA_1 (NDArray, , true); + CONVERT_CDATA_1 (NDArray,, true); else if (cdata.is_single_type ()) CONVERT_CDATA_1 (FloatNDArray, float_, true); else if (cdata.islogical ()) @@ -1699,26 +1699,26 @@ } if (m_data.is_double_type () || m_data.islogical ()) - CHECK_ARRAY_EQUAL (double, , NDArray) - else if (m_data.is_single_type ()) - CHECK_ARRAY_EQUAL (float, float_, FloatNDArray) - else if (m_data.is_int8_type ()) - CHECK_ARRAY_EQUAL (octave_int8, int8_, int8NDArray) - else if (m_data.is_int16_type ()) - CHECK_ARRAY_EQUAL (octave_int16, int16_, int16NDArray) - else if (m_data.is_int32_type ()) - CHECK_ARRAY_EQUAL (octave_int32, int32_, int32NDArray) - else if (m_data.is_int64_type ()) - CHECK_ARRAY_EQUAL (octave_int64, int64_, int64NDArray) - else if (m_data.is_uint8_type ()) - CHECK_ARRAY_EQUAL (octave_uint8, uint8_, uint8NDArray) - else if (m_data.is_uint16_type ()) - CHECK_ARRAY_EQUAL (octave_uint16, uint16_, uint16NDArray) - else if (m_data.is_uint32_type ()) - CHECK_ARRAY_EQUAL (octave_uint32, uint32_, uint32NDArray) - else if (m_data.is_uint64_type ()) - CHECK_ARRAY_EQUAL (octave_uint64, uint64_, uint64NDArray) - } + CHECK_ARRAY_EQUAL (double,, NDArray) + else if (m_data.is_single_type ()) + CHECK_ARRAY_EQUAL (float, float_, FloatNDArray) + else if (m_data.is_int8_type ()) + CHECK_ARRAY_EQUAL (octave_int8, int8_, int8NDArray) + else if (m_data.is_int16_type ()) + CHECK_ARRAY_EQUAL (octave_int16, int16_, int16NDArray) + else if (m_data.is_int32_type ()) + CHECK_ARRAY_EQUAL (octave_int32, int32_, int32NDArray) + else if (m_data.is_int64_type ()) + CHECK_ARRAY_EQUAL (octave_int64, int64_, int64NDArray) + else if (m_data.is_uint8_type ()) + CHECK_ARRAY_EQUAL (octave_uint8, uint8_, uint8NDArray) + else if (m_data.is_uint16_type ()) + CHECK_ARRAY_EQUAL (octave_uint16, uint16_, uint16NDArray) + else if (m_data.is_uint32_type ()) + CHECK_ARRAY_EQUAL (octave_uint32, uint32_, uint32NDArray) + else if (m_data.is_uint64_type ()) + CHECK_ARRAY_EQUAL (octave_uint64, uint64_, uint64NDArray) + } } return false; @@ -1980,7 +1980,7 @@ // their handlevisibility property set to "callback" to be visible. octave::unwind_action executing_callbacks_cleanup - ([=] () { executing_callbacks.erase (this); }); + ([=] () { executing_callbacks.erase (this); }); if (! executing_callbacks.contains (this)) { @@ -2014,7 +2014,7 @@ else if (type.compare ("any")) { octave_value ov = (args.length () > 0 ? args(0) - : octave_value (Matrix ())); + : octave_value (Matrix ())); retval = property (new any_property (name, h, ov)); } @@ -2023,7 +2023,8 @@ if (args.length () < 1) error ("addproperty: missing possible values for radio property"); - std::string sv = args(0).xstring_value ("addproperty: argument for radio property must be a string"); + std::string sv = args( + 0).xstring_value ("addproperty: argument for radio property must be a string"); retval = property (new radio_property (name, h, sv)); @@ -2039,7 +2040,7 @@ else if (type.compare ("handle")) { double hv = (args.length () > 0 ? args(0).double_value () - : octave::numeric_limits<double>::NaN ()); + : octave::numeric_limits<double>::NaN ()); graphics_handle gh (hv); @@ -2935,7 +2936,7 @@ if (h.value () < 0) m_handle_free_list.insert - (std::ceil (h.value ()) - make_handle_fraction ()); + (std::ceil (h.value ()) - make_handle_fraction ()); } } @@ -3041,7 +3042,7 @@ octave_value val = xget (0, "currentfigure"); return val.isempty () ? octave::numeric_limits<double>::NaN () - : val.double_value (); + : val.double_value (); } // This function is NOT equivalent to the scripting language function gca. @@ -3051,7 +3052,7 @@ octave_value val = xget (gcf (), "currentaxes"); return val.isempty () ? octave::numeric_limits<double>::NaN () - : val.double_value (); + : val.double_value (); } static void @@ -3685,9 +3686,9 @@ children_list.push_back (go); else if (traverse && go.isa ("hggroup")) go.get_properties ().get_children_of_type (chtype, - get_invisible, - traverse, - children_list); + get_invisible, + traverse, + children_list); } } } @@ -3711,7 +3712,7 @@ void base_graphics_object::update_axis_limits (const std::string& axis_type, - const graphics_handle& h) + const graphics_handle& h) { if (! valid_object ()) error ("base_graphics_object::update_axis_limits: invalid graphics object"); @@ -5145,11 +5146,11 @@ calc_ticklabels (m_xtick, m_xticklabel, m_xscale.is ("log"), xaxislocation_is ("origin"), m_yscale.is ("log") ? 2 : (yaxislocation_is ("origin") ? 0 : - (yaxislocation_is ("left") ? -1 : 1)), m_xlim); + (yaxislocation_is ("left") ? -1 : 1)), m_xlim); calc_ticklabels (m_ytick, m_yticklabel, m_yscale.is ("log"), yaxislocation_is ("origin"), m_xscale.is ("log") ? 2 : (xaxislocation_is ("origin") ? 0 : - (xaxislocation_is ("bottom") ? -1 : 1)), m_ylim); + (xaxislocation_is ("bottom") ? -1 : 1)), m_ylim); calc_ticklabels (m_ztick, m_zticklabel, m_zscale.is ("log"), false, 2, m_zlim); @@ -6353,11 +6354,11 @@ double offset = get___fontsize_points__ () / 2; m_xtickoffset = (mode2D ? std::max (0., m_xticklen) : std::abs (m_xticklen)) + - (m_xstate == AXE_HORZ_DIR ? offset*1.5 : offset); + (m_xstate == AXE_HORZ_DIR ? offset*1.5 : offset); m_ytickoffset = (mode2D ? std::max (0., m_yticklen) : std::abs (m_yticklen)) + - (m_ystate == AXE_HORZ_DIR ? offset*1.5 : offset); + (m_ystate == AXE_HORZ_DIR ? offset*1.5 : offset); m_ztickoffset = (mode2D ? std::max (0., m_zticklen) : std::abs (m_zticklen)) + - (m_zstate == AXE_HORZ_DIR ? offset*1.5 : offset); + (m_zstate == AXE_HORZ_DIR ? offset*1.5 : offset); update_xlabel_position (); update_ylabel_position (); @@ -6433,15 +6434,15 @@ bool isempty = xlabel_props.get_string ().isempty (); octave::unwind_protect_var<bool> - restore_var (updating_xlabel_position, true); + restore_var (updating_xlabel_position, true); if (! isempty) { if (xlabel_props.horizontalalignmentmode_is ("auto")) { xlabel_props.set_horizontalalignment - (m_xstate > AXE_DEPTH_DIR ? "center" - : (m_xyzSym ? "left" : "right")); + (m_xstate > AXE_DEPTH_DIR ? "center" + : (m_xyzSym ? "left" : "right")); xlabel_props.set_horizontalalignmentmode ("auto"); } @@ -6449,7 +6450,7 @@ if (xlabel_props.verticalalignmentmode_is ("auto")) { xlabel_props.set_verticalalignment - (m_xstate == AXE_VERT_DIR || m_x2Dtop ? "bottom" : "top"); + (m_xstate == AXE_VERT_DIR || m_x2Dtop ? "bottom" : "top"); xlabel_props.set_verticalalignmentmode ("auto"); } @@ -6537,15 +6538,15 @@ bool isempty = ylabel_props.get_string ().isempty (); octave::unwind_protect_var<bool> - restore_var (updating_ylabel_position, true); + restore_var (updating_ylabel_position, true); if (! isempty) { if (ylabel_props.horizontalalignmentmode_is ("auto")) { ylabel_props.set_horizontalalignment - (m_ystate > AXE_DEPTH_DIR ? "center" - : (! m_xyzSym ? "left" : "right")); + (m_ystate > AXE_DEPTH_DIR ? "center" + : (! m_xyzSym ? "left" : "right")); ylabel_props.set_horizontalalignmentmode ("auto"); } @@ -6553,7 +6554,7 @@ if (ylabel_props.verticalalignmentmode_is ("auto")) { ylabel_props.set_verticalalignment - (m_ystate == AXE_VERT_DIR && ! m_y2Dright ? "bottom" : "top"); + (m_ystate == AXE_VERT_DIR && ! m_y2Dright ? "bottom" : "top"); ylabel_props.set_verticalalignmentmode ("auto"); } @@ -6642,14 +6643,14 @@ bool isempty = zlabel_props.get_string ().isempty (); octave::unwind_protect_var<bool> - restore_updating_zlabel_position (updating_zlabel_position, true); + restore_updating_zlabel_position (updating_zlabel_position, true); if (! isempty) { if (zlabel_props.horizontalalignmentmode_is ("auto")) { zlabel_props.set_horizontalalignment - ((m_zstate > AXE_DEPTH_DIR || camAuto) ? "center" : "right"); + ((m_zstate > AXE_DEPTH_DIR || camAuto) ? "center" : "right"); zlabel_props.set_horizontalalignmentmode ("auto"); } @@ -6657,8 +6658,8 @@ if (zlabel_props.verticalalignmentmode_is ("auto")) { zlabel_props.set_verticalalignment - (m_zstate == AXE_VERT_DIR - ? "bottom" : ((m_zSign || camAuto) ? "bottom" : "top")); + (m_zstate == AXE_VERT_DIR + ? "bottom" : ((m_zSign || camAuto) ? "bottom" : "top")); zlabel_props.set_verticalalignmentmode ("auto"); } @@ -6916,7 +6917,7 @@ if (modified_limits) { octave::unwind_protect_var<std::set<double>> - restore_var (updating_aspectratios); + restore_var (updating_aspectratios); updating_aspectratios.insert (get___myhandle__ ().value ()); @@ -7012,7 +7013,7 @@ const Matrix& parent_pix_size) const { Matrix pos = (internal ? get_position ().matrix_value () - : get_outerposition ().matrix_value ()); + : get_outerposition ().matrix_value ()); Matrix parent_size (parent_pix_size); if (parent_size.isempty ()) @@ -7076,7 +7077,7 @@ text::properties& text_props = reinterpret_cast<text::properties&> - (gh_mgr.get_object (htext).get_properties ()); + (gh_mgr.get_object (htext).get_properties ()); Matrix text_pos = text_props.get_data_position (); text_pos = xform.transform (text_pos(0), text_pos(1), text_pos(2)); @@ -8197,7 +8198,7 @@ int n = (is_logscale ? 8 : 4); double mult_below = (is_logscale ? tmp_ticks(1) / tmp_ticks(0) : 1); double mult_above = (is_logscale ? tmp_ticks(n_ticks-1) / tmp_ticks(n_ticks-2) - : 1); + : 1); double d_below = (tmp_ticks(1) - tmp_ticks(0)) / mult_below / (n+1); int n_below = static_cast<int> (std::floor ((tmp_ticks(0)-lo_lim) / d_below)); @@ -8207,7 +8208,7 @@ double d_above = (tmp_ticks(n_ticks-1) - tmp_ticks(n_ticks-2)) * mult_above / (n+1); int n_above = static_cast<int> (std::floor ((hi_lim-tmp_ticks(n_ticks-1)) - / d_above)); + / d_above)); if (n_above < 0) n_above = 0; @@ -8351,8 +8352,8 @@ Matrix axes::properties::get_ticklabel_extents (const Matrix& ticks, - const string_vector& ticklabels, - const Matrix& limits) + const string_vector& ticklabels, + const Matrix& limits) { Matrix ext (1, 2, 0.0); double wmax, hmax; @@ -8651,7 +8652,7 @@ #undef FIX_LIMITS octave::unwind_protect_var<std::set<double>> - restore_var (updating_axis_limits); + restore_var (updating_axis_limits); updating_axis_limits.insert (get_handle ().value ()); bool is_auto; @@ -8868,7 +8869,7 @@ } octave::unwind_protect_var<std::set<double>> - restore_var (updating_axis_limits); + restore_var (updating_axis_limits); updating_axis_limits.insert (get_handle ().value ()); bool is_auto; @@ -9692,7 +9693,7 @@ graphics_object go = gh_mgr.get_object (get___myhandle__ ()); axes::properties& ax_props = dynamic_cast<axes::properties&> - (go.get_ancestor ("axes").get_properties ()); + (go.get_ancestor ("axes").get_properties ()); if (is_visible ()) ax_props.increase_num_lights (); else @@ -9709,7 +9710,7 @@ graphics_object go = gh_mgr.get_object (get___myhandle__ ()); axes::properties& ax_props = dynamic_cast<axes::properties&> - (go.get_ancestor ("axes").get_properties ()); + (go.get_ancestor ("axes").get_properties ()); return (ax_props.get_num_lights () > 0); } @@ -10367,7 +10368,7 @@ axes::properties& parent_axes_prop = dynamic_cast<axes::properties&> - (go.get_ancestor ("axes").get_properties ()); + (go.get_ancestor ("axes").get_properties ()); Matrix color_order = parent_axes_prop.get_colororder ().matrix_value (); octave_idx_type s = (static_cast<octave_idx_type> (series_idx(0)) - 1) @@ -10395,7 +10396,7 @@ // Increment series index counter in parent axes axes::properties& parent_axes_prop = dynamic_cast<axes::properties&> - (go.get_ancestor ("axes").get_properties ()); + (go.get_ancestor ("axes").get_properties ()); if (! parent_axes_prop.nextplot_is ("add")) parent_axes_prop.set_nextseriesindex (1); @@ -10405,7 +10406,7 @@ m_properties.set_seriesindex (series_idx); parent_axes_prop.set_nextseriesindex - (parent_axes_prop.get_nextseriesindex () + 1); + (parent_axes_prop.get_nextseriesindex () + 1); } if (m_properties.cdatamode_is ("auto")) @@ -10428,7 +10429,7 @@ graphics_object go = gh_mgr.get_object (get___myhandle__ ()); axes::properties& ax_prop = dynamic_cast<axes::properties&> - (go.get_ancestor ("axes").get_properties ()); + (go.get_ancestor ("axes").get_properties ()); return (ax_prop.get_num_lights () > 0); } @@ -10605,30 +10606,30 @@ if ((j > 0) && (i > 0)) // upper left quadrangle cross_product - (x(j1,i-1)-x(j2,i), y(j-1,i1)-y(j,i2), z(j-1,i-1)-z(j,i), - x(j2,i-1)-x(j1,i), y(j,i1)-y(j-1,i2), z(j,i-1)-z(j-1,i), - nx, ny, nz); + (x(j1, i-1)-x(j2, i), y(j-1, i1)-y(j, i2), z(j-1, i-1)-z(j, i), + x(j2, i-1)-x(j1, i), y(j, i1)-y(j-1, i2), z(j, i-1)-z(j-1, i), + nx, ny, nz); if ((j > 0) && (i < (p -1))) // upper right quadrangle cross_product - (x(j1,i+1)-x(j2,i), y(j-1,i3)-y(j,i2), z(j-1,i+1)-z(j,i), - x(j1,i)-x(j2,i+1), y(j-1,i2)-y(j,i3), z(j-1,i)-z(j,i+1), - nx, ny, nz); + (x(j1, i+1)-x(j2, i), y(j-1, i3)-y(j, i2), z(j-1, i+1)-z(j, i), + x(j1, i)-x(j2, i+1), y(j-1, i2)-y(j, i3), z(j-1, i)-z(j, i+1), + nx, ny, nz); if ((j < (q - 1)) && (i > 0)) // lower left quadrangle cross_product - (x(j2,i-1)-x(j3,i), y(j,i1)-y(j+1,i2), z(j,i-1)-z(j+1,i), - x(j3,i-1)-x(j2,i), y(j+1,i1)-y(j,i2), z(j+1,i-1)-z(j,i), - nx, ny, nz); + (x(j2, i-1)-x(j3, i), y(j, i1)-y(j+1, i2), z(j, i-1)-z(j+1, i), + x(j3, i-1)-x(j2, i), y(j+1, i1)-y(j, i2), z(j+1, i-1)-z(j, i), + nx, ny, nz); if ((j < (q - 1)) && (i < (p -1))) // lower right quadrangle cross_product - (x(j3,i)-x(j2,i+1), y(j+1,i2)-y(j,i3), z(j+1,i)-z(j,i+1), - x(j3,i+1)-x(j2,i), y(j+1,i3)-y(j,i2), z(j+1,i+1)-z(j,i), - nx, ny, nz); + (x(j3, i)-x(j2, i+1), y(j+1, i2)-y(j, i3), z(j+1, i)-z(j, i+1), + x(j3, i+1)-x(j2, i), y(j+1, i3)-y(j, i2), z(j+1, i+1)-z(j, i), + nx, ny, nz); double d = -std::max (std::max (fabs (nx), fabs (ny)), fabs (nz)); @@ -11190,7 +11191,7 @@ Matrix uibuttongroup::properties::get_boundingbox (bool internal, - const Matrix& parent_pix_size) const + const Matrix& parent_pix_size) const { Matrix pos = get_position ().matrix_value (); Matrix parent_size (parent_pix_size); @@ -11399,7 +11400,7 @@ void uibuttongroup::properties::remove_child (const graphics_handle& h, - bool from_root) + bool from_root) { graphics_handle current_selected = get_selectedobject (); if (h.value () == current_selected.value ()) @@ -12286,7 +12287,7 @@ args(1) = Matrix (); octave::unwind_action_safe restore_gcbo_action - (&gh_manager::restore_gcbo, this); + (&gh_manager::restore_gcbo, this); graphics_object go (get_object (h)); if (go) @@ -12417,7 +12418,7 @@ } else post_event (graphics_event::create_callback_event (h, name, data, - busyaction)); + busyaction)); } } @@ -12437,7 +12438,7 @@ octave::autolock guard (m_graphics_lock); post_event (graphics_event::create_set_event (h, name, value, notify_toolkit, - redraw_figure)); + redraw_figure)); } int @@ -13118,7 +13119,8 @@ caseless_str property; if (nargin > 1) - property = args(1).xstring_value ("get: second argument must be property name or cell array of property names"); + property = args( + 1).xstring_value ("get: second argument must be property name or cell array of property names"); vals.resize (dim_vector (hcv_len, 1)); @@ -13983,7 +13985,8 @@ } } - debug_file = (args.length () > 2 ? args(2).xstring_value ("drawnow: DEBUG_FILE must be a string") : ""); + debug_file = (args.length () > 2 ? args(2).xstring_value ("drawnow: DEBUG_FILE must be a string") : + ""); graphics_handle h = gcf (); @@ -14521,7 +14524,7 @@ else { cleanup_waitfor_postset_listener_action.set - (cleanup_waitfor_postset_listener, ov_listener); + (cleanup_waitfor_postset_listener, ov_listener); go.add_property_listener (pname, ov_listener, GCB_POSTSET); go.add_property_listener (pname, ov_listener, GCB_PERSISTENT); @@ -14546,7 +14549,7 @@ octave_value ov_del_listener (del_listener); cleanup_waitfor_predelete_listener_action.set - (cleanup_waitfor_predelete_listener, ov_del_listener); + (cleanup_waitfor_predelete_listener, ov_del_listener); go.add_property_listener (pname, ov_del_listener, GCB_PREDELETE); @@ -14558,7 +14561,8 @@ if (timeout_index < 0 && args.length () > (max_arg_index + 1)) { - caseless_str s = args(max_arg_index + 1).xstring_value ("waitfor: invalid parameter, expected 'timeout'"); + caseless_str s = args(max_arg_index + + 1).xstring_value ("waitfor: invalid parameter, expected 'timeout'"); if (! s.compare ("timeout")) error ("waitfor: invalid parameter '%s'", s.c_str ());