Mercurial > octave
diff libinterp/corefcn/gl-render.cc @ 23577:80c42f4cca13
maint: Deprecate is_empty and replace with isempty.
* ov.h (is_empty): Use OCTAVE_DEPRECATED macro around function.
* ov.h (isempty): New function.
* Array.h (is_empty): Use OCTAVE_DEPRECATED macro around function.
* Array.h (isempty): New function.
* Range.h (is_empty): Use OCTAVE_DEPRECATED macro around function.
* Range.h (isempty): New function.
* Sparse.h (is_empty): Use OCTAVE_DEPRECATED macro around function.
* Sparse.h (isempty): New function.
* Backend.cc, BaseControl.cc, Canvas.cc, Figure.cc, gl-select.cc,
__magick_read__.cc, __qp__.cc, cellfun.cc, daspk.cc, dasrt.cc, dassl.cc,
data.cc, debug.cc, det.cc, eig.cc, error.cc, fft.cc, filter.cc, find.cc,
ft-text-renderer.cc, gl-render.cc, gl2ps-print.cc, graphics.cc, graphics.in.h,
hess.cc, inv.cc, lsode.cc, lu.cc, max.cc, mex.cc, mxarray.in.h, oct-handle.h,
oct-lvalue.cc, oct-map.cc, oct-map.h, oct-stream.cc, pinv.cc, pr-output.cc,
quadcc.cc, qz.cc, strfind.cc, strfns.cc, sylvester.cc, time.cc, toplev.cc,
tril.cc, urlwrite.cc, utils.cc, utils.h, xnorm.cc, __delaunayn__.cc,
__glpk__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc,
__voronoi__.cc, chol.cc, convhulln.cc, ov-base-diag.cc, ov-base-mat.cc,
ov-base-sparse.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-sparse.cc,
ov-cell.cc, ov-class.cc, ov-classdef.cc, ov-cx-sparse.cc, ov-fcn-inline.cc,
ov-flt-re-mat.cc, ov-intx.h, ov-java.cc, ov-perm.cc, ov-range.cc, ov-re-mat.cc,
ov-re-sparse.cc, ov-str-mat.cc, ov-struct.cc, ov-usr-fcn.cc, ov.cc, ov.h,
bp-table.cc, oct-parse.in.yy, pt-eval.cc, pt-tm-const.cc, pt-tm-const.h,
Array.cc, Range.cc, Range.h, Sparse.cc, Sparse.h, chNDArray.cc, dNDArray.cc,
fNDArray.cc, DASPK.cc, DASRT.cc, DASSL.cc, LSODE.cc, bsxfun-defs.cc,
eigs-base.cc, oct-convn.cc, qr.cc:
Replace instances of is_empty with isempty.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sun, 11 Jun 2017 22:14:09 -0700 |
| parents | 7049da1648c0 |
| children | 08036a7f3660 |
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/gl-render.cc Sun Jun 11 22:14:09 2017 -0700 @@ -1183,7 +1183,7 @@ #if defined (HAVE_OPENGL) Matrix axe_color = props.get_color_rgb (); - if (axe_color.is_empty () || ! props.is_visible ()) + if (axe_color.isempty () || ! props.is_visible ()) return; double xPlane = props.get_xPlane (); @@ -2830,19 +2830,19 @@ Matrix mfcolor = props.get_markerfacecolor_rgb (); Matrix cc (1, 3, 0.0); - if (mecolor.is_empty () && props.markeredgecolor_is ("auto")) + if (mecolor.isempty () && props.markeredgecolor_is ("auto")) { mecolor = props.get_edgecolor_rgb (); do_edge = ! props.edgecolor_is ("none"); } - if (mfcolor.is_empty () && props.markerfacecolor_is ("auto")) + if (mfcolor.isempty () && props.markerfacecolor_is ("auto")) { mfcolor = props.get_facecolor_rgb (); do_face = ! props.facecolor_is ("none"); } - if ((mecolor.is_empty () || mfcolor.is_empty ()) && c.is_empty ()) + if ((mecolor.isempty () || mfcolor.isempty ()) && c.isempty ()) c = props.get_color_data ().array_value (); init_marker (props.get_marker (), props.get_markersize (), @@ -2861,8 +2861,8 @@ if (x_mat) j1 = j; - if ((do_edge && mecolor.is_empty ()) - || (do_face && mfcolor.is_empty ())) + if ((do_edge && mecolor.isempty ()) + || (do_face && mfcolor.isempty ())) { if (! octave::math::isfinite (c(j,i))) continue; // Skip NaNs in color data @@ -2871,9 +2871,9 @@ cc(k) = c(j,i,k); } - Matrix lc = (do_edge ? (mecolor.is_empty () ? cc : mecolor) + Matrix lc = (do_edge ? (mecolor.isempty () ? cc : mecolor) : Matrix ()); - Matrix fc = (do_face ? (mfcolor.is_empty () ? cc : mfcolor) + Matrix fc = (do_face ? (mfcolor.isempty () ? cc : mfcolor) : Matrix ()); draw_marker (x(j1,i), y(j,i1), z(j,i), lc, fc); @@ -3300,23 +3300,23 @@ bool has_markerfacecolor = false; - if ((mecolor.is_empty () && ! props.markeredgecolor_is ("none")) - || (mfcolor.is_empty () && ! props.markerfacecolor_is ("none"))) + if ((mecolor.isempty () && ! props.markeredgecolor_is ("none")) + || (mfcolor.isempty () && ! props.markerfacecolor_is ("none"))) { Matrix mc = props.get_color_data ().matrix_value (); if (mc.rows () == 1) { // Single color specifications, we can simplify a little bit - if (mfcolor.is_empty () && ! props.markerfacecolor_is ("none")) + if (mfcolor.isempty () && ! props.markerfacecolor_is ("none")) mfcolor = mc; - if (mecolor.is_empty () && ! props.markeredgecolor_is ("none")) + if (mecolor.isempty () && ! props.markeredgecolor_is ("none")) mecolor = mc; } else { - if (c.is_empty ()) + if (c.isempty ()) c = props.get_color_data ().matrix_value (); has_markerfacecolor = ((c.numel () > 0) && (c.rows () == f.rows ())); @@ -3344,9 +3344,9 @@ cc(0) = c(idx,0), cc(1) = c(idx,1), cc(2) = c(idx,2); } - Matrix lc = (do_edge ? (mecolor.is_empty () ? cc : mecolor) + Matrix lc = (do_edge ? (mecolor.isempty () ? cc : mecolor) : Matrix ()); - Matrix fc = (do_face ? (mfcolor.is_empty () ? cc : mfcolor) + Matrix fc = (do_face ? (mfcolor.isempty () ? cc : mfcolor) : Matrix ()); draw_marker (v(idx,0), v(idx,1), (has_z ? v(idx,2) : 0), lc, fc); @@ -3415,7 +3415,7 @@ { #if defined (HAVE_OPENGL) - if (props.get_string ().is_empty ()) + if (props.get_string ().isempty ()) return; set_font (props); @@ -3462,7 +3462,7 @@ Matrix y = props.get_ydata ().matrix_value (); // Someone wants us to draw an empty image? No way. - if (x.is_empty () || y.is_empty ()) + if (x.isempty () || y.isempty ()) return; if (w > 1 && x(1) == x(0))