Mercurial > octave-nkf

comparison src/graphics.cc @ 14846:460a3c6d8bf1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
14844:5bc9b9cb4362 14846:460a3c6d8bf1
1035 bool 1035 bool
1036 color_values::str2rgb (std::string str) 1036 color_values::str2rgb (std::string str)
1037 { 1037 {
1038 double tmp_rgb[3] = {0, 0, 0}; 1038 double tmp_rgb[3] = {0, 0, 0};
1039 bool retval = true; 1039 bool retval = true;
1040 unsigned int len = str.length(); 1040 unsigned int len = str.length ();
1041 1041
1042 std::transform (str.begin (), str.end (), str.begin (), tolower); 1042 std::transform (str.begin (), str.end (), str.begin (), tolower);
1043 1043
1044 if (str.compare(0, len, "blue", 0, len) == 0) 1044 if (str.compare(0, len, "blue", 0, len) == 0)
1045 tmp_rgb[2] = 1; 1045 tmp_rgb[2] = 1;
1269 \ 1269 \
1270 return flag; \ 1270 return flag; \
1271 } \ 1271 } \
1272 } 1272 }
1273 1273
1274 if (data.is_double_type() || data.is_bool_type ()) 1274 if (data.is_double_type () || data.is_bool_type ())
1275 CHECK_ARRAY_EQUAL (double, , NDArray) 1275 CHECK_ARRAY_EQUAL (double, , NDArray)
1276 else if (data.is_single_type ()) 1276 else if (data.is_single_type ())
1277 CHECK_ARRAY_EQUAL (float, float_, FloatNDArray) 1277 CHECK_ARRAY_EQUAL (float, float_, FloatNDArray)
1278 else if (data.is_int8_type ()) 1278 else if (data.is_int8_type ())
1279 CHECK_ARRAY_EQUAL (octave_int8, int8_, int8NDArray) 1279 CHECK_ARRAY_EQUAL (octave_int8, int8_, int8NDArray)
1426 return true; 1426 return true;
1427 else if (v.is_string ()) 1427 else if (v.is_string ())
1428 // complete validation will be done at execution-time 1428 // complete validation will be done at execution-time
1429 return true; 1429 return true;
1430 else if (v.is_cell () && v.length () > 0 1430 else if (v.is_cell () && v.length () > 0
1431 && (v.rows() == 1 || v.columns () == 1) 1431 && (v.rows () == 1 || v.columns () == 1)
1432 && v.cell_value ()(0).is_function_handle ()) 1432 && v.cell_value ()(0).is_function_handle ())
1433 return true; 1433 return true;
1434 else if (v.is_empty ()) 1434 else if (v.is_empty ())
1435 return true; 1435 return true;
1436 1436
5627 5627
5628 bool ignore_horizontal = false; 5628 bool ignore_horizontal = false;
5629 bool ignore_vertical = false; 5629 bool ignore_vertical = false;
5630 if (only_text_height) 5630 if (only_text_height)
5631 { 5631 {
5632 double text_rotation = text_props.get_rotation(); 5632 double text_rotation = text_props.get_rotation ();
5633 if (text_rotation == 0. || text_rotation == 180.) 5633 if (text_rotation == 0. || text_rotation == 180.)
5634 ignore_horizontal = true; 5634 ignore_horizontal = true;
5635 else if (text_rotation == 90. || text_rotation == 270.) 5635 else if (text_rotation == 90. || text_rotation == 270.)
5636 ignore_vertical = true; 5636 ignore_vertical = true;
5637 } 5637 }
5675 axes::properties::update_units (const caseless_str& old_units) 5675 axes::properties::update_units (const caseless_str& old_units)
5676 { 5676 {
5677 graphics_object obj = gh_manager::get_object (get_parent ()); 5677 graphics_object obj = gh_manager::get_object (get_parent ());
5678 Matrix parent_bb = obj.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2); 5678 Matrix parent_bb = obj.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2);
5679 caseless_str new_units = get_units (); 5679 caseless_str new_units = get_units ();
5680 position.set (octave_value (convert_position (get_position().matrix_value(), old_units, new_units, parent_bb)), false); 5680 position.set (octave_value (convert_position (get_position ().matrix_value (), old_units, new_units, parent_bb)), false);
5681 outerposition.set (octave_value (convert_position (get_outerposition().matrix_value(), old_units, new_units, parent_bb)), false); 5681 outerposition.set (octave_value (convert_position (get_outerposition ().matrix_value (), old_units, new_units, parent_bb)), false);
5682 tightinset.set (octave_value (convert_position (get_tightinset().matrix_value(), old_units, new_units, parent_bb)), false); 5682 tightinset.set (octave_value (convert_position (get_tightinset ().matrix_value (), old_units, new_units, parent_bb)), false);
5683 } 5683 }
5684 5684
5685 void 5685 void
5686 axes::properties::set_fontunits (const octave_value& v) 5686 axes::properties::set_fontunits (const octave_value& v)
5687 { 5687 {
6166 ext = text_renderer.get_extent (ticklabels(i)); 6166 ext = text_renderer.get_extent (ticklabels(i));
6167 wmax = std::max (wmax, ext(0)); 6167 wmax = std::max (wmax, ext(0));
6168 hmax = std::max (hmax, ext(1)); 6168 hmax = std::max (hmax, ext(1));
6169 #else 6169 #else
6170 //FIXME: find a better approximation 6170 //FIXME: find a better approximation
6171 int len = ticklabels(i).length(); 6171 int len = ticklabels(i).length ();
6172 wmax = std::max (wmax, 0.5*fontsize*len); 6172 wmax = std::max (wmax, 0.5*fontsize*len);
6173 hmax = fontsize; 6173 hmax = fontsize;
6174 #endif 6174 #endif
6175 } 6175 }
6176 } 6176 }
6284 6284
6285 Matrix limits; 6285 Matrix limits;
6286 double val; 6286 double val;
6287 6287
6288 #define FIX_LIMITS \ 6288 #define FIX_LIMITS \
6289 if (limits.numel() == 4) \ 6289 if (limits.numel () == 4) \
6290 { \ 6290 { \
6291 val = limits(0); \ 6291 val = limits(0); \
6292 if (! (xisinf (val) || xisnan (val))) \ 6292 if (! (xisinf (val) || xisnan (val))) \
6293 min_val = val; \ 6293 min_val = val; \
6294 val = limits(1); \ 6294 val = limits(1); \
6839 v(1) = -90; 6839 v(1) = -90;
6840 6840
6841 v (0) = fmod(v(0) - delta_az + 720,360); 6841 v (0) = fmod(v(0) - delta_az + 720,360);
6842 6842
6843 set_view(v); 6843 set_view(v);
6844 update_transform(); 6844 update_transform ();
6845 } 6845 }
6846 6846
6847 void 6847 void
6848 axes::properties::unzoom (void) 6848 axes::properties::unzoom (void)
6849 { 6849 {
6995 string_vector sv = string_prop.all_strings (); 6995 string_vector sv = string_prop.all_strings ();
6996 6996
6997 renderer.text_to_pixels (sv.join ("\n"), pixels, bbox, 6997 renderer.text_to_pixels (sv.join ("\n"), pixels, bbox,
6998 halign, valign, get_rotation ()); 6998 halign, valign, get_rotation ());
6999 /* The bbox is relative to the text's position. 6999 /* The bbox is relative to the text's position.
7000 We'll leave it that way, because get_position() does not return 7000 We'll leave it that way, because get_position () does not return
7001 valid results when the text is first constructed. 7001 valid results when the text is first constructed.
7002 Conversion to proper coordinates is performed in get_extent. */ 7002 Conversion to proper coordinates is performed in get_extent. */
7003 set_extent (bbox); 7003 set_extent (bbox);
7004 7004
7005 #endif 7005 #endif
7075 // --------------------------------------------------------------------- 7075 // ---------------------------------------------------------------------
7076 7076
7077 octave_value 7077 octave_value
7078 patch::properties::get_color_data (void) const 7078 patch::properties::get_color_data (void) const
7079 { 7079 {
7080 octave_value fvc = get_facevertexcdata(); 7080 octave_value fvc = get_facevertexcdata ();
7081 if (fvc.is_undefined () || fvc.is_empty ()) 7081 if (fvc.is_undefined () || fvc.is_empty ())
7082 return Matrix (); 7082 return Matrix ();
7083 else 7083 else
7084 return convert_cdata (*this, fvc,cdatamapping_is ("scaled"), 2); 7084 return convert_cdata (*this, fvc,cdatamapping_is ("scaled"), 2);
7085 } 7085 }
7255 { 7255 {
7256 limits = xproperties.get_alim ().matrix_value (); 7256 limits = xproperties.get_alim ().matrix_value ();
7257 update_type = 'a'; 7257 update_type = 'a';
7258 } 7258 }
7259 7259
7260 if (limits.numel() == 4) 7260 if (limits.numel () == 4)
7261 { 7261 {
7262 val = limits(0); 7262 val = limits(0);
7263 if (! (xisinf (val) || xisnan (val))) 7263 if (! (xisinf (val) || xisnan (val)))
7264 min_val = val; 7264 min_val = val;
7265 val = limits(1); 7265 val = limits(1);
7478 } 7478 }
7479 7479
7480 void 7480 void
7481 uicontrol::properties::set_style (const octave_value& st) 7481 uicontrol::properties::set_style (const octave_value& st)
7482 { 7482 {
7483 if (get___object__ ().is_empty()) 7483 if (get___object__ ().is_empty ())
7484 style = st; 7484 style = st;
7485 else 7485 else
7486 error ("set: cannot change the style of a uicontrol object after creation."); 7486 error ("set: cannot change the style of a uicontrol object after creation.");
7487 } 7487 }
7488 7488
8513 8513
8514 bool use_cell_format = false; 8514 bool use_cell_format = false;
8515 8515
8516 if (nargin == 1 || nargin == 2) 8516 if (nargin == 1 || nargin == 2)
8517 { 8517 {
8518 if (args(0).is_empty()) 8518 if (args(0).is_empty ())
8519 { 8519 {
8520 retval = Matrix (); 8520 retval = Matrix ();
8521 return retval; 8521 return retval;
8522 } 8522 }
8523 8523
8916 nd = 3; 8916 nd = 3;
8917 8917
8918 if ((go.isa ("line") || go.isa ("patch")) && ! go.get("zdata").is_empty ()) 8918 if ((go.isa ("line") || go.isa ("patch")) && ! go.get("zdata").is_empty ())
8919 nd = 3; 8919 nd = 3;
8920 8920
8921 Matrix kids = go.get_properties().get_children (); 8921 Matrix kids = go.get_properties ().get_children ();
8922 8922
8923 for (octave_idx_type i = 0; i < kids.length (); i++) 8923 for (octave_idx_type i = 0; i < kids.length (); i++)
8924 { 8924 {
8925 graphics_handle hnd = gh_manager::lookup (kids(i)); 8925 graphics_handle hnd = gh_manager::lookup (kids(i));
8926 8926
8927 if (hnd.ok ()) 8927 if (hnd.ok ())
8928 { 8928 {
8929 const graphics_object& kid = gh_manager::get_object(hnd); 8929 const graphics_object& kid = gh_manager::get_object(hnd);
8930 8930
8931 if (kid.valid_object()) 8931 if (kid.valid_object ())
8932 nd = calc_dimensions (kid); 8932 nd = calc_dimensions (kid);
8933 8933
8934 if (nd == 3) 8934 if (nd == 3)
8935 break; 8935 break;
8936 } 8936 }
9855 octave_value retval; 9855 octave_value retval;
9856 9856
9857 if (obj) 9857 if (obj)
9858 retval = obj.get (caseless_str (property)); 9858 retval = obj.get (caseless_str (property));
9859 else 9859 else
9860 error ("%s: invalid handle (= %g)", func.c_str(), handle); 9860 error ("%s: invalid handle (= %g)", func.c_str (), handle);
9861 9861
9862 return retval; 9862 return retval;
9863 } 9863 }
9864 9864
9865 bool 9865 bool
9877 9877
9878 if (! error_state) 9878 if (! error_state)
9879 ret = true; 9879 ret = true;
9880 } 9880 }
9881 else 9881 else
9882 error ("%s: invalid handle (= %g)", func.c_str(), handle); 9882 error ("%s: invalid handle (= %g)", func.c_str (), handle);
9883 9883
9884 return ret; 9884 return ret;
9885 } 9885 }
9886 9886
9887 static bool 9887 static bool