Mercurial > hg > octave-lyh
view scripts/plot/private/__errcomm__.m @ 12965:22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
* __axis_label__.m: Don't check type of txt argument.
* __go_draw_axes__.m: Handle multi-line string property for
text objects.
* text.m: Likewise.
* gl2ps-renderer.cc (glps_renderer::draw_text): Handle
text::properties string property as octave_value object that can
contain either a char array or cellstr object.
* graphics.cc (axes::properties::update_xlabel_position,
axes::properties::update_ylabel_position,
axes::properties::update_zlabel_position,
axes::properties::get_extent, text::properties::update_text_extent): Likewise.
* graphics.h.in (text_label_property::do_set): Don't forget to set
stored_type when value is a cell.
(text::properties::get_string): Delete custom getter.
author | Ben Abbott <bpabbott@mac.com> |
---|---|
date | Mon, 15 Aug 2011 10:24:09 -0400 |
parents | fd0a3ac60b0e |
children | 72c96de7a403 |
line wrap: on
line source
## Copyright (C) 2001-2011 Teemu Ikonen ## ## This file is part of Octave. ## ## Octave is free software; you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or (at ## your option) any later version. ## ## Octave is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- ## @deftypefn {Function File} {} __errcomm__ (@var{caller}, @var{p}, @dots{}) ## Undocumented internal function. ## @end deftypefn ## Created: 20.02.2001 ## Author: Teemu Ikonen <tpikonen@pcu.helsinki.fi> ## Keywords: errorbar, plotting function retval = __errcomm__ (caller, p, varargin) if (nargin < 4) print_usage (); endif nargs = length (varargin); retval = []; k = 1; data = cell(6,1); while (k <= nargs) a = varargin{k++}; if (isvector (a)) a = a(:); elseif (ismatrix (a)) ; else usage ("%s (...)", caller); endif sz = size (a); ndata = 1; data{ndata} = a; while (k <= nargs) a = varargin{k++}; if (ischar (a) || iscellstr (a)) retval = [retval; __errplot__(a, p, data{1:ndata})]; break; elseif (isvector (a)) a = a(:); elseif (ismatrix (a)) ; else error ("wrong argument types"); endif if (size (a) != sz) error ("argument sizes do not match"); endif data{++ndata} = a; if (ndata > 6) error ("too many arguments to a plot"); endif endwhile endwhile if (! (ischar (a) || iscellstr (a))) retval = [retval; __errplot__("~", p, data{1:ndata})]; endif drawnow (); endfunction