octave-nkf: libinterp/corefcn/graphics.cc annotate

annotate libinterp/corefcn/graphics.cc @ 18807:70ea5a2856fe

Handle figure paperpositionmode "auto" (bug #37554) * graphics.cc (figure::properties::get_auto_paperposition): new method to compute paperposition from on screen figure position * graphics.cc (figure::properties::set_position, figure::properties::update_papertype, update_papersize, update_paperorientation): use new method to update paperposition when mode is "auto" * graphics.cc: add %!test for bug #37554 * graphics.in.h (figure::properties): let paperposition update paperpositionmode * graphics.in.h (figure::properties::update_paperpositionmode): use new method to update paperposition when mode is "auto"

author	Pantxo Diribarne <pantxo.diribarne@gmail.com>
date	Wed, 21 May 2014 23:27:44 +0200
parents	89448a7523b2
children	888f8ce79bbe

rev	line source
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	1 /*
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2
17744 d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 17652 diff changeset	3 Copyright (C) 2007-2013 John W. Eaton
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	4
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	6
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6962 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6962 diff changeset	10 option) any later version.
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	11
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	15 for more details.
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	16
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6962 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6962 diff changeset	19 <http://www.gnu.org/licenses/>.
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	20
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	21 */
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	22
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	23 #ifdef HAVE_CONFIG_H
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	24 #include <config.h>
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	25 #endif
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	26
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	27 #include <cctype>
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	28 #include <cfloat>
7286 c0c6aa5afff4 [project @ 2007-12-11 16:52:56 by jwe] jwe parents: 7283 diff changeset	29 #include <cstdlib>
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	30 #include <ctime>
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	31
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	32 #include <algorithm>
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	33 #include <list>
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	34 #include <map>
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	35 #include <set>
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	36 #include <string>
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	37 #include <sstream>
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	38
13992 e1f76bfe0452 apply singleton_cleanup to a few more classes John W. Eaton <jwe@octave.org> parents: 13955 diff changeset	39 #include "cmd-edit.h"
7409 73036cdd855d [project @ 2008-01-22 20:31:59 by jwe] jwe parents: 7408 diff changeset	40 #include "file-ops.h"
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe] jwe parents: 7408 diff changeset	41 #include "file-stat.h"
13992 e1f76bfe0452 apply singleton_cleanup to a few more classes John W. Eaton <jwe@octave.org> parents: 13955 diff changeset	42 #include "oct-locbuf.h"
e1f76bfe0452 apply singleton_cleanup to a few more classes John W. Eaton <jwe@octave.org> parents: 13955 diff changeset	43 #include "singleton-cleanup.h"
e1f76bfe0452 apply singleton_cleanup to a few more classes John W. Eaton <jwe@octave.org> parents: 13955 diff changeset	44
15423 53d073233fa4 call more built-in functions directly John W. Eaton <jwe@octave.org> parents: 15220 diff changeset	45 #include "builtins.h"
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	46 #include "cutils.h"
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	47 #include "defun.h"
8560 5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	48 #include "display.h"
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	49 #include "error.h"
6595 55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	50 #include "graphics.h"
7409 73036cdd855d [project @ 2008-01-22 20:31:59 by jwe] jwe parents: 7408 diff changeset	51 #include "input.h"
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	52 #include "ov.h"
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	53 #include "oct-obj.h"
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	54 #include "oct-map.h"
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	55 #include "ov-fcn-handle.h"
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	56 #include "pager.h"
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	57 #include "parse.h"
7409 73036cdd855d [project @ 2008-01-22 20:31:59 by jwe] jwe parents: 7408 diff changeset	58 #include "toplev.h"
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	59 #include "txt-eng-ft.h"
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	60 #include "unwind-prot.h"
18680 2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	61 #include "octave-default-image.h"
6595 55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	62
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	63 // forward declarations
9238 0ae2b6617005 Use display information from the root object to compute bounding boxes Michael Goffioul <michael.goffioul@gmail.com> parents: 9185 diff changeset	64 static octave_value xget (const graphics_handle& h, const caseless_str& name);
0ae2b6617005 Use display information from the root object to compute bounding boxes Michael Goffioul <michael.goffioul@gmail.com> parents: 9185 diff changeset	65
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	66 static void
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	67 gripe_set_invalid (const std::string& pname)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	68 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	69 error ("set: invalid value for %s property", pname.c_str ());
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	70 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	71
9584 0fcbfddaa87f allow abbreviated graphics property names to match, with optional warning John W. Eaton <jwe@octave.org> parents: 9582 diff changeset	72 // Check to see that PNAME matches just one of PNAMES uniquely.
0fcbfddaa87f allow abbreviated graphics property names to match, with optional warning John W. Eaton <jwe@octave.org> parents: 9582 diff changeset	73 // Return the full name of the match, or an empty caseless_str object
0fcbfddaa87f allow abbreviated graphics property names to match, with optional warning John W. Eaton <jwe@octave.org> parents: 9582 diff changeset	74 // if there is no match, or the match is ambiguous.
0fcbfddaa87f allow abbreviated graphics property names to match, with optional warning John W. Eaton <jwe@octave.org> parents: 9582 diff changeset	75
0fcbfddaa87f allow abbreviated graphics property names to match, with optional warning John W. Eaton <jwe@octave.org> parents: 9582 diff changeset	76 static caseless_str
9585 06b8b51dca48 also handle user-defined graphics properties in new property name validation scheme John W. Eaton <jwe@octave.org> parents: 9584 diff changeset	77 validate_property_name (const std::string& who, const std::string& what,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	78 const std::set<std::string>& pnames,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	79 const caseless_str& pname)
9582 bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	80 {
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	81 size_t len = pname.length ();
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	82 std::set<std::string> matches;
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	83
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	84 for (std::set<std::string>::const_iterator p = pnames.begin ();
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	85 p != pnames.end (); p++)
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	86 {
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	87 if (pname.compare (*p, len))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	88 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	89 if (len == p->length ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	90 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	91 // Exact match.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	92 return pname;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	93 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	94
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	95 matches.insert (*p);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	96 }
9582 bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	97 }
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	98
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	99 size_t num_matches = matches.size ();
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	100
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	101 if (num_matches == 0)
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	102 {
9585 06b8b51dca48 also handle user-defined graphics properties in new property name validation scheme John W. Eaton <jwe@octave.org> parents: 9584 diff changeset	103 error ("%s: unknown %s property %s",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	104 who.c_str (), what.c_str (), pname.c_str ());
9582 bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	105 }
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	106 else if (num_matches > 1)
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	107 {
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	108 string_vector sv (matches);
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	109
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	110 std::ostringstream os;
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	111
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	112 sv.list_in_columns (os);
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	113
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	114 std::string match_list = os.str ();
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	115
9585 06b8b51dca48 also handle user-defined graphics properties in new property name validation scheme John W. Eaton <jwe@octave.org> parents: 9584 diff changeset	116 error ("%s: ambiguous %s property name %s; possible matches:\n\n%s",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	117 who.c_str (), what.c_str (), pname.c_str (), match_list.c_str ());
9582 bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	118 }
9584 0fcbfddaa87f allow abbreviated graphics property names to match, with optional warning John W. Eaton <jwe@octave.org> parents: 9582 diff changeset	119 else if (num_matches == 1)
9582 bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	120 {
9584 0fcbfddaa87f allow abbreviated graphics property names to match, with optional warning John W. Eaton <jwe@octave.org> parents: 9582 diff changeset	121 // Exact match was handled above.
0fcbfddaa87f allow abbreviated graphics property names to match, with optional warning John W. Eaton <jwe@octave.org> parents: 9582 diff changeset	122
9582 bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	123 std::string possible_match = *(matches.begin ());
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	124
9584 0fcbfddaa87f allow abbreviated graphics property names to match, with optional warning John W. Eaton <jwe@octave.org> parents: 9582 diff changeset	125 warning_with_id ("Octave:abbreviated-property-match",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	126 "%s: allowing %s to match %s property %s",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	127 who.c_str (), pname.c_str (), what.c_str (),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	128 possible_match.c_str ());
9584 0fcbfddaa87f allow abbreviated graphics property names to match, with optional warning John W. Eaton <jwe@octave.org> parents: 9582 diff changeset	129
0fcbfddaa87f allow abbreviated graphics property names to match, with optional warning John W. Eaton <jwe@octave.org> parents: 9582 diff changeset	130 return possible_match;
9582 bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	131 }
9584 0fcbfddaa87f allow abbreviated graphics property names to match, with optional warning John W. Eaton <jwe@octave.org> parents: 9582 diff changeset	132
0fcbfddaa87f allow abbreviated graphics property names to match, with optional warning John W. Eaton <jwe@octave.org> parents: 9582 diff changeset	133 return caseless_str ();
9582 bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	134 }
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	135
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	136 static Matrix
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	137 jet_colormap (void)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	138 {
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	139 Matrix cmap (64, 3, 0.0);
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	140
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	141 // Produce X in the same manner as linspace so that
15707 d803cd07f31a Tweak C++ implementation of jet colormap to produce exactly the same result as jet.m Rik <rik@octave.org> parents: 15467 diff changeset	142 // jet_colormap and jet.m produce exactly the same result.
d803cd07f31a Tweak C++ implementation of jet colormap to produce exactly the same result as jet.m Rik <rik@octave.org> parents: 15467 diff changeset	143 double delta = 1.0 / 63.0;
d803cd07f31a Tweak C++ implementation of jet colormap to produce exactly the same result as jet.m Rik <rik@octave.org> parents: 15467 diff changeset	144
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	145 for (octave_idx_type i = 0; i < 64; i++)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	146 {
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	147 // This is the jet colormap. It would be nice to be able
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	148 // to feval the jet function but since there is a static
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	149 // property object that includes a colormap_property
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	150 // object, we need to initialize this before main is even
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	151 // called, so calling an interpreted function is not
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	152 // possible.
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	153
15707 d803cd07f31a Tweak C++ implementation of jet colormap to produce exactly the same result as jet.m Rik <rik@octave.org> parents: 15467 diff changeset	154 double x = i*delta;
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	155
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	156 if (x >= 3.0/8.0 && x < 5.0/8.0)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	157 cmap(i,0) = 4.0 * x - 3.0/2.0;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	158 else if (x >= 5.0/8.0 && x < 7.0/8.0)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	159 cmap(i,0) = 1.0;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	160 else if (x >= 7.0/8.0)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	161 cmap(i,0) = -4.0 * x + 9.0/2.0;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	162
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	163 if (x >= 1.0/8.0 && x < 3.0/8.0)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	164 cmap(i,1) = 4.0 * x - 1.0/2.0;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	165 else if (x >= 3.0/8.0 && x < 5.0/8.0)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	166 cmap(i,1) = 1.0;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	167 else if (x >= 5.0/8.0 && x < 7.0/8.0)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	168 cmap(i,1) = -4.0 * x + 7.0/2.0;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	169
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	170 if (x < 1.0/8.0)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	171 cmap(i,2) = 4.0 * x + 1.0/2.0;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	172 else if (x >= 1.0/8.0 && x < 3.0/8.0)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	173 cmap(i,2) = 1.0;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	174 else if (x >= 3.0/8.0 && x < 5.0/8.0)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	175 cmap(i,2) = -4.0 * x + 5.0/2.0;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	176 }
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	177
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	178 return cmap;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	179 }
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	180
8560 5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	181 static double
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	182 default_screendepth (void)
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	183 {
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	184 return display_info::depth ();
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	185 }
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	186
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	187 static Matrix
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	188 default_screensize (void)
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	189 {
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	190 Matrix retval (1, 4, 1.0);
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	191
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	192 retval(2) = display_info::width ();
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	193 retval(3) = display_info::height ();
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	194
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	195 return retval;
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	196 }
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	197
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	198 static double
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	199 default_screenpixelsperinch (void)
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	200 {
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	201 return (display_info::x_dpi () + display_info::y_dpi ()) / 2;
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	202 }
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	203
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	204 static Matrix
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	205 default_colororder (void)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	206 {
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	207 Matrix retval (7, 3, 0.0);
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	208
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	209 retval(0,2) = 1.0;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	210
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	211 retval(1,1) = 0.5;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	212
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	213 retval(2,0) = 1.0;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	214
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	215 retval(3,1) = 0.75;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	216 retval(3,2) = 0.75;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	217
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	218 retval(4,0) = 0.75;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	219 retval(4,2) = 0.75;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	220
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	221 retval(5,0) = 0.75;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	222 retval(5,1) = 0.75;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	223
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	224 retval(6,0) = 0.25;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	225 retval(6,1) = 0.25;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	226 retval(6,2) = 0.25;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	227
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	228 return retval;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	229 }
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	230
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	231 static Matrix
13757 1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	232 default_lim (bool logscale = false)
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	233 {
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	234 Matrix m (1, 2, 0);
13757 1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	235
1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	236 if (logscale)
1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	237 {
1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	238 m(0) = 0.1;
1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	239 m(1) = 1.0;
1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	240 }
1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	241 else
1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	242 m(1) = 1;
1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	243
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	244 return m;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	245 }
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	246
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	247 static Matrix
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	248 default_data (void)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	249 {
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	250 Matrix retval (1, 2);
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	251
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	252 retval(0) = 0;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	253 retval(1) = 1;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	254
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	255 return retval;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	256 }
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	257
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	258 static Matrix
18680 2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	259 default_image_cdata (void)
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	260 {
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	261 Matrix m (64, 64, 0.0);
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	262 int i = 0;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	263 for (int col = 0; col < 64; col++)
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	264 for (int row = 0; row < 64; row++)
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	265 {
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	266 m(col,row) = static_cast<double> (default_im_data[i]);
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	267 i++;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	268 }
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	269
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	270 return m;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	271 }
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	272
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	273 static Matrix
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	274 default_surface_xdata (void)
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	275 {
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	276 Matrix m (3, 3, 0.0);
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	277 for (int col = 0; col < 3; col++)
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	278 for (int row = 0; row < 3; row++)
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	279 m(row,col) = col+1;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	280
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	281 return m;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	282 }
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	283
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	284 static Matrix
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	285 default_surface_ydata (void)
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	286 {
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	287 Matrix m (3, 3, 0.0);
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	288 for (int row = 0; row < 3; row++)
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	289 for (int col = 0; col < 3; col++)
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	290 m(row,col) = row+1;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	291
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	292 return m;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	293 }
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	294
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	295 static Matrix
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	296 default_surface_zdata (void)
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	297 {
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	298 Matrix m (3, 3, 0.0);
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	299 for (int row = 0; row < 3; row++)
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	300 m(row,row) = 1.0;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	301 return m;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	302 }
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	303
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	304 static Matrix
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	305 default_surface_cdata (void)
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	306 {
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	307 return default_surface_zdata ();
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	308 }
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	309
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	310 static Matrix
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	311 default_patch_faces (void)
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	312 {
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	313 Matrix m (1, 3, 1.0);
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	314 m(1) = 2.0;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	315 m(2) = 3.0;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	316 return m;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	317 }
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	318
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	319 static Matrix
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	320 default_patch_vertices (void)
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	321 {
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	322 Matrix m (3, 2, 0);
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	323 m(1) = 1.0;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	324 m(3) = 1.0;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	325 m(4) = 1.0;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	326 return m;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	327 }
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	328
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	329 static Matrix
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	330 default_axes_position (void)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	331 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	332 Matrix m (1, 4, 0.0);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	333 m(0) = 0.13;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	334 m(1) = 0.11;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	335 m(2) = 0.775;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	336 m(3) = 0.815;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	337 return m;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	338 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	339
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	340 static Matrix
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	341 default_axes_outerposition (void)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	342 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	343 Matrix m (1, 4, 0.0);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	344 m(2) = m(3) = 1.0;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	345 return m;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	346 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	347
7445 af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	348 static Matrix
18680 2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	349 default_axes_view (void)
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	350 {
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	351 Matrix m (1, 2, 0.0);
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	352 m(1) = 90.0;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	353 return m;
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	354 }
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	355
2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	356 static Matrix
8599 b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	357 default_axes_tick (void)
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	358 {
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	359 Matrix m (1, 6, 0.0);
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	360 m(0) = 0.0;
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	361 m(1) = 0.2;
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	362 m(2) = 0.4;
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	363 m(3) = 0.6;
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	364 m(4) = 0.8;
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	365 m(5) = 1.0;
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	366 return m;
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	367 }
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	368
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	369 static Matrix
8740 cb0ea772a4af Initialize axes ticklength property. Ben Abbott <bpabbott@mac.com> parents: 8687 diff changeset	370 default_axes_ticklength (void)
cb0ea772a4af Initialize axes ticklength property. Ben Abbott <bpabbott@mac.com> parents: 8687 diff changeset	371 {
14022 de90542b7afc Return retval(1) before retval(0) to avoid re-sizing call on retval. Rik <octave@nomad.inbox5.com> parents: 14021 diff changeset	372 Matrix m (1, 2, 0.0);
de90542b7afc Return retval(1) before retval(0) to avoid re-sizing call on retval. Rik <octave@nomad.inbox5.com> parents: 14021 diff changeset	373 m(0) = 0.01;
8740 cb0ea772a4af Initialize axes ticklength property. Ben Abbott <bpabbott@mac.com> parents: 8687 diff changeset	374 m(1) = 0.025;
cb0ea772a4af Initialize axes ticklength property. Ben Abbott <bpabbott@mac.com> parents: 8687 diff changeset	375 return m;
cb0ea772a4af Initialize axes ticklength property. Ben Abbott <bpabbott@mac.com> parents: 8687 diff changeset	376 }
cb0ea772a4af Initialize axes ticklength property. Ben Abbott <bpabbott@mac.com> parents: 8687 diff changeset	377
cb0ea772a4af Initialize axes ticklength property. Ben Abbott <bpabbott@mac.com> parents: 8687 diff changeset	378 static Matrix
7445 af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	379 default_figure_position (void)
af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	380 {
af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	381 Matrix m (1, 4, 0.0);
af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	382 m(0) = 300;
af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	383 m(1) = 200;
af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	384 m(2) = 560;
af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	385 m(3) = 420;
af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	386 return m;
af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	387 }
af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	388
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	389 static Matrix
8599 b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	390 default_figure_papersize (void)
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	391 {
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	392 Matrix m (1, 2, 0.0);
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	393 m(0) = 8.5;
8961 6b87f2f34fdd graphics.cc: Fix default "papersize" property value. Ben Abbott <bpabbott@mac.com> parents: 8944 diff changeset	394 m(1) = 11.0;
8599 b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	395 return m;
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	396 }
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	397
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	398 static Matrix
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	399 default_figure_paperposition (void)
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	400 {
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	401 Matrix m (1, 4, 0.0);
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	402 m(0) = 0.25;
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	403 m(1) = 2.50;
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	404 m(2) = 8.00;
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	405 m(3) = 6.00;
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	406 return m;
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	407 }
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	408
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	409 static Matrix
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	410 default_control_position (void)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	411 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	412 Matrix retval (1, 4, 0.0);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	413
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	414 retval(0) = 0;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	415 retval(1) = 0;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	416 retval(2) = 80;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	417 retval(3) = 30;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	418
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	419 return retval;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	420 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	421
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	422 static Matrix
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	423 default_control_sliderstep (void)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	424 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	425 Matrix retval (1, 2, 0.0);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	426
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	427 retval(0) = 0.01;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	428 retval(1) = 0.1;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	429
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	430 return retval;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	431 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	432
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	433 static Matrix
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	434 default_panel_position (void)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	435 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	436 Matrix retval (1, 4, 0.0);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	437
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	438 retval(0) = 0;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	439 retval(1) = 0;
14022 de90542b7afc Return retval(1) before retval(0) to avoid re-sizing call on retval. Rik <octave@nomad.inbox5.com> parents: 14021 diff changeset	440 retval(2) = 0.5;
de90542b7afc Return retval(1) before retval(0) to avoid re-sizing call on retval. Rik <octave@nomad.inbox5.com> parents: 14021 diff changeset	441 retval(3) = 0.5;
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	442
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	443 return retval;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	444 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	445
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	446 static double
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	447 convert_font_size (double font_size, const caseless_str& from_units,
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	448 const caseless_str& to_units, double parent_height = 0)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	449 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	450 // Simple case where from_units == to_units
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	451
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	452 if (from_units.compare (to_units))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	453 return font_size;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	454
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	455 // Converts the given fontsize using the following transformation:
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	456 // <old_font_size> => points => <new_font_size>
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	457
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	458 double points_size = 0;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	459 double res = 0;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	460
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	461 if (from_units.compare ("points"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	462 points_size = font_size;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	463 else
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	464 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	465 res = xget (0, "screenpixelsperinch").double_value ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	466
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	467 if (from_units.compare ("pixels"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	468 points_size = font_size * 72.0 / res;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	469 else if (from_units.compare ("inches"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	470 points_size = font_size * 72.0;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	471 else if (from_units.compare ("centimeters"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	472 points_size = font_size * 72.0 / 2.54;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	473 else if (from_units.compare ("normalized"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	474 points_size = font_size * parent_height * 72.0 / res;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	475 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	476
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	477 double new_font_size = 0;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	478
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	479 if (to_units.compare ("points"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	480 new_font_size = points_size;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	481 else
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	482 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	483 if (res <= 0)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	484 res = xget (0, "screenpixelsperinch").double_value ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	485
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	486 if (to_units.compare ("pixels"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	487 new_font_size = points_size * res / 72.0;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	488 else if (to_units.compare ("inches"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	489 new_font_size = points_size / 72.0;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	490 else if (to_units.compare ("centimeters"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	491 new_font_size = points_size * 2.54 / 72.0;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	492 else if (to_units.compare ("normalized"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	493 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	494 // Avoid setting font size to (0/0) = NaN
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	495
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	496 if (parent_height > 0)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	497 new_font_size = points_size * res / (parent_height * 72.0);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	498 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	499 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	500
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	501 return new_font_size;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	502 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	503
13804 4f112bebd474 use correct method to get window position for fltk John W. Eaton <jwe@octave.org> parents: 13801 diff changeset	504 static Matrix
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	505 convert_position (const Matrix& pos, const caseless_str& from_units,
13799 760e4e88dba3 convert units for figure positions John W. Eaton <jwe@octave.org> parents: 13757 diff changeset	506 const caseless_str& to_units, const Matrix& parent_dim)
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	507 {
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	508 Matrix retval (1, pos.numel ());
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	509 double res = 0;
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	510 bool is_rectangle = (pos.numel () == 4);
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	511 bool is_2d = (pos.numel () == 2);
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	512
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	513 if (from_units.compare ("pixels"))
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	514 retval = pos;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	515 else if (from_units.compare ("normalized"))
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	516 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	517 retval(0) = pos(0) * parent_dim(0) + 1;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	518 retval(1) = pos(1) * parent_dim(1) + 1;
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	519 if (is_rectangle)
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	520 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	521 retval(2) = pos(2) * parent_dim(0);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	522 retval(3) = pos(3) * parent_dim(1);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	523 }
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	524 else if (! is_2d)
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	525 retval(2) = 0;
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	526 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	527 else if (from_units.compare ("characters"))
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	528 {
9238 0ae2b6617005 Use display information from the root object to compute bounding boxes Michael Goffioul <michael.goffioul@gmail.com> parents: 9185 diff changeset	529 if (res <= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	530 res = xget (0, "screenpixelsperinch").double_value ();
8599 b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	531
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	532 double f = 0.0;
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	533
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	534 // FIXME: this assumes the system font is Helvetica 10pt
8599 b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	535 // (for which "x" requires 6x12 pixels at 74.951 pixels/inch)
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	536 f = 12.0 * res / 74.951;
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	537
b4fb0a52b15e Improve default property compatibility. Ben Abbott <bpabbott@mac.com> parents: 8560 diff changeset	538 if (f > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	539 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	540 retval(0) = 0.5 * pos(0) * f;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	541 retval(1) = pos(1) * f;
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	542 if (is_rectangle)
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	543 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	544 retval(2) = 0.5 * pos(2) * f;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	545 retval(3) = pos(3) * f;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	546 }
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	547 else if (! is_2d)
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	548 retval(2) = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	549 }
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	550 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	551 else
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	552 {
9238 0ae2b6617005 Use display information from the root object to compute bounding boxes Michael Goffioul <michael.goffioul@gmail.com> parents: 9185 diff changeset	553 if (res <= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	554 res = xget (0, "screenpixelsperinch").double_value ();
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	555
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	556 double f = 0.0;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	557
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	558 if (from_units.compare ("points"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	559 f = res / 72.0;
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	560 else if (from_units.compare ("inches"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	561 f = res;
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	562 else if (from_units.compare ("centimeters"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	563 f = res / 2.54;
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	564
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	565 if (f > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	566 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	567 retval(0) = pos(0) * f + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	568 retval(1) = pos(1) * f + 1;
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	569 if (is_rectangle)
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	570 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	571 retval(2) = pos(2) * f;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	572 retval(3) = pos(3) * f;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	573 }
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	574 else if (! is_2d)
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	575 retval(2) = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	576 }
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	577 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	578
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	579 if (! to_units.compare ("pixels"))
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	580 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	581 if (to_units.compare ("normalized"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	582 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	583 retval(0) = (retval(0) - 1) / parent_dim(0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	584 retval(1) = (retval(1) - 1) / parent_dim(1);
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	585 if (is_rectangle)
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	586 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	587 retval(2) /= parent_dim(0);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	588 retval(3) /= parent_dim(1);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	589 }
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	590 else if (! is_2d)
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	591 retval(2) = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	592 }
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	593 else if (to_units.compare ("characters"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	594 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	595 if (res <= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	596 res = xget (0, "screenpixelsperinch").double_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	597
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	598 double f = 0.0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	599
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	600 f = 12.0 * res / 74.951;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	601
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	602 if (f > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	603 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	604 retval(0) = 2 * retval(0) / f;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	605 retval(1) = retval(1) / f;
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	606 if (is_rectangle)
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	607 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	608 retval(2) = 2 * retval(2) / f;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	609 retval(3) = retval(3) / f;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	610 }
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	611 else if (! is_2d)
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	612 retval(2) = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	613 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	614 }
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	615 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	616 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	617 if (res <= 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	618 res = xget (0, "screenpixelsperinch").double_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	619
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	620 double f = 0.0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	621
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	622 if (to_units.compare ("points"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	623 f = res / 72.0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	624 else if (to_units.compare ("inches"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	625 f = res;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	626 else if (to_units.compare ("centimeters"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	627 f = res / 2.54;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	628
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	629 if (f > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	630 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	631 retval(0) = (retval(0) - 1) / f;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	632 retval(1) = (retval(1) - 1) / f;
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	633 if (is_rectangle)
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	634 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	635 retval(2) /= f;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	636 retval(3) /= f;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	637 }
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	638 else if (! is_2d)
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	639 retval(2) = 0;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	640 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	641 }
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	642 }
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	643 else if (! is_rectangle && ! is_2d)
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	644 retval(2) = 0;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	645
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	646 return retval;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	647 }
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	648
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	649 static Matrix
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	650 convert_text_position (const Matrix& pos, const text::properties& props,
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	651 const caseless_str& from_units,
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	652 const caseless_str& to_units)
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	653 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	654 graphics_object go = gh_manager::get_object (props.get___myhandle__ ());
11250 830b940e7ff4 Turn xget_ancestor into regular API Michael Goffioul <michael.goffioul@gmail.com> parents: 11239 diff changeset	655 graphics_object ax = go.get_ancestor ("axes");
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	656
13876 c1b072ef1fc7 avoid writing outside bounds of matrix John W. Eaton <jwe@octave.org> parents: 13849 diff changeset	657 Matrix retval;
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	658
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	659 if (ax.valid_object ())
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	660 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	661 const axes::properties& ax_props =
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	662 dynamic_cast<const axes::properties&> (ax.get_properties ());
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	663 graphics_xform ax_xform = ax_props.get_transform ();
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	664 bool is_rectangle = (pos.numel () == 4);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	665 Matrix ax_bbox = ax_props.get_boundingbox (true),
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	666 ax_size = ax_bbox.extract_n (0, 2, 1, 2);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	667
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	668 if (from_units.compare ("data"))
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	669 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	670 if (is_rectangle)
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	671 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	672 ColumnVector v1 = ax_xform.transform (pos(0), pos(1), 0),
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	673 v2 = ax_xform.transform (pos(0) + pos(2),
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	674 pos(1) + pos(3), 0);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	675
13876 c1b072ef1fc7 avoid writing outside bounds of matrix John W. Eaton <jwe@octave.org> parents: 13849 diff changeset	676 retval.resize (1, 4);
c1b072ef1fc7 avoid writing outside bounds of matrix John W. Eaton <jwe@octave.org> parents: 13849 diff changeset	677
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	678 retval(0) = v1(0) - ax_bbox(0) + 1;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	679 retval(1) = ax_bbox(1) + ax_bbox(3) - v1(1) + 1;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	680 retval(2) = v2(0) - v1(0);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	681 retval(3) = v1(1) - v2(1);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	682 }
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	683 else
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	684 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	685 ColumnVector v = ax_xform.transform (pos(0), pos(1), pos(2));
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	686
13876 c1b072ef1fc7 avoid writing outside bounds of matrix John W. Eaton <jwe@octave.org> parents: 13849 diff changeset	687 retval.resize (1, 3);
c1b072ef1fc7 avoid writing outside bounds of matrix John W. Eaton <jwe@octave.org> parents: 13849 diff changeset	688
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	689 retval(0) = v(0) - ax_bbox(0) + 1;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	690 retval(1) = ax_bbox(1) + ax_bbox(3) - v(1) + 1;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	691 retval(2) = 0;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	692 }
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	693 }
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	694 else
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	695 retval = convert_position (pos, from_units, "pixels", ax_size);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	696
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	697 if (! to_units.compare ("pixels"))
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	698 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	699 if (to_units.compare ("data"))
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	700 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	701 if (is_rectangle)
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	702 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	703 ColumnVector v1, v2;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	704 v1 = ax_xform.untransform (
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	705 retval(0) + ax_bbox(0) - 1,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	706 ax_bbox(1) + ax_bbox(3) - retval(1) + 1);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	707 v2 = ax_xform.untransform (
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	708 retval(0) + retval(2) + ax_bbox(0) - 1,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	709 ax_bbox(1) + ax_bbox(3) - (retval(1) + retval(3)) + 1);
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	710
13876 c1b072ef1fc7 avoid writing outside bounds of matrix John W. Eaton <jwe@octave.org> parents: 13849 diff changeset	711 retval.resize (1, 4);
c1b072ef1fc7 avoid writing outside bounds of matrix John W. Eaton <jwe@octave.org> parents: 13849 diff changeset	712
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	713 retval(0) = v1(0);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	714 retval(1) = v1(1);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	715 retval(2) = v2(0) - v1(0);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	716 retval(3) = v2(1) - v1(1);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	717 }
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	718 else
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	719 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	720 ColumnVector v;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	721 v = ax_xform.untransform (
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	722 retval(0) + ax_bbox(0) - 1,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	723 ax_bbox(1) + ax_bbox(3) - retval(1) + 1);
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	724
13876 c1b072ef1fc7 avoid writing outside bounds of matrix John W. Eaton <jwe@octave.org> parents: 13849 diff changeset	725 retval.resize (1, 3);
c1b072ef1fc7 avoid writing outside bounds of matrix John W. Eaton <jwe@octave.org> parents: 13849 diff changeset	726
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	727 retval(0) = v(0);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	728 retval(1) = v(1);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	729 retval(2) = v(2);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	730 }
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	731 }
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	732 else
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	733 retval = convert_position (retval, "pixels", to_units, ax_size);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	734 }
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	735 }
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	736
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	737 return retval;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	738 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	739
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	740 // This function always returns the screensize in pixels
13804 4f112bebd474 use correct method to get window position for fltk John W. Eaton <jwe@octave.org> parents: 13801 diff changeset	741 static Matrix
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	742 screen_size_pixels (void)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	743 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	744 graphics_object obj = gh_manager::get_object (0);
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	745 Matrix sz = obj.get ("screensize").matrix_value ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	746 return convert_position (sz, obj.get ("units").string_value (), "pixels",
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	747 sz.extract_n (0, 2, 1, 2)).extract_n (0, 2, 1, 2);
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	748 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	749
10923 4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	750 static void
18717 44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	751 convert_cdata_2 (bool is_scaled, bool is_real, double clim_0, double clim_1,
10923 4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	752 const double *cmapv, double x, octave_idx_type lda,
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	753 octave_idx_type nc, octave_idx_type i, double *av)
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	754 {
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	755 if (is_scaled)
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	756 x = xround ((nc - 1) * (x - clim_0) / (clim_1 - clim_0));
18717 44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	757 else if (is_real)
10923 4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	758 x = xround (x - 1);
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	759
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	760 if (xisnan (x))
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	761 {
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	762 av[i] = x;
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	763 av[i+lda] = x;
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	764 av[i+2*lda] = x;
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	765 }
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	766 else
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	767 {
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	768 if (x < 0)
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	769 x = 0;
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	770 else if (x >= nc)
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	771 x = (nc - 1);
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	772
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	773 octave_idx_type idx = static_cast<octave_idx_type> (x);
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	774
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	775 av[i] = cmapv[idx];
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	776 av[i+lda] = cmapv[idx+nc];
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	777 av[i+2lda] = cmapv[idx+2nc];
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	778 }
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	779 }
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	780
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	781 template <class T>
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	782 void
18717 44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	783 convert_cdata_1 (bool is_scaled, bool is_real, double clim_0, double clim_1,
10923 4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	784 const double cmapv, const T cv, octave_idx_type lda,
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	785 octave_idx_type nc, double *av)
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	786 {
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	787 for (octave_idx_type i = 0; i < lda; i++)
18717 44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	788 convert_cdata_2 (is_scaled, is_real,
44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	789 clim_0, clim_1, cmapv, cv[i], lda, nc, i, av);
10923 4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	790 }
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	791
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	792 static octave_value
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	793 convert_cdata (const base_properties& props, const octave_value& cdata,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	794 bool is_scaled, int cdim)
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	795 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	796 dim_vector dv (cdata.dims ());
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	797
18717 44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	798 // TrueColor data doesn't require conversion
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	799 if (dv.length () == cdim && dv(cdim-1) == 3)
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	800 return cdata;
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	801
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	802 Matrix cmap (1, 3, 0.0);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	803 Matrix clim (1, 2, 0.0);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	804
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	805 graphics_object go = gh_manager::get_object (props.get___myhandle__ ());
11250 830b940e7ff4 Turn xget_ancestor into regular API Michael Goffioul <michael.goffioul@gmail.com> parents: 11239 diff changeset	806 graphics_object fig = go.get_ancestor ("figure");
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	807
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	808 if (fig.valid_object ())
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	809 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	810 Matrix _cmap = fig.get (caseless_str ("colormap")).matrix_value ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	811
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	812 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	813 cmap = _cmap;
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	814 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	815
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	816 if (is_scaled)
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	817 {
11250 830b940e7ff4 Turn xget_ancestor into regular API Michael Goffioul <michael.goffioul@gmail.com> parents: 11239 diff changeset	818 graphics_object ax = go.get_ancestor ("axes");
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	819
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	820 if (ax.valid_object ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	821 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	822 Matrix _clim = ax.get (caseless_str ("clim")).matrix_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	823
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	824 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	825 clim = _clim;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	826 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	827 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	828
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	829 dv.resize (cdim);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	830 dv(cdim-1) = 3;
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	831
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	832 NDArray a (dv);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	833
8075 a028a5960e18 Fix for hold with no figures/axes. Set prop/val pairs to hggroups rather than underlying objects. Fix for equality test in array_property David Bateman <dbateman@free.fr> parents: 8063 diff changeset	834 octave_idx_type lda = a.numel () / static_cast<octave_idx_type> (3);
a028a5960e18 Fix for hold with no figures/axes. Set prop/val pairs to hggroups rather than underlying objects. Fix for equality test in array_property David Bateman <dbateman@free.fr> parents: 8063 diff changeset	835 octave_idx_type nc = cmap.rows ();
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	836
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	837 double *av = a.fortran_vec ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	838 const double *cmapv = cmap.data ();
10923 4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	839
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	840 double clim_0 = clim(0);
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	841 double clim_1 = clim(1);
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	842
18717 44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	843 // FIXME: There is a lot of processing time spent just on data conversion
44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	844 // both here in graphics.cc and again in gl-render.cc. There must
44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	845 // be room for improvement! Here a macro expands to a templated
44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	846 // function which in turn calls another function (covert_cdata_2).
44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	847 // And in gl-render.cc (opengl_renderer::draw_image), only GLfloat
44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	848 // is supported anyways so there is another double for loop across
44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	849 // height and width to convert all of the input data to GLfloat.
44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	850
44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	851 #define CONVERT_CDATA_1(ARRAY_T, VAL_FN, IS_REAL) \
10923 4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	852 do \
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	853 { \
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	854 ARRAY_T tmp = cdata. VAL_FN ## array_value (); \
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	855 \
18717 44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	856 convert_cdata_1 (is_scaled, IS_REAL, clim_0, clim_1, cmapv, \
10923 4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	857 tmp.data (), lda, nc, av); \
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	858 } \
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	859 while (0)
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	860
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	861 if (cdata.is_uint8_type ())
18717 44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	862 CONVERT_CDATA_1 (uint8NDArray, uint8_, false);
44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	863 else if (cdata.is_uint16_type ())
44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	864 CONVERT_CDATA_1 (uint16NDArray, uint16_, false);
44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	865 else if (cdata.is_double_type ())
44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	866 CONVERT_CDATA_1 (NDArray, , true);
10923 4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	867 else if (cdata.is_single_type ())
18717 44f0d1a53ead Add support for integer data types for image cdata. Rik <rik@octave.org> parents: 18714 diff changeset	868 CONVERT_CDATA_1 (FloatNDArray, float_, true);
18746 d57a83f2d73e Preserve image class in cdata (bug #41240). Rik <rik@octave.org> parents: 18736 diff changeset	869 else if (cdata.is_bool_type ())
d57a83f2d73e Preserve image class in cdata (bug #41240). Rik <rik@octave.org> parents: 18736 diff changeset	870 CONVERT_CDATA_1 (boolNDArray, bool_, false);
10923 4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	871 else
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	872 error ("unsupported type for cdata (= %s)", cdata.type_name ().c_str ());
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	873
4c1ffaed8caa graphics.cc (convert_cdata): avoid data conversion for entire cdata array at once John W. Eaton <jwe@octave.org> parents: 10922 diff changeset	874 #undef CONVERT_CDATA_1
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	875
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	876 return octave_value (a);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	877 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	878
7836 4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	879 template<class T>
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	880 static void
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	881 get_array_limits (const Array<T>& m, double& emin, double& emax,
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	882 double& eminp, double& emaxp)
7836 4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	883 {
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	884 const T *data = m.data ();
8075 a028a5960e18 Fix for hold with no figures/axes. Set prop/val pairs to hggroups rather than underlying objects. Fix for equality test in array_property David Bateman <dbateman@free.fr> parents: 8063 diff changeset	885 octave_idx_type n = m.numel ();
a028a5960e18 Fix for hold with no figures/axes. Set prop/val pairs to hggroups rather than underlying objects. Fix for equality test in array_property David Bateman <dbateman@free.fr> parents: 8063 diff changeset	886
a028a5960e18 Fix for hold with no figures/axes. Set prop/val pairs to hggroups rather than underlying objects. Fix for equality test in array_property David Bateman <dbateman@free.fr> parents: 8063 diff changeset	887 for (octave_idx_type i = 0; i < n; i++)
7836 4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	888 {
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	889 double e = double (data[i]);
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	890
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	891 // Don't need to test for NaN here as NaN>x and NaN<x is always false
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	892 if (! xisinf (e))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	893 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	894 if (e < emin)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	895 emin = e;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	896
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	897 if (e > emax)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	898 emax = e;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	899
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	900 if (e > 0 && e < eminp)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	901 eminp = e;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	902
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	903 if (e < 0 && e > emaxp)
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	904 emaxp = e;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	905 }
7836 4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	906 }
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	907 }
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	908
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	909 static bool
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	910 lookup_object_name (const caseless_str& name, caseless_str& go_name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	911 caseless_str& rest)
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	912 {
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	913 int len = name.length ();
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	914 int offset = 0;
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	915 bool result = false;
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	916
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	917 if (len >= 4)
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	918 {
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	919 caseless_str pfx = name.substr (0, 4);
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	920
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	921 if (pfx.compare ("axes") \|\| pfx.compare ("line")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	922 \|\| pfx.compare ("text"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	923 offset = 4;
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	924 else if (len >= 5)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	925 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	926 pfx = name.substr (0, 5);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	927
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	928 if (pfx.compare ("image") \|\| pfx.compare ("patch"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	929 offset = 5;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	930 else if (len >= 6)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	931 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	932 pfx = name.substr (0, 6);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	933
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11076 diff changeset	934 if (pfx.compare ("figure") \|\| pfx.compare ("uimenu"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	935 offset = 6;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	936 else if (len >= 7)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	937 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	938 pfx = name.substr (0, 7);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	939
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	940 if (pfx.compare ("surface") \|\| pfx.compare ("hggroup")
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	941 \|\| pfx.compare ("uipanel"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	942 offset = 7;
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	943 else if (len >= 9)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	944 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	945 pfx = name.substr (0, 9);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	946
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	947 if (pfx.compare ("uicontrol")
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	948 \|\| pfx.compare ("uitoolbar"))
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	949 offset = 9;
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	950 else if (len >= 10)
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	951 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	952 pfx = name.substr (0, 10);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	953
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	954 if (pfx.compare ("uipushtool"))
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	955 offset = 10;
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	956 else if (len >= 12)
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	957 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	958 pfx = name.substr (0, 12);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	959
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	960 if (pfx.compare ("uitoggletool"))
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	961 offset = 12;
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	962 else if (len >= 13)
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	963 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	964 pfx = name.substr (0, 13);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	965
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	966 if (pfx.compare ("uicontextmenu"))
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	967 offset = 13;
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	968 }
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	969 }
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	970 }
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	971 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	972 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	973 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	974 }
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	975
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	976 if (offset > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	977 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	978 go_name = pfx;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	979 rest = name.substr (offset);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	980 result = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	981 }
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	982 }
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	983
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	984 return result;
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	985 }
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	986
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	987 static base_graphics_object*
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	988 make_graphics_object_from_type (const caseless_str& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	989 const graphics_handle& h = graphics_handle (),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	990 const graphics_handle& p = graphics_handle ())
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	991 {
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	992 base_graphics_object *go = 0;
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	993
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	994 if (type.compare ("figure"))
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	995 go = new figure (h, p);
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	996 else if (type.compare ("axes"))
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	997 go = new axes (h, p);
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	998 else if (type.compare ("line"))
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	999 go = new line (h, p);
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1000 else if (type.compare ("text"))
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1001 go = new text (h, p);
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1002 else if (type.compare ("image"))
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1003 go = new image (h, p);
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1004 else if (type.compare ("patch"))
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1005 go = new patch (h, p);
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1006 else if (type.compare ("surface"))
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1007 go = new surface (h, p);
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	1008 else if (type.compare ("hggroup"))
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	1009 go = new hggroup (h, p);
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11076 diff changeset	1010 else if (type.compare ("uimenu"))
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11076 diff changeset	1011 go = new uimenu (h, p);
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1012 else if (type.compare ("uicontrol"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1013 go = new uicontrol (h, p);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1014 else if (type.compare ("uipanel"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1015 go = new uipanel (h, p);
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1016 else if (type.compare ("uicontextmenu"))
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1017 go = new uicontextmenu (h, p);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1018 else if (type.compare ("uitoolbar"))
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1019 go = new uitoolbar (h, p);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1020 else if (type.compare ("uipushtool"))
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1021 go = new uipushtool (h, p);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1022 else if (type.compare ("uitoggletool"))
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1023 go = new uitoggletool (h, p);
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1024 return go;
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1025 }
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1026
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	1027 // ---------------------------------------------------------------------
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	1028
8063 41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1029 bool
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1030 base_property::set (const octave_value& v, bool do_run, bool do_notify_toolkit)
8058 ca39c21fa4b8 [mq]: generic_octave_to_backend_nofitication John W. Eaton <jwe@octave.org> parents: 8052 diff changeset	1031 {
8063 41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1032 if (do_set (v))
8058 ca39c21fa4b8 [mq]: generic_octave_to_backend_nofitication John W. Eaton <jwe@octave.org> parents: 8052 diff changeset	1033 {
8063 41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1034
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	1035 // Notify graphics toolkit.
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1036 if (id >= 0 && do_notify_toolkit)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1037 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1038 graphics_object go = gh_manager::get_object (parent);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1039 if (go)
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1040 go.update (id);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1041 }
8063 41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1042
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1043 // run listeners
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1044 if (do_run && ! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1045 run_listeners (POSTSET);
8063 41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1046
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1047 return true;
8058 ca39c21fa4b8 [mq]: generic_octave_to_backend_nofitication John W. Eaton <jwe@octave.org> parents: 8052 diff changeset	1048 }
8063 41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1049
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1050 return false;
8058 ca39c21fa4b8 [mq]: generic_octave_to_backend_nofitication John W. Eaton <jwe@octave.org> parents: 8052 diff changeset	1051 }
ca39c21fa4b8 [mq]: generic_octave_to_backend_nofitication John W. Eaton <jwe@octave.org> parents: 8052 diff changeset	1052
ca39c21fa4b8 [mq]: generic_octave_to_backend_nofitication John W. Eaton <jwe@octave.org> parents: 8052 diff changeset	1053
ca39c21fa4b8 [mq]: generic_octave_to_backend_nofitication John W. Eaton <jwe@octave.org> parents: 8052 diff changeset	1054 void
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	1055 base_property::run_listeners (listener_mode mode)
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	1056 {
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	1057 const octave_value_list& l = listeners[mode];
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	1058
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	1059 for (int i = 0; i < l.length (); i++)
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	1060 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1061 gh_manager::execute_listener (parent, l(i));
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	1062
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	1063 if (error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1064 break;
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	1065 }
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	1066 }
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	1067
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1068 radio_values::radio_values (const std::string& opt_string)
12164 18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12159 diff changeset	1069 : default_val (), possible_vals ()
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	1070 {
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1071 size_t beg = 0;
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1072 size_t len = opt_string.length ();
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1073 bool done = len == 0;
6681 0458599c50d7 [project @ 2007-06-01 03:33:21 by jwe] jwe parents: 6678 diff changeset	1074
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1075 while (! done)
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1076 {
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1077 size_t end = opt_string.find ('\|', beg);
6681 0458599c50d7 [project @ 2007-06-01 03:33:21 by jwe] jwe parents: 6678 diff changeset	1078
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1079 if (end == std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1080 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1081 end = len;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1082 done = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1083 }
6681 0458599c50d7 [project @ 2007-06-01 03:33:21 by jwe] jwe parents: 6678 diff changeset	1084
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1085 std::string t = opt_string.substr (beg, end-beg);
6681 0458599c50d7 [project @ 2007-06-01 03:33:21 by jwe] jwe parents: 6678 diff changeset	1086
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1087 // Might want more error checking here...
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1088 if (t[0] == '{')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1089 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1090 t = t.substr (1, t.length () - 2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1091 default_val = t;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1092 }
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1093 else if (beg == 0) // ensure default value
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1094 default_val = t;
6681 0458599c50d7 [project @ 2007-06-01 03:33:21 by jwe] jwe parents: 6678 diff changeset	1095
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1096 possible_vals.insert (t);
6681 0458599c50d7 [project @ 2007-06-01 03:33:21 by jwe] jwe parents: 6678 diff changeset	1097
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1098 beg = end + 1;
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1099 }
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1100 }
6681 0458599c50d7 [project @ 2007-06-01 03:33:21 by jwe] jwe parents: 6678 diff changeset	1101
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1102 std::string
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1103 radio_values::values_as_string (void) const
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1104 {
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1105 std::string retval;
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1106 for (std::set<caseless_str>::const_iterator it = possible_vals.begin ();
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1107 it != possible_vals.end (); it++)
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1108 {
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	1109 if (retval.empty ())
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1110 {
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1111 if (*it == default_value ())
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1112 retval = "{" + *it + "}";
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1113 else
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1114 retval = *it;
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1115 }
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1116 else
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1117 {
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1118 if (*it == default_value ())
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1119 retval += " \| {" + *it + "}";
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1120 else
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1121 retval += " \| " + *it;
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1122 }
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1123 }
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	1124
ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	1125 if (! retval.empty ())
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1126 retval = "[ " + retval + " ]";
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	1127
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1128 return retval;
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1129 }
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1130
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1131 Cell
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1132 radio_values::values_as_cell (void) const
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1133 {
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1134 octave_idx_type i = 0;
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1135 Cell retval (nelem (), 1);
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1136 for (std::set<caseless_str>::const_iterator it = possible_vals.begin ();
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1137 it != possible_vals.end (); it++)
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1138 retval(i++) = std::string (*it);
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1139 return retval;
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1140 }
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	1141
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1142 bool
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	1143 color_values::str2rgb (const std::string& str_arg)
ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	1144 {
ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	1145 bool retval = true;
ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	1146
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1147 double tmp_rgb[3] = {0, 0, 0};
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	1148
ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	1149 std::string str = str_arg;
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14798 diff changeset	1150 unsigned int len = str.length ();
6681 0458599c50d7 [project @ 2007-06-01 03:33:21 by jwe] jwe parents: 6678 diff changeset	1151
6925 1401a79af68c [project @ 2007-09-26 18:58:52 by dbateman] dbateman parents: 6898 diff changeset	1152 std::transform (str.begin (), str.end (), str.begin (), tolower);
1401a79af68c [project @ 2007-09-26 18:58:52 by dbateman] dbateman parents: 6898 diff changeset	1153
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1154 if (str.compare (0, len, "blue", 0, len) == 0)
6761 813172f035de [project @ 2007-06-27 15:08:05 by jwe] jwe parents: 6733 diff changeset	1155 tmp_rgb[2] = 1;
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1156 else if (str.compare (0, len, "black", 0, len) == 0
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1157 \|\| str.compare (0, len, "k", 0, len) == 0)
6761 813172f035de [project @ 2007-06-27 15:08:05 by jwe] jwe parents: 6733 diff changeset	1158 tmp_rgb[0] = tmp_rgb[1] = tmp_rgb[2] = 0;
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1159 else if (str.compare (0, len, "red", 0, len) == 0)
6761 813172f035de [project @ 2007-06-27 15:08:05 by jwe] jwe parents: 6733 diff changeset	1160 tmp_rgb[0] = 1;
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1161 else if (str.compare (0, len, "green", 0, len) == 0)
6761 813172f035de [project @ 2007-06-27 15:08:05 by jwe] jwe parents: 6733 diff changeset	1162 tmp_rgb[1] = 1;
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1163 else if (str.compare (0, len, "yellow", 0, len) == 0)
6761 813172f035de [project @ 2007-06-27 15:08:05 by jwe] jwe parents: 6733 diff changeset	1164 tmp_rgb[0] = tmp_rgb[1] = 1;
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1165 else if (str.compare (0, len, "magenta", 0, len) == 0)
6761 813172f035de [project @ 2007-06-27 15:08:05 by jwe] jwe parents: 6733 diff changeset	1166 tmp_rgb[0] = tmp_rgb[2] = 1;
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1167 else if (str.compare (0, len, "cyan", 0, len) == 0)
6761 813172f035de [project @ 2007-06-27 15:08:05 by jwe] jwe parents: 6733 diff changeset	1168 tmp_rgb[1] = tmp_rgb[2] = 1;
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1169 else if (str.compare (0, len, "white", 0, len) == 0
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1170 \|\| str.compare (0, len, "w", 0, len) == 0)
6761 813172f035de [project @ 2007-06-27 15:08:05 by jwe] jwe parents: 6733 diff changeset	1171 tmp_rgb[0] = tmp_rgb[1] = tmp_rgb[2] = 1;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	1172 else
6761 813172f035de [project @ 2007-06-27 15:08:05 by jwe] jwe parents: 6733 diff changeset	1173 retval = false;
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	1174
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1175 if (retval)
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1176 {
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1177 for (int i = 0; i < 3; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1178 xrgb(i) = tmp_rgb[i];
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1179 }
6563 7a65c1a09ec3 [project @ 2007-04-23 19:26:17 by jwe] jwe parents: 6509 diff changeset	1180
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1181 return retval;
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1182 }
6681 0458599c50d7 [project @ 2007-06-01 03:33:21 by jwe] jwe parents: 6678 diff changeset	1183
8063 41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1184 bool
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	1185 color_property::do_set (const octave_value& val)
6790 f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1186 {
f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1187 if (val.is_string ())
f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1188 {
f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1189 std::string s = val.string_value ();
f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1190
f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1191 if (! s.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1192 {
13236 8bb526fb3349 allow radio values for graphics properaties to be abbreviated John W. Eaton <jwe@octave.org> parents: 13211 diff changeset	1193 std::string match;
8bb526fb3349 allow radio values for graphics properaties to be abbreviated John W. Eaton <jwe@octave.org> parents: 13211 diff changeset	1194
8bb526fb3349 allow radio values for graphics properaties to be abbreviated John W. Eaton <jwe@octave.org> parents: 13211 diff changeset	1195 if (radio_val.contains (s, match))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1196 {
13236 8bb526fb3349 allow radio values for graphics properaties to be abbreviated John W. Eaton <jwe@octave.org> parents: 13211 diff changeset	1197 if (current_type != radio_t \|\| match != current_val)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1198 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1199 if (s.length () != match.length ())
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1200 warning_with_id ("Octave:abbreviated-property-match",
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1201 "%s: allowing %s to match %s value %s",
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1202 "set", s.c_str (), get_name ().c_str (),
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1203 match.c_str ());
13236 8bb526fb3349 allow radio values for graphics properaties to be abbreviated John W. Eaton <jwe@octave.org> parents: 13211 diff changeset	1204 current_val = match;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1205 current_type = radio_t;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1206 return true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1207 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1208 }
6790 f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1209 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1210 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1211 color_values col (s);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1212 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1213 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1214 if (current_type != color_t \|\| col != color_val)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1215 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1216 color_val = col;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1217 current_type = color_t;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1218 return true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1219 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1220 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1221 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1222 error ("invalid value for color property \"%s\" (value = %s)",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1223 get_name ().c_str (), s.c_str ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	1224 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1225 }
6790 f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1226 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1227 error ("invalid value for color property \"%s\"",
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1228 get_name ().c_str ());
6790 f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1229 }
9311 868fbeb2e365 allow ranges and other matrices in set Jaroslav Hajek <highegg@gmail.com> parents: 9238 diff changeset	1230 else if (val.is_numeric_type ())
6790 f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1231 {
f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1232 Matrix m = val.matrix_value ();
f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1233
f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1234 if (m.numel () == 3)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1235 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1236 color_values col (m(0), m(1), m(2));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1237 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1238 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1239 if (current_type != color_t \|\| col != color_val)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1240 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1241 color_val = col;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1242 current_type = color_t;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1243 return true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1244 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1245 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1246 }
6790 f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1247 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1248 error ("invalid value for color property \"%s\"",
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1249 get_name ().c_str ());
6790 f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1250 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	1251 else
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1252 error ("invalid value for color property \"%s\"",
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1253 get_name ().c_str ());
8063 41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1254
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1255 return false;
6790 f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1256 }
f1157da78825 [project @ 2007-07-24 19:02:27 by jwe] jwe parents: 6765 diff changeset	1257
8063 41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1258 bool
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	1259 double_radio_property::do_set (const octave_value& val)
7844 3d60445d3638 Add new double_radio_property class for alpha values. Michael Goffioul <michael.goffioul@gmail.com> parents: 7843 diff changeset	1260 {
3d60445d3638 Add new double_radio_property class for alpha values. Michael Goffioul <michael.goffioul@gmail.com> parents: 7843 diff changeset	1261 if (val.is_string ())
3d60445d3638 Add new double_radio_property class for alpha values. Michael Goffioul <michael.goffioul@gmail.com> parents: 7843 diff changeset	1262 {
3d60445d3638 Add new double_radio_property class for alpha values. Michael Goffioul <michael.goffioul@gmail.com> parents: 7843 diff changeset	1263 std::string s = val.string_value ();
13236 8bb526fb3349 allow radio values for graphics properaties to be abbreviated John W. Eaton <jwe@octave.org> parents: 13211 diff changeset	1264 std::string match;
8bb526fb3349 allow radio values for graphics properaties to be abbreviated John W. Eaton <jwe@octave.org> parents: 13211 diff changeset	1265
8bb526fb3349 allow radio values for graphics properaties to be abbreviated John W. Eaton <jwe@octave.org> parents: 13211 diff changeset	1266 if (! s.empty () && radio_val.contains (s, match))
8bb526fb3349 allow radio values for graphics properaties to be abbreviated John W. Eaton <jwe@octave.org> parents: 13211 diff changeset	1267 {
8bb526fb3349 allow radio values for graphics properaties to be abbreviated John W. Eaton <jwe@octave.org> parents: 13211 diff changeset	1268 if (current_type != radio_t \|\| match != current_val)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1269 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1270 if (s.length () != match.length ())
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1271 warning_with_id ("Octave:abbreviated-property-match",
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1272 "%s: allowing %s to match %s value %s",
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1273 "set", s.c_str (), get_name ().c_str (),
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1274 match.c_str ());
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1275 current_val = match;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1276 current_type = radio_t;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1277 return true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1278 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1279 }
7844 3d60445d3638 Add new double_radio_property class for alpha values. Michael Goffioul <michael.goffioul@gmail.com> parents: 7843 diff changeset	1280 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1281 error ("invalid value for double_radio property \"%s\"",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1282 get_name ().c_str ());
7844 3d60445d3638 Add new double_radio_property class for alpha values. Michael Goffioul <michael.goffioul@gmail.com> parents: 7843 diff changeset	1283 }
3d60445d3638 Add new double_radio_property class for alpha values. Michael Goffioul <michael.goffioul@gmail.com> parents: 7843 diff changeset	1284 else if (val.is_scalar_type () && val.is_real_type ())
3d60445d3638 Add new double_radio_property class for alpha values. Michael Goffioul <michael.goffioul@gmail.com> parents: 7843 diff changeset	1285 {
8063 41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1286 double new_dval = val.double_value ();
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1287
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1288 if (current_type != double_t \|\| new_dval != dval)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1289 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1290 dval = new_dval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1291 current_type = double_t;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1292 return true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1293 }
7844 3d60445d3638 Add new double_radio_property class for alpha values. Michael Goffioul <michael.goffioul@gmail.com> parents: 7843 diff changeset	1294 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	1295 else
7844 3d60445d3638 Add new double_radio_property class for alpha values. Michael Goffioul <michael.goffioul@gmail.com> parents: 7843 diff changeset	1296 error ("invalid value for double_radio property \"%s\"",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1297 get_name ().c_str ());
8063 41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1298
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1299 return false;
7844 3d60445d3638 Add new double_radio_property class for alpha values. Michael Goffioul <michael.goffioul@gmail.com> parents: 7843 diff changeset	1300 }
3d60445d3638 Add new double_radio_property class for alpha values. Michael Goffioul <michael.goffioul@gmail.com> parents: 7843 diff changeset	1301
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1302 bool
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1303 array_property::validate (const octave_value& v)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1304 {
7364 0e07f78369d1 [project @ 2008-01-12 08:38:17 by jwe] jwe parents: 7363 diff changeset	1305 bool xok = false;
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1306
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1307 // check value type
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1308 if (type_constraints.size () > 0)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1309 {
17631 94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1310 if (type_constraints.find (v.class_name ()) != type_constraints.end ())
15069 7a3957ca99c3 Handle complex arguments in imagesc (bug #36866) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15017 diff changeset	1311 xok = true;
7a3957ca99c3 Handle complex arguments in imagesc (bug #36866) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15017 diff changeset	1312
7a3957ca99c3 Handle complex arguments in imagesc (bug #36866) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15017 diff changeset	1313 // check if complex is allowed (it's also of class "double", so
7a3957ca99c3 Handle complex arguments in imagesc (bug #36866) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15017 diff changeset	1314 // checking that alone is not enough to ensure real type)
7a3957ca99c3 Handle complex arguments in imagesc (bug #36866) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15017 diff changeset	1315 if (type_constraints.find ("real") != type_constraints.end ()
7a3957ca99c3 Handle complex arguments in imagesc (bug #36866) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15017 diff changeset	1316 && v.is_complex_type ())
7a3957ca99c3 Handle complex arguments in imagesc (bug #36866) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15017 diff changeset	1317 xok = false;
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1318 }
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1319 else
9181 86ae7e50dc5d graphics.cc (array_property::validate): require value to be numeric, not necessarily double John W. Eaton <jwe@octave.org> parents: 9064 diff changeset	1320 xok = v.is_numeric_type ();
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1321
7364 0e07f78369d1 [project @ 2008-01-12 08:38:17 by jwe] jwe parents: 7363 diff changeset	1322 if (xok)
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1323 {
17631 94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1324 if (size_constraints.size () == 0)
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1325 return true;
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1326
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1327 dim_vector vdims = v.dims ();
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1328 int vlen = vdims.length ();
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1329
7364 0e07f78369d1 [project @ 2008-01-12 08:38:17 by jwe] jwe parents: 7363 diff changeset	1330 xok = false;
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1331
17631 94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1332 // check dimensional size constraints until a match is found
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1333 for (std::list<dim_vector>::const_iterator it = size_constraints.begin ();
18680 2deed6538c72 Make some graphics factory defaults conform to Matlab values (bug #41770). pantxo <pantxo.diribarne@gmail.com> parents: 18610 diff changeset	1334 ! xok && it != size_constraints.end ();++it)
17631 94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1335 {
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1336 dim_vector itdims = (*it);
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1337
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1338 if (itdims.length () == vlen)
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1339 {
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1340 xok = true;
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1341
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1342 for (int i = 0; xok && i < vlen; i++)
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1343 {
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1344 if (itdims(i) > 0)
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1345 {
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1346 if (itdims(i) != vdims(i))
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1347 xok = false;
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1348 }
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1349 else if (v.is_empty ())
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1350 break;
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1351 }
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1352 }
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	1353 }
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1354 }
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1355
7364 0e07f78369d1 [project @ 2008-01-12 08:38:17 by jwe] jwe parents: 7363 diff changeset	1356 return xok;
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1357 }
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1358
8063 41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1359 bool
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1360 array_property::is_equal (const octave_value& v) const
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1361 {
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1362 if (data.type_name () == v.type_name ())
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1363 {
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1364 if (data.dims () == v.dims ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1365 {
8075 a028a5960e18 Fix for hold with no figures/axes. Set prop/val pairs to hggroups rather than underlying objects. Fix for equality test in array_property David Bateman <dbateman@free.fr> parents: 8063 diff changeset	1366
a028a5960e18 Fix for hold with no figures/axes. Set prop/val pairs to hggroups rather than underlying objects. Fix for equality test in array_property David Bateman <dbateman@free.fr> parents: 8063 diff changeset	1367 #define CHECK_ARRAY_EQUAL(T,F,A) \
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1368 { \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1369 if (data.numel () == 1) \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1370 return data.F ## scalar_value () == \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1371 v.F ## scalar_value (); \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1372 else \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1373 { \
8075 a028a5960e18 Fix for hold with no figures/axes. Set prop/val pairs to hggroups rather than underlying objects. Fix for equality test in array_property David Bateman <dbateman@free.fr> parents: 8063 diff changeset	1374 /* Keep copy of array_value to allow sparse/bool arrays */ \
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1375 /* that are converted, to not be deallocated early */ \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1376 const A m1 = data.F ## array_value (); \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1377 const T* d1 = m1.data (); \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1378 const A m2 = v.F ## array_value (); \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1379 const T* d2 = m2.data ();\
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1380 \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1381 bool flag = true; \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1382 \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1383 for (int i = 0; flag && i < data.numel (); i++) \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1384 if (d1[i] != d2[i]) \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1385 flag = false; \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1386 \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1387 return flag; \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1388 } \
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1389 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1390
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14798 diff changeset	1391 if (data.is_double_type () \|\| data.is_bool_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1392 CHECK_ARRAY_EQUAL (double, , NDArray)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1393 else if (data.is_single_type ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1394 CHECK_ARRAY_EQUAL (float, float_, FloatNDArray)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1395 else if (data.is_int8_type ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1396 CHECK_ARRAY_EQUAL (octave_int8, int8_, int8NDArray)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1397 else if (data.is_int16_type ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1398 CHECK_ARRAY_EQUAL (octave_int16, int16_, int16NDArray)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1399 else if (data.is_int32_type ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1400 CHECK_ARRAY_EQUAL (octave_int32, int32_, int32NDArray)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1401 else if (data.is_int64_type ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1402 CHECK_ARRAY_EQUAL (octave_int64, int64_, int64NDArray)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1403 else if (data.is_uint8_type ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1404 CHECK_ARRAY_EQUAL (octave_uint8, uint8_, uint8NDArray)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1405 else if (data.is_uint16_type ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1406 CHECK_ARRAY_EQUAL (octave_uint16, uint16_, uint16NDArray)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1407 else if (data.is_uint32_type ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1408 CHECK_ARRAY_EQUAL (octave_uint32, uint32_, uint32NDArray)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1409 else if (data.is_uint64_type ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1410 CHECK_ARRAY_EQUAL (octave_uint64, uint64_, uint64NDArray)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1411 }
8063 41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1412 }
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1413
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1414 return false;
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1415 }
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1416
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1417 void
7836 4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	1418 array_property::get_data_limits (void)
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	1419 {
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	1420 xmin = xminp = octave_Inf;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	1421 xmax = xmaxp = -octave_Inf;
7836 4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	1422
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	1423 if (! data.is_empty ())
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	1424 {
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	1425 if (data.is_integer_type ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1426 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1427 if (data.is_int8_type ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1428 get_array_limits (data.int8_array_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1429 xmin, xmax, xminp, xmaxp);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1430 else if (data.is_uint8_type ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1431 get_array_limits (data.uint8_array_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1432 xmin, xmax, xminp, xmaxp);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1433 else if (data.is_int16_type ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1434 get_array_limits (data.int16_array_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1435 xmin, xmax, xminp, xmaxp);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1436 else if (data.is_uint16_type ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1437 get_array_limits (data.uint16_array_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1438 xmin, xmax, xminp, xmaxp);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1439 else if (data.is_int32_type ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1440 get_array_limits (data.int32_array_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1441 xmin, xmax, xminp, xmaxp);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1442 else if (data.is_uint32_type ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1443 get_array_limits (data.uint32_array_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1444 xmin, xmax, xminp, xmaxp);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1445 else if (data.is_int64_type ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1446 get_array_limits (data.int64_array_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1447 xmin, xmax, xminp, xmaxp);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1448 else if (data.is_uint64_type ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1449 get_array_limits (data.uint64_array_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1450 xmin, xmax, xminp, xmaxp);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1451 }
7836 4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	1452 else
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	1453 get_array_limits (data.array_value (), xmin, xmax, xminp, xmaxp);
7836 4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	1454 }
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	1455 }
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	1456
8063 41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1457 bool
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	1458 handle_property::do_set (const octave_value& v)
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1459 {
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1460 double dv = v.double_value ();
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1461
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1462 if (! error_state)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1463 {
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1464 graphics_handle gh = gh_manager::lookup (dv);
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1465
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1466 if (xisnan (gh.value ()) \|\| gh.ok ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1467 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1468 if (current_val != gh)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1469 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1470 current_val = gh;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1471 return true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1472 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1473 }
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1474 else
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1475 error ("set: invalid graphics handle (= %g) for property \"%s\"",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1476 dv, get_name ().c_str ());
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1477 }
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1478 else
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1479 error ("set: invalid graphics handle for property \"%s\"",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1480 get_name ().c_str ());
8063 41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1481
41bc700ff642 Trigger actions/listeners only for actual property change Michael Goffioul parents: 8062 diff changeset	1482 return false;
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1483 }
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1484
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	1485 Matrix
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1486 children_property::do_get_children (bool return_hidden) const
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1487 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1488 Matrix retval (children_list.size (), 1);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1489 octave_idx_type k = 0;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1490
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1491 graphics_object go = gh_manager::get_object (0);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	1492
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1493 root_figure::properties& props =
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1494 dynamic_cast<root_figure::properties&> (go.get_properties ());
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1495
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1496 if (! props.is_showhiddenhandles ())
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1497 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1498 for (const_children_list_iterator p = children_list.begin ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1499 p != children_list.end (); p++)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1500 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1501 graphics_handle kid = *p;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1502
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1503 if (gh_manager::is_handle_visible (kid))
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1504 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1505 if (! return_hidden)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1506 retval(k++) = *p;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1507 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1508 else if (return_hidden)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1509 retval(k++) = *p;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1510 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1511
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1512 retval.resize (k, 1);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1513 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1514 else
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1515 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1516 for (const_children_list_iterator p = children_list.begin ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1517 p != children_list.end (); p++)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1518 retval(k++) = *p;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1519 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	1520
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1521 return retval;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1522 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1523
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	1524 void
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1525 children_property::do_delete_children (bool clear)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1526 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1527 for (children_list_iterator p = children_list.begin ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1528 p != children_list.end (); p++)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1529 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1530 graphics_object go = gh_manager::get_object (*p);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1531
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1532 if (go.valid_object ())
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1533 gh_manager::free (*p);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1534
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1535 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1536
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1537 if (clear)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1538 children_list.clear ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1539 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	1540
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1541 bool
7367 600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1542 callback_property::validate (const octave_value& v) const
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1543 {
7367 600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1544 // case 1: function handle
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1545 // case 2: cell array with first element being a function handle
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1546 // case 3: string corresponding to known function name
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1547 // case 4: evaluatable string
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1548 // case 5: empty matrix
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1549
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1550 if (v.is_function_handle ())
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1551 return true;
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1552 else if (v.is_string ())
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1553 // complete validation will be done at execution-time
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1554 return true;
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1555 else if (v.is_cell () && v.length () > 0
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14798 diff changeset	1556 && (v.rows () == 1 \|\| v.columns () == 1)
7367 600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1557 && v.cell_value ()(0).is_function_handle ())
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1558 return true;
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1559 else if (v.is_empty ())
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1560 return true;
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1561
600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1562 return false;
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1563 }
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1564
13324 1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	1565 // If TRUE, we are executing any callback function, or the functions it
1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	1566 // calls. Used to determine handle visibility inside callback
1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	1567 // functions.
1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	1568 static bool executing_callback = false;
1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	1569
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1570 void
7367 600808df131c [project @ 2008-01-14 08:58:02 by jwe] jwe parents: 7366 diff changeset	1571 callback_property::execute (const octave_value& data) const
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1572 {
13323 de081abd32c6 don't execute graphics handle callback functions recursively John W. Eaton <jwe@octave.org> parents: 13281 diff changeset	1573 unwind_protect frame;
de081abd32c6 don't execute graphics handle callback functions recursively John W. Eaton <jwe@octave.org> parents: 13281 diff changeset	1574
de081abd32c6 don't execute graphics handle callback functions recursively John W. Eaton <jwe@octave.org> parents: 13281 diff changeset	1575 // We are executing the callback function associated with this
de081abd32c6 don't execute graphics handle callback functions recursively John W. Eaton <jwe@octave.org> parents: 13281 diff changeset	1576 // callback property. When set to true, we avoid recursive calls to
de081abd32c6 don't execute graphics handle callback functions recursively John W. Eaton <jwe@octave.org> parents: 13281 diff changeset	1577 // callback routines.
de081abd32c6 don't execute graphics handle callback functions recursively John W. Eaton <jwe@octave.org> parents: 13281 diff changeset	1578 frame.protect_var (executing);
de081abd32c6 don't execute graphics handle callback functions recursively John W. Eaton <jwe@octave.org> parents: 13281 diff changeset	1579
13324 1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	1580 // We are executing a callback function, so allow handles that have
1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	1581 // their handlevisibility property set to "callback" to be visible.
1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	1582 frame.protect_var (executing_callback);
1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	1583
13323 de081abd32c6 don't execute graphics handle callback functions recursively John W. Eaton <jwe@octave.org> parents: 13281 diff changeset	1584 if (! executing)
de081abd32c6 don't execute graphics handle callback functions recursively John W. Eaton <jwe@octave.org> parents: 13281 diff changeset	1585 {
de081abd32c6 don't execute graphics handle callback functions recursively John W. Eaton <jwe@octave.org> parents: 13281 diff changeset	1586 executing = true;
13324 1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	1587 executing_callback = true;
13323 de081abd32c6 don't execute graphics handle callback functions recursively John W. Eaton <jwe@octave.org> parents: 13281 diff changeset	1588
de081abd32c6 don't execute graphics handle callback functions recursively John W. Eaton <jwe@octave.org> parents: 13281 diff changeset	1589 if (callback.is_defined () && ! callback.is_empty ())
de081abd32c6 don't execute graphics handle callback functions recursively John W. Eaton <jwe@octave.org> parents: 13281 diff changeset	1590 gh_manager::execute_callback (get_parent (), callback, data);
de081abd32c6 don't execute graphics handle callback functions recursively John W. Eaton <jwe@octave.org> parents: 13281 diff changeset	1591 }
7824 adb520646d7e Fix execution of callback strings and allow execution of callback by name. Michael Goffioul <michael.goffioul@gmail.com> parents: 7822 diff changeset	1592 }
adb520646d7e Fix execution of callback strings and allow execution of callback by name. Michael Goffioul <michael.goffioul@gmail.com> parents: 7822 diff changeset	1593
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1594 // Used to cache dummy graphics objects from which dynamic
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1595 // properties can be cloned.
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1596 static std::map<caseless_str, graphics_object> dprop_obj_map;
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1597
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1598 property
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1599 property::create (const std::string& name, const graphics_handle& h,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1600 const caseless_str& type, const octave_value_list& args)
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1601 {
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1602 property retval;
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1603
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1604 if (type.compare ("string"))
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1605 {
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1606 std::string val = (args.length () > 0 ? args(0).string_value () : "");
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1607
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1608 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1609 retval = property (new string_property (name, h, val));
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1610 }
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1611 else if (type.compare ("any"))
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1612 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1613 octave_value val = args.length () > 0 ? args(0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1614 : octave_value (Matrix ());
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1615
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1616 retval = property (new any_property (name, h, val));
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1617 }
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1618 else if (type.compare ("radio"))
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1619 {
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1620 if (args.length () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1621 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1622 std::string vals = args(0).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1623
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1624 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1625 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1626 retval = property (new radio_property (name, h, vals));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1627
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1628 if (args.length () > 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1629 retval.set (args(1));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1630 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1631 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1632 error ("addproperty: invalid argument for radio property, expected a string value");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1633 }
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1634 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1635 error ("addproperty: missing possible values for radio property");
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1636 }
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1637 else if (type.compare ("double"))
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1638 {
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1639 double d = (args.length () > 0 ? args(0).double_value () : 0);
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1640
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1641 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1642 retval = property (new double_property (name, h, d));
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1643 }
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1644 else if (type.compare ("handle"))
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1645 {
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1646 double hh = (args.length () > 0 ? args(0).double_value () : octave_NaN);
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1647
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1648 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1649 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1650 graphics_handle gh (hh);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1651
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1652 retval = property (new handle_property (name, h, gh));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1653 }
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1654 }
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1655 else if (type.compare ("boolean"))
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1656 {
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1657 retval = property (new bool_property (name, h, false));
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1658
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1659 if (args.length () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1660 retval.set (args(0));
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1661 }
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1662 else if (type.compare ("data"))
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1663 {
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1664 retval = property (new array_property (name, h, Matrix ()));
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1665
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1666 if (args.length () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1667 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1668 retval.set (args(0));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1669
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1670 // FIXME: additional argument could define constraints,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1671 // but is this really useful?
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1672 }
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1673 }
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1674 else if (type.compare ("color"))
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1675 {
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1676 color_values cv (0, 0, 0);
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1677 radio_values rv;
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1678
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1679 if (args.length () > 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1680 rv = radio_values (args(1).string_value ());
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1681
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1682 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1683 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1684 retval = property (new color_property (name, h, cv, rv));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1685
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1686 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1687 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1688 if (args.length () > 0 && ! args(0).is_empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1689 retval.set (args(0));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1690 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1691 retval.set (rv.default_value ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1692 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1693 }
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1694 }
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1695 else
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1696 {
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1697 caseless_str go_name, go_rest;
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1698
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1699 if (lookup_object_name (type, go_name, go_rest))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1700 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1701 graphics_object go;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1702
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1703 std::map<caseless_str, graphics_object>::const_iterator it =
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1704 dprop_obj_map.find (go_name);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1705
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1706 if (it == dprop_obj_map.end ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1707 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1708 base_graphics_object *bgo =
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1709 make_graphics_object_from_type (go_name);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1710
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1711 if (bgo)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1712 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1713 go = graphics_object (bgo);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1714
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1715 dprop_obj_map[go_name] = go;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1716 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1717 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1718 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1719 go = it->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1720
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1721 if (go.valid_object ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1722 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1723 property prop = go.get_properties ().get_property (go_rest);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1724
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1725 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1726 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1727 retval = prop.clone ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1728
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1729 retval.set_parent (h);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1730 retval.set_name (name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1731
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1732 if (args.length () > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1733 retval.set (args(0));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1734 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1735 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1736 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1737 error ("addproperty: invalid object type (= %s)",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1738 go_name.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1739 }
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1740 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1741 error ("addproperty: unsupported type for dynamic property (= %s)",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1742 type.c_str ());
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1743 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	1744
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1745 return retval;
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1746 }
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	1747
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1748 static void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1749 finalize_r (const graphics_handle& h)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1750 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1751 graphics_object go = gh_manager::get_object (h);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1752
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1753 if (go)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1754 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1755 Matrix children = go.get_properties ().get_all_children ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1756
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1757 for (int k = 0; k < children.numel (); k++)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1758 finalize_r (children(k));
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1759
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1760 go.finalize ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1761 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1762 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1763
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1764 static void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1765 initialize_r (const graphics_handle& h)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1766 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1767 graphics_object go = gh_manager::get_object (h);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1768
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1769 if (go)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1770 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1771 Matrix children = go.get_properties ().get_all_children ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1772
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1773 go.initialize ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1774
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1775 for (int k = 0; k < children.numel (); k++)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1776 initialize_r (children(k));
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1777 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1778 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1779
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1780 void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1781 figure::properties::set_toolkit (const graphics_toolkit& b)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1782 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1783 if (toolkit)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1784 finalize_r (get___myhandle__ ());
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1785
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1786 toolkit = b;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1787 __graphics_toolkit__ = b.get_name ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1788 __plot_stream__ = Matrix ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1789
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1790 if (toolkit)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1791 initialize_r (get___myhandle__ ());
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1792
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1793 mark_modified ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1794 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1795
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	1796 // ---------------------------------------------------------------------
6681 0458599c50d7 [project @ 2007-06-01 03:33:21 by jwe] jwe parents: 6678 diff changeset	1797
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1798 void
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7176 diff changeset	1799 property_list::set (const caseless_str& name, const octave_value& val)
6681 0458599c50d7 [project @ 2007-06-01 03:33:21 by jwe] jwe parents: 6678 diff changeset	1800 {
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1801 size_t offset = 0;
6681 0458599c50d7 [project @ 2007-06-01 03:33:21 by jwe] jwe parents: 6678 diff changeset	1802
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1803 size_t len = name.length ();
6681 0458599c50d7 [project @ 2007-06-01 03:33:21 by jwe] jwe parents: 6678 diff changeset	1804
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1805 if (len > 4)
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1806 {
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7176 diff changeset	1807 caseless_str pfx = name.substr (0, 4);
6681 0458599c50d7 [project @ 2007-06-01 03:33:21 by jwe] jwe parents: 6678 diff changeset	1808
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1809 if (pfx.compare ("axes") \|\| pfx.compare ("line")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1810 \|\| pfx.compare ("text"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1811 offset = 4;
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1812 else if (len > 5)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1813 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1814 pfx = name.substr (0, 5);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1815
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1816 if (pfx.compare ("image") \|\| pfx.compare ("patch"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1817 offset = 5;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1818 else if (len > 6)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1819 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1820 pfx = name.substr (0, 6);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1821
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11076 diff changeset	1822 if (pfx.compare ("figure") \|\| pfx.compare ("uimenu"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1823 offset = 6;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1824 else if (len > 7)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1825 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1826 pfx = name.substr (0, 7);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1827
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1828 if (pfx.compare ("surface") \|\| pfx.compare ("hggroup")
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1829 \|\| pfx.compare ("uipanel"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1830 offset = 7;
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1831 else if (len > 9)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1832 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1833 pfx = name.substr (0, 9);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1834
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1835 if (pfx.compare ("uicontrol")
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1836 \|\| pfx.compare ("uitoolbar"))
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1837 offset = 9;
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1838 else if (len > 10)
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1839 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1840 pfx = name.substr (0, 10);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1841
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1842 if (pfx.compare ("uipushtool"))
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1843 offset = 10;
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1844 else if (len > 12)
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1845 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1846 pfx = name.substr (0, 12);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1847
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1848 if (pfx.compare ("uitoogletool"))
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1849 offset = 12;
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1850 else if (len > 13)
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1851 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1852 pfx = name.substr (0, 13);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1853
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1854 if (pfx.compare ("uicontextmenu"))
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1855 offset = 13;
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1856 }
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1857 }
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1858 }
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1859 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1860 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1861 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1862 }
6681 0458599c50d7 [project @ 2007-06-01 03:33:21 by jwe] jwe parents: 6678 diff changeset	1863
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1864 if (offset > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1865 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1866 // FIXME: should we validate property names and values here?
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1867
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1868 std::string pname = name.substr (offset);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1869
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1870 std::transform (pfx.begin (), pfx.end (), pfx.begin (), tolower);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1871 std::transform (pname.begin (), pname.end (), pname.begin (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1872 tolower);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1873
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1874 bool has_property = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1875 if (pfx == "axes")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1876 has_property = axes::properties::has_core_property (pname);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1877 else if (pfx == "line")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1878 has_property = line::properties::has_core_property (pname);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1879 else if (pfx == "text")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1880 has_property = text::properties::has_core_property (pname);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1881 else if (pfx == "image")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1882 has_property = image::properties::has_core_property (pname);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1883 else if (pfx == "patch")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1884 has_property = patch::properties::has_core_property (pname);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1885 else if (pfx == "figure")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1886 has_property = figure::properties::has_core_property (pname);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1887 else if (pfx == "surface")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1888 has_property = surface::properties::has_core_property (pname);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1889 else if (pfx == "hggroup")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1890 has_property = hggroup::properties::has_core_property (pname);
11283 58f175d39a7a GUI file functions Kai Habel <kai.habel@gmx.de> parents: 11259 diff changeset	1891 else if (pfx == "uimenu")
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11076 diff changeset	1892 has_property = uimenu::properties::has_core_property (pname);
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1893 else if (pfx == "uicontrol")
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1894 has_property = uicontrol::properties::has_core_property (pname);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1895 else if (pfx == "uipanel")
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1896 has_property = uipanel::properties::has_core_property (pname);
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1897 else if (pfx == "uicontextmenu")
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1898 has_property = uicontextmenu::properties::has_core_property (pname);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1899 else if (pfx == "uitoolbar")
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1900 has_property = uitoolbar::properties::has_core_property (pname);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1901 else if (pfx == "uipushtool")
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1902 has_property = uipushtool::properties::has_core_property (pname);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1903
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1904 if (has_property)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1905 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1906 bool remove = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1907 if (val.is_string ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1908 {
16312 d81ef5e64cf1 Accept only case-sensitive keywords 'default', 'factory', 'remove' for graphics properties. Rik <rik@octave.org> parents: 16206 diff changeset	1909 std::string tval = val.string_value ();
d81ef5e64cf1 Accept only case-sensitive keywords 'default', 'factory', 'remove' for graphics properties. Rik <rik@octave.org> parents: 16206 diff changeset	1910
d81ef5e64cf1 Accept only case-sensitive keywords 'default', 'factory', 'remove' for graphics properties. Rik <rik@octave.org> parents: 16206 diff changeset	1911 remove = (tval.compare ("remove") == 0);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1912 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1913
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1914 pval_map_type& pval_map = plist_map[pfx];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1915
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1916 if (remove)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1917 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1918 pval_map_iterator p = pval_map.find (pname);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1919
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1920 if (p != pval_map.end ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1921 pval_map.erase (p);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1922 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1923 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1924 pval_map[pname] = val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1925 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1926 else
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14325 diff changeset	1927 error ("invalid %s property '%s'", pfx.c_str (), pname.c_str ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1928 }
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1929 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	1930
9185 1e5c11890f85 check for invalid property names when setting defaults John W. Eaton <jwe@octave.org> parents: 9181 diff changeset	1931 if (! error_state && offset == 0)
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1932 error ("invalid default property specification");
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1933 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	1934
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1935 octave_value
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7176 diff changeset	1936 property_list::lookup (const caseless_str& name) const
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1937 {
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1938 octave_value retval;
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	1939
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1940 size_t offset = 0;
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	1941
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1942 size_t len = name.length ();
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	1943
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1944 if (len > 4)
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1945 {
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7176 diff changeset	1946 caseless_str pfx = name.substr (0, 4);
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	1947
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1948 if (pfx.compare ("axes") \|\| pfx.compare ("line")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1949 \|\| pfx.compare ("text"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1950 offset = 4;
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	1951 else if (len > 5)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1952 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1953 pfx = name.substr (0, 5);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1954
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1955 if (pfx.compare ("image") \|\| pfx.compare ("patch"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1956 offset = 5;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1957 else if (len > 6)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1958 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1959 pfx = name.substr (0, 6);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1960
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11076 diff changeset	1961 if (pfx.compare ("figure") \|\| pfx.compare ("uimenu"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1962 offset = 6;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1963 else if (len > 7)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1964 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1965 pfx = name.substr (0, 7);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1966
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1967 if (pfx.compare ("surface") \|\| pfx.compare ("hggroup")
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1968 \|\| pfx.compare ("uipanel"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1969 offset = 7;
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1970 else if (len > 9)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1971 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1972 pfx = name.substr (0, 9);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1973
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1974 if (pfx.compare ("uicontrol")
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1975 \|\| pfx.compare ("uitoolbar"))
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1976 offset = 9;
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1977 else if (len > 10)
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1978 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1979 pfx = name.substr (0, 10);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1980
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1981 if (pfx.compare ("uipushtool"))
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1982 offset = 10;
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1983 else if (len > 12)
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1984 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1985 pfx = name.substr (0, 12);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1986
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1987 if (pfx.compare ("uitoggletool"))
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1988 offset = 12;
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1989 else if (len > 13)
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1990 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1991 pfx = name.substr (0, 13);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1992
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1993 if (pfx.compare ("uicontextmenu"))
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1994 offset = 13;
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1995 }
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1996 }
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	1997 }
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	1998 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	1999 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2000 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2001 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2002
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2003 if (offset > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2004 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2005 std::string pname = name.substr (offset);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2006
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2007 std::transform (pfx.begin (), pfx.end (), pfx.begin (), tolower);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2008 std::transform (pname.begin (), pname.end (), pname.begin (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2009 tolower);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2010
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2011 plist_map_const_iterator p = find (pfx);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2012
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2013 if (p != end ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2014 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2015 const pval_map_type& pval_map = p->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2016
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2017 pval_map_const_iterator q = pval_map.find (pname);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2018
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2019 if (q != pval_map.end ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2020 retval = q->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2021 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2022 }
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2023 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2024
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2025 return retval;
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2026 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2027
11074 8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	2028 octave_scalar_map
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2029 property_list::as_struct (const std::string& prefix_arg) const
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2030 {
11074 8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	2031 octave_scalar_map m;
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2032
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2033 for (plist_map_const_iterator p = begin (); p != end (); p++)
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2034 {
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2035 std::string prefix = prefix_arg + p->first;
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2036
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2037 const pval_map_type pval_map = p->second;
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2038
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2039 for (pval_map_const_iterator q = pval_map.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2040 q != pval_map.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2041 q++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2042 m.assign (prefix + q->first, q->second);
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2043 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2044
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	2045 return m;
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2046 }
6432 5bec61ae1576 [project @ 2007-03-23 02:19:10 by jwe] jwe parents: 6425 diff changeset	2047
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2048 // Set properties given as a cs-list of name, value pairs.
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2049
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2050 void
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2051 graphics_object::set (const octave_value_list& args)
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2052 {
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2053 int nargin = args.length ();
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2054
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2055 if (nargin == 0)
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	2056 error ("graphics_object::set: Nothing to set");
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2057 else if (nargin % 2 == 0)
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2058 {
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2059 for (int i = 0; i < nargin; i += 2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2060 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2061 caseless_str name = args(i).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2062
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2063 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2064 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2065 octave_value val = args(i+1);
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2066
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2067 set_value_or_default (name, val);
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2068
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2069 if (error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2070 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2071 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2072 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2073 error ("set: expecting argument %d to be a property name", i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2074 }
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2075 }
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2076 else
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2077 error ("set: invalid number of arguments");
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2078 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2079
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2080 /*
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	2081 ## test set with name, value pairs
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2082 %!test
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2083 %! hf = figure ("visible", "off");
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	2084 %! h = plot (1:10, 10:-1:1);
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	2085 %! set (h, "linewidth", 10, "marker", "x");
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2086 %! lw = get (h, "linewidth");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2087 %! mk = get (h, "marker");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2088 %! close (hf);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2089 %! assert (lw, 10);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2090 %! assert (mk, "x");
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2091 */
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2092
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2093 // Set properties given in two cell arrays containing names and values.
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2094 void
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2095 graphics_object::set (const Array<std::string>& names,
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2096 const Cell& values, octave_idx_type row)
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2097 {
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2098 if (names.numel () != values.columns ())
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2099 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2100 error ("set: number of names must match number of value columns (%d != %d)",
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2101 names.numel (), values.columns ());
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2102 }
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2103
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2104 octave_idx_type k = names.columns ();
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2105
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2106 for (octave_idx_type column = 0; column < k; column++)
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2107 {
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2108 caseless_str name = names(column);
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2109 octave_value val = values(row, column);
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2110
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2111 set_value_or_default (name, val);
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2112
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2113 if (error_state)
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2114 break;
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2115 }
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2116 }
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2117
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2118 /*
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	2119 ## test set with cell array arguments
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2120 %!test
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2121 %! hf = figure ("visible", "off");
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	2122 %! h = plot (1:10, 10:-1:1);
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	2123 %! set (h, {"linewidth", "marker"}, {10, "x"});
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2124 %! lw = get (h, "linewidth");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2125 %! mk = get (h, "marker");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2126 %! close (hf);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2127 %! assert (lw, 10);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2128 %! assert (mk, "x");
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	2129
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	2130 ## test set with multiple handles and cell array arguments
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2131 %!test
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2132 %! hf = figure ("visible", "off");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2133 %! unwind_protect
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2134 %! h = plot (1:10, 10:-1:1, 1:10, 1:10);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2135 %! set (h, {"linewidth", "marker"}, {10, "x"; 5, "o"});
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2136 %! assert (get (h, "linewidth"), {10; 5});
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2137 %! assert (get (h, "marker"), {"x"; "o"});
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2138 %! set (h, {"linewidth", "marker"}, {10, "x"});
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2139 %! assert (get (h, "linewidth"), {10; 10});
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2140 %! assert (get (h, "marker"), {"x"; "x"});
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2141 %! unwind_protect_cleanup
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2142 %! close (hf);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2143 %! end_unwind_protect;
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2144
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2145 %!error <set: number of graphics handles must match number of value rows>
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2146 %! hf = figure ("visible", "off");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2147 %! unwind_protect
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2148 %! h = plot (1:10, 10:-1:1, 1:10, 1:10);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2149 %! set (h, {"linewidth", "marker"}, {10, "x"; 5, "o"; 7, "."});
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2150 %! unwind_protect_cleanup
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2151 %! close (hf);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2152 %! end_unwind_protect
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2153
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2154 %!error <set: number of names must match number of value columns>
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2155 %! hf = figure ("visible", "off");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2156 %! unwind_protect
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2157 %! h = plot (1:10, 10:-1:1, 1:10, 1:10);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2158 %! set (h, {"linewidth"}, {10, "x"; 5, "o"});
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2159 %! unwind_protect_cleanup
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2160 %! close (hf);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2161 %! end_unwind_protect
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2162 */
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2163
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2164 // Set properties given in a struct array
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2165 void
11074 8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	2166 graphics_object::set (const octave_map& m)
8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	2167 {
15760 1ac3c906990a graphics.cc (graphics_object::set (const octave_map& m)): set structure Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 15707 diff changeset	2168 for (octave_idx_type p = 0; p < m.nfields (); p++)
1ac3c906990a graphics.cc (graphics_object::set (const octave_map& m)): set structure Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 15707 diff changeset	2169 {
1ac3c906990a graphics.cc (graphics_object::set (const octave_map& m)): set structure Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 15707 diff changeset	2170 caseless_str name = m.keys ()[p];
1ac3c906990a graphics.cc (graphics_object::set (const octave_map& m)): set structure Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 15707 diff changeset	2171
1ac3c906990a graphics.cc (graphics_object::set (const octave_map& m)): set structure Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 15707 diff changeset	2172 octave_value val = octave_value (m.contents (name).elem (m.numel () - 1));
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2173
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2174 set_value_or_default (name, val);
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2175
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2176 if (error_state)
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2177 break;
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2178 }
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2179 }
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2180
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2181 /*
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	2182 ## test set ticklabels for compatibility
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	2183 %!test
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2184 %! hf = figure ("visible", "off");
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	2185 %! set (gca (), "xticklabel", [0, 0.2, 0.4, 0.6, 0.8, 1]);
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	2186 %! xticklabel = get (gca (), "xticklabel");
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2187 %! close (hf);
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	2188 %! assert (class (xticklabel), "char");
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	2189 %! assert (size (xticklabel), [6, 3]);
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2190
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	2191 %!test
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2192 %! hf = figure ("visible", "off");
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	2193 %! set (gca (), "xticklabel", "0\|0.2\|0.4\|0.6\|0.8\|1");
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	2194 %! xticklabel = get (gca (), "xticklabel");
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2195 %! close (hf);
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	2196 %! assert (class (xticklabel), "char");
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	2197 %! assert (size (xticklabel), [6, 3]);
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2198
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	2199 %!test
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2200 %! hf = figure ("visible", "off");
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	2201 %! set (gca (), "xticklabel", ["0 "; "0.2"; "0.4"; "0.6"; "0.8"; "1 "]);
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	2202 %! xticklabel = get (gca (), "xticklabel");
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2203 %! close (hf);
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	2204 %! assert (class (xticklabel), "char");
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	2205 %! assert (size (xticklabel), [6, 3]);
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2206
16841 2ce1ddead134 Return a cellstr column vector for ticklabels (bug #34906). Rik <rik@octave.org> parents: 16840 diff changeset	2207 %!test
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2208 %! hf = figure ("visible", "off");
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	2209 %! set (gca (), "xticklabel", {"0", "0.2", "0.4", "0.6", "0.8", "1"});
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	2210 %! xticklabel = get (gca (), "xticklabel");
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2211 %! close (hf);
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	2212 %! assert (class (xticklabel), "cell");
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	2213 %! assert (size (xticklabel), [6, 1]);
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	2214 */
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	2215
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	2216 /*
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	2217 ## test set with struct arguments
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2218 %!test
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2219 %! hf = figure ("visible", "off");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2220 %! unwind_protect
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2221 %! h = plot (1:10, 10:-1:1);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2222 %! set (h, struct ("linewidth", 10, "marker", "x"));
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2223 %! assert (get (h, "linewidth"), 10);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2224 %! assert (get (h, "marker"), "x");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2225 %! h = plot (1:10, 10:-1:1, 1:10, 1:10);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2226 %! set (h, struct ("linewidth", {5, 10}));
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2227 %! assert (get (h, "linewidth"), {10; 10});
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2228 %! unwind_protect_cleanup
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2229 %! close (hf);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2230 %! end_unwind_protect
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2231
15760 1ac3c906990a graphics.cc (graphics_object::set (const octave_map& m)): set structure Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 15707 diff changeset	2232 ## test ordering
1ac3c906990a graphics.cc (graphics_object::set (const octave_map& m)): set structure Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 15707 diff changeset	2233 %!test
1ac3c906990a graphics.cc (graphics_object::set (const octave_map& m)): set structure Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 15707 diff changeset	2234 %! markchanged = @(h, foobar, name) set (h, "userdata", [get(h,"userdata"); {name}]);
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2235 %! hf = figure ("visible", "off");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2236 %! unwind_protect
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2237 %! h = line ();
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2238 %! set (h, "userdata", {});
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2239 %! addlistener (h, "color", {markchanged, "color"});
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2240 %! addlistener (h, "linewidth", {markchanged, "linewidth"});
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2241 %! ## "linewidth" first
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2242 %! props.linewidth = 2;
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2243 %! props.color = "r";
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2244 %! set (h, props);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2245 %! assert (get (h, "userdata"), fieldnames (props));
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2246 %! clear props;
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2247 %! clf ();
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2248 %! h = line ();
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2249 %! set (h, "userdata", {});
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2250 %! addlistener (h, "color", {markchanged, "color"});
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2251 %! addlistener (h, "linewidth", {markchanged, "linewidth"});
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2252 %! ## "color" first
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2253 %! props.color = "r";
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2254 %! props.linewidth = 2;
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2255 %! set (h, props);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2256 %! assert (get (h, "userdata"), fieldnames (props));
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2257 %! unwind_protect_cleanup
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2258 %! close (hf);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	2259 %! end_unwind_protect
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2260 */
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2261
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2262 // Set a property to a value or to its (factory) default value.
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2263
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2264 void
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2265 graphics_object::set_value_or_default (const caseless_str& name,
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2266 const octave_value& val)
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2267 {
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2268 if (val.is_string ())
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2269 {
16312 d81ef5e64cf1 Accept only case-sensitive keywords 'default', 'factory', 'remove' for graphics properties. Rik <rik@octave.org> parents: 16206 diff changeset	2270 std::string tval = val.string_value ();
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2271
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2272 octave_value default_val;
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2273
16312 d81ef5e64cf1 Accept only case-sensitive keywords 'default', 'factory', 'remove' for graphics properties. Rik <rik@octave.org> parents: 16206 diff changeset	2274 if (tval.compare ("default") == 0)
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2275 {
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2276 default_val = get_default (name);
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2277
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2278 if (error_state)
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2279 return;
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2280
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2281 rep->set (name, default_val);
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2282 }
16312 d81ef5e64cf1 Accept only case-sensitive keywords 'default', 'factory', 'remove' for graphics properties. Rik <rik@octave.org> parents: 16206 diff changeset	2283 else if (tval.compare ("factory") == 0)
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2284 {
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2285 default_val = get_factory_default (name);
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2286
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2287 if (error_state)
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2288 return;
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2289
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2290 rep->set (name, default_val);
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2291 }
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2292 else
16312 d81ef5e64cf1 Accept only case-sensitive keywords 'default', 'factory', 'remove' for graphics properties. Rik <rik@octave.org> parents: 16206 diff changeset	2293 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2294 // Matlab specifically uses "\default" to escape string setting
16312 d81ef5e64cf1 Accept only case-sensitive keywords 'default', 'factory', 'remove' for graphics properties. Rik <rik@octave.org> parents: 16206 diff changeset	2295 if (tval.compare ("\\default") == 0)
d81ef5e64cf1 Accept only case-sensitive keywords 'default', 'factory', 'remove' for graphics properties. Rik <rik@octave.org> parents: 16206 diff changeset	2296 rep->set (name, "default");
d81ef5e64cf1 Accept only case-sensitive keywords 'default', 'factory', 'remove' for graphics properties. Rik <rik@octave.org> parents: 16206 diff changeset	2297 else if (tval.compare ("\\factory") == 0)
d81ef5e64cf1 Accept only case-sensitive keywords 'default', 'factory', 'remove' for graphics properties. Rik <rik@octave.org> parents: 16206 diff changeset	2298 rep->set (name, "factory");
d81ef5e64cf1 Accept only case-sensitive keywords 'default', 'factory', 'remove' for graphics properties. Rik <rik@octave.org> parents: 16206 diff changeset	2299 else
d81ef5e64cf1 Accept only case-sensitive keywords 'default', 'factory', 'remove' for graphics properties. Rik <rik@octave.org> parents: 16206 diff changeset	2300 rep->set (name, val);
d81ef5e64cf1 Accept only case-sensitive keywords 'default', 'factory', 'remove' for graphics properties. Rik <rik@octave.org> parents: 16206 diff changeset	2301 }
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2302 }
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2303 else
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2304 rep->set (name, val);
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2305 }
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2306
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2307 /*
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	2308 ## test setting of default values
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2309 %!test
17237 5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	2310 %! old_lw = get (0, "defaultlinelinewidth");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	2311 %! unwind_protect
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	2312 %! hf = figure ("visible", "off");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	2313 %! h = plot (1:10, 10:-1:1);
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	2314 %! set (0, "defaultlinelinewidth", 20);
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	2315 %! set (h, "linewidth", "default");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	2316 %! assert (get (h, "linewidth"), 20);
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	2317 %! set (h, "linewidth", "factory");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	2318 %! assert (get (h, "linewidth"), 0.5);
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	2319 %! unwind_protect_cleanup
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	2320 %! close (hf);
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	2321 %! set (0, "defaultlinelinewidth", old_lw);
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	2322 %! end_unwind_protect
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2323 */
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	2324
8234 8c4e79668a5e generate new fractional parts for recycled graphics handles John W. Eaton <jwe@octave.org> parents: 8233 diff changeset	2325 static double
8c4e79668a5e generate new fractional parts for recycled graphics handles John W. Eaton <jwe@octave.org> parents: 8233 diff changeset	2326 make_handle_fraction (void)
8c4e79668a5e generate new fractional parts for recycled graphics handles John W. Eaton <jwe@octave.org> parents: 8233 diff changeset	2327 {
8c4e79668a5e generate new fractional parts for recycled graphics handles John W. Eaton <jwe@octave.org> parents: 8233 diff changeset	2328 static double maxrand = RAND_MAX + 2.0;
8c4e79668a5e generate new fractional parts for recycled graphics handles John W. Eaton <jwe@octave.org> parents: 8233 diff changeset	2329
8c4e79668a5e generate new fractional parts for recycled graphics handles John W. Eaton <jwe@octave.org> parents: 8233 diff changeset	2330 return (rand () + 1.0) / maxrand;
8c4e79668a5e generate new fractional parts for recycled graphics handles John W. Eaton <jwe@octave.org> parents: 8233 diff changeset	2331 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2332
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2333 graphics_handle
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2334 gh_manager::do_get_handle (bool integer_figure_handle)
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2335 {
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2336 graphics_handle retval;
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2337
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	2338 if (integer_figure_handle)
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2339 {
8234 8c4e79668a5e generate new fractional parts for recycled graphics handles John W. Eaton <jwe@octave.org> parents: 8233 diff changeset	2340 // Figure handles are positive integers corresponding to the
8c4e79668a5e generate new fractional parts for recycled graphics handles John W. Eaton <jwe@octave.org> parents: 8233 diff changeset	2341 // figure number.
8c4e79668a5e generate new fractional parts for recycled graphics handles John W. Eaton <jwe@octave.org> parents: 8233 diff changeset	2342
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2343 // We always want the lowest unused figure number.
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2344
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2345 retval = 1;
6425 0cc5ca7b1e91 [project @ 2007-03-21 15:57:19 by jwe] jwe parents: 6424 diff changeset	2346
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2347 while (handle_map.find (retval) != handle_map.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2348 retval++;
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2349 }
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2350 else
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2351 {
8234 8c4e79668a5e generate new fractional parts for recycled graphics handles John W. Eaton <jwe@octave.org> parents: 8233 diff changeset	2352 // Other graphics handles are negative integers plus some random
8c4e79668a5e generate new fractional parts for recycled graphics handles John W. Eaton <jwe@octave.org> parents: 8233 diff changeset	2353 // fractional part. To avoid running out of integers, we
8c4e79668a5e generate new fractional parts for recycled graphics handles John W. Eaton <jwe@octave.org> parents: 8233 diff changeset	2354 // recycle the integer part but tack on a new random part each
8c4e79668a5e generate new fractional parts for recycled graphics handles John W. Eaton <jwe@octave.org> parents: 8233 diff changeset	2355 // time.
8c4e79668a5e generate new fractional parts for recycled graphics handles John W. Eaton <jwe@octave.org> parents: 8233 diff changeset	2356
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2357 free_list_iterator p = handle_free_list.begin ();
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2358
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2359 if (p != handle_free_list.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2360 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2361 retval = *p;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2362 handle_free_list.erase (p);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2363 }
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2364 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2365 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2366 retval = graphics_handle (next_handle);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2367
11450 5eb10763069f substitute and use LAPACK_LIBS in mkoctfile script John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2368 next_handle = std::ceil (next_handle) - 1.0 - make_handle_fraction ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2369 }
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2370 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2371
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2372 return retval;
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2373 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2374
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2375 void
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2376 gh_manager::do_free (const graphics_handle& h)
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2377 {
7056 2002804df782 [project @ 2007-10-24 00:32:44 by jwe] jwe parents: 7030 diff changeset	2378 if (h.ok ())
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2379 {
6874 94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	2380 if (h.value () != 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2381 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2382 iterator p = handle_map.find (h);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2383
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2384 if (p != handle_map.end ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2385 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2386 base_properties& bp = p->second.get_properties ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	2387
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2388 bp.set_beingdeleted (true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2389
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2390 bp.delete_children ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2391
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2392 octave_value val = bp.get_deletefcn ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2393
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2394 bp.execute_deletefcn ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2395
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2396 // Notify graphics toolkit.
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	2397 p->second.finalize ();
8208 f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	2398
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	2399 // Note: this will be valid only for first explicitly
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2400 // deleted object. All its children will then have an
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2401 // unknown graphics toolkit.
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2402
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2403 // Graphics handles for non-figure objects are negative
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2404 // integers plus some random fractional part. To avoid
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2405 // running out of integers, we recycle the integer part
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2406 // but tack on a new random part each time.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2407
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2408 handle_map.erase (p);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2409
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2410 if (h.value () < 0)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2411 handle_free_list.insert
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2412 (std::ceil (h.value ()) - make_handle_fraction ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2413 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2414 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2415 error ("graphics_handle::free: invalid object %g", h.value ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2416 }
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2417 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2418 error ("graphics_handle::free: can't delete root figure");
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2419 }
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2420 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2421
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2422 void
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2423 gh_manager::do_renumber_figure (const graphics_handle& old_gh,
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2424 const graphics_handle& new_gh)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2425 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2426 iterator p = handle_map.find (old_gh);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2427
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2428 if (p != handle_map.end ())
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2429 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2430 graphics_object go = p->second;
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2431
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2432 handle_map.erase (p);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2433
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2434 handle_map[new_gh] = go;
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2435
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2436 if (old_gh.value () < 0)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2437 handle_free_list.insert (std::ceil (old_gh.value ())
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2438 - make_handle_fraction ());
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2439 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2440 else
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2441 error ("graphics_handle::free: invalid object %g", old_gh.value ());
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2442
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2443 for (figure_list_iterator q = figure_list.begin ();
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2444 q != figure_list.end (); q++)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2445 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2446 if (*q == old_gh)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2447 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2448 *q = new_gh;
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2449 break;
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2450 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2451 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2452 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	2453
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2454 gh_manager *gh_manager::instance = 0;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2455
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2456 static void
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7176 diff changeset	2457 xset (const graphics_handle& h, const caseless_str& name,
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2458 const octave_value& val)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2459 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2460 graphics_object obj = gh_manager::get_object (h);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2461 obj.set (name, val);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2462 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2463
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2464 static void
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2465 xset (const graphics_handle& h, const octave_value_list& args)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2466 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2467 if (args.length () > 0)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2468 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2469 graphics_object obj = gh_manager::get_object (h);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2470 obj.set (args);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2471 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2472 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2473
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2474 static octave_value
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7176 diff changeset	2475 xget (const graphics_handle& h, const caseless_str& name)
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2476 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2477 graphics_object obj = gh_manager::get_object (h);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2478 return obj.get (name);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2479 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2480
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2481 static graphics_handle
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2482 reparent (const octave_value& ov, const std::string& who,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2483 const std::string& property, const graphics_handle& new_parent,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2484 bool adopt = true)
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2485 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2486 graphics_handle h = octave_NaN;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2487
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2488 double val = ov.double_value ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2489
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2490 if (! error_state)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2491 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2492 h = gh_manager::lookup (val);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2493
7056 2002804df782 [project @ 2007-10-24 00:32:44 by jwe] jwe parents: 7030 diff changeset	2494 if (h.ok ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2495 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2496 graphics_object obj = gh_manager::get_object (h);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	2497
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2498 graphics_handle parent_h = obj.get_parent ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2499
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2500 graphics_object parent_obj = gh_manager::get_object (parent_h);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2501
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2502 parent_obj.remove_child (h);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2503
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2504 if (adopt)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2505 obj.set ("parent", new_parent.value ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2506 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2507 obj.reparent (new_parent);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2508 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2509 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2510 error ("%s: invalid graphics handle (= %g) for %s",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2511 who.c_str (), val, property.c_str ());
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2512 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2513 else
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2514 error ("%s: expecting %s to be a graphics handle",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2515 who.c_str (), property.c_str ());
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2516
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2517 return h;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2518 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2519
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2520 // This function is NOT equivalent to the scripting language function gcf.
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2521 graphics_handle
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2522 gcf (void)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2523 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2524 octave_value val = xget (0, "currentfigure");
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2525
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2526 return val.is_empty () ? octave_NaN : val.double_value ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2527 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2528
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2529 // This function is NOT equivalent to the scripting language function gca.
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2530 graphics_handle
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2531 gca (void)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2532 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2533 octave_value val = xget (gcf (), "currentaxes");
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2534
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2535 return val.is_empty () ? octave_NaN : val.double_value ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2536 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2537
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2538 static void
14014 907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2539 delete_graphics_object (const graphics_handle& h)
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2540 {
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2541 if (h.ok ())
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2542 {
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2543 graphics_object obj = gh_manager::get_object (h);
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2544
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2545 // Don't do recursive deleting, due to callbacks
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2546 if (! obj.get_properties ().is_beingdeleted ())
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2547 {
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2548 graphics_handle parent_h = obj.get_parent ();
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2549
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2550 graphics_object parent_obj =
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2551 gh_manager::get_object (parent_h);
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2552
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2553 // NOTE: free the handle before removing it from its
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2554 // parent's children, such that the object's
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2555 // state is correct when the deletefcn callback
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2556 // is executed
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2557
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2558 gh_manager::free (h);
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2559
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2560 // A callback function might have already deleted
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2561 // the parent
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2562 if (parent_obj.valid_object ())
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2563 parent_obj.remove_child (h);
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2564
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2565 Vdrawnow_requested = true;
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2566 }
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2567 }
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2568 }
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2569
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2570 static void
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2571 delete_graphics_object (double val)
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2572 {
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2573 delete_graphics_object (gh_manager::lookup (val));
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2574 }
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2575
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2576 static void
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2577 delete_graphics_objects (const NDArray vals)
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2578 {
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2579 for (octave_idx_type i = 0; i < vals.numel (); i++)
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2580 delete_graphics_object (vals.elem (i));
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2581 }
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2582
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2583 static void
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2584 close_figure (const graphics_handle& handle)
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2585 {
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2586 octave_value closerequestfcn = xget (handle, "closerequestfcn");
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2587
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2588 OCTAVE_SAFE_CALL (gh_manager::execute_callback, (handle, closerequestfcn));
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2589 }
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2590
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2591 static void
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2592 force_close_figure (const graphics_handle& handle)
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2593 {
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2594 // Remove the deletefcn and closerequestfcn callbacks and delete the
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2595 // object directly.
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2596
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2597 xset (handle, "deletefcn", Matrix ());
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2598 xset (handle, "closerequestfcn", Matrix ());
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2599
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2600 delete_graphics_object (handle);
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2601 }
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2602
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2603 void
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2604 gh_manager::do_close_all_figures (void)
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2605 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2606 // FIXME: should we process or discard pending events?
14014 907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2607
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2608 event_queue.clear ();
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2609
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2610 // Don't use figure_list_iterator because we'll be removing elements
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2611 // from the list elsewhere.
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2612
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2613 Matrix hlist = do_figure_handle_list (true);
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2614
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2615 for (octave_idx_type i = 0; i < hlist.numel (); i++)
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2616 {
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2617 graphics_handle h = gh_manager::lookup (hlist(i));
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2618
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2619 if (h.ok ())
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2620 close_figure (h);
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2621 }
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2622
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2623 // They should all be closed now. If not, force them to close.
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2624
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2625 hlist = do_figure_handle_list (true);
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2626
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2627 for (octave_idx_type i = 0; i < hlist.numel (); i++)
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2628 {
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2629 graphics_handle h = gh_manager::lookup (hlist(i));
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2630
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2631 if (h.ok ())
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2632 force_close_figure (h);
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2633 }
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2634
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2635 // None left now, right?
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2636
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2637 hlist = do_figure_handle_list (true);
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2638
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2639 assert (hlist.numel () == 0);
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2640
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2641 // Clear all callback objects from our list.
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2642
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2643 callback_objects.clear ();
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2644 }
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2645
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2646 static void
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2647 adopt (const graphics_handle& p, const graphics_handle& h)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2648 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2649 graphics_object parent_obj = gh_manager::get_object (p);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2650 parent_obj.adopt (h);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2651 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2652
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2653 static bool
7056 2002804df782 [project @ 2007-10-24 00:32:44 by jwe] jwe parents: 7030 diff changeset	2654 is_handle (const graphics_handle& h)
2002804df782 [project @ 2007-10-24 00:32:44 by jwe] jwe parents: 7030 diff changeset	2655 {
2002804df782 [project @ 2007-10-24 00:32:44 by jwe] jwe parents: 7030 diff changeset	2656 return h.ok ();
2002804df782 [project @ 2007-10-24 00:32:44 by jwe] jwe parents: 7030 diff changeset	2657 }
2002804df782 [project @ 2007-10-24 00:32:44 by jwe] jwe parents: 7030 diff changeset	2658
2002804df782 [project @ 2007-10-24 00:32:44 by jwe] jwe parents: 7030 diff changeset	2659 static bool
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2660 is_handle (double val)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2661 {
6874 94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	2662 graphics_handle h = gh_manager::lookup (val);
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	2663
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	2664 return h.ok ();
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2665 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2666
8183 277218396978 Handle arrays of handles in the Fishandle function David Bateman <dbateman@free.fr> parents: 8102 diff changeset	2667 static octave_value
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2668 is_handle (const octave_value& val)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2669 {
8183 277218396978 Handle arrays of handles in the Fishandle function David Bateman <dbateman@free.fr> parents: 8102 diff changeset	2670 octave_value retval = false;
277218396978 Handle arrays of handles in the Fishandle function David Bateman <dbateman@free.fr> parents: 8102 diff changeset	2671
277218396978 Handle arrays of handles in the Fishandle function David Bateman <dbateman@free.fr> parents: 8102 diff changeset	2672 if (val.is_real_scalar () && is_handle (val.double_value ()))
277218396978 Handle arrays of handles in the Fishandle function David Bateman <dbateman@free.fr> parents: 8102 diff changeset	2673 retval = true;
12587 c3d4542a4f06 graphics.cc: Allow ishandle() to accept vector of handles (bug 33025). John Eaton <jwe@octave.org> parents: 12549 diff changeset	2674 else if (val.is_numeric_type () && val.is_real_type ())
c3d4542a4f06 graphics.cc: Allow ishandle() to accept vector of handles (bug 33025). John Eaton <jwe@octave.org> parents: 12549 diff changeset	2675 {
c3d4542a4f06 graphics.cc: Allow ishandle() to accept vector of handles (bug 33025). John Eaton <jwe@octave.org> parents: 12549 diff changeset	2676 const NDArray handles = val.array_value ();
c3d4542a4f06 graphics.cc: Allow ishandle() to accept vector of handles (bug 33025). John Eaton <jwe@octave.org> parents: 12549 diff changeset	2677
c3d4542a4f06 graphics.cc: Allow ishandle() to accept vector of handles (bug 33025). John Eaton <jwe@octave.org> parents: 12549 diff changeset	2678 if (! error_state)
c3d4542a4f06 graphics.cc: Allow ishandle() to accept vector of handles (bug 33025). John Eaton <jwe@octave.org> parents: 12549 diff changeset	2679 {
c3d4542a4f06 graphics.cc: Allow ishandle() to accept vector of handles (bug 33025). John Eaton <jwe@octave.org> parents: 12549 diff changeset	2680 boolNDArray result (handles.dims ());
c3d4542a4f06 graphics.cc: Allow ishandle() to accept vector of handles (bug 33025). John Eaton <jwe@octave.org> parents: 12549 diff changeset	2681
c3d4542a4f06 graphics.cc: Allow ishandle() to accept vector of handles (bug 33025). John Eaton <jwe@octave.org> parents: 12549 diff changeset	2682 for (octave_idx_type i = 0; i < handles.numel (); i++)
c3d4542a4f06 graphics.cc: Allow ishandle() to accept vector of handles (bug 33025). John Eaton <jwe@octave.org> parents: 12549 diff changeset	2683 result.xelem (i) = is_handle (handles (i));
c3d4542a4f06 graphics.cc: Allow ishandle() to accept vector of handles (bug 33025). John Eaton <jwe@octave.org> parents: 12549 diff changeset	2684
c3d4542a4f06 graphics.cc: Allow ishandle() to accept vector of handles (bug 33025). John Eaton <jwe@octave.org> parents: 12549 diff changeset	2685 retval = result;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2686 }
8183 277218396978 Handle arrays of handles in the Fishandle function David Bateman <dbateman@free.fr> parents: 8102 diff changeset	2687 }
277218396978 Handle arrays of handles in the Fishandle function David Bateman <dbateman@free.fr> parents: 8102 diff changeset	2688
277218396978 Handle arrays of handles in the Fishandle function David Bateman <dbateman@free.fr> parents: 8102 diff changeset	2689 return retval;
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2690 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2691
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2692 static bool
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2693 is_figure (double val)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2694 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2695 graphics_object obj = gh_manager::get_object (val);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2696
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2697 return obj && obj.isa ("figure");
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2698 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2699
7370 74d64ead0cd7 [project @ 2008-01-14 19:12:45 by jwe] jwe parents: 7367 diff changeset	2700 static void
74d64ead0cd7 [project @ 2008-01-14 19:12:45 by jwe] jwe parents: 7367 diff changeset	2701 xcreatefcn (const graphics_handle& h)
74d64ead0cd7 [project @ 2008-01-14 19:12:45 by jwe] jwe parents: 7367 diff changeset	2702 {
74d64ead0cd7 [project @ 2008-01-14 19:12:45 by jwe] jwe parents: 7367 diff changeset	2703 graphics_object obj = gh_manager::get_object (h);
74d64ead0cd7 [project @ 2008-01-14 19:12:45 by jwe] jwe parents: 7367 diff changeset	2704 obj.get_properties ().execute_createfcn ();
74d64ead0cd7 [project @ 2008-01-14 19:12:45 by jwe] jwe parents: 7367 diff changeset	2705 }
74d64ead0cd7 [project @ 2008-01-14 19:12:45 by jwe] jwe parents: 7367 diff changeset	2706
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	2707 static void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	2708 xinitialize (const graphics_handle& h)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	2709 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	2710 graphics_object go = gh_manager::get_object (h);
13908 32a77debff75 strip trailing spaces Konstantinos Poulios <logari81@googlemail.com> parents: 13897 diff changeset	2711
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	2712 if (go)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	2713 go.initialize ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	2714 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	2715
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2716 // ---------------------------------------------------------------------
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2717
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2718 void
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2719 base_graphics_toolkit::update (const graphics_handle& h, int id)
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2720 {
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2721 graphics_object go = gh_manager::get_object (h);
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2722
10973 a8235d26b57a improve names of base_graphics_backend methods John W. Eaton <jwe@octave.org> parents: 10949 diff changeset	2723 update (go, id);
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2724 }
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2725
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	2726 bool
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2727 base_graphics_toolkit::initialize (const graphics_handle& h)
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2728 {
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2729 graphics_object go = gh_manager::get_object (h);
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2730
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	2731 return initialize (go);
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2732 }
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2733
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2734 void
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2735 base_graphics_toolkit::finalize (const graphics_handle& h)
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2736 {
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2737 graphics_object go = gh_manager::get_object (h);
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2738
10973 a8235d26b57a improve names of base_graphics_backend methods John W. Eaton <jwe@octave.org> parents: 10949 diff changeset	2739 finalize (go);
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2740 }
14014 907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	2741
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2742 // ---------------------------------------------------------------------
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	2743
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2744 void
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2745 base_properties::set_from_list (base_graphics_object& obj,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2746 property_list& defaults)
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2747 {
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2748 std::string go_name = graphics_object_name ();
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2749
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2750 property_list::plist_map_const_iterator p = defaults.find (go_name);
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2751
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2752 if (p != defaults.end ())
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2753 {
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2754 const property_list::pval_map_type pval_map = p->second;
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2755
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2756 for (property_list::pval_map_const_iterator q = pval_map.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2757 q != pval_map.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2758 q++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2759 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2760 std::string pname = q->first;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2761
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2762 obj.set (pname, q->second);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2763
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2764 if (error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2765 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2766 error ("error setting default property %s", pname.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2767 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2768 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2769 }
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2770 }
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2771 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2772
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2773 octave_value
8061 f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2774 base_properties::get_dynamic (const caseless_str& name) const
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2775 {
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2776 octave_value retval;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2777
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2778 std::map<caseless_str, property, cmp_caseless_str>::const_iterator it =
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2779 all_props.find (name);
8061 f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2780
f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2781 if (it != all_props.end ())
f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2782 retval = it->second.get ();
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2783 else
8061 f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2784 error ("get: unknown property \"%s\"", name.c_str ());
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2785
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2786 return retval;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2787 }
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2788
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2789 octave_value
8061 f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2790 base_properties::get_dynamic (bool all) const
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2791 {
11074 8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	2792 octave_scalar_map m;
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2793
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2794 for (std::map<caseless_str, property, cmp_caseless_str>::const_iterator
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2795 it = all_props.begin (); it != all_props.end (); ++it)
7379 a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	2796 if (all \|\| ! it->second.is_hidden ())
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	2797 m.assign (it->second.get_name (), it->second.get ());
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2798
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2799 return m;
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2800 }
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2801
9582 bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	2802 std::set<std::string>
9972 d32a6cc0193b unshare dynamic properties John W. Eaton <jwe@octave.org> parents: 9883 diff changeset	2803 base_properties::dynamic_property_names (void) const
d32a6cc0193b unshare dynamic properties John W. Eaton <jwe@octave.org> parents: 9883 diff changeset	2804 {
d32a6cc0193b unshare dynamic properties John W. Eaton <jwe@octave.org> parents: 9883 diff changeset	2805 return dynamic_properties;
9582 bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	2806 }
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	2807
9185 1e5c11890f85 check for invalid property names when setting defaults John W. Eaton <jwe@octave.org> parents: 9181 diff changeset	2808 bool
9972 d32a6cc0193b unshare dynamic properties John W. Eaton <jwe@octave.org> parents: 9883 diff changeset	2809 base_properties::has_dynamic_property (const std::string& pname)
d32a6cc0193b unshare dynamic properties John W. Eaton <jwe@octave.org> parents: 9883 diff changeset	2810 {
d32a6cc0193b unshare dynamic properties John W. Eaton <jwe@octave.org> parents: 9883 diff changeset	2811 const std::set<std::string>& dynprops = dynamic_property_names ();
9185 1e5c11890f85 check for invalid property names when setting defaults John W. Eaton <jwe@octave.org> parents: 9181 diff changeset	2812
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	2813 if (dynprops.find (pname) != dynprops.end ())
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	2814 return true;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	2815 else
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	2816 return all_props.find (pname) != all_props.end ();
9185 1e5c11890f85 check for invalid property names when setting defaults John W. Eaton <jwe@octave.org> parents: 9181 diff changeset	2817 }
1e5c11890f85 check for invalid property names when setting defaults John W. Eaton <jwe@octave.org> parents: 9181 diff changeset	2818
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2819 void
9185 1e5c11890f85 check for invalid property names when setting defaults John W. Eaton <jwe@octave.org> parents: 9181 diff changeset	2820 base_properties::set_dynamic (const caseless_str& pname,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2821 const octave_value& val)
9185 1e5c11890f85 check for invalid property names when setting defaults John W. Eaton <jwe@octave.org> parents: 9181 diff changeset	2822 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2823 std::map<caseless_str, property, cmp_caseless_str>::iterator it =
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2824 all_props.find (pname);
8061 f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2825
f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2826 if (it != all_props.end ())
f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2827 it->second.set (val);
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2828 else
9185 1e5c11890f85 check for invalid property names when setting defaults John W. Eaton <jwe@octave.org> parents: 9181 diff changeset	2829 error ("set: unknown property \"%s\"", pname.c_str ());
8061 f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2830
f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2831 if (! error_state)
9185 1e5c11890f85 check for invalid property names when setting defaults John W. Eaton <jwe@octave.org> parents: 9181 diff changeset	2832 {
9972 d32a6cc0193b unshare dynamic properties John W. Eaton <jwe@octave.org> parents: 9883 diff changeset	2833 dynamic_properties.insert (pname);
9185 1e5c11890f85 check for invalid property names when setting defaults John W. Eaton <jwe@octave.org> parents: 9181 diff changeset	2834
1e5c11890f85 check for invalid property names when setting defaults John W. Eaton <jwe@octave.org> parents: 9181 diff changeset	2835 mark_modified ();
1e5c11890f85 check for invalid property names when setting defaults John W. Eaton <jwe@octave.org> parents: 9181 diff changeset	2836 }
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2837 }
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2838
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2839 property
8061 f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2840 base_properties::get_property_dynamic (const caseless_str& name)
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2841 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2842 std::map<caseless_str, property, cmp_caseless_str>::const_iterator it =
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2843 all_props.find (name);
8061 f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2844
f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2845 if (it == all_props.end ())
f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2846 {
f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2847 error ("get_property: unknown property \"%s\"", name.c_str ());
f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2848 return property ();
f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2849 }
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2850 else
8061 f819e8992367 Auto-generate base_properties John W. Eaton <jwe@octave.org> parents: 8059 diff changeset	2851 return it->second;
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2852 }
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2853
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2854 void
6836 ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	2855 base_properties::set_parent (const octave_value& val)
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2856 {
17641 cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2857 double hnp = val.double_value ();
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2858
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2859 graphics_handle new_parent = octave_NaN;
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	2860
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2861 if (! error_state)
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2862 {
17641 cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2863 if (hnp == __myhandle__)
17626 82b1778798d3 Fix segfault when setting object parent to be object itself (bug #37927). Rik <rik@octave.org> parents: 17608 diff changeset	2864 error ("set: can not set object parent to be object itself");
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2865 else
17626 82b1778798d3 Fix segfault when setting object parent to be object itself (bug #37927). Rik <rik@octave.org> parents: 17608 diff changeset	2866 {
17641 cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2867 new_parent = gh_manager::lookup (hnp);
17626 82b1778798d3 Fix segfault when setting object parent to be object itself (bug #37927). Rik <rik@octave.org> parents: 17608 diff changeset	2868
82b1778798d3 Fix segfault when setting object parent to be object itself (bug #37927). Rik <rik@octave.org> parents: 17608 diff changeset	2869 if (new_parent.ok ())
82b1778798d3 Fix segfault when setting object parent to be object itself (bug #37927). Rik <rik@octave.org> parents: 17608 diff changeset	2870 {
17641 cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2871 // Remove child from current parent
cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2872 graphics_object old_parent_obj;
cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2873 old_parent_obj = gh_manager::get_object (get_parent ());
18449 0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2874
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2875
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2876 if (old_parent_obj.get_handle () != hnp)
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2877 old_parent_obj.remove_child (__myhandle__);
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2878 else
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2879 // Do nothing more
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2880 return;
17641 cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2881
cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2882 // Check new parent's parent is not this child to avoid recursion
cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2883 graphics_object new_parent_obj;
cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2884 new_parent_obj = gh_manager::get_object (new_parent);
cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2885 if (new_parent_obj.get_parent () == __myhandle__)
cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2886 {
cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2887 // new parent's parent gets child's original parent
cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2888 new_parent_obj.get_properties ().set_parent (get_parent ().as_octave_value ());
cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2889 }
cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2890
cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2891 // Set parent property to new_parent and do adoption
17626 82b1778798d3 Fix segfault when setting object parent to be object itself (bug #37927). Rik <rik@octave.org> parents: 17608 diff changeset	2892 parent = new_parent.as_octave_value ();
82b1778798d3 Fix segfault when setting object parent to be object itself (bug #37927). Rik <rik@octave.org> parents: 17608 diff changeset	2893 ::adopt (parent.handle_value (), __myhandle__);
82b1778798d3 Fix segfault when setting object parent to be object itself (bug #37927). Rik <rik@octave.org> parents: 17608 diff changeset	2894 }
82b1778798d3 Fix segfault when setting object parent to be object itself (bug #37927). Rik <rik@octave.org> parents: 17608 diff changeset	2895 else
17641 cd5a6008ae72 Fix recursion segfault when setting axis parent to be child hggroup (bug #37927). Rik <rik@octave.org> parents: 17631 diff changeset	2896 error ("set: invalid graphics handle (= %g) for parent", hnp);
17626 82b1778798d3 Fix segfault when setting object parent to be object itself (bug #37927). Rik <rik@octave.org> parents: 17608 diff changeset	2897 }
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2898 }
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2899 else
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2900 error ("set: expecting parent to be a graphics handle");
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2901 }
6432 5bec61ae1576 [project @ 2007-03-23 02:19:10 by jwe] jwe parents: 6425 diff changeset	2902
18449 0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2903 /*
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2904 %!test
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2905 %! hf = figure ("visible", "off");
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2906 %! unwind_protect
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2907 %! hax = gca ();
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2908 %! set (hax, "parent", gcf ())
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2909 %! assert (gca (), hax)
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2910 %! unwind_protect_cleanup
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2911 %! close (hf);
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2912 %! end_unwind_protect
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2913 */
0cbd0d285541 Avoid reseting "parent" property to the same value (bug #37752). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18118 diff changeset	2914
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	2915 void
6836 ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	2916 base_properties::mark_modified (void)
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	2917 {
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2918 __modified__ = "on";
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2919 graphics_object parent_obj = gh_manager::get_object (get_parent ());
7379 a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	2920 if (parent_obj)
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	2921 parent_obj.mark_modified ();
6836 ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	2922 }
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	2923
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	2924 void
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	2925 base_properties::override_defaults (base_graphics_object& obj)
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	2926 {
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	2927 graphics_object parent_obj = gh_manager::get_object (get_parent ());
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	2928
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	2929 if (parent_obj)
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	2930 parent_obj.override_defaults (obj);
6836 ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	2931 }
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	2932
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	2933 void
7214 86d0b16f2bb2 [project @ 2007-11-29 03:40:04 by jwe] jwe parents: 7213 diff changeset	2934 base_properties::update_axis_limits (const std::string& axis_type) const
86d0b16f2bb2 [project @ 2007-11-29 03:40:04 by jwe] jwe parents: 7213 diff changeset	2935 {
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	2936 graphics_object obj = gh_manager::get_object (__myhandle__);
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	2937
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	2938 if (obj)
7214 86d0b16f2bb2 [project @ 2007-11-29 03:40:04 by jwe] jwe parents: 7213 diff changeset	2939 obj.update_axis_limits (axis_type);
86d0b16f2bb2 [project @ 2007-11-29 03:40:04 by jwe] jwe parents: 7213 diff changeset	2940 }
86d0b16f2bb2 [project @ 2007-11-29 03:40:04 by jwe] jwe parents: 7213 diff changeset	2941
86d0b16f2bb2 [project @ 2007-11-29 03:40:04 by jwe] jwe parents: 7213 diff changeset	2942 void
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2943 base_properties::update_axis_limits (const std::string& axis_type,
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2944 const graphics_handle& h) const
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2945 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2946 graphics_object obj = gh_manager::get_object (__myhandle__);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2947
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2948 if (obj)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	2949 obj.update_axis_limits (axis_type, h);
6836 ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	2950 }
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	2951
13324 1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	2952 bool
1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	2953 base_properties::is_handle_visible (void) const
1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	2954 {
1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	2955 return (handlevisibility.is ("on")
13736 deb69dab4514 Avoid some compilation warnings. Michael Goffioul <michael.goffioul@gmail.com> parents: 13713 diff changeset	2956 \|\| (executing_callback && ! handlevisibility.is ("off")));
13324 1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	2957 }
1e12601d2697 make handles with their handlevisibility property set to "callback" visible in callback functions John W. Eaton <jwe@octave.org> parents: 13323 diff changeset	2958
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2959 graphics_toolkit
8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2960 base_properties::get_toolkit (void) const
7419 f62fb98f1da2 [project @ 2008-01-25 08:24:48 by jwe] jwe parents: 7409 diff changeset	2961 {
f62fb98f1da2 [project @ 2008-01-25 08:24:48 by jwe] jwe parents: 7409 diff changeset	2962 graphics_object go = gh_manager::get_object (get_parent ());
f62fb98f1da2 [project @ 2008-01-25 08:24:48 by jwe] jwe parents: 7409 diff changeset	2963
f62fb98f1da2 [project @ 2008-01-25 08:24:48 by jwe] jwe parents: 7409 diff changeset	2964 if (go)
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2965 return go.get_toolkit ();
7419 f62fb98f1da2 [project @ 2008-01-25 08:24:48 by jwe] jwe parents: 7409 diff changeset	2966 else
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2967 return graphics_toolkit ();
7419 f62fb98f1da2 [project @ 2008-01-25 08:24:48 by jwe] jwe parents: 7409 diff changeset	2968 }
f62fb98f1da2 [project @ 2008-01-25 08:24:48 by jwe] jwe parents: 7409 diff changeset	2969
7828 4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	2970 void
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	2971 base_properties::update_boundingbox (void)
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	2972 {
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	2973 Matrix kids = get_children ();
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	2974
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	2975 for (int i = 0; i < kids.numel (); i++)
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	2976 {
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	2977 graphics_object go = gh_manager::get_object (kids(i));
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	2978
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	2979 if (go.valid_object ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2980 go.get_properties ().update_boundingbox ();
7828 4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	2981 }
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	2982 }
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	2983
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	2984 void
12389 5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	2985 base_properties::update_autopos (const std::string& elem_type)
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	2986 {
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	2987 graphics_object parent_obj = gh_manager::get_object (get_parent ());
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	2988
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	2989 if (parent_obj.valid_object ())
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	2990 parent_obj.get_properties ().update_autopos (elem_type);
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	2991 }
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	2992
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	2993 void
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	2994 base_properties::add_listener (const caseless_str& nm, const octave_value& v,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	2995 listener_mode mode)
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	2996 {
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	2997 property p = get_property (nm);
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	2998
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	2999 if (! error_state && p.ok ())
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	3000 p.add_listener (v, mode);
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	3001 }
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	3002
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	3003 void
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	3004 base_properties::delete_listener (const caseless_str& nm,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3005 const octave_value& v, listener_mode mode)
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	3006 {
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	3007 property p = get_property (nm);
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	3008
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	3009 if (! error_state && p.ok ())
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	3010 p.delete_listener (v, mode);
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	3011 }
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	3012
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	3013 // ---------------------------------------------------------------------
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	3014
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	3015 void
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	3016 base_graphics_object::update_axis_limits (const std::string& axis_type)
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	3017 {
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	3018 if (valid_object ())
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	3019 {
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	3020 graphics_object parent_obj = gh_manager::get_object (get_parent ());
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	3021
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	3022 if (parent_obj)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3023 parent_obj.update_axis_limits (axis_type);
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	3024 }
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	3025 else
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	3026 error ("base_graphics_object::update_axis_limits: invalid graphics object");
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	3027 }
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	3028
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	3029 void
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3030 base_graphics_object::update_axis_limits (const std::string& axis_type,
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3031 const graphics_handle& h)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3032 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3033 if (valid_object ())
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3034 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3035 graphics_object parent_obj = gh_manager::get_object (get_parent ());
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3036
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3037 if (parent_obj)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3038 parent_obj.update_axis_limits (axis_type, h);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3039 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3040 else
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3041 error ("base_graphics_object::update_axis_limits: invalid graphics object");
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3042 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3043
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3044 void
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	3045 base_graphics_object::remove_all_listeners (void)
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	3046 {
11074 8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	3047 octave_map m = get (true).map_value ();
8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	3048
8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	3049 for (octave_map::const_iterator pa = m.begin (); pa != m.end (); pa++)
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	3050 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	3051 // FIXME: there has to be a better way. I think we want to
9585 06b8b51dca48 also handle user-defined graphics properties in new property name validation scheme John W. Eaton <jwe@octave.org> parents: 9584 diff changeset	3052 // ask whether it is OK to delete the listener for the given
06b8b51dca48 also handle user-defined graphics properties in new property name validation scheme John W. Eaton <jwe@octave.org> parents: 9584 diff changeset	3053 // property. How can we know in advance that it will be OK?
06b8b51dca48 also handle user-defined graphics properties in new property name validation scheme John W. Eaton <jwe@octave.org> parents: 9584 diff changeset	3054
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10056 diff changeset	3055 unwind_protect frame;
2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10056 diff changeset	3056
13849 b4b8e525dee0 Stop debug_on_error triggering for a new plot (bug #32655) Rik <octave@nomad.inbox5.com> parents: 13830 diff changeset	3057 frame.protect_var (error_state);
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10056 diff changeset	3058 frame.protect_var (discard_error_messages);
13849 b4b8e525dee0 Stop debug_on_error triggering for a new plot (bug #32655) Rik <octave@nomad.inbox5.com> parents: 13830 diff changeset	3059 frame.protect_var (Vdebug_on_error);
b4b8e525dee0 Stop debug_on_error triggering for a new plot (bug #32655) Rik <octave@nomad.inbox5.com> parents: 13830 diff changeset	3060 frame.protect_var (Vdebug_on_warning);
9585 06b8b51dca48 also handle user-defined graphics properties in new property name validation scheme John W. Eaton <jwe@octave.org> parents: 9584 diff changeset	3061
06b8b51dca48 also handle user-defined graphics properties in new property name validation scheme John W. Eaton <jwe@octave.org> parents: 9584 diff changeset	3062 discard_error_messages = true;
13849 b4b8e525dee0 Stop debug_on_error triggering for a new plot (bug #32655) Rik <octave@nomad.inbox5.com> parents: 13830 diff changeset	3063 Vdebug_on_error = false;
b4b8e525dee0 Stop debug_on_error triggering for a new plot (bug #32655) Rik <octave@nomad.inbox5.com> parents: 13830 diff changeset	3064 Vdebug_on_warning = false;
9585 06b8b51dca48 also handle user-defined graphics properties in new property name validation scheme John W. Eaton <jwe@octave.org> parents: 9584 diff changeset	3065
06b8b51dca48 also handle user-defined graphics properties in new property name validation scheme John W. Eaton <jwe@octave.org> parents: 9584 diff changeset	3066 property p = get_properties ().get_property (pa->first);
06b8b51dca48 also handle user-defined graphics properties in new property name validation scheme John W. Eaton <jwe@octave.org> parents: 9584 diff changeset	3067
06b8b51dca48 also handle user-defined graphics properties in new property name validation scheme John W. Eaton <jwe@octave.org> parents: 9584 diff changeset	3068 if (! error_state && p.ok ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3069 p.delete_listener ();
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	3070 }
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	3071 }
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	3072
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3073 std::string
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3074 base_graphics_object::values_as_string (void)
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3075 {
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3076 std::string retval;
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3077
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3078 if (valid_object ())
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3079 {
11074 8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	3080 octave_map m = get ().map_value ();
18580 5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3081 graphics_object obj = gh_manager::get_object (get_handle ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	3082
11074 8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	3083 for (octave_map::const_iterator pa = m.begin (); pa != m.end (); pa++)
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3084 {
18580 5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3085 if (pa->first != "children" &&
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3086 ! obj.has_readonly_property (pa->first))
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3087 {
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3088 property p = get_properties ().get_property (pa->first);
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3089
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3090 if (p.ok () && ! p.is_hidden ())
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3091 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	3092 retval += "\n\t" + std::string (pa->first) + ": ";
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3093 if (p.is_radio ())
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3094 retval += p.values_as_string ();
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3095 }
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3096 }
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3097 }
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	3098
ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	3099 if (! retval.empty ())
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3100 retval += "\n";
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3101 }
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3102 else
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3103 error ("base_graphics_object::values_as_string: invalid graphics object");
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3104
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3105 return retval;
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3106 }
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3107
18117 ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3108 std::string
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	3109 base_graphics_object::value_as_string (const std::string& prop)
18117 ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3110 {
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3111 std::string retval;
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3112
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3113 if (valid_object ())
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3114 {
18580 5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3115 graphics_object obj = gh_manager::get_object (get_handle ());
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3116
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3117 if (prop != "children" && ! obj.has_readonly_property (prop))
18117 ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3118 {
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3119 property p = get_properties ().get_property (prop);
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3120
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3121 if (p.ok () && ! p.is_hidden ())
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3122 {
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3123 if (p.is_radio ())
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	3124 retval += p.values_as_string ();
ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	3125 }
ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	3126 }
ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	3127
ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	3128 if (! retval.empty ())
18117 ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3129 retval += "\n";
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3130 }
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3131 else
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3132 error ("base_graphics_object::value_as_string: invalid graphics object");
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3133
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3134 return retval;
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3135 }
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	3136
11074 8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	3137 octave_scalar_map
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3138 base_graphics_object::values_as_struct (void)
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3139 {
11074 8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	3140 octave_scalar_map retval;
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3141
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3142 if (valid_object ())
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3143 {
11074 8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	3144 octave_scalar_map m = get ().scalar_map_value ();
18580 5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3145 graphics_object obj = gh_manager::get_object (get_handle ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	3146
11074 8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	3147 for (octave_scalar_map::const_iterator pa = m.begin ();
8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	3148 pa != m.end (); pa++)
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3149 {
18580 5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3150 if (pa->first != "children"
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3151 && ! obj.has_readonly_property (pa->first))
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3152 {
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3153 property p = get_properties ().get_property (pa->first);
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3154
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3155 if (p.ok () && ! p.is_hidden ())
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3156 {
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3157 if (p.is_radio ())
11074 8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	3158 retval.assign (p.get_name (), p.values_as_cell ());
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3159 else
11074 8a3b7e8fcbbc graphics.cc, graphics.h.in, genprops.awk: use octave_map and octave_scalar_map instead of Octave_map John W. Eaton <jwe@octave.org> parents: 10995 diff changeset	3160 retval.assign (p.get_name (), Cell ());
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3161 }
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3162 }
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3163 }
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3164 }
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3165 else
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3166 error ("base_graphics_object::values_as_struct: invalid graphics object");
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3167
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3168 return retval;
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3169 }
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	3170
18580 5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3171 /*
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3172 %!test
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3173 %! hfig = figure ("visible", "off");
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3174 %! unwind_protect
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3175 %! hax = axes ();
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3176 %! ret = set (hax, "tightinset");
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3177 %! assert (isempty (ret));
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3178 %! ret = set (hax, "type");
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3179 %! assert (isempty (ret));
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3180 %! ret = set (hfig, "__graphics_toolkit__");
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3181 %! assert (isempty (ret));
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3182 %! ret = set (0, "commandwindowsize");
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3183 %! assert (isempty (ret));
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3184 %! ret = set (0);
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3185 %! assert (! isfield (ret, "commandwindowsize"));
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3186 %! unwind_protect_cleanup
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3187 %! close (hfig);
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3188 %! end_unwind_protect
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	3189 */
11250 830b940e7ff4 Turn xget_ancestor into regular API Michael Goffioul <michael.goffioul@gmail.com> parents: 11239 diff changeset	3190 graphics_object
11492 d86389a6dc3f graphics.cc: avoid GCC warning John W. Eaton <jwe@octave.org> parents: 11456 diff changeset	3191 graphics_object::get_ancestor (const std::string& obj_type) const
11250 830b940e7ff4 Turn xget_ancestor into regular API Michael Goffioul <michael.goffioul@gmail.com> parents: 11239 diff changeset	3192 {
830b940e7ff4 Turn xget_ancestor into regular API Michael Goffioul <michael.goffioul@gmail.com> parents: 11239 diff changeset	3193 if (valid_object ())
830b940e7ff4 Turn xget_ancestor into regular API Michael Goffioul <michael.goffioul@gmail.com> parents: 11239 diff changeset	3194 {
11492 d86389a6dc3f graphics.cc: avoid GCC warning John W. Eaton <jwe@octave.org> parents: 11456 diff changeset	3195 if (isa (obj_type))
11250 830b940e7ff4 Turn xget_ancestor into regular API Michael Goffioul <michael.goffioul@gmail.com> parents: 11239 diff changeset	3196 return *this;
830b940e7ff4 Turn xget_ancestor into regular API Michael Goffioul <michael.goffioul@gmail.com> parents: 11239 diff changeset	3197 else
11492 d86389a6dc3f graphics.cc: avoid GCC warning John W. Eaton <jwe@octave.org> parents: 11456 diff changeset	3198 return gh_manager::get_object (get_parent ()).get_ancestor (obj_type);
11250 830b940e7ff4 Turn xget_ancestor into regular API Michael Goffioul <michael.goffioul@gmail.com> parents: 11239 diff changeset	3199 }
830b940e7ff4 Turn xget_ancestor into regular API Michael Goffioul <michael.goffioul@gmail.com> parents: 11239 diff changeset	3200 else
830b940e7ff4 Turn xget_ancestor into regular API Michael Goffioul <michael.goffioul@gmail.com> parents: 11239 diff changeset	3201 return graphics_object ();
830b940e7ff4 Turn xget_ancestor into regular API Michael Goffioul <michael.goffioul@gmail.com> parents: 11239 diff changeset	3202 }
830b940e7ff4 Turn xget_ancestor into regular API Michael Goffioul <michael.goffioul@gmail.com> parents: 11239 diff changeset	3203
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	3204 // ---------------------------------------------------------------------
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	3205
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	3206 #include "graphics-props.cc"
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	3207
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	3208 // ---------------------------------------------------------------------
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	3209
6836 ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	3210 void
7822 edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3211 root_figure::properties::set_callbackobject (const octave_value& v)
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3212 {
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3213 graphics_handle val (v);
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3214
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3215 if (error_state)
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3216 return;
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3217
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3218 if (xisnan (val.value ()))
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3219 {
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3220 if (! cbo_stack.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3221 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3222 val = cbo_stack.front ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3223
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3224 cbo_stack.pop_front ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3225 }
7822 edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3226
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3227 callbackobject = val;
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3228 }
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3229 else if (is_handle (val))
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3230 {
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3231 if (get_callbackobject ().ok ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3232 cbo_stack.push_front (get_callbackobject ());
7822 edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3233
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3234 callbackobject = val;
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3235 }
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3236 else
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3237 gripe_set_invalid ("callbackobject");
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3238 }
edbaa13397ee Implement callbackobject property in root object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7820 diff changeset	3239
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3240 void
18771 9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3241 root_figure::properties::set_currentfigure (const octave_value& v)
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3242 {
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3243 graphics_handle val (v);
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3244
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3245 if (error_state)
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3246 return;
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3247
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3248 if (xisnan (val.value ()) \|\| is_handle (val))
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3249 {
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3250 currentfigure = val;
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3251
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3252 if (val.ok ())
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3253 gh_manager::push_figure (val);
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3254 }
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3255 else
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3256 gripe_set_invalid ("currentfigure");
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3257 }
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3258
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3259 std::string
18798 89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3260 root_figure::properties::get_diary (void) const
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3261 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3262 bool is_diary_on = F__diarystate__ ()(0).bool_value ();
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3263 if (is_diary_on)
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3264 return std::string ("on");
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3265 else
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3266 return std::string ("off");
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3267 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3268
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3269 void
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3270 root_figure::properties::set_diary (const octave_value& val)
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3271 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3272 if (! error_state)
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3273 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3274 // Input checking and abrev. matching
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3275 diary.set (val, false);
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3276
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3277 if (! error_state)
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3278 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3279 Fdiary (ovl (diary.current_value ()));
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3280
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3281 diary.run_listeners ();
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3282 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3283 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3284 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3285
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3286 std::string
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3287 root_figure::properties::get_diaryfile (void) const
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3288 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3289 return F__diaryfile__ ()(0).string_value ();
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3290 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3291
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3292 void
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3293 root_figure::properties::set_diaryfile (const octave_value& val)
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3294 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3295 if (! error_state)
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3296 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3297 // Input checking and abrev. matching
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3298 diaryfile.set (val, false);
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3299
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3300 if (! error_state)
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3301 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3302 Fdiary (ovl (diaryfile.string_value ()));
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3303
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3304 diaryfile.run_listeners ();
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3305 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3306 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3307 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3308
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3309 std::string
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3310 root_figure::properties::get_echo (void) const
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3311 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3312 bool is_echo_on = F__echostate__ ()(0).bool_value ();
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3313 if (is_echo_on)
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3314 return std::string ("on");
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3315 else
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3316 return std::string ("off");
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3317 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3318
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3319 void
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3320 root_figure::properties::set_echo (const octave_value& val)
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3321 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3322 if (! error_state)
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3323 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3324 // Input checking and abrev. matching
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3325 echo.set (val, false);
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3326
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3327 if (! error_state)
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3328 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3329 Fecho (ovl (echo.current_value ()));
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3330
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3331 echo.run_listeners ();
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3332 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3333 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3334 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3335
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3336 std::string
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3337 root_figure::properties::get_errormessage (void) const
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3338 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3339 return Flasterr ()(0).string_value ();
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3340 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3341
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3342 std::string
18771 9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3343 root_figure::properties::get_format (void) const
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3344 {
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3345 return F__formatstring__ ()(0).string_value ();
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3346 }
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3347
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3348 void
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3349 root_figure::properties::set_format (const octave_value& val)
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3350 {
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3351 if (! error_state)
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3352 {
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3353 // Input checking and abrev. matching
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3354 format.set (val, false);
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3355
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3356 if (! error_state)
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3357 {
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3358 Fformat (ovl (format.current_value ()));
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3359
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3360 format.run_listeners ();
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3361 }
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3362 }
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3363 }
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3364
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3365 std::string
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3366 root_figure::properties::get_formatspacing (void) const
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3367 {
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3368 bool iscompact = F__compactformat__ ()(0).bool_value ();
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3369 if (iscompact)
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3370 return std::string ("compact");
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3371 else
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3372 return std::string ("loose");
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3373 }
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3374
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3375 void
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3376 root_figure::properties::set_formatspacing (const octave_value& val)
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3377 {
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3378 if (! error_state)
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3379 {
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3380 // Input checking and abrev. matching
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3381 formatspacing.set (val, false);
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3382
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3383 if (! error_state)
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3384 {
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3385 std::string strval = formatspacing.current_value ();
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3386
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3387 if (strval == "compact")
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3388 F__compactformat__ (ovl (true));
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3389 else
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3390 F__compactformat__ (ovl (false));
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3391
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3392 formatspacing.run_listeners ();
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3393 }
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3394 }
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3395 }
9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3396
18798 89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3397
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3398 double
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3399 root_figure::properties::get_recursionlimit (void) const
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3400 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3401 return Fmax_recursion_depth ()(0).double_value ();
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3402 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3403
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3404 void
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3405 root_figure::properties::set_recursionlimit (const octave_value& val)
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3406 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3407 if (! error_state)
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3408 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3409 // Input checking and abrev. matching
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3410 recursionlimit.set (val, false);
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3411
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3412 if (! error_state)
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3413 {
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3414 double dval = recursionlimit.double_value ();
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3415
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3416 Fmax_recursion_depth (ovl (dval));
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3417
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3418 recursionlimit.run_listeners ();
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3419 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3420 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3421 }
89448a7523b2 Add some more callbacks for root properties (bug #42347). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18771 diff changeset	3422
18771 9fbb254c09e6 build: Fix compiling with new graphic root properties (cset 28eab2d84190). Rik <rik@octave.org> parents: 18761 diff changeset	3423 void
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3424 figure::properties::set_integerhandle (const octave_value& val)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3425 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3426 if (! error_state)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3427 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3428 if (integerhandle.set (val, true))
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3429 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3430 bool int_fig_handle = integerhandle.is_on ();
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3431
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3432 graphics_object this_go = gh_manager::get_object (__myhandle__);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3433
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3434 graphics_handle old_myhandle = __myhandle__;
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3435
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3436 __myhandle__ = gh_manager::get_handle (int_fig_handle);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3437
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3438 gh_manager::renumber_figure (old_myhandle, __myhandle__);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3439
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3440 graphics_object parent_go = gh_manager::get_object (get_parent ());
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3441
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3442 base_properties& props = parent_go.get_properties ();
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3443
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3444 props.renumber_child (old_myhandle, __myhandle__);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3445
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3446 Matrix kids = get_children ();
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3447
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3448 for (octave_idx_type i = 0; i < kids.numel (); i++)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3449 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3450 graphics_object kid = gh_manager::get_object (kids(i));
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3451
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3452 kid.get_properties ().renumber_parent (__myhandle__);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3453 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3454
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3455 graphics_handle cf = gh_manager::current_figure ();
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3456
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3457 if (__myhandle__ == cf)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3458 xset (0, "currentfigure", __myhandle__.value ());
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3459
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3460 this_go.update (integerhandle.get_id ());
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3461
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3462 mark_modified ();
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3463 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3464 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3465 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	3466
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17842 diff changeset	3467 // FIXME: This should update monitorpositions and pointerlocation, but
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3468 // as these properties are yet used, and so it doesn't matter that they
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3469 // aren't set yet.
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	3470 void
8560 5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3471 root_figure::properties::update_units (void)
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3472 {
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3473 caseless_str xunits = get_units ();
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3474
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3475 Matrix ss = default_screensize ();
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3476
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3477 double dpi = get_screenpixelsperinch ();
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3478
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3479 if (xunits.compare ("inches"))
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3480 {
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3481 ss(0) = 0;
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3482 ss(1) = 0;
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3483 ss(2) /= dpi;
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3484 ss(3) /= dpi;
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3485 }
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3486 else if (xunits.compare ("centimeters"))
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3487 {
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3488 ss(0) = 0;
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3489 ss(1) = 0;
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3490 ss(2) *= 2.54 / dpi;
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3491 ss(3) *= 2.54 / dpi;
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3492 }
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3493 else if (xunits.compare ("normalized"))
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3494 {
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3495 ss = Matrix (1, 4, 1.0);
14266 37ca58f9a887 When root_figure units = normalized, screensize = [0 0 1 1]. Ben Abbott <bpabbott@mac.com> parents: 14258 diff changeset	3496 ss(0) = 0;
37ca58f9a887 When root_figure units = normalized, screensize = [0 0 1 1]. Ben Abbott <bpabbott@mac.com> parents: 14258 diff changeset	3497 ss(1) = 0;
8560 5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3498 }
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3499 else if (xunits.compare ("points"))
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3500 {
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3501 ss(0) = 0;
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3502 ss(1) = 0;
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3503 ss(2) *= 72 / dpi;
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3504 ss(3) *= 72 / dpi;
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3505 }
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3506
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3507 set_screensize (ss);
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3508 }
5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3509
14357 e7c74f56cd03 fltk toolkit requires figure units to be "pixels". Bug # 35430. Ben Abbott <bpabbott@mac.com> parents: 14326 diff changeset	3510 Matrix
14604 de72463862c4 Silence warnings Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14498 diff changeset	3511 root_figure::properties::get_boundingbox (bool, const Matrix&) const
14357 e7c74f56cd03 fltk toolkit requires figure units to be "pixels". Bug # 35430. Ben Abbott <bpabbott@mac.com> parents: 14326 diff changeset	3512 {
e7c74f56cd03 fltk toolkit requires figure units to be "pixels". Bug # 35430. Ben Abbott <bpabbott@mac.com> parents: 14326 diff changeset	3513 Matrix screen_size = screen_size_pixels ();
e7c74f56cd03 fltk toolkit requires figure units to be "pixels". Bug # 35430. Ben Abbott <bpabbott@mac.com> parents: 14326 diff changeset	3514 Matrix pos = Matrix (1, 4, 0);
e7c74f56cd03 fltk toolkit requires figure units to be "pixels". Bug # 35430. Ben Abbott <bpabbott@mac.com> parents: 14326 diff changeset	3515 pos(2) = screen_size(0);
e7c74f56cd03 fltk toolkit requires figure units to be "pixels". Bug # 35430. Ben Abbott <bpabbott@mac.com> parents: 14326 diff changeset	3516 pos(3) = screen_size(1);
e7c74f56cd03 fltk toolkit requires figure units to be "pixels". Bug # 35430. Ben Abbott <bpabbott@mac.com> parents: 14326 diff changeset	3517 return pos;
e7c74f56cd03 fltk toolkit requires figure units to be "pixels". Bug # 35430. Ben Abbott <bpabbott@mac.com> parents: 14326 diff changeset	3518 }
e7c74f56cd03 fltk toolkit requires figure units to be "pixels". Bug # 35430. Ben Abbott <bpabbott@mac.com> parents: 14326 diff changeset	3519
14266 37ca58f9a887 When root_figure units = normalized, screensize = [0 0 1 1]. Ben Abbott <bpabbott@mac.com> parents: 14258 diff changeset	3520 /*
37ca58f9a887 When root_figure units = normalized, screensize = [0 0 1 1]. Ben Abbott <bpabbott@mac.com> parents: 14258 diff changeset	3521 %!test
17237 5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3522 %! old_units = get (0, "units");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3523 %! unwind_protect
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3524 %! set (0, "units", "pixels");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3525 %! sz = get (0, "screensize") - [1, 1, 0, 0];
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3526 %! dpi = get (0, "screenpixelsperinch");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3527 %! set (0, "units", "inches");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3528 %! assert (get (0, "screensize"), sz / dpi, 0.5 / dpi);
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3529 %! set (0, "units", "centimeters");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3530 %! assert (get (0, "screensize"), sz / dpi * 2.54, 0.5 / dpi * 2.54);
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3531 %! set (0, "units", "points");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3532 %! assert (get (0, "screensize"), sz / dpi * 72, 0.5 / dpi * 72);
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3533 %! set (0, "units", "normalized");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3534 %! assert (get (0, "screensize"), [0.0, 0.0, 1.0, 1.0]);
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3535 %! set (0, "units", "pixels");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3536 %! assert (get (0, "screensize"), sz + [1, 1, 0, 0]);
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3537 %! unwind_protect_cleanup
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3538 %! set (0, "units", old_units);
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	3539 %! end_unwind_protect
14266 37ca58f9a887 When root_figure units = normalized, screensize = [0 0 1 1]. Ben Abbott <bpabbott@mac.com> parents: 14258 diff changeset	3540 */
37ca58f9a887 When root_figure units = normalized, screensize = [0 0 1 1]. Ben Abbott <bpabbott@mac.com> parents: 14258 diff changeset	3541
8560 5cc594679cdc get display characteristics from system John W. Eaton <jwe@octave.org> parents: 8557 diff changeset	3542 void
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	3543 root_figure::properties::remove_child (const graphics_handle& gh)
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	3544 {
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	3545 gh_manager::pop_figure (gh);
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	3546
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	3547 graphics_handle cf = gh_manager::current_figure ();
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	3548
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	3549 xset (0, "currentfigure", cf.value ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	3550
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	3551 base_properties::remove_child (gh);
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	3552 }
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	3553
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	3554 property_list
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	3555 root_figure::factory_properties = root_figure::init_factory_properties ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	3556
10733 f72a761a784c eliminate code duplication in reset_default_properties methods John W. Eaton <jwe@octave.org> parents: 10722 diff changeset	3557 static void
f72a761a784c eliminate code duplication in reset_default_properties methods John W. Eaton <jwe@octave.org> parents: 10722 diff changeset	3558 reset_default_properties (property_list& default_properties)
10722 755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3559 {
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3560 property_list new_defaults;
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3561
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3562 for (property_list::plist_map_const_iterator p = default_properties.begin ();
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3563 p != default_properties.end (); p++)
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3564 {
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3565 const property_list::pval_map_type pval_map = p->second;
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3566 std::string prefix = p->first;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	3567
10722 755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3568 for (property_list::pval_map_const_iterator q = pval_map.begin ();
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3569 q != pval_map.end ();
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3570 q++)
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3571 {
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3572 std::string s = q->first;
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3573
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3574 if (prefix == "axes" && (s == "position" \|\| s == "units"))
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3575 new_defaults.set (prefix + s, q->second);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	3576 else if (prefix == "figure" && (s == "position" \|\| s == "units"
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	3577 \|\| s == "windowstyle"
10722 755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3578 \|\| s == "paperunits"))
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3579 new_defaults.set (prefix + s, q->second);
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3580 }
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3581 }
10733 f72a761a784c eliminate code duplication in reset_default_properties methods John W. Eaton <jwe@octave.org> parents: 10722 diff changeset	3582
10722 755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3583 default_properties = new_defaults;
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3584 }
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	3585
10733 f72a761a784c eliminate code duplication in reset_default_properties methods John W. Eaton <jwe@octave.org> parents: 10722 diff changeset	3586 void
f72a761a784c eliminate code duplication in reset_default_properties methods John W. Eaton <jwe@octave.org> parents: 10722 diff changeset	3587 root_figure::reset_default_properties (void)
f72a761a784c eliminate code duplication in reset_default_properties methods John W. Eaton <jwe@octave.org> parents: 10722 diff changeset	3588 {
f72a761a784c eliminate code duplication in reset_default_properties methods John W. Eaton <jwe@octave.org> parents: 10722 diff changeset	3589 ::reset_default_properties (default_properties);
f72a761a784c eliminate code duplication in reset_default_properties methods John W. Eaton <jwe@octave.org> parents: 10722 diff changeset	3590 }
f72a761a784c eliminate code duplication in reset_default_properties methods John W. Eaton <jwe@octave.org> parents: 10722 diff changeset	3591
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	3592 // ---------------------------------------------------------------------
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	3593
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	3594 void
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	3595 figure::properties::set_currentaxes (const octave_value& v)
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	3596 {
7378 3771971e8891 [project @ 2008-01-15 07:40:23 by jwe] jwe parents: 7373 diff changeset	3597 graphics_handle val (v);
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	3598
6874 94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3599 if (error_state)
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3600 return;
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3601
7070 7593f8e83a2e [project @ 2007-10-25 20:41:16 by jwe] jwe parents: 7059 diff changeset	3602 if (xisnan (val.value ()) \|\| is_handle (val))
6874 94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3603 currentaxes = val;
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3604 else
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3605 gripe_set_invalid ("currentaxes");
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3606 }
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3607
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3608 void
8266 81b124f463f9 properly update currentaxes when axes are deleted John W. Eaton <jwe@octave.org> parents: 8249 diff changeset	3609 figure::properties::remove_child (const graphics_handle& gh)
81b124f463f9 properly update currentaxes when axes are deleted John W. Eaton <jwe@octave.org> parents: 8249 diff changeset	3610 {
81b124f463f9 properly update currentaxes when axes are deleted John W. Eaton <jwe@octave.org> parents: 8249 diff changeset	3611 base_properties::remove_child (gh);
81b124f463f9 properly update currentaxes when axes are deleted John W. Eaton <jwe@octave.org> parents: 8249 diff changeset	3612
81b124f463f9 properly update currentaxes when axes are deleted John W. Eaton <jwe@octave.org> parents: 8249 diff changeset	3613 if (gh == currentaxes.handle_value ())
81b124f463f9 properly update currentaxes when axes are deleted John W. Eaton <jwe@octave.org> parents: 8249 diff changeset	3614 {
81b124f463f9 properly update currentaxes when axes are deleted John W. Eaton <jwe@octave.org> parents: 8249 diff changeset	3615 graphics_handle new_currentaxes;
81b124f463f9 properly update currentaxes when axes are deleted John W. Eaton <jwe@octave.org> parents: 8249 diff changeset	3616
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3617 Matrix kids = get_children ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3618
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3619 for (octave_idx_type i = 0; i < kids.numel (); i++)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3620 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	3621 graphics_handle kid = kids(i);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3622
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3623 graphics_object go = gh_manager::get_object (kid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3624
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3625 if (go.isa ("axes"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3626 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3627 new_currentaxes = kid;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3628 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3629 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3630 }
8266 81b124f463f9 properly update currentaxes when axes are deleted John W. Eaton <jwe@octave.org> parents: 8249 diff changeset	3631
81b124f463f9 properly update currentaxes when axes are deleted John W. Eaton <jwe@octave.org> parents: 8249 diff changeset	3632 currentaxes = new_currentaxes;
81b124f463f9 properly update currentaxes when axes are deleted John W. Eaton <jwe@octave.org> parents: 8249 diff changeset	3633 }
81b124f463f9 properly update currentaxes when axes are deleted John W. Eaton <jwe@octave.org> parents: 8249 diff changeset	3634 }
81b124f463f9 properly update currentaxes when axes are deleted John W. Eaton <jwe@octave.org> parents: 8249 diff changeset	3635
81b124f463f9 properly update currentaxes when axes are deleted John W. Eaton <jwe@octave.org> parents: 8249 diff changeset	3636 void
6874 94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3637 figure::properties::set_visible (const octave_value& val)
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3638 {
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3639 std::string s = val.string_value ();
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3640
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3641 if (! error_state)
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3642 {
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3643 if (s == "on")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3644 xset (0, "currentfigure", __myhandle__.value ());
6874 94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3645
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3646 visible = val;
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3647 }
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3648 }
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	3649
7445 af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	3650 Matrix
13713 d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3651 figure::properties::get_boundingbox (bool internal, const Matrix&) const
7445 af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	3652 {
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3653 Matrix screen_size = screen_size_pixels ();
13713 d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3654 Matrix pos = (internal ?
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3655 get_position ().matrix_value () :
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3656 get_outerposition ().matrix_value ());
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3657
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3658 pos = convert_position (pos, get_units (), "pixels", screen_size);
7445 af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	3659
af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	3660 pos(0)--;
af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	3661 pos(1)--;
7447 25018e35b4cb [project @ 2008-02-05 22:38:57 by jwe] jwe parents: 7446 diff changeset	3662 pos(1) = screen_size(1) - pos(1) - pos(3);
7445 af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	3663
af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	3664 return pos;
af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	3665 }
af92b34f3a3a [project @ 2008-02-04 07:53:07 by jwe] jwe parents: 7440 diff changeset	3666
7828 4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3667 void
13713 d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3668 figure::properties::set_boundingbox (const Matrix& bb, bool internal,
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3669 bool do_notify_toolkit)
7828 4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3670 {
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3671 Matrix screen_size = screen_size_pixels ();
7828 4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3672 Matrix pos = bb;
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3673
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3674 pos(1) = screen_size(1) - pos(1) - pos(3);
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3675 pos(1)++;
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3676 pos(0)++;
9238 0ae2b6617005 Use display information from the root object to compute bounding boxes Michael Goffioul <michael.goffioul@gmail.com> parents: 9185 diff changeset	3677 pos = convert_position (pos, "pixels", get_units (), screen_size);
7828 4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3678
13713 d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3679 if (internal)
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3680 set_position (pos, do_notify_toolkit);
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3681 else
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3682 set_outerposition (pos, do_notify_toolkit);
7828 4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3683 }
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3684
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3685 Matrix
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3686 figure::properties::map_from_boundingbox (double x, double y) const
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3687 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3688 Matrix bb = get_boundingbox (true);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3689 Matrix pos (1, 2, 0);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3690
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3691 pos(0) = x;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3692 pos(1) = y;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3693
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3694 pos(1) = bb(3) - pos(1);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3695 pos(0)++;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3696 pos = convert_position (pos, "pixels", get_units (),
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3697 bb.extract_n (0, 2, 1, 2));
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3698
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3699 return pos;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3700 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3701
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3702 Matrix
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3703 figure::properties::map_to_boundingbox (double x, double y) const
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3704 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3705 Matrix bb = get_boundingbox (true);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3706 Matrix pos (1, 2, 0);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3707
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3708 pos(0) = x;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3709 pos(1) = y;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3710
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3711 pos = convert_position (pos, get_units (), "pixels",
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3712 bb.extract_n (0, 2, 1, 2));
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3713 pos(0)--;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3714 pos(1) = bb(3) - pos(1);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3715
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3716 return pos;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3717 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	3718
7828 4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3719 void
13713 d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3720 figure::properties::set_position (const octave_value& v,
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3721 bool do_notify_toolkit)
7828 4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3722 {
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3723 if (! error_state)
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3724 {
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3725 Matrix old_bb, new_bb;
14367 ba01a38bc5c1 Use internal bounding box in figure::properties::set_position. Ben Abbott <bpabbott@mac.com> parents: 14357 diff changeset	3726 bool modified = false;
ba01a38bc5c1 Use internal bounding box in figure::properties::set_position. Ben Abbott <bpabbott@mac.com> parents: 14357 diff changeset	3727
ba01a38bc5c1 Use internal bounding box in figure::properties::set_position. Ben Abbott <bpabbott@mac.com> parents: 14357 diff changeset	3728 old_bb = get_boundingbox (true);
ba01a38bc5c1 Use internal bounding box in figure::properties::set_position. Ben Abbott <bpabbott@mac.com> parents: 14357 diff changeset	3729 modified = position.set (v, false, do_notify_toolkit);
ba01a38bc5c1 Use internal bounding box in figure::properties::set_position. Ben Abbott <bpabbott@mac.com> parents: 14357 diff changeset	3730 new_bb = get_boundingbox (true);
7828 4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3731
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3732 if (old_bb != new_bb)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3733 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3734 if (old_bb(2) != new_bb(2) \|\| old_bb(3) != new_bb(3))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3735 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3736 execute_resizefcn ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3737 update_boundingbox ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3738 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	3739 }
7828 4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3740
14367 ba01a38bc5c1 Use internal bounding box in figure::properties::set_position. Ben Abbott <bpabbott@mac.com> parents: 14357 diff changeset	3741 if (modified)
ba01a38bc5c1 Use internal bounding box in figure::properties::set_position. Ben Abbott <bpabbott@mac.com> parents: 14357 diff changeset	3742 {
ba01a38bc5c1 Use internal bounding box in figure::properties::set_position. Ben Abbott <bpabbott@mac.com> parents: 14357 diff changeset	3743 position.run_listeners (POSTSET);
ba01a38bc5c1 Use internal bounding box in figure::properties::set_position. Ben Abbott <bpabbott@mac.com> parents: 14357 diff changeset	3744 mark_modified ();
ba01a38bc5c1 Use internal bounding box in figure::properties::set_position. Ben Abbott <bpabbott@mac.com> parents: 14357 diff changeset	3745 }
18807 70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3746
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3747 if (paperpositionmode.is ("auto"))
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3748 paperposition.set (get_auto_paperposition ());
7828 4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3749 }
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3750 }
4739b6a1925c Implement resize handler mechanism (call resizefcn on figure resize and notify children). Michael Goffioul <michael.goffioul@gmail.com> parents: 7827 diff changeset	3751
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3752 void
13713 d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3753 figure::properties::set_outerposition (const octave_value& v,
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3754 bool do_notify_toolkit)
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3755 {
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3756 if (! error_state)
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3757 {
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3758 if (outerposition.set (v, true, do_notify_toolkit))
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3759 {
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3760 mark_modified ();
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3761 }
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3762 }
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3763 }
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3764
d99aa455296e Add outerposition property to figure objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 13703 diff changeset	3765 void
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3766 figure::properties::set_paperunits (const octave_value& v)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3767 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3768 if (! error_state)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3769 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3770 caseless_str typ = get_papertype ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3771 caseless_str punits = v.string_value ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3772 if (! error_state)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3773 {
10994 9e1270a84a10 graphics.cc: Replace pagetype property value custom with <custom>. Ben Abbott <bpabbott@mac.com> parents: 10991 diff changeset	3774 if (punits.compare ("normalized") && typ.compare ("<custom>"))
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3775 error ("set: can't set the paperunits to normalized when the papertype is custom");
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3776 else
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3777 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3778 caseless_str old_paperunits = get_paperunits ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3779 if (paperunits.set (v, true))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3780 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3781 update_paperunits (old_paperunits);
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3782 mark_modified ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3783 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3784 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3785 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3786 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3787 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3788
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3789 void
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3790 figure::properties::set_papertype (const octave_value& v)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3791 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3792 if (! error_state)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3793 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3794 caseless_str typ = v.string_value ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3795 caseless_str punits = get_paperunits ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3796 if (! error_state)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3797 {
10994 9e1270a84a10 graphics.cc: Replace pagetype property value custom with <custom>. Ben Abbott <bpabbott@mac.com> parents: 10991 diff changeset	3798 if (punits.compare ("normalized") && typ.compare ("<custom>"))
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3799 error ("set: can't set the paperunits to normalized when the papertype is custom");
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3800 else
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3801 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3802 if (papertype.set (v, true))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3803 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3804 update_papertype ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3805 mark_modified ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3806 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3807 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3808 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3809 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3810 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3811
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3812 static Matrix
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3813 papersize_from_type (const caseless_str punits, const caseless_str typ)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	3814 {
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3815 Matrix ret (1, 2, 1.0);
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3816
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3817 if (! punits.compare ("normalized"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3818 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3819 double in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3820 double mm2units;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	3821
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3822 if (punits.compare ("inches"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3823 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3824 in2units = 1.0;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3825 mm2units = 1 / 25.4 ;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3826 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3827 else if (punits.compare ("centimeters"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3828 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3829 in2units = 2.54;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3830 mm2units = 1 / 10.0;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3831 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3832 else // points
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3833 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3834 in2units = 72.0;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3835 mm2units = 72.0 / 25.4;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3836 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3837
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3838 if (typ.compare ("usletter"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3839 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3840 ret (0) = 8.5 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3841 ret (1) = 11.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3842 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3843 else if (typ.compare ("uslegal"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3844 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3845 ret (0) = 8.5 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3846 ret (1) = 14.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3847 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3848 else if (typ.compare ("tabloid"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3849 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3850 ret (0) = 11.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3851 ret (1) = 17.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3852 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3853 else if (typ.compare ("a0"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3854 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3855 ret (0) = 841.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3856 ret (1) = 1189.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3857 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3858 else if (typ.compare ("a1"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3859 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3860 ret (0) = 594.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3861 ret (1) = 841.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3862 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3863 else if (typ.compare ("a2"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3864 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3865 ret (0) = 420.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3866 ret (1) = 594.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3867 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3868 else if (typ.compare ("a3"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3869 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3870 ret (0) = 297.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3871 ret (1) = 420.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3872 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3873 else if (typ.compare ("a4"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3874 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3875 ret (0) = 210.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3876 ret (1) = 297.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3877 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3878 else if (typ.compare ("a5"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3879 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3880 ret (0) = 148.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3881 ret (1) = 210.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3882 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3883 else if (typ.compare ("b0"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3884 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3885 ret (0) = 1029.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3886 ret (1) = 1456.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3887 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3888 else if (typ.compare ("b1"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3889 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3890 ret (0) = 728.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3891 ret (1) = 1028.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3892 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3893 else if (typ.compare ("b2"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3894 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3895 ret (0) = 514.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3896 ret (1) = 728.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3897 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3898 else if (typ.compare ("b3"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3899 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3900 ret (0) = 364.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3901 ret (1) = 514.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3902 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3903 else if (typ.compare ("b4"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3904 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3905 ret (0) = 257.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3906 ret (1) = 364.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3907 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3908 else if (typ.compare ("b5"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3909 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3910 ret (0) = 182.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3911 ret (1) = 257.0 * mm2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3912 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3913 else if (typ.compare ("arch-a"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3914 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3915 ret (0) = 9.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3916 ret (1) = 12.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3917 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3918 else if (typ.compare ("arch-b"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3919 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3920 ret (0) = 12.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3921 ret (1) = 18.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3922 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3923 else if (typ.compare ("arch-c"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3924 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3925 ret (0) = 18.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3926 ret (1) = 24.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3927 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3928 else if (typ.compare ("arch-d"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3929 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3930 ret (0) = 24.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3931 ret (1) = 36.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3932 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3933 else if (typ.compare ("arch-e"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3934 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3935 ret (0) = 36.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3936 ret (1) = 48.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3937 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3938 else if (typ.compare ("a"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3939 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3940 ret (0) = 8.5 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3941 ret (1) = 11.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3942 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3943 else if (typ.compare ("b"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3944 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3945 ret (0) = 11.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3946 ret (1) = 17.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3947 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3948 else if (typ.compare ("c"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3949 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3950 ret (0) = 17.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3951 ret (1) = 22.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3952 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3953 else if (typ.compare ("d"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3954 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3955 ret (0) = 22.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3956 ret (1) = 34.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3957 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3958 else if (typ.compare ("e"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3959 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3960 ret (0) = 34.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3961 ret (1) = 43.0 * in2units;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3962 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3963 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	3964
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3965 return ret;
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3966 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	3967
18807 70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3968
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3969 Matrix
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3970 figure::properties::get_auto_paperposition (void)
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3971 {
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3972 Matrix pos = get_position ().matrix_value ();
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3973 Matrix sz;
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3974
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3975 caseless_str funits = get_units ();
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3976 caseless_str punits = get_paperunits ();
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3977
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3978 // Convert position from figure units to paperunits
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3979 if (funits == "normalized" \|\| punits == "normalized")
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3980 {
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3981 sz = screen_size_pixels ();
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3982 pos = convert_position (pos, funits, "inches", sz);
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3983
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3984 if (punits == "normalized")
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3985 sz = papersize_from_type ("points", get_papertype ());
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3986
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3987 pos = convert_position (pos, "inches", punits, sz);
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3988 }
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3989 else
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3990 pos = convert_position (pos, funits, punits, sz);
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3991
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3992 // Center the figure on the page
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3993 sz = get_papersize ().matrix_value ();
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3994
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3995 pos(0) = sz(0)/2 - pos(2)/2;
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3996 pos(1) = sz(1)/2 - pos(3)/2;
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3997
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3998 return pos;
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	3999 }
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4000
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4001 /*
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4002 %!test
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4003 %! hf = figure ("visible", "off");
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4004 %! unwind_protect
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4005 %! ## paperpositionmode "auto" converts figure size to paper units
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4006 %! set (hf, "units", "inches");
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4007 %! set (hf, "position", [0 0 4 5]);
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4008 %! set (hf, "paperunits", "centimeters");
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4009 %! psz = get (hf, "papersize");
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4010 %! fsz = [10.16 12.7];
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4011 %! pos = [(psz/2 .- fsz/2) fsz];
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4012 %! set (hf, "paperpositionmode", "auto");
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4013 %! assert (get (hf, "paperposition"), pos)
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4014 %!
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4015 %! ## likewise with normalized units
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4016 %! set (hf, "paperunits", "normalized");
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4017 %! fsz = [10.16 12.7]./psz;
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4018 %! pos = [([0.5 0.5] .- fsz/2) fsz];
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4019 %! assert (get (hf, "paperposition"), pos)
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4020 %!
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4021 %! ## changing papertype updates paperposition
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4022 %! set (hf, "paperunits", "centimeters");
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4023 %! set (hf, "papertype", "a4");
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4024 %! psz = get (hf, "papersize");
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4025 %! fsz = [10.16 12.7];
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4026 %! pos = [(psz/2 .- fsz/2) fsz];
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4027 %! assert (get (hf, "paperposition"), pos)
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4028 %!
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4029 %! ## lanscape updates paperposition
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4030 %! set (hf, "paperorientation", "landscape");
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4031 %! psz = get (hf, "papersize");
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4032 %! fsz = [10.16 12.7];
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4033 %! pos = [(psz/2 .- fsz/2) fsz];
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4034 %! assert (get (hf, "paperposition"), pos)
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4035 %!
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4036 %! ## back to manual mode
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4037 %! set (hf, "paperposition", pos+eps)
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4038 %! assert (get (hf, "paperpositionmode"), "manual")
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4039 %! assert (get (hf, "paperposition"), pos + eps)
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4040 %! unwind_protect_cleanup
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4041 %! close (hf);
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4042 %! end_unwind_protect
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4043 */
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4044
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4045 void
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4046 figure::properties::update_paperunits (const caseless_str& old_paperunits)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4047 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4048 Matrix pos = get_paperposition ().matrix_value ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4049 Matrix sz = get_papersize ().matrix_value ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	4050
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4051 pos(0) /= sz(0);
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4052 pos(1) /= sz(1);
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4053 pos(2) /= sz(0);
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4054 pos(3) /= sz(1);
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4055
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4056 std::string porient = get_paperorientation ();
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4057 caseless_str punits = get_paperunits ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4058 caseless_str typ = get_papertype ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4059
10994 9e1270a84a10 graphics.cc: Replace pagetype property value custom with <custom>. Ben Abbott <bpabbott@mac.com> parents: 10991 diff changeset	4060 if (typ.compare ("<custom>"))
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4061 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4062 if (old_paperunits.compare ("centimeters"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4063 {
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4064 sz(0) /= 2.54;
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4065 sz(1) /= 2.54;
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4066 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4067 else if (old_paperunits.compare ("points"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4068 {
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4069 sz(0) /= 72.0;
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4070 sz(1) /= 72.0;
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4071 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4072
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4073 if (punits.compare ("centimeters"))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4074 {
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4075 sz(0) *= 2.54;
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4076 sz(1) *= 2.54;
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4077 }
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4078 else if (punits.compare ("points"))
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4079 {
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4080 sz(0) *= 72.0;
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4081 sz(1) *= 72.0;
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4082 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4083 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4084 else
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4085 {
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4086 sz = papersize_from_type (punits, typ);
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4087 if (porient == "landscape")
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4088 std::swap (sz(0), sz(1));
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4089 }
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4090
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4091 pos(0) *= sz(0);
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4092 pos(1) *= sz(1);
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4093 pos(2) *= sz(0);
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4094 pos(3) *= sz(1);
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4095
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4096 papersize.set (octave_value (sz));
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4097 paperposition.set (octave_value (pos));
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4098 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4099
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4100 void
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4101 figure::properties::update_papertype (void)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4102 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4103 caseless_str typ = get_papertype ();
10994 9e1270a84a10 graphics.cc: Replace pagetype property value custom with <custom>. Ben Abbott <bpabbott@mac.com> parents: 10991 diff changeset	4104 if (! typ.compare ("<custom>"))
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4105 {
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4106 Matrix sz = papersize_from_type (get_paperunits (), typ);
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4107 if (get_paperorientation () == "landscape")
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4108 std::swap (sz(0), sz(1));
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4109 // Call papersize.set rather than set_papersize to avoid loops
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4110 // between update_papersize and update_papertype
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4111 papersize.set (octave_value (sz));
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4112 }
18807 70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4113
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4114 if (paperpositionmode.is ("auto"))
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4115 paperposition.set (get_auto_paperposition ());
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4116 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4117
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4118 void
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4119 figure::properties::update_papersize (void)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4120 {
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4121 Matrix sz = get_papersize ().matrix_value ();
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4122 if (sz(0) > sz(1))
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4123 {
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4124 std::swap (sz(0), sz(1));
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4125 papersize.set (octave_value (sz));
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4126 paperorientation.set (octave_value ("landscape"));
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4127 }
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4128 else
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4129 {
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4130 paperorientation.set ("portrait");
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4131 }
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4132 std::string punits = get_paperunits ();
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4133 if (punits == "centimeters")
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4134 {
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4135 sz(0) /= 2.54;
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4136 sz(1) /= 2.54;
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4137 }
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4138 else if (punits == "points")
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4139 {
14498 36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4140 sz(0) /= 72.0;
36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4141 sz(1) /= 72.0;
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4142 }
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4143 if (punits == "normalized")
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4144 {
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4145 caseless_str typ = get_papertype ();
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4146 if (get_papertype () == "<custom>")
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4147 error ("set: can't set the papertype to <custom> when the paperunits is normalized");
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4148 }
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4149 else
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4150 {
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4151 // TODO - the papersizes info is also in papersize_from_type().
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4152 // Both should be rewritten to avoid the duplication.
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4153 std::string typ = "<custom>";
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4154 const double mm2in = 1.0 / 25.4;
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4155 const double tol = 0.01;
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4156
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4157 if (std::abs (sz(0) - 8.5) + std::abs (sz(1) - 11.0) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4158 typ = "usletter";
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4159 else if (std::abs (sz(0) - 8.5) + std::abs (sz(1) - 14.0) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4160 typ = "uslegal";
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4161 else if (std::abs (sz(0) - 11.0) + std::abs (sz(1) - 17.0) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4162 typ = "tabloid";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4163 else if (std::abs (sz(0) - 841.0 * mm2in)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4164 + std::abs (sz(1) - 1198.0 * mm2in) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4165 typ = "a0";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4166 else if (std::abs (sz(0) - 594.0 * mm2in)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4167 + std::abs (sz(1) - 841.0 * mm2in) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4168 typ = "a1";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4169 else if (std::abs (sz(0) - 420.0 * mm2in)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4170 + std::abs (sz(1) - 594.0 * mm2in) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4171 typ = "a2";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4172 else if (std::abs (sz(0) - 297.0 * mm2in)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4173 + std::abs (sz(1) - 420.0 * mm2in) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4174 typ = "a3";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4175 else if (std::abs (sz(0) - 210.0 * mm2in)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4176 + std::abs (sz(1) - 297.0 * mm2in) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4177 typ = "a4";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4178 else if (std::abs (sz(0) - 148.0 * mm2in)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4179 + std::abs (sz(1) - 210.0 * mm2in) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4180 typ = "a5";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4181 else if (std::abs (sz(0) - 1029.0 * mm2in)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4182 + std::abs (sz(1) - 1456.0 * mm2in) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4183 typ = "b0";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4184 else if (std::abs (sz(0) - 728.0 * mm2in)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4185 + std::abs (sz(1) - 1028.0 * mm2in) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4186 typ = "b1";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4187 else if (std::abs (sz(0) - 514.0 * mm2in)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4188 + std::abs (sz(1) - 728.0 * mm2in) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4189 typ = "b2";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4190 else if (std::abs (sz(0) - 364.0 * mm2in)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4191 + std::abs (sz(1) - 514.0 * mm2in) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4192 typ = "b3";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4193 else if (std::abs (sz(0) - 257.0 * mm2in)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4194 + std::abs (sz(1) - 364.0 * mm2in) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4195 typ = "b4";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4196 else if (std::abs (sz(0) - 182.0 * mm2in)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4197 + std::abs (sz(1) - 257.0 * mm2in) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4198 typ = "b5";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4199 else if (std::abs (sz(0) - 9.0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4200 + std::abs (sz(1) - 12.0) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4201 typ = "arch-a";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4202 else if (std::abs (sz(0) - 12.0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4203 + std::abs (sz(1) - 18.0) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4204 typ = "arch-b";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4205 else if (std::abs (sz(0) - 18.0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4206 + std::abs (sz(1) - 24.0) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4207 typ = "arch-c";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4208 else if (std::abs (sz(0) - 24.0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4209 + std::abs (sz(1) - 36.0) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4210 typ = "arch-d";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4211 else if (std::abs (sz(0) - 36.0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4212 + std::abs (sz(1) - 48.0) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4213 typ = "arch-e";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4214 else if (std::abs (sz(0) - 8.5)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4215 + std::abs (sz(1) - 11.0) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4216 typ = "a";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4217 else if (std::abs (sz(0) - 11.0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4218 + std::abs (sz(1) - 17.0) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4219 typ = "b";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4220 else if (std::abs (sz(0) - 17.0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4221 + std::abs (sz(1) - 22.0) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4222 typ = "c";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4223 else if (std::abs (sz(0) - 22.0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4224 + std::abs (sz(1) - 34.0) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4225 typ = "d";
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4226 else if (std::abs (sz(0) - 34.0)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4227 + std::abs (sz(1) - 43.0) < tol)
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4228 typ = "e";
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4229 // Call papertype.set rather than set_papertype to avoid loops between
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4230 // update_papersize and update_papertype
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4231 papertype.set (typ);
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4232 }
14498 36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4233 if (punits == "centimeters")
36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4234 {
36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4235 sz(0) *= 2.54;
36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4236 sz(1) *= 2.54;
36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4237 }
36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4238 else if (punits == "points")
36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4239 {
36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4240 sz(0) *= 72.0;
36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4241 sz(1) *= 72.0;
36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4242 }
14457 008a29999c3d Save the papersize property in the proper orientation. Ben Abbott <bpabbott@mac.com> parents: 14429 diff changeset	4243 if (get_paperorientation () == "landscape")
008a29999c3d Save the papersize property in the proper orientation. Ben Abbott <bpabbott@mac.com> parents: 14429 diff changeset	4244 {
008a29999c3d Save the papersize property in the proper orientation. Ben Abbott <bpabbott@mac.com> parents: 14429 diff changeset	4245 std::swap (sz(0), sz(1));
008a29999c3d Save the papersize property in the proper orientation. Ben Abbott <bpabbott@mac.com> parents: 14429 diff changeset	4246 papersize.set (octave_value (sz));
008a29999c3d Save the papersize property in the proper orientation. Ben Abbott <bpabbott@mac.com> parents: 14429 diff changeset	4247 }
18807 70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4248
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4249 if (paperpositionmode.is ("auto"))
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4250 paperposition.set (get_auto_paperposition ());
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4251 }
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4252
14498 36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4253 /*
36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4254 %!test
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4255 %! hf = figure ("visible", "off");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4256 %! unwind_protect
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4257 %! set (hf, "paperunits", "inches");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4258 %! set (hf, "papersize", [5, 4]);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4259 %! set (hf, "paperunits", "points");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4260 %! assert (get (hf, "papersize"), [5, 4] * 72, 1);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4261 %! papersize = get (hf, "papersize");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4262 %! set (hf, "papersize", papersize + 1);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4263 %! set (hf, "papersize", papersize);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4264 %! assert (get (hf, "papersize"), [5, 4] * 72, 1);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4265 %! unwind_protect_cleanup
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4266 %! close (hf);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4267 %! end_unwind_protect
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4268
14498 36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4269 %!test
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4270 %! hf = figure ("visible", "off");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4271 %! unwind_protect
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4272 %! set (hf, "paperunits", "inches");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4273 %! set (hf, "papersize", [5, 4]);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4274 %! set (hf, "paperunits", "centimeters");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4275 %! assert (get (hf, "papersize"), [5, 4] * 2.54, 2.54/72);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4276 %! papersize = get (hf, "papersize");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4277 %! set (hf, "papersize", papersize + 1);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4278 %! set (hf, "papersize", papersize);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4279 %! assert (get (hf, "papersize"), [5, 4] * 2.54, 2.54/72);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4280 %! unwind_protect_cleanup
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4281 %! close (hf);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4282 %! end_unwind_protect
14498 36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4283 */
36cfbd23fe9f Fix papersize updater. Bug # 35908. Ben Abbott <bpabbott@mac.com> parents: 14483 diff changeset	4284
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4285 void
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4286 figure::properties::update_paperorientation (void)
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4287 {
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4288 std::string porient = get_paperorientation ();
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4289 Matrix sz = get_papersize ().matrix_value ();
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4290 Matrix pos = get_paperposition ().matrix_value ();
14258 08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4291 if ((sz(0) > sz(1) && porient == "portrait")
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4292 \|\| (sz(0) < sz(1) && porient == "landscape"))
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4293 {
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4294 std::swap (sz(0), sz(1));
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4295 std::swap (pos(0), pos(1));
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4296 std::swap (pos(2), pos(3));
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4297 // Call papertype.set rather than set_papertype to avoid loops
08779abcb640 maint: Style fixes for 5cc69bafe3b9 Rik <octave@nomad.inbox5.com> parents: 14257 diff changeset	4298 // between update_papersize and update_papertype
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4299 papersize.set (octave_value (sz));
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4300 paperposition.set (octave_value (pos));
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4301 }
18807 70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4302
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4303 if (paperpositionmode.is ("auto"))
70ea5a2856fe Handle figure paperpositionmode "auto" (bug #37554) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18798 diff changeset	4304 paperposition.set (get_auto_paperposition ());
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4305 }
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4306
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4307 /*
5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4308 %!test
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4309 %! hf = figure ("visible", "off");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4310 %! unwind_protect
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4311 %! tol = 100 * eps ();
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4312 %! ## UPPER case and MiXed case is part of test and should not be changed.
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4313 %! set (hf, "paperorientation", "PORTRAIT");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4314 %! set (hf, "paperunits", "inches");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4315 %! set (hf, "papertype", "USletter");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4316 %! assert (get (hf, "papersize"), [8.5, 11.0], tol);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4317 %! set (hf, "paperorientation", "Landscape");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4318 %! assert (get (hf, "papersize"), [11.0, 8.5], tol);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4319 %! set (hf, "paperunits", "centimeters");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4320 %! assert (get (hf, "papersize"), [11.0, 8.5] * 2.54, tol);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4321 %! set (hf, "papertype", "a4");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4322 %! assert (get (hf, "papersize"), [29.7, 21.0], tol);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4323 %! set (hf, "paperunits", "inches", "papersize", [8.5, 11.0]);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4324 %! assert (get (hf, "papertype"), "usletter");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4325 %! assert (get (hf, "paperorientation"), "portrait");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4326 %! set (hf, "papersize", [11.0, 8.5]);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4327 %! assert (get (hf, "papertype"), "usletter");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4328 %! assert (get (hf, "paperorientation"), "landscape");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4329 %! unwind_protect_cleanup
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4330 %! close (hf);
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4331 %! end_unwind_protect
14257 5cc69bafe3b9 Add updating for figure paperorientation property. Bug # 35329. Ben Abbott <bpabbott@mac.com> parents: 14138 diff changeset	4332 */
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4333
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4334 void
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4335 figure::properties::set_units (const octave_value& v)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4336 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4337 if (! error_state)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4338 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4339 caseless_str old_units = get_units ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4340 if (units.set (v, true))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4341 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4342 update_units (old_units);
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4343 mark_modified ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4344 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4345 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4346 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4347
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4348 void
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4349 figure::properties::update_units (const caseless_str& old_units)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4350 {
14367 ba01a38bc5c1 Use internal bounding box in figure::properties::set_position. Ben Abbott <bpabbott@mac.com> parents: 14357 diff changeset	4351 position.set (convert_position (get_position ().matrix_value (), old_units,
ba01a38bc5c1 Use internal bounding box in figure::properties::set_position. Ben Abbott <bpabbott@mac.com> parents: 14357 diff changeset	4352 get_units (), screen_size_pixels ()), false);
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4353 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	4354
14266 37ca58f9a887 When root_figure units = normalized, screensize = [0 0 1 1]. Ben Abbott <bpabbott@mac.com> parents: 14258 diff changeset	4355 /*
37ca58f9a887 When root_figure units = normalized, screensize = [0 0 1 1]. Ben Abbott <bpabbott@mac.com> parents: 14258 diff changeset	4356 %!test
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4357 %! hf = figure ("visible", "off");
17237 5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	4358 %! old_units = get (0, "units");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	4359 %! unwind_protect
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	4360 %! set (0, "units", "pixels");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	4361 %! rsz = get (0, "screensize");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	4362 %! set (gcf (), "units", "pixels");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	4363 %! fsz = get (gcf (), "position");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	4364 %! set (gcf (), "units", "normalized");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	4365 %! pos = get (gcf (), "position");
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	4366 %! assert (pos, (fsz - [1, 1, 0, 0]) ./ rsz([3, 4, 3, 4]));
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	4367 %! unwind_protect_cleanup
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	4368 %! close (hf);
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	4369 %! set (0, "units", old_units);
5f14fc8feba3 graphics.cc: Restore default graphics properties after %!tests. Rik <rik@octave.org> parents: 17223 diff changeset	4370 %! end_unwind_protect
14266 37ca58f9a887 When root_figure units = normalized, screensize = [0 0 1 1]. Ben Abbott <bpabbott@mac.com> parents: 14258 diff changeset	4371 */
37ca58f9a887 When root_figure units = normalized, screensize = [0 0 1 1]. Ben Abbott <bpabbott@mac.com> parents: 14258 diff changeset	4372
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	4373 std::string
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	4374 figure::properties::get_title (void) const
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	4375 {
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	4376 if (is_numbertitle ())
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	4377 {
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	4378 std::ostringstream os;
8062 e04a4beeb283 graphics.cc (figure::properties::get_title): avoid gcc warning John W. Eaton <jwe@octave.org> parents: 8061 diff changeset	4379 std::string nm = get_name ();
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	4380
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	4381 os << "Figure " << __myhandle__.value ();
8062 e04a4beeb283 graphics.cc (figure::properties::get_title): avoid gcc warning John W. Eaton <jwe@octave.org> parents: 8061 diff changeset	4382 if (! nm.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	4383 os << ": " << get_name ();
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	4384
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	4385 return os.str ();
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	4386 }
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	4387 else
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	4388 return get_name ();
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	4389 }
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	4390
6836 ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	4391 octave_value
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7176 diff changeset	4392 figure::get_default (const caseless_str& name) const
6836 ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	4393 {
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	4394 octave_value retval = default_properties.lookup (name);
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	4395
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	4396 if (retval.is_undefined ())
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	4397 {
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	4398 graphics_handle parent = get_parent ();
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	4399 graphics_object parent_obj = gh_manager::get_object (parent);
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	4400
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	4401 retval = parent_obj.get_default (name);
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	4402 }
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	4403
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	4404 return retval;
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	4405 }
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	4406
10722 755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	4407 void
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	4408 figure::reset_default_properties (void)
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	4409 {
10733 f72a761a784c eliminate code duplication in reset_default_properties methods John W. Eaton <jwe@octave.org> parents: 10722 diff changeset	4410 ::reset_default_properties (default_properties);
10722 755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	4411 }
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	4412
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	4413 // ---------------------------------------------------------------------
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	4414
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4415 void
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4416 axes::properties::init (void)
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4417 {
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4418 position.add_constraint (dim_vector (1, 4));
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4419 outerposition.add_constraint (dim_vector (1, 4));
17631 94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	4420 tightinset.add_constraint (dim_vector (1, 4));
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	4421 looseinset.add_constraint (dim_vector (1, 4));
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4422 colororder.add_constraint (dim_vector (-1, 3));
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4423 dataaspectratio.add_constraint (dim_vector (1, 3));
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4424 plotboxaspectratio.add_constraint (dim_vector (1, 3));
17631 94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	4425 alim.add_constraint (2);
94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	4426 clim.add_constraint (2);
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4427 xlim.add_constraint (2);
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4428 ylim.add_constraint (2);
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4429 zlim.add_constraint (2);
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4430 xtick.add_constraint (dim_vector (1, -1));
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4431 ytick.add_constraint (dim_vector (1, -1));
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4432 ztick.add_constraint (dim_vector (1, -1));
17631 94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	4433 ticklength.add_constraint (dim_vector (1, 2));
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4434 Matrix vw (1, 2, 0);
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4435 vw(1) = 90;
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4436 view = vw;
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4437 view.add_constraint (dim_vector (1, 2));
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4438 cameraposition.add_constraint (dim_vector (1, 3));
17631 94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	4439 cameratarget.add_constraint (dim_vector (1, 3));
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4440 Matrix upv (1, 3, 0.0);
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4441 upv(2) = 1.0;
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4442 cameraupvector = upv;
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4443 cameraupvector.add_constraint (dim_vector (1, 3));
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4444 currentpoint.add_constraint (dim_vector (2, 3));
17631 94dd9bba06a0 Fix validation of array properties to set(), avoid segfaults (bug #bug #35687). Rik <rik@octave.org> parents: 17626 diff changeset	4445 // No constraints for hidden transform properties
12777 6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	4446 update_font ();
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4447
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4448 x_zlim.resize (1, 2);
8557 ab82e19002c4 better compatibility for axis label properties John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	4449
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4450 sx = "linear";
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4451 sy = "linear";
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4452 sz = "linear";
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4453
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9396 diff changeset	4454 calc_ticklabels (xtick, xticklabel, xscale.is ("log"));
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9396 diff changeset	4455 calc_ticklabels (ytick, yticklabel, yscale.is ("log"));
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9396 diff changeset	4456 calc_ticklabels (ztick, zticklabel, zscale.is ("log"));
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9396 diff changeset	4457
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4458 xset (xlabel.handle_value (), "handlevisibility", "off");
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4459 xset (ylabel.handle_value (), "handlevisibility", "off");
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4460 xset (zlabel.handle_value (), "handlevisibility", "off");
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4461 xset (title.handle_value (), "handlevisibility", "off");
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4462
8557 ab82e19002c4 better compatibility for axis label properties John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	4463 xset (xlabel.handle_value (), "horizontalalignment", "center");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4464 xset (xlabel.handle_value (), "horizontalalignmentmode", "auto");
8557 ab82e19002c4 better compatibility for axis label properties John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	4465 xset (ylabel.handle_value (), "horizontalalignment", "center");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4466 xset (ylabel.handle_value (), "horizontalalignmentmode", "auto");
8557 ab82e19002c4 better compatibility for axis label properties John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	4467 xset (zlabel.handle_value (), "horizontalalignment", "right");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4468 xset (zlabel.handle_value (), "horizontalalignmentmode", "auto");
8557 ab82e19002c4 better compatibility for axis label properties John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	4469 xset (title.handle_value (), "horizontalalignment", "center");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4470 xset (title.handle_value (), "horizontalalignmentmode", "auto");
8557 ab82e19002c4 better compatibility for axis label properties John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	4471
16204 92f8bfae9b13 Set default xlabel "verticalalignment" to "top". Rik <rik@octave.org> parents: 16201 diff changeset	4472 xset (xlabel.handle_value (), "verticalalignment", "top");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4473 xset (xlabel.handle_value (), "verticalalignmentmode", "auto");
8557 ab82e19002c4 better compatibility for axis label properties John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	4474 xset (ylabel.handle_value (), "verticalalignment", "bottom");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4475 xset (ylabel.handle_value (), "verticalalignmentmode", "auto");
8557 ab82e19002c4 better compatibility for axis label properties John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	4476 xset (title.handle_value (), "verticalalignment", "bottom");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4477 xset (title.handle_value (), "verticalalignmentmode", "auto");
8557 ab82e19002c4 better compatibility for axis label properties John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	4478
ab82e19002c4 better compatibility for axis label properties John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	4479 xset (ylabel.handle_value (), "rotation", 90.0);
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4480 xset (ylabel.handle_value (), "rotationmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4481
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9396 diff changeset	4482 xset (zlabel.handle_value (), "visible", "off");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	4483
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9396 diff changeset	4484 xset (xlabel.handle_value (), "clipping", "off");
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9396 diff changeset	4485 xset (ylabel.handle_value (), "clipping", "off");
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9396 diff changeset	4486 xset (zlabel.handle_value (), "clipping", "off");
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9396 diff changeset	4487 xset (title.handle_value (), "clipping", "off");
8557 ab82e19002c4 better compatibility for axis label properties John W. Eaton <jwe@octave.org> parents: 8503 diff changeset	4488
12389 5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	4489 xset (xlabel.handle_value (), "autopos_tag", "xlabel");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	4490 xset (ylabel.handle_value (), "autopos_tag", "ylabel");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	4491 xset (zlabel.handle_value (), "autopos_tag", "zlabel");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	4492 xset (title.handle_value (), "autopos_tag", "title");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	4493
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4494 adopt (xlabel.handle_value ());
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4495 adopt (ylabel.handle_value ());
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4496 adopt (zlabel.handle_value ());
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4497 adopt (title.handle_value ());
12467 2f83974d5a6d implement looseinset property for axes Konstantinos Poulios <logari81@googlemail.com> parents: 12458 diff changeset	4498
2f83974d5a6d implement looseinset property for axes Konstantinos Poulios <logari81@googlemail.com> parents: 12458 diff changeset	4499 Matrix tlooseinset = default_axes_position ();
2f83974d5a6d implement looseinset property for axes Konstantinos Poulios <logari81@googlemail.com> parents: 12458 diff changeset	4500 tlooseinset(2) = 1-tlooseinset(0)-tlooseinset(2);
2f83974d5a6d implement looseinset property for axes Konstantinos Poulios <logari81@googlemail.com> parents: 12458 diff changeset	4501 tlooseinset(3) = 1-tlooseinset(1)-tlooseinset(3);
2f83974d5a6d implement looseinset property for axes Konstantinos Poulios <logari81@googlemail.com> parents: 12458 diff changeset	4502 looseinset = tlooseinset;
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4503 }
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4504
12440 2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4505 Matrix
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4506 axes::properties::calc_tightbox (const Matrix& init_pos)
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4507 {
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4508 Matrix pos = init_pos;
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4509 graphics_object obj = gh_manager::get_object (get_parent ());
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4510 Matrix parent_bb = obj.get_properties ().get_boundingbox (true);
12496 245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	4511 Matrix ext = get_extent (true, true);
12440 2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4512 ext(1) = parent_bb(3) - ext(1) - ext(3);
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4513 ext(0)++;
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4514 ext(1)++;
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4515 ext = convert_position (ext, "pixels", get_units (),
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4516 parent_bb.extract_n (0, 2, 1, 2));
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4517 if (ext(0) < pos(0))
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4518 {
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4519 pos(2) += pos(0)-ext(0);
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4520 pos(0) = ext(0);
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4521 }
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4522 if (ext(0)+ext(2) > pos(0)+pos(2))
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4523 pos(2) = ext(0)+ext(2)-pos(0);
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4524
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4525 if (ext(1) < pos(1))
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4526 {
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4527 pos(3) += pos(1)-ext(1);
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4528 pos(1) = ext(1);
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4529 }
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4530 if (ext(1)+ext(3) > pos(1)+pos(3))
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4531 pos(3) = ext(1)+ext(3)-pos(1);
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4532 return pos;
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4533 }
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	4534
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	4535 void
7860 67edbcb19665 rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition Shai Ayal <shaiay@users.sourceforge.net> parents: 7859 diff changeset	4536 axes::properties::sync_positions (void)
67edbcb19665 rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition Shai Ayal <shaiay@users.sourceforge.net> parents: 7859 diff changeset	4537 {
17011 350cad34b0f8 Simplify syncing axes "position", "outerposition", and "looseinset". Ben Abbott <bpabbott@mac.com> parents: 16971 diff changeset	4538 // First part is equivalent to `update_tightinset ()'
17216 283422a219a2 Update axes position/outerpostion prior to calcuating tightinset. Ben Abbott <bpabbott@mac.com> parents: 17192 diff changeset	4539 if (activepositionproperty.is ("position"))
283422a219a2 Update axes position/outerpostion prior to calcuating tightinset. Ben Abbott <bpabbott@mac.com> parents: 17192 diff changeset	4540 update_position ();
283422a219a2 Update axes position/outerpostion prior to calcuating tightinset. Ben Abbott <bpabbott@mac.com> parents: 17192 diff changeset	4541 else
283422a219a2 Update axes position/outerpostion prior to calcuating tightinset. Ben Abbott <bpabbott@mac.com> parents: 17192 diff changeset	4542 update_outerposition ();
17011 350cad34b0f8 Simplify syncing axes "position", "outerposition", and "looseinset". Ben Abbott <bpabbott@mac.com> parents: 16971 diff changeset	4543 caseless_str old_units = get_units ();
350cad34b0f8 Simplify syncing axes "position", "outerposition", and "looseinset". Ben Abbott <bpabbott@mac.com> parents: 16971 diff changeset	4544 set_units ("normalized");
16832 e528beb2d774 Initialization and updating of tightinset and looseinset properties. Ben Abbott <bpabbott@mac.com> parents: 16831 diff changeset	4545 Matrix pos = position.get ().matrix_value ();
e528beb2d774 Initialization and updating of tightinset and looseinset properties. Ben Abbott <bpabbott@mac.com> parents: 16831 diff changeset	4546 Matrix outpos = outerposition.get ().matrix_value ();
e528beb2d774 Initialization and updating of tightinset and looseinset properties. Ben Abbott <bpabbott@mac.com> parents: 16831 diff changeset	4547 Matrix tightpos = calc_tightbox (pos);
17011 350cad34b0f8 Simplify syncing axes "position", "outerposition", and "looseinset". Ben Abbott <bpabbott@mac.com> parents: 16971 diff changeset	4548 Matrix tinset (1, 4, 1.0);
350cad34b0f8 Simplify syncing axes "position", "outerposition", and "looseinset". Ben Abbott <bpabbott@mac.com> parents: 16971 diff changeset	4549 tinset(0) = pos(0)-tightpos(0);
350cad34b0f8 Simplify syncing axes "position", "outerposition", and "looseinset". Ben Abbott <bpabbott@mac.com> parents: 16971 diff changeset	4550 tinset(1) = pos(1)-tightpos(1);
350cad34b0f8 Simplify syncing axes "position", "outerposition", and "looseinset". Ben Abbott <bpabbott@mac.com> parents: 16971 diff changeset	4551 tinset(2) = tightpos(0)+tightpos(2)-pos(0)-pos(2);
350cad34b0f8 Simplify syncing axes "position", "outerposition", and "looseinset". Ben Abbott <bpabbott@mac.com> parents: 16971 diff changeset	4552 tinset(3) = tightpos(1)+tightpos(3)-pos(1)-pos(3);
350cad34b0f8 Simplify syncing axes "position", "outerposition", and "looseinset". Ben Abbott <bpabbott@mac.com> parents: 16971 diff changeset	4553 tightinset = tinset;
350cad34b0f8 Simplify syncing axes "position", "outerposition", and "looseinset". Ben Abbott <bpabbott@mac.com> parents: 16971 diff changeset	4554 set_units (old_units);
350cad34b0f8 Simplify syncing axes "position", "outerposition", and "looseinset". Ben Abbott <bpabbott@mac.com> parents: 16971 diff changeset	4555 update_transform ();
17260 92effb035b97 Update axes position/outerpostion before and after tightinset. Ben Abbott <bpabbott@mac.com> parents: 17237 diff changeset	4556 if (activepositionproperty.is ("position"))
92effb035b97 Update axes position/outerpostion before and after tightinset. Ben Abbott <bpabbott@mac.com> parents: 17237 diff changeset	4557 update_position ();
92effb035b97 Update axes position/outerpostion before and after tightinset. Ben Abbott <bpabbott@mac.com> parents: 17237 diff changeset	4558 else
92effb035b97 Update axes position/outerpostion before and after tightinset. Ben Abbott <bpabbott@mac.com> parents: 17237 diff changeset	4559 update_outerposition ();
17011 350cad34b0f8 Simplify syncing axes "position", "outerposition", and "looseinset". Ben Abbott <bpabbott@mac.com> parents: 16971 diff changeset	4560 }
7860 67edbcb19665 rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition Shai Ayal <shaiay@users.sourceforge.net> parents: 7859 diff changeset	4561
17024 c358c6e7416b Add test to graphics.cc for initial tightinset value. Ben Abbott <bpabbott@mac.com> parents: 17011 diff changeset	4562 /*
17286 d5efffe5a789 graphics.cc: Condition tests on HAVE_FLTK Mike Miller <mtmiller@ieee.org> parents: 17281 diff changeset	4563 %!testif HAVE_FLTK
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4564 %! hf = figure ("visible", "off");
e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4565 %! graphics_toolkit (hf, "fltk");
17024 c358c6e7416b Add test to graphics.cc for initial tightinset value. Ben Abbott <bpabbott@mac.com> parents: 17011 diff changeset	4566 %! unwind_protect
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4567 %! subplot(2,1,1); plot(rand(10,1)); subplot(2,1,2); plot(rand(10,1));
17024 c358c6e7416b Add test to graphics.cc for initial tightinset value. Ben Abbott <bpabbott@mac.com> parents: 17011 diff changeset	4568 %! hax = findall (gcf (), "type", "axes");
c358c6e7416b Add test to graphics.cc for initial tightinset value. Ben Abbott <bpabbott@mac.com> parents: 17011 diff changeset	4569 %! positions = cell2mat (get (hax, "position"));
c358c6e7416b Add test to graphics.cc for initial tightinset value. Ben Abbott <bpabbott@mac.com> parents: 17011 diff changeset	4570 %! outerpositions = cell2mat (get (hax, "outerposition"));
c358c6e7416b Add test to graphics.cc for initial tightinset value. Ben Abbott <bpabbott@mac.com> parents: 17011 diff changeset	4571 %! looseinsets = cell2mat (get (hax, "looseinset"));
c358c6e7416b Add test to graphics.cc for initial tightinset value. Ben Abbott <bpabbott@mac.com> parents: 17011 diff changeset	4572 %! tightinsets = cell2mat (get (hax, "tightinset"));
17150 e7723410ec32 Recode some %!tests which pop up figures with new figure() behavior. Rik <rik@octave.org> parents: 17123 diff changeset	4573 %! subplot(2,1,1); plot(rand(10,1)); subplot(2,1,2); plot(rand(10,1));
17024 c358c6e7416b Add test to graphics.cc for initial tightinset value. Ben Abbott <bpabbott@mac.com> parents: 17011 diff changeset	4574 %! hax = findall (gcf (), "type", "axes");
17216 283422a219a2 Update axes position/outerpostion prior to calcuating tightinset. Ben Abbott <bpabbott@mac.com> parents: 17192 diff changeset	4575 %! assert (cell2mat (get (hax, "position")), positions, 1e-4);
283422a219a2 Update axes position/outerpostion prior to calcuating tightinset. Ben Abbott <bpabbott@mac.com> parents: 17192 diff changeset	4576 %! assert (cell2mat (get (hax, "outerposition")), outerpositions, 1e-4);
283422a219a2 Update axes position/outerpostion prior to calcuating tightinset. Ben Abbott <bpabbott@mac.com> parents: 17192 diff changeset	4577 %! assert (cell2mat (get (hax, "looseinset")), looseinsets, 1e-4);
283422a219a2 Update axes position/outerpostion prior to calcuating tightinset. Ben Abbott <bpabbott@mac.com> parents: 17192 diff changeset	4578 %! assert (cell2mat (get (hax, "tightinset")), tightinsets, 1e-4);
17024 c358c6e7416b Add test to graphics.cc for initial tightinset value. Ben Abbott <bpabbott@mac.com> parents: 17011 diff changeset	4579 %! unwind_protect_cleanup
c358c6e7416b Add test to graphics.cc for initial tightinset value. Ben Abbott <bpabbott@mac.com> parents: 17011 diff changeset	4580 %! close (hf);
c358c6e7416b Add test to graphics.cc for initial tightinset value. Ben Abbott <bpabbott@mac.com> parents: 17011 diff changeset	4581 %! end_unwind_protect
17286 d5efffe5a789 graphics.cc: Condition tests on HAVE_FLTK Mike Miller <mtmiller@ieee.org> parents: 17281 diff changeset	4582 %!testif HAVE_FLTK
17222 8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4583 %! hf = figure ("visible", "off");
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4584 %! graphics_toolkit (hf, "fltk");
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4585 %! fpos = get (hf, "position");
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4586 %! unwind_protect
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4587 %! plot (rand (3))
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4588 %! position = get (gca, "position");
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4589 %! outerposition = get (gca, "outerposition");
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4590 %! looseinset = get (gca, "looseinset");
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4591 %! tightinset = get (gca, "tightinset");
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4592 %! set (hf, "position", [fpos(1:2), 2*fpos(3:4)])
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4593 %! set (hf, "position", fpos);
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4594 %! assert (get (gca, "outerposition"), outerposition, 0.001)
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4595 %! assert (get (gca, "position"), position, 0.001)
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4596 %! assert (get (gca, "looseinset"), looseinset, 0.001)
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4597 %! assert (get (gca, "tightinset"), tightinset, 0.001)
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4598 %! unwind_protect_cleanup
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4599 %! close (hf);
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4600 %! end_unwind_protect
17286 d5efffe5a789 graphics.cc: Condition tests on HAVE_FLTK Mike Miller <mtmiller@ieee.org> parents: 17281 diff changeset	4601 %!testif HAVE_FLTK
17222 8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4602 %! hf = figure ("visible", "off");
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4603 %! graphics_toolkit (hf, "fltk");
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4604 %! fpos = get (hf, "position");
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4605 %! set (gca, "activepositionproperty", "position")
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4606 %! unwind_protect
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4607 %! plot (rand (3))
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4608 %! position = get (gca, "position");
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4609 %! outerposition = get (gca, "outerposition");
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4610 %! looseinset = get (gca, "looseinset");
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4611 %! tightinset = get (gca, "tightinset");
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4612 %! set (hf, "position", [fpos(1:2), 2*fpos(3:4)])
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4613 %! set (hf, "position", fpos);
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4614 %! assert (get (gca, "position"), position, 0.001)
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4615 %! assert (get (gca, "outerposition"), outerposition, 0.001)
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4616 %! assert (get (gca, "looseinset"), looseinset, 0.001)
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4617 %! assert (get (gca, "tightinset"), tightinset, 0.001)
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4618 %! unwind_protect_cleanup
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4619 %! close (hf);
8e196132bbea Tests for for updating axes properties when figure position changes. Ben Abbott <bpabbott@mac.com> parents: 17216 diff changeset	4620 %! end_unwind_protect
17024 c358c6e7416b Add test to graphics.cc for initial tightinset value. Ben Abbott <bpabbott@mac.com> parents: 17011 diff changeset	4621 */
c358c6e7416b Add test to graphics.cc for initial tightinset value. Ben Abbott <bpabbott@mac.com> parents: 17011 diff changeset	4622
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4623 void
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4624 axes::properties::set_text_child (handle_property& hp,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	4625 const std::string& who,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	4626 const octave_value& v)
6962 9ac23c7f1c37 [project @ 2007-10-05 20:52:19 by jwe] jwe parents: 6945 diff changeset	4627 {
10265 8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4628 graphics_handle val;
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4629
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4630 if (v.is_string ())
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4631 {
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	4632 val = gh_manager::make_graphics_handle ("text", __myhandle__,
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	4633 false, false);
10265 8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4634
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4635 xset (val, "string", v);
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4636 }
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4637 else
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4638 {
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4639 graphics_object go = gh_manager::get_object (gh_manager::lookup (v));
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4640
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4641 if (go.isa ("text"))
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4642 val = ::reparent (v, "set", who, __myhandle__, false);
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4643 else
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4644 {
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4645 std::string cname = v.class_name ();
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4646
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4647 error ("set: expecting text graphics object or character string for %s property, found %s",
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4648 who.c_str (), cname.c_str ());
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4649 }
8c583af2cf64 validate text object children of axes objects John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	4650 }
6962 9ac23c7f1c37 [project @ 2007-10-05 20:52:19 by jwe] jwe parents: 6945 diff changeset	4651
6874 94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4652 if (! error_state)
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4653 {
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4654 xset (val, "handlevisibility", "off");
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4655
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4656 gh_manager::free (hp.handle_value ());
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4657
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4658 base_properties::remove_child (hp.handle_value ());
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4659
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4660 hp = val;
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4661
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4662 adopt (hp.handle_value ());
6874 94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4663 }
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4664 }
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4665
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4666 void
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4667 axes::properties::set_xlabel (const octave_value& v)
6874 94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4668 {
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4669 set_text_child (xlabel, "xlabel", v);
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4670 xset (xlabel.handle_value (), "positionmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4671 xset (xlabel.handle_value (), "rotationmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4672 xset (xlabel.handle_value (), "horizontalalignmentmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4673 xset (xlabel.handle_value (), "verticalalignmentmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4674 xset (xlabel.handle_value (), "clipping", "off");
11598 62b7ea59a6ff fixing color mismatch between axis and axis label Konstantinos Poulios <logari81@googlemail.com> parents: 11586 diff changeset	4675 xset (xlabel.handle_value (), "color", get_xcolor ());
12389 5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	4676 xset (xlabel.handle_value (), "autopos_tag", "xlabel");
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	4677 update_xlabel_position ();
6874 94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4678 }
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4679
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4680 void
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4681 axes::properties::set_ylabel (const octave_value& v)
6874 94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4682 {
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4683 set_text_child (ylabel, "ylabel", v);
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4684 xset (ylabel.handle_value (), "positionmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4685 xset (ylabel.handle_value (), "rotationmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4686 xset (ylabel.handle_value (), "horizontalalignmentmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4687 xset (ylabel.handle_value (), "verticalalignmentmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4688 xset (ylabel.handle_value (), "clipping", "off");
11598 62b7ea59a6ff fixing color mismatch between axis and axis label Konstantinos Poulios <logari81@googlemail.com> parents: 11586 diff changeset	4689 xset (ylabel.handle_value (), "color", get_ycolor ());
12389 5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	4690 xset (ylabel.handle_value (), "autopos_tag", "ylabel");
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	4691 update_ylabel_position ();
6874 94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4692 }
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4693
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4694 void
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4695 axes::properties::set_zlabel (const octave_value& v)
6874 94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4696 {
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4697 set_text_child (zlabel, "zlabel", v);
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4698 xset (zlabel.handle_value (), "positionmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4699 xset (zlabel.handle_value (), "rotationmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4700 xset (zlabel.handle_value (), "horizontalalignmentmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4701 xset (zlabel.handle_value (), "verticalalignmentmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4702 xset (zlabel.handle_value (), "clipping", "off");
11598 62b7ea59a6ff fixing color mismatch between axis and axis label Konstantinos Poulios <logari81@googlemail.com> parents: 11586 diff changeset	4703 xset (zlabel.handle_value (), "color", get_zcolor ());
12389 5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	4704 xset (zlabel.handle_value (), "autopos_tag", "zlabel");
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	4705 update_zlabel_position ();
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4706 }
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4707
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4708 void
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4709 axes::properties::set_title (const octave_value& v)
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4710 {
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4711 set_text_child (title, "title", v);
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4712 xset (title.handle_value (), "positionmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4713 xset (title.handle_value (), "horizontalalignment", "center");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4714 xset (title.handle_value (), "horizontalalignmentmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4715 xset (title.handle_value (), "verticalalignment", "bottom");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4716 xset (title.handle_value (), "verticalalignmentmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4717 xset (title.handle_value (), "clipping", "off");
12389 5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	4718 xset (title.handle_value (), "autopos_tag", "title");
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	4719 update_title_position ();
6874 94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4720 }
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4721
94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4722 void
6844 9ac351b05b51 [project @ 2007-08-30 00:46:23 by jwe] jwe parents: 6841 diff changeset	4723 axes::properties::set_defaults (base_graphics_object& obj,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	4724 const std::string& mode)
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4725 {
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4726 box = "on";
6962 9ac23c7f1c37 [project @ 2007-10-05 20:52:19 by jwe] jwe parents: 6945 diff changeset	4727 colororder = default_colororder ();
17081 86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4728 // Note: dataspectratio will be set through update_aspectratios
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4729 dataaspectratiomode = "auto";
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4730 layer = "bottom";
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4731
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4732 Matrix tlim (1, 2, 0.0);
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4733 tlim(1) = 1;
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4734 xlim = tlim;
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4735 ylim = tlim;
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4736 zlim = tlim;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	4737
6807 0089a504fdd6 [project @ 2007-08-10 17:34:59 by jwe] jwe parents: 6790 diff changeset	4738 Matrix cl (1, 2, 0);
0089a504fdd6 [project @ 2007-08-10 17:34:59 by jwe] jwe parents: 6790 diff changeset	4739 cl(1) = 1;
0089a504fdd6 [project @ 2007-08-10 17:34:59 by jwe] jwe parents: 6790 diff changeset	4740 clim = cl;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	4741
17081 86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4742 alim = tlim;
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4743
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4744 xlimmode = "auto";
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4745 ylimmode = "auto";
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4746 zlimmode = "auto";
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4747 climmode = "auto";
17081 86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4748 alimmode = "auto";
8208 f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4749
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4750 xgrid = "off";
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4751 ygrid = "off";
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4752 zgrid = "off";
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4753 xminorgrid = "off";
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4754 yminorgrid = "off";
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4755 zminorgrid = "off";
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4756 xtick = Matrix ();
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4757 ytick = Matrix ();
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4758 ztick = Matrix ();
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4759 xtickmode = "auto";
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4760 ytickmode = "auto";
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4761 ztickmode = "auto";
17081 86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4762 xminortick = "off";
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4763 yminortick = "off";
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4764 zminortick = "off";
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4765 xticklabel = "";
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4766 yticklabel = "";
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4767 zticklabel = "";
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4768 xticklabelmode = "auto";
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4769 yticklabelmode = "auto";
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4770 zticklabelmode = "auto";
17081 86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4771
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4772 interpreter = "none";
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4773
14798 fce841c941a5 The color property for new plot axes should take on the default value. Ben Abbott <bpabbott@mac.com> parents: 14691 diff changeset	4774 color = color_values ("white");
7364 0e07f78369d1 [project @ 2008-01-12 08:38:17 by jwe] jwe parents: 7363 diff changeset	4775 xcolor = color_values ("black");
0e07f78369d1 [project @ 2008-01-12 08:38:17 by jwe] jwe parents: 7363 diff changeset	4776 ycolor = color_values ("black");
0e07f78369d1 [project @ 2008-01-12 08:38:17 by jwe] jwe parents: 7363 diff changeset	4777 zcolor = color_values ("black");
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4778 xscale = "linear";
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4779 yscale = "linear";
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4780 zscale = "linear";
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4781 xdir = "normal";
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4782 ydir = "normal";
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4783 zdir = "normal";
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4784 yaxislocation = "left";
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4785 xaxislocation = "bottom";
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4786
17081 86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4787 Matrix tview (1, 2, 0.0);
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4788 tview(1) = 90;
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4789 view = tview;
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4790
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4791 __hold_all__ = "off";
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4792 nextplot = "replace";
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4793
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4794 ambientlightcolor = Matrix (1, 3, 1.0);
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4795
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4796 // Note: camera properties (not mode) will be set in update_transform
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4797 camerapositionmode = "auto";
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4798 cameratargetmode = "auto";
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4799 cameraupvectormode = "auto";
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4800 cameraviewanglemode = "auto";
17081 86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4801
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4802 drawmode = "normal";
17081 86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4803
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4804 fontangle = "normal";
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4805 fontname = OCTAVE_DEFAULT_FONTNAME;
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4806 fontsize = 10;
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4807 fontunits = "points";
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4808 fontweight = "normal";
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4809
7820 cb4838d70ab2 Fix default value for axes gridlinestyle and minorgridlinestyle. Michael Goffioul <michael.goffioul@gmail.com> parents: 7680 diff changeset	4810 gridlinestyle = ":";
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4811 linestyleorder = "-";
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4812 linewidth = 0.5;
7820 cb4838d70ab2 Fix default value for axes gridlinestyle and minorgridlinestyle. Michael Goffioul <michael.goffioul@gmail.com> parents: 7680 diff changeset	4813 minorgridlinestyle = ":";
17081 86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4814
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4815 // Note: plotboxaspectratio will be set through update_aspectratios
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4816 plotboxaspectratiomode = "auto";
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4817 projection = "orthographic";
17081 86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4818
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4819 tickdir = "in";
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4820 tickdirmode = "auto";
8740 cb0ea772a4af Initialize axes ticklength property. Ben Abbott <bpabbott@mac.com> parents: 8687 diff changeset	4821 ticklength = default_axes_ticklength ();
17081 86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4822
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4823 tightinset = Matrix (1, 4, 0.0);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4824
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4825 sx = "linear";
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4826 sy = "linear";
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4827 sz = "linear";
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4828
6765 e6b528a3a2a9 [project @ 2007-06-28 15:25:43 by jwe] jwe parents: 6761 diff changeset	4829 visible = "on";
17081 86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4830
86067af51d5e Truly reset axes so that all properties are set to default. Rik <rik@octave.org> parents: 17024 diff changeset	4831 // Replace preserves Position and Units properties
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4832 if (mode != "replace")
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4833 {
16832 e528beb2d774 Initialization and updating of tightinset and looseinset properties. Ben Abbott <bpabbott@mac.com> parents: 16831 diff changeset	4834 outerposition = default_axes_outerposition ();
7860 67edbcb19665 rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition Shai Ayal <shaiay@users.sourceforge.net> parents: 7859 diff changeset	4835 position = default_axes_position ();
8228 53dbbd331498 Preserve font and position properties when axes are replace in the handle code David Bateman <dbateman@free.fr> parents: 8209 diff changeset	4836 activepositionproperty = "outerposition";
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	4837 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	4838
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	4839 delete_children (true);
6432 5bec61ae1576 [project @ 2007-03-23 02:19:10 by jwe] jwe parents: 6425 diff changeset	4840
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	4841 xlabel = gh_manager::make_graphics_handle ("text", __myhandle__,
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	4842 false, false);
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	4843
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	4844 ylabel = gh_manager::make_graphics_handle ("text", __myhandle__,
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	4845 false, false);
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	4846
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	4847 zlabel = gh_manager::make_graphics_handle ("text", __myhandle__,
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	4848 false, false);
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	4849
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	4850 title = gh_manager::make_graphics_handle ("text", __myhandle__,
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	4851 false, false);
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4852
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4853 xset (xlabel.handle_value (), "handlevisibility", "off");
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4854 xset (ylabel.handle_value (), "handlevisibility", "off");
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4855 xset (zlabel.handle_value (), "handlevisibility", "off");
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4856 xset (title.handle_value (), "handlevisibility", "off");
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4857
8636 ee70d438a5b4 [mq]: grfx John W. Eaton <jwe@octave.org> parents: 8599 diff changeset	4858 xset (xlabel.handle_value (), "horizontalalignment", "center");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4859 xset (xlabel.handle_value (), "horizontalalignmentmode", "auto");
8636 ee70d438a5b4 [mq]: grfx John W. Eaton <jwe@octave.org> parents: 8599 diff changeset	4860 xset (ylabel.handle_value (), "horizontalalignment", "center");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4861 xset (ylabel.handle_value (), "horizontalalignmentmode", "auto");
8636 ee70d438a5b4 [mq]: grfx John W. Eaton <jwe@octave.org> parents: 8599 diff changeset	4862 xset (zlabel.handle_value (), "horizontalalignment", "right");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4863 xset (zlabel.handle_value (), "horizontalalignmentmode", "auto");
8636 ee70d438a5b4 [mq]: grfx John W. Eaton <jwe@octave.org> parents: 8599 diff changeset	4864 xset (title.handle_value (), "horizontalalignment", "center");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4865 xset (title.handle_value (), "horizontalalignmentmode", "auto");
8636 ee70d438a5b4 [mq]: grfx John W. Eaton <jwe@octave.org> parents: 8599 diff changeset	4866
16204 92f8bfae9b13 Set default xlabel "verticalalignment" to "top". Rik <rik@octave.org> parents: 16201 diff changeset	4867 xset (xlabel.handle_value (), "verticalalignment", "top");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4868 xset (xlabel.handle_value (), "verticalalignmentmode", "auto");
8636 ee70d438a5b4 [mq]: grfx John W. Eaton <jwe@octave.org> parents: 8599 diff changeset	4869 xset (ylabel.handle_value (), "verticalalignment", "bottom");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4870 xset (ylabel.handle_value (), "verticalalignmentmode", "auto");
8636 ee70d438a5b4 [mq]: grfx John W. Eaton <jwe@octave.org> parents: 8599 diff changeset	4871 xset (title.handle_value (), "verticalalignment", "bottom");
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4872 xset (title.handle_value (), "verticalalignmentmode", "auto");
8636 ee70d438a5b4 [mq]: grfx John W. Eaton <jwe@octave.org> parents: 8599 diff changeset	4873
ee70d438a5b4 [mq]: grfx John W. Eaton <jwe@octave.org> parents: 8599 diff changeset	4874 xset (ylabel.handle_value (), "rotation", 90.0);
11385 71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4875 xset (ylabel.handle_value (), "rotationmode", "auto");
71e7467fbd34 Disable auto-positioning of manually positioned title and axes labels. Konstantinos Poulios <logari81@googlemail.com> parents: 11384 diff changeset	4876
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9396 diff changeset	4877 xset (zlabel.handle_value (), "visible", "off");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	4878
9403 4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9396 diff changeset	4879 xset (xlabel.handle_value (), "clipping", "off");
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9396 diff changeset	4880 xset (ylabel.handle_value (), "clipping", "off");
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9396 diff changeset	4881 xset (zlabel.handle_value (), "clipping", "off");
4af6e29449c1 [mq]: graphics_text_engine Michael Goffioul <michael.goffioul@gmail.com> parents: 9396 diff changeset	4882 xset (title.handle_value (), "clipping", "off");
8636 ee70d438a5b4 [mq]: grfx John W. Eaton <jwe@octave.org> parents: 8599 diff changeset	4883
12389 5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	4884 xset (xlabel.handle_value (), "autopos_tag", "xlabel");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	4885 xset (ylabel.handle_value (), "autopos_tag", "ylabel");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	4886 xset (zlabel.handle_value (), "autopos_tag", "zlabel");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	4887 xset (title.handle_value (), "autopos_tag", "title");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	4888
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4889 adopt (xlabel.handle_value ());
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4890 adopt (ylabel.handle_value ());
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4891 adopt (zlabel.handle_value ());
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4892 adopt (title.handle_value ());
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4893
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4894 update_transform ();
17011 350cad34b0f8 Simplify syncing axes "position", "outerposition", and "looseinset". Ben Abbott <bpabbott@mac.com> parents: 16971 diff changeset	4895 sync_positions ();
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4896 override_defaults (obj);
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4897 }
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4898
8208 f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4899 void
f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4900 axes::properties::delete_text_child (handle_property& hp)
6874 94bda6abc224 [project @ 2007-09-06 21:34:24 by jwe] jwe parents: 6845 diff changeset	4901 {
8208 f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4902 graphics_handle h = hp.handle_value ();
f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4903
f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4904 if (h.ok ())
f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4905 {
f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4906 graphics_object go = gh_manager::get_object (h);
f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4907
f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4908 if (go.valid_object ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	4909 gh_manager::free (h);
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4910
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4911 base_properties::remove_child (h);
8208 f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4912 }
f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4913
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	4914 // FIXME: is it necessary to check whether the axes object is
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4915 // being deleted now? I think this function is only called when an
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4916 // individual child object is delete and not when the parent axes
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4917 // object is deleted.
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4918
8208 f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4919 if (! is_beingdeleted ())
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4920 {
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	4921 hp = gh_manager::make_graphics_handle ("text", __myhandle__,
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	4922 false, false);
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4923
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4924 xset (hp.handle_value (), "handlevisibility", "off");
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4925
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4926 adopt (hp.handle_value ());
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4927 }
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4928 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	4929
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4930 void
6844 9ac351b05b51 [project @ 2007-08-30 00:46:23 by jwe] jwe parents: 6841 diff changeset	4931 axes::properties::remove_child (const graphics_handle& h)
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4932 {
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4933 if (xlabel.handle_value ().ok () && h == xlabel.handle_value ())
8208 f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4934 delete_text_child (xlabel);
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4935 else if (ylabel.handle_value ().ok () && h == ylabel.handle_value ())
8208 f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4936 delete_text_child (ylabel);
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	4937 else if (zlabel.handle_value ().ok () && h == zlabel.handle_value ())
8208 f6ca8ff51818 [mq]: graphics-backend John W. Eaton <jwe@octave.org> parents: 8196 diff changeset	4938 delete_text_child (zlabel);
8249 1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4939 else if (title.handle_value ().ok () && h == title.handle_value ())
1f429086565c [mq]: hidden-children John W. Eaton <jwe@octave.org> parents: 8234 diff changeset	4940 delete_text_child (title);
6705 0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4941 else
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4942 base_properties::remove_child (h);
0ee6bda23b87 [project @ 2007-06-13 05:42:24 by jwe] jwe parents: 6684 diff changeset	4943 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	4944
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4945 inline Matrix
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4946 xform_matrix (void)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4947 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4948 Matrix m (4, 4, 0.0);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4949 for (int i = 0; i < 4; i++)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4950 m(i,i) = 1;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4951 return m;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4952 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4953
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4954 inline ColumnVector
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4955 xform_vector (void)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4956 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4957 ColumnVector v (4, 0.0);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4958 v(3) = 1;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4959 return v;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4960 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4961
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4962 inline ColumnVector
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4963 xform_vector (double x, double y, double z)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4964 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4965 ColumnVector v (4, 1.0);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4966 v(0) = x; v(1) = y; v(2) = z;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4967 return v;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4968 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4969
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4970 inline ColumnVector
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4971 transform (const Matrix& m, double x, double y, double z)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4972 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4973 return (m * xform_vector (x, y, z));
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4974 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4975
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4976 inline Matrix
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4977 xform_scale (double x, double y, double z)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4978 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4979 Matrix m (4, 4, 0.0);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4980 m(0,0) = x; m(1,1) = y; m(2,2) = z; m(3,3) = 1;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4981 return m;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4982 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4983
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4984 inline Matrix
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4985 xform_translate (double x, double y, double z)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4986 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4987 Matrix m = xform_matrix ();
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4988 m(0,3) = x; m(1,3) = y; m(2,3) = z; m(3,3) = 1;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4989 return m;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4990 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4991
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4992 inline void
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4993 scale (Matrix& m, double x, double y, double z)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4994 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4995 m = m * xform_scale (x, y, z);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4996 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4997
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4998 inline void
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	4999 translate (Matrix& m, double x, double y, double z)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5000 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5001 m = m * xform_translate (x, y, z);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5002 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5003
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5004 inline void
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5005 xform (ColumnVector& v, const Matrix& m)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5006 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5007 v = m*v;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5008 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5009
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5010 inline void
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5011 scale (ColumnVector& v, double x, double y, double z)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5012 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5013 v(0) *= x;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5014 v(1) *= y;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5015 v(2) *= z;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5016 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5017
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5018 inline void
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5019 translate (ColumnVector& v, double x, double y, double z)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5020 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5021 v(0) += x;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5022 v(1) += y;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5023 v(2) += z;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5024 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5025
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5026 inline void
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5027 normalize (ColumnVector& v)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5028 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5029 double fact = 1.0 / sqrt (v(0)v(0)+v(1)v(1)+v(2)*v(2));
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5030 scale (v, fact, fact, fact);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5031 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5032
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5033 inline double
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5034 dot (const ColumnVector& v1, const ColumnVector& v2)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5035 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5036 return (v1(0)v2(0)+v1(1)v2(1)+v1(2)*v2(2));
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5037 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5038
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5039 inline double
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5040 norm (const ColumnVector& v)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5041 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5042 return sqrt (dot (v, v));
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5043 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5044
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5045 inline ColumnVector
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5046 cross (const ColumnVector& v1, const ColumnVector& v2)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5047 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5048 ColumnVector r = xform_vector ();
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5049 r(0) = v1(1)v2(2)-v1(2)v2(1);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5050 r(1) = v1(2)v2(0)-v1(0)v2(2);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5051 r(2) = v1(0)v2(1)-v1(1)v2(0);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5052 return r;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5053 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5054
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5055 inline Matrix
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5056 unit_cube (void)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5057 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5058 static double data[32] =
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5059 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5060 0,0,0,1,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5061 1,0,0,1,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5062 0,1,0,1,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5063 0,0,1,1,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5064 1,1,0,1,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5065 1,0,1,1,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5066 0,1,1,1,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5067 1,1,1,1
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5068 };
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5069 Matrix m (4, 8);
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5070 memcpy (m.fortran_vec (), data, sizeof (double)*32);
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5071 return m;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5072 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5073
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5074 inline ColumnVector
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5075 cam2xform (const Array<double>& m)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5076 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5077 ColumnVector retval (4, 1.0);
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5078 memcpy (retval.fortran_vec (), m.fortran_vec (), sizeof (double)*3);
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5079 return retval;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5080 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5081
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5082 inline RowVector
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5083 xform2cam (const ColumnVector& v)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5084 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5085 return v.extract_n (0, 3).transpose ();
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5086 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5087
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5088 void
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5089 axes::properties::update_camera (void)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5090 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5091 double xd = (xdir_is ("normal") ? 1 : -1);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5092 double yd = (ydir_is ("normal") ? 1 : -1);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5093 double zd = (zdir_is ("normal") ? 1 : -1);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5094
7526 52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5095 Matrix xlimits = sx.scale (get_xlim ().matrix_value ());
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5096 Matrix ylimits = sy.scale (get_ylim ().matrix_value ());
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5097 Matrix zlimits = sz.scale (get_zlim ().matrix_value ());
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5098
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5099 double xo = xlimits(xd > 0 ? 0 : 1);
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5100 double yo = ylimits(yd > 0 ? 0 : 1);
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5101 double zo = zlimits(zd > 0 ? 0 : 1);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	5102
17564 234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	5103 Matrix pb = get_plotboxaspectratio ().matrix_value ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	5104
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5105 bool autocam = (camerapositionmode_is ("auto")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5106 && cameratargetmode_is ("auto")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5107 && cameraupvectormode_is ("auto")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5108 && cameraviewanglemode_is ("auto"));
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5109 bool dowarp = (autocam && dataaspectratiomode_is ("auto")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5110 && plotboxaspectratiomode_is ("auto"));
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5111
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5112 ColumnVector c_eye (xform_vector ());
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5113 ColumnVector c_center (xform_vector ());
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5114 ColumnVector c_upv (xform_vector ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	5115
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5116 if (cameratargetmode_is ("auto"))
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5117 {
7526 52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5118 c_center(0) = (xlimits(0)+xlimits(1))/2;
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5119 c_center(1) = (ylimits(0)+ylimits(1))/2;
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5120 c_center(2) = (zlimits(0)+zlimits(1))/2;
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5121
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5122 cameratarget = xform2cam (c_center);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5123 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5124 else
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5125 c_center = cam2xform (get_cameratarget ().matrix_value ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	5126
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5127 if (camerapositionmode_is ("auto"))
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5128 {
7526 52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5129 Matrix tview = get_view ().matrix_value ();
18099 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5130 double az = tview(0);
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5131 double el = tview(1);
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5132 double d = 5 * sqrt (pb(0)pb(0)+pb(1)pb(1)+pb(2)*pb(2));
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5133
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5134 if (el == 90 \|\| el == -90)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5135 c_eye(2) = d*signum (el);
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5136 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5137 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5138 az *= M_PI/180.0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5139 el *= M_PI/180.0;
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5140 c_eye(0) = d * cos (el) * sin (az);
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5141 c_eye(1) = -d* cos (el) * cos (az);
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5142 c_eye(2) = d * sin (el);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5143 }
7526 52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5144 c_eye(0) = c_eye(0)(xlimits(1)-xlimits(0))/(xdpb(0))+c_center(0);
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5145 c_eye(1) = c_eye(1)(ylimits(1)-ylimits(0))/(ydpb(1))+c_center(1);
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5146 c_eye(2) = c_eye(2)(zlimits(1)-zlimits(0))/(zdpb(2))+c_center(2);
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5147
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5148 cameraposition = xform2cam (c_eye);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5149 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5150 else
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5151 c_eye = cam2xform (get_cameraposition ().matrix_value ());
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5152
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5153 if (cameraupvectormode_is ("auto"))
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5154 {
7526 52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5155 Matrix tview = get_view ().matrix_value ();
18099 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5156 double az = tview(0);
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5157 double el = tview(1);
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5158
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5159 if (el == 90 \|\| el == -90)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5160 {
10917 888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	5161 c_upv(0) =
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5162 -signum (el) sin (azM_PI/180.0)*(xlimits(1)-xlimits(0))/pb(0);
10917 888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	5163 c_upv(1) =
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5164 signum (el) * cos (azM_PI/180.0)(ylimits(1)-ylimits(0))/pb(1);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5165 }
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5166 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5167 c_upv(2) = 1;
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5168
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5169 cameraupvector = xform2cam (c_upv);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5170 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5171 else
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5172 c_upv = cam2xform (get_cameraupvector ().matrix_value ());
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5173
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5174 Matrix x_view = xform_matrix ();
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5175 Matrix x_projection = xform_matrix ();
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5176 Matrix x_viewport = xform_matrix ();
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5177 Matrix x_normrender = xform_matrix ();
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5178 Matrix x_pre = xform_matrix ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	5179
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5180 x_render = xform_matrix ();
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5181 x_render_inv = xform_matrix ();
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5182
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5183 scale (x_pre, pb(0), pb(1), pb(2));
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5184 translate (x_pre, -0.5, -0.5, -0.5);
7526 52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5185 scale (x_pre, xd/(xlimits(1)-xlimits(0)), yd/(ylimits(1)-ylimits(0)),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5186 zd/(zlimits(1)-zlimits(0)));
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5187 translate (x_pre, -xo, -yo, -zo);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5188
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5189 xform (c_eye, x_pre);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5190 xform (c_center, x_pre);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	5191 scale (c_upv, pb(0)/(xlimits(1)-xlimits(0)), pb(1)/(ylimits(1)-ylimits(0)),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5192 pb(2)/(zlimits(1)-zlimits(0)));
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5193 translate (c_center, -c_eye(0), -c_eye(1), -c_eye(2));
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5194
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5195 ColumnVector F (c_center), f (F), UP (c_upv);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5196 normalize (f);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5197 normalize (UP);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5198
7440 4e3b073e910e [project @ 2008-02-02 18:23:50 by jwe] jwe parents: 7435 diff changeset	5199 if (std::abs (dot (f, UP)) > 1e-15)
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5200 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5201 double fa = 1 / sqrt(1-f(2)*f(2));
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5202 scale (UP, fa, fa, fa);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5203 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5204
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5205 ColumnVector s = cross (f, UP);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5206 ColumnVector u = cross (s, f);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5207
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5208 scale (x_view, 1, 1, -1);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5209 Matrix l = xform_matrix ();
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5210 l(0,0) = s(0); l(0,1) = s(1); l(0,2) = s(2);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5211 l(1,0) = u(0); l(1,1) = u(1); l(1,2) = u(2);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5212 l(2,0) = -f(0); l(2,1) = -f(1); l(2,2) = -f(2);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5213 x_view = x_view * l;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5214 translate (x_view, -c_eye(0), -c_eye(1), -c_eye(2));
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5215 scale (x_view, pb(0), pb(1), pb(2));
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5216 translate (x_view, -0.5, -0.5, -0.5);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5217
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5218 Matrix x_cube = x_view * unit_cube ();
18099 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5219 ColumnVector cmin = x_cube.row_min ();
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5220 ColumnVector cmax = x_cube.row_max ();
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5221 double xM = cmax(0)-cmin(0);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5222 double yM = cmax(1)-cmin(1);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5223
7447 25018e35b4cb [project @ 2008-02-05 22:38:57 by jwe] jwe parents: 7446 diff changeset	5224 Matrix bb = get_boundingbox (true);
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5225
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5226 double v_angle;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5227
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5228 if (cameraviewanglemode_is ("auto"))
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5229 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5230 double af;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5231
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5232 // FIXME: was this really needed? When compared to Matlab, it
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5233 // does not seem to be required. Need investigation with concrete
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	5234 // graphics toolkit to see results visually.
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5235 if (false && dowarp)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5236 af = 1.0 / (xM > yM ? xM : yM);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5237 else
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5238 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5239 if ((bb(2)/bb(3)) > (xM/yM))
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5240 af = 1.0 / yM;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5241 else
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5242 af = 1.0 / xM;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5243 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5244 v_angle = 2 * (180.0 / M_PI) * atan (1 / (2 * af * norm (F)));
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5245
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5246 cameraviewangle = v_angle;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5247 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5248 else
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5249 v_angle = get_cameraviewangle ();
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5250
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5251 double pf = 1 / (2 * tan ((v_angle / 2) * M_PI / 180.0) * norm (F));
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5252 scale (x_projection, pf, pf, 1);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5253
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5254 if (dowarp)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5255 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5256 xM *= pf;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5257 yM *= pf;
7447 25018e35b4cb [project @ 2008-02-05 22:38:57 by jwe] jwe parents: 7446 diff changeset	5258 translate (x_viewport, bb(0)+bb(2)/2, bb(1)+bb(3)/2, 0);
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5259 scale (x_viewport, bb(2)/xM, -bb(3)/yM, 1);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5260 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5261 else
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5262 {
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5263 double pix = 1;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5264 if (autocam)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5265 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5266 if ((bb(2)/bb(3)) > (xM/yM))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5267 pix = bb(3);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5268 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5269 pix = bb(2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5270 }
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5271 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5272 pix = (bb(2) < bb(3) ? bb(2) : bb(3));
7447 25018e35b4cb [project @ 2008-02-05 22:38:57 by jwe] jwe parents: 7446 diff changeset	5273 translate (x_viewport, bb(0)+bb(2)/2, bb(1)+bb(3)/2, 0);
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5274 scale (x_viewport, pix, -pix, 1);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5275 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5276
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5277 x_normrender = x_viewport * x_projection * x_view;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5278
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5279 x_cube = x_normrender * unit_cube ();
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5280 cmin = x_cube.row_min ();
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5281 cmax = x_cube.row_max ();
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5282 x_zlim.resize (1, 2);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5283 x_zlim(0) = cmin(2);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5284 x_zlim(1) = cmax(2);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5285
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5286 x_render = x_normrender;
7526 52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5287 scale (x_render, xd/(xlimits(1)-xlimits(0)), yd/(ylimits(1)-ylimits(0)),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5288 zd/(zlimits(1)-zlimits(0)));
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5289 translate (x_render, -xo, -yo, -zo);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5290
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5291 x_viewtransform = x_view;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5292 x_projectiontransform = x_projection;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5293 x_viewporttransform = x_viewport;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5294 x_normrendertransform = x_normrender;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5295 x_rendertransform = x_render;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5296
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5297 x_render_inv = x_render.inverse ();
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5298
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5299 // Note: these matrices are a slight modified version of the regular
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5300 // matrices, more suited for OpenGL rendering (x_gl_mat1 => light
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5301 // => x_gl_mat2)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5302 x_gl_mat1 = x_view;
7526 52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5303 scale (x_gl_mat1, xd/(xlimits(1)-xlimits(0)), yd/(ylimits(1)-ylimits(0)),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	5304 zd/(zlimits(1)-zlimits(0)));
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5305 translate (x_gl_mat1, -xo, -yo, -zo);
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5306 x_gl_mat2 = x_viewport * x_projection;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5307 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5308
12347 f6763ab98609 Prevent race condition in update_axes_layout Konstantinos Poulios <logari81@googlemail.com> parents: 12334 diff changeset	5309 static bool updating_axes_layout = false;
f6763ab98609 Prevent race condition in update_axes_layout Konstantinos Poulios <logari81@googlemail.com> parents: 12334 diff changeset	5310
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5311 void
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5312 axes::properties::update_axes_layout (void)
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5313 {
12347 f6763ab98609 Prevent race condition in update_axes_layout Konstantinos Poulios <logari81@googlemail.com> parents: 12334 diff changeset	5314 if (updating_axes_layout)
f6763ab98609 Prevent race condition in update_axes_layout Konstantinos Poulios <logari81@googlemail.com> parents: 12334 diff changeset	5315 return;
f6763ab98609 Prevent race condition in update_axes_layout Konstantinos Poulios <logari81@googlemail.com> parents: 12334 diff changeset	5316
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5317 graphics_xform xform = get_transform ();
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5318
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5319 double xd = (xdir_is ("normal") ? 1 : -1);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5320 double yd = (ydir_is ("normal") ? 1 : -1);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5321 double zd = (zdir_is ("normal") ? 1 : -1);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5322
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5323 const Matrix xlims = xform.xscale (get_xlim ().matrix_value ());
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5324 const Matrix ylims = xform.yscale (get_ylim ().matrix_value ());
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5325 const Matrix zlims = xform.zscale (get_zlim ().matrix_value ());
18099 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5326
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5327 double x_min, x_max, y_min, y_max, z_min, z_max;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5328 x_min = xlims(0), x_max = xlims(1);
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5329 y_min = ylims(0), y_max = ylims(1);
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5330 z_min = zlims(0), z_max = zlims(1);
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5331
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5332 ColumnVector p1, p2, dir (3);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5333
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5334 xstate = ystate = zstate = AXE_ANY_DIR;
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5335
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5336 p1 = xform.transform (x_min, (y_min+y_max)/2, (z_min+z_max)/2, false);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5337 p2 = xform.transform (x_max, (y_min+y_max)/2, (z_min+z_max)/2, false);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5338 dir(0) = xround (p2(0)-p1(0));
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5339 dir(1) = xround (p2(1)-p1(1));
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5340 dir(2) = (p2(2)-p1(2));
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5341 if (dir(0) == 0 && dir(1) == 0)
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5342 xstate = AXE_DEPTH_DIR;
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5343 else if (dir(2) == 0)
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5344 {
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5345 if (dir(0) == 0)
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5346 xstate = AXE_VERT_DIR;
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5347 else if (dir(1) == 0)
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5348 xstate = AXE_HORZ_DIR;
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5349 }
12348 d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5350
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5351 if (dir(2) == 0)
12348 d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5352 {
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5353 if (dir(1) == 0)
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5354 xPlane = (dir(0) > 0 ? x_max : x_min);
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5355 else
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5356 xPlane = (dir(1) < 0 ? x_max : x_min);
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5357 }
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5358 else
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5359 xPlane = (dir(2) < 0 ? x_min : x_max);
12348 d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5360
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5361 xPlaneN = (xPlane == x_min ? x_max : x_min);
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5362 fx = (x_max-x_min) / sqrt (dir(0)dir(0)+dir(1)dir(1));
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5363
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5364 p1 = xform.transform ((x_min+x_max)/2, y_min, (z_min+z_max)/2, false);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5365 p2 = xform.transform ((x_min+x_max)/2, y_max, (z_min+z_max)/2, false);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5366 dir(0) = xround (p2(0)-p1(0));
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5367 dir(1) = xround (p2(1)-p1(1));
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5368 dir(2) = (p2(2)-p1(2));
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5369 if (dir(0) == 0 && dir(1) == 0)
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5370 ystate = AXE_DEPTH_DIR;
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5371 else if (dir(2) == 0)
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5372 {
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5373 if (dir(0) == 0)
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5374 ystate = AXE_VERT_DIR;
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5375 else if (dir(1) == 0)
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5376 ystate = AXE_HORZ_DIR;
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5377 }
12348 d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5378
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5379 if (dir(2) == 0)
12348 d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5380 {
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5381 if (dir(1) == 0)
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5382 yPlane = (dir(0) > 0 ? y_max : y_min);
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5383 else
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5384 yPlane = (dir(1) < 0 ? y_max : y_min);
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5385 }
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5386 else
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5387 yPlane = (dir(2) < 0 ? y_min : y_max);
12348 d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5388
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5389 yPlaneN = (yPlane == y_min ? y_max : y_min);
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5390 fy = (y_max-y_min) / sqrt (dir(0)dir(0)+dir(1)dir(1));
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5391
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5392 p1 = xform.transform ((x_min+x_max)/2, (y_min+y_max)/2, z_min, false);
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5393 p2 = xform.transform ((x_min+x_max)/2, (y_min+y_max)/2, z_max, false);
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5394 dir(0) = xround (p2(0)-p1(0));
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5395 dir(1) = xround (p2(1)-p1(1));
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5396 dir(2) = (p2(2)-p1(2));
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5397 if (dir(0) == 0 && dir(1) == 0)
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5398 zstate = AXE_DEPTH_DIR;
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5399 else if (dir(2) == 0)
12348 d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5400 {
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5401 if (dir(0) == 0)
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5402 zstate = AXE_VERT_DIR;
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5403 else if (dir(1) == 0)
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5404 zstate = AXE_HORZ_DIR;
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5405 }
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5406
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5407 if (dir(2) == 0)
12348 d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5408 {
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5409 if (dir(1) == 0)
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5410 zPlane = (dir(0) > 0 ? z_min : z_max);
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5411 else
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5412 zPlane = (dir(1) < 0 ? z_min : z_max);
d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5413 }
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5414 else
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5415 zPlane = (dir(2) < 0 ? z_min : z_max);
12348 d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5416
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5417 zPlaneN = (zPlane == z_min ? z_max : z_min);
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5418 fz = (z_max-z_min) / sqrt (dir(0)dir(0)+dir(1)dir(1));
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5419
12347 f6763ab98609 Prevent race condition in update_axes_layout Konstantinos Poulios <logari81@googlemail.com> parents: 12334 diff changeset	5420 unwind_protect frame;
f6763ab98609 Prevent race condition in update_axes_layout Konstantinos Poulios <logari81@googlemail.com> parents: 12334 diff changeset	5421 frame.protect_var (updating_axes_layout);
f6763ab98609 Prevent race condition in update_axes_layout Konstantinos Poulios <logari81@googlemail.com> parents: 12334 diff changeset	5422 updating_axes_layout = true;
f6763ab98609 Prevent race condition in update_axes_layout Konstantinos Poulios <logari81@googlemail.com> parents: 12334 diff changeset	5423
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5424 xySym = (xdyd(xPlane-xPlaneN)*(yPlane-yPlaneN) > 0);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5425 zSign = (zd*(zPlane-zPlaneN) <= 0);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5426 xyzSym = zSign ? xySym : !xySym;
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5427 xpTick = (zSign ? xPlaneN : xPlane);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5428 ypTick = (zSign ? yPlaneN : yPlane);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5429 zpTick = (zSign ? zPlane : zPlaneN);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5430 xpTickN = (zSign ? xPlane : xPlaneN);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5431 ypTickN = (zSign ? yPlane : yPlaneN);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5432 zpTickN = (zSign ? zPlaneN : zPlane);
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5433
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5434 /* 2D mode */
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5435 x2Dtop = false;
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5436 y2Dright = false;
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5437 layer2Dtop = false;
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5438 if (xstate == AXE_HORZ_DIR && ystate == AXE_VERT_DIR)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5439 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5440 if (xaxislocation_is ("top"))
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5441 {
18711 f684f7075aee Don't fetch lots of axes state information for rendering if object is not visible. Rik <rik@octave.org> parents: 18701 diff changeset	5442 std::swap (yPlane, yPlaneN);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5443 x2Dtop = true;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5444 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5445 ypTick = yPlaneN;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5446 ypTickN = yPlane;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5447 if (yaxislocation_is ("right"))
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5448 {
18711 f684f7075aee Don't fetch lots of axes state information for rendering if object is not visible. Rik <rik@octave.org> parents: 18701 diff changeset	5449 std::swap (xPlane, xPlaneN);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5450 y2Dright = true;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5451 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5452 xpTick = xPlaneN;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5453 xpTickN = xPlane;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5454 if (layer_is ("top"))
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5455 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5456 zpTick = zPlaneN;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5457 layer2Dtop = true;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5458 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5459 else
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5460 zpTick = zPlane;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5461 }
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5462
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5463 Matrix viewmat = get_view ().matrix_value ();
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5464 nearhoriz = std::abs (viewmat(1)) <= 5;
18701 e42843ceff48 Fix axes bounding box not obeying 'layer' property. Rik <rik@octave.org> parents: 18680 diff changeset	5465 is2D = viewmat(1) == 90;
13830 462b5f556346 avoid uninitialized variable warning from valgrind John W. Eaton <jwe@octave.org> parents: 13816 diff changeset	5466
14391 c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5467 update_ticklength ();
c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5468 }
c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5469
c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5470 void
c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5471 axes::properties::update_ticklength (void)
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5472 {
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5473 bool mode2d = (((xstate > AXE_DEPTH_DIR ? 1 : 0) +
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5474 (ystate > AXE_DEPTH_DIR ? 1 : 0) +
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5475 (zstate > AXE_DEPTH_DIR ? 1 : 0)) == 2);
14395 e41e538e9d03 Fix TickDir handling for 2D and 3D plots (bug #35575). Rik <octave@nomad.inbox5.com> parents: 14391 diff changeset	5476
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5477 if (tickdirmode_is ("auto"))
14395 e41e538e9d03 Fix TickDir handling for 2D and 3D plots (bug #35575). Rik <octave@nomad.inbox5.com> parents: 14391 diff changeset	5478 tickdir.set (mode2d ? "in" : "out", true);
e41e538e9d03 Fix TickDir handling for 2D and 3D plots (bug #35575). Rik <octave@nomad.inbox5.com> parents: 14391 diff changeset	5479
e41e538e9d03 Fix TickDir handling for 2D and 3D plots (bug #35575). Rik <octave@nomad.inbox5.com> parents: 14391 diff changeset	5480 double ticksign = (tickdir_is ("in") ? -1 : 1);
14391 c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5481
c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5482 Matrix bbox = get_boundingbox (true);
c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5483 Matrix ticklen = get_ticklength ().matrix_value ();
c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5484 ticklen(0) = ticklen(0) * std::max (bbox(2), bbox(3));
c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5485 ticklen(1) = ticklen(1) * std::max (bbox(2), bbox(3));
c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5486
c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5487 xticklen = ticksign * (mode2d ? ticklen(0) : ticklen(1));
c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5488 yticklen = ticksign * (mode2d ? ticklen(0) : ticklen(1));
c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5489 zticklen = ticksign * (mode2d ? ticklen(0) : ticklen(1));
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5490
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5491 xtickoffset = (mode2d ? std::max (0., xticklen) : std::abs (xticklen)) + 5;
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5492 ytickoffset = (mode2d ? std::max (0., yticklen) : std::abs (yticklen)) + 5;
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5493 ztickoffset = (mode2d ? std::max (0., zticklen) : std::abs (zticklen)) + 5;
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5494
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5495 update_xlabel_position ();
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5496 update_ylabel_position ();
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5497 update_zlabel_position ();
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5498 update_title_position ();
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5499 }
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5500
14391 c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5501 /*
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	5502 ## FIXME: A demo can't be called in a C++ file. This should be made a test
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	5503 ## or moved to a .m file where it can be called.
14391 c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5504 %!demo
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	5505 %! clf;
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	5506 %! subplot (2,1,1);
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	5507 %! plot (rand (3));
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	5508 %! xlabel xlabel;
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	5509 %! ylabel ylabel;
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	5510 %! title title;
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	5511 %! subplot (2,1,2);
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	5512 %! plot (rand (3));
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	5513 %! set (gca, "ticklength", get (gca, "ticklength") * 2, "tickdir", "out");
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	5514 %! xlabel xlabel;
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	5515 %! ylabel ylabel;
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	5516 %! title title;
14391 c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5517 */
c9ec21bef97a Fix ticklength updating (bug # 35438). Ben Abbott <bpabbott@mac.com> parents: 14367 diff changeset	5518
12910 e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5519 static bool updating_xlabel_position = false;
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5520
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5521 void
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5522 axes::properties::update_xlabel_position (void)
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5523 {
12910 e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5524 if (updating_xlabel_position)
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5525 return;
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5526
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5527 text::properties& xlabel_props
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5528 = reinterpret_cast<text::properties&>
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5529 (gh_manager::get_object (get_xlabel ()).get_properties ());
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5530
12965 22bc9ec80c2c allow multi-line string property for text objects using cell arrays or char matrices Ben Abbott <bpabbott@mac.com> parents: 12910 diff changeset	5531 bool is_empty = xlabel_props.get_string ().is_empty ();
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5532
12910 e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5533 unwind_protect frame;
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5534 frame.protect_var (updating_xlabel_position);
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5535 updating_xlabel_position = true;
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5536
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5537 if (! is_empty)
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5538 {
12389 5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5539 if (xlabel_props.horizontalalignmentmode_is ("auto"))
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5540 {
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5541 xlabel_props.set_horizontalalignment
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5542 (xstate > AXE_DEPTH_DIR
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5543 ? "center" : (xyzSym ? "left" : "right"));
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5544
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5545 xlabel_props.set_horizontalalignmentmode ("auto");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5546 }
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5547
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5548 if (xlabel_props.verticalalignmentmode_is ("auto"))
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5549 {
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5550 xlabel_props.set_verticalalignment
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5551 (xstate == AXE_VERT_DIR \|\| x2Dtop ? "bottom" : "top");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5552
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5553 xlabel_props.set_verticalalignmentmode ("auto");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5554 }
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5555 }
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5556
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5557 if (xlabel_props.positionmode_is ("auto")
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5558 \|\| xlabel_props.rotationmode_is ("auto"))
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5559 {
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5560 graphics_xform xform = get_transform ();
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5561
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5562 Matrix ext (1, 2, 0.0);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5563 ext = get_ticklabel_extents (get_xtick ().matrix_value (),
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5564 get_xticklabel ().all_strings (),
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5565 get_xlim ().matrix_value ());
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5566
18099 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5567 double wmax = ext(0);
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5568 double hmax = ext(1);
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5569 double angle = 0;
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5570 ColumnVector p =
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5571 graphics_xform::xform_vector ((xpTickN+xpTick)/2, ypTick, zpTick);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5572
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5573 bool tick_along_z = nearhoriz \|\| xisinf (fy);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5574 if (tick_along_z)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5575 p(2) += (signum (zpTick-zpTickN)fzxtickoffset);
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5576 else
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5577 p(1) += (signum (ypTick-ypTickN)fyxtickoffset);
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5578
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5579 p = xform.transform (p(0), p(1), p(2), false);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5580
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5581 switch (xstate)
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5582 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5583 case AXE_ANY_DIR:
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5584 p(0) += (xyzSym ? wmax : -wmax);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5585 p(1) += hmax;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5586 break;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5587
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5588 case AXE_VERT_DIR:
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5589 p(0) -= wmax;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5590 angle = 90;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5591 break;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5592
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5593 case AXE_HORZ_DIR:
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5594 p(1) += (x2Dtop ? -hmax : hmax);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5595 break;
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5596 }
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5597
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5598 if (xlabel_props.positionmode_is ("auto"))
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5599 {
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5600 p = xform.untransform (p(0), p(1), p(2), true);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5601 xlabel_props.set_position (p.extract_n (0, 3).transpose ());
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5602 xlabel_props.set_positionmode ("auto");
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5603 }
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5604
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5605 if (! is_empty && xlabel_props.rotationmode_is ("auto"))
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5606 {
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5607 xlabel_props.set_rotation (angle);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5608 xlabel_props.set_rotationmode ("auto");
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5609 }
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5610 }
12910 e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5611 }
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5612
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5613 static bool updating_ylabel_position = false;
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5614
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5615 void
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5616 axes::properties::update_ylabel_position (void)
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5617 {
12910 e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5618 if (updating_ylabel_position)
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5619 return;
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5620
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5621 text::properties& ylabel_props
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5622 = reinterpret_cast<text::properties&>
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5623 (gh_manager::get_object (get_ylabel ()).get_properties ());
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5624
12965 22bc9ec80c2c allow multi-line string property for text objects using cell arrays or char matrices Ben Abbott <bpabbott@mac.com> parents: 12910 diff changeset	5625 bool is_empty = ylabel_props.get_string ().is_empty ();
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5626
12910 e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5627 unwind_protect frame;
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5628 frame.protect_var (updating_ylabel_position);
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5629 updating_ylabel_position = true;
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5630
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5631 if (! is_empty)
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5632 {
12389 5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5633 if (ylabel_props.horizontalalignmentmode_is ("auto"))
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5634 {
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5635 ylabel_props.set_horizontalalignment
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5636 (ystate > AXE_DEPTH_DIR
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5637 ? "center" : (!xyzSym ? "left" : "right"));
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5638
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5639 ylabel_props.set_horizontalalignmentmode ("auto");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5640 }
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5641
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5642 if (ylabel_props.verticalalignmentmode_is ("auto"))
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5643 {
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5644 ylabel_props.set_verticalalignment
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5645 (ystate == AXE_VERT_DIR && !y2Dright ? "bottom" : "top");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5646
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5647 ylabel_props.set_verticalalignmentmode ("auto");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5648 }
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5649 }
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5650
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5651 if (ylabel_props.positionmode_is ("auto")
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5652 \|\| ylabel_props.rotationmode_is ("auto"))
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5653 {
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5654 graphics_xform xform = get_transform ();
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5655
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5656 Matrix ext (1, 2, 0.0);
16201 2338a92e9782 Fix spacing between ylabel and y-axis (bug #38461) Rik <rik@octave.org> parents: 15760 diff changeset	5657
2338a92e9782 Fix spacing between ylabel and y-axis (bug #38461) Rik <rik@octave.org> parents: 15760 diff changeset	5658 // The underlying get_extents() from FreeType produces mismatched values.
2338a92e9782 Fix spacing between ylabel and y-axis (bug #38461) Rik <rik@octave.org> parents: 15760 diff changeset	5659 // x-extent accurately measures the width of the glyphs.
2338a92e9782 Fix spacing between ylabel and y-axis (bug #38461) Rik <rik@octave.org> parents: 15760 diff changeset	5660 // y-extent instead measures from baseline-to-baseline.
2338a92e9782 Fix spacing between ylabel and y-axis (bug #38461) Rik <rik@octave.org> parents: 15760 diff changeset	5661 // Pad x-extent (+4) so that it approximately matches y-extent.
2338a92e9782 Fix spacing between ylabel and y-axis (bug #38461) Rik <rik@octave.org> parents: 15760 diff changeset	5662 // This keeps ylabels about the same distance from y-axis as
2338a92e9782 Fix spacing between ylabel and y-axis (bug #38461) Rik <rik@octave.org> parents: 15760 diff changeset	5663 // xlabels are from x-axis.
2338a92e9782 Fix spacing between ylabel and y-axis (bug #38461) Rik <rik@octave.org> parents: 15760 diff changeset	5664 // ALWAYS use an even number for padding or horizontal alignment
2338a92e9782 Fix spacing between ylabel and y-axis (bug #38461) Rik <rik@octave.org> parents: 15760 diff changeset	5665 // will be off.
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5666 ext = get_ticklabel_extents (get_ytick ().matrix_value (),
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5667 get_yticklabel ().all_strings (),
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5668 get_ylim ().matrix_value ());
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5669
18099 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5670 double wmax = ext(0)+4;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5671 double hmax = ext(1);
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5672 double angle = 0;
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5673 ColumnVector p =
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5674 graphics_xform::xform_vector (xpTick, (ypTickN+ypTick)/2, zpTick);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5675
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5676 bool tick_along_z = nearhoriz \|\| xisinf (fx);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5677 if (tick_along_z)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5678 p(2) += (signum (zpTick-zpTickN)fzytickoffset);
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5679 else
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5680 p(0) += (signum (xpTick-xpTickN)fxytickoffset);
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5681
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5682 p = xform.transform (p(0), p(1), p(2), false);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5683
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5684 switch (ystate)
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5685 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5686 case AXE_ANY_DIR:
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5687 p(0) += (!xyzSym ? wmax : -wmax);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5688 p(1) += hmax;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5689 break;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5690
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5691 case AXE_VERT_DIR:
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5692 p(0) += (y2Dright ? wmax : -wmax);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5693 angle = 90;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5694 break;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5695
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5696 case AXE_HORZ_DIR:
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5697 p(1) += hmax;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5698 break;
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5699 }
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5700
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5701 if (ylabel_props.positionmode_is ("auto"))
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5702 {
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5703 p = xform.untransform (p(0), p(1), p(2), true);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5704 ylabel_props.set_position (p.extract_n (0, 3).transpose ());
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5705 ylabel_props.set_positionmode ("auto");
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5706 }
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5707
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5708 if (! is_empty && ylabel_props.rotationmode_is ("auto"))
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5709 {
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5710 ylabel_props.set_rotation (angle);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5711 ylabel_props.set_rotationmode ("auto");
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5712 }
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5713 }
12910 e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5714 }
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5715
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5716 static bool updating_zlabel_position = false;
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5717
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5718 void
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5719 axes::properties::update_zlabel_position (void)
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5720 {
12910 e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5721 if (updating_zlabel_position)
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5722 return;
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5723
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5724 text::properties& zlabel_props
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5725 = reinterpret_cast<text::properties&>
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5726 (gh_manager::get_object (get_zlabel ()).get_properties ());
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5727
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5728 bool camAuto = cameraupvectormode_is ("auto");
12965 22bc9ec80c2c allow multi-line string property for text objects using cell arrays or char matrices Ben Abbott <bpabbott@mac.com> parents: 12910 diff changeset	5729 bool is_empty = zlabel_props.get_string ().is_empty ();
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5730
12910 e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5731 unwind_protect frame;
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5732 frame.protect_var (updating_zlabel_position);
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5733 updating_zlabel_position = true;
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5734
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5735 if (! is_empty)
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5736 {
12389 5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5737 if (zlabel_props.horizontalalignmentmode_is ("auto"))
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5738 {
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5739 zlabel_props.set_horizontalalignment
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5740 ((zstate > AXE_DEPTH_DIR \|\| camAuto) ? "center" : "right");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5741
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5742 zlabel_props.set_horizontalalignmentmode ("auto");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5743 }
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5744
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5745 if (zlabel_props.verticalalignmentmode_is ("auto"))
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5746 {
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5747 zlabel_props.set_verticalalignment
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5748 (zstate == AXE_VERT_DIR
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5749 ? "bottom" : ((zSign \|\| camAuto) ? "bottom" : "top"));
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5750
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5751 zlabel_props.set_verticalalignmentmode ("auto");
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5752 }
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5753 }
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5754
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5755 if (zlabel_props.positionmode_is ("auto")
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5756 \|\| zlabel_props.rotationmode_is ("auto"))
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5757 {
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5758 graphics_xform xform = get_transform ();
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5759
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5760 Matrix ext (1, 2, 0.0);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5761 ext = get_ticklabel_extents (get_ztick ().matrix_value (),
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5762 get_zticklabel ().all_strings (),
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5763 get_zlim ().matrix_value ());
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5764
18099 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5765 double wmax = ext(0);
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5766 double hmax = ext(1);
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	5767 double angle = 0;
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5768 ColumnVector p;
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5769
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5770 if (xySym)
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5771 {
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5772 p = graphics_xform::xform_vector (xPlaneN, yPlane,
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5773 (zpTickN+zpTick)/2);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5774 if (xisinf (fy))
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5775 p(0) += (signum (xPlaneN-xPlane)fxztickoffset);
12348 d1e48a4a9a0b Untabify and improve indentation Konstantinos Poulios <logari81@googlemail.com> parents: 12347 diff changeset	5776 else
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5777 p(1) += (signum (yPlane-yPlaneN)fyztickoffset);
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5778 }
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5779 else
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5780 {
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5781 p = graphics_xform::xform_vector (xPlane, yPlaneN,
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5782 (zpTickN+zpTick)/2);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5783 if (xisinf (fx))
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5784 p(1) += (signum (yPlaneN-yPlane)fyztickoffset);
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5785 else
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5786 p(0) += (signum (xPlane-xPlaneN)fxztickoffset);
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5787 }
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5788
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5789 p = xform.transform (p(0), p(1), p(2), false);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5790
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5791 switch (zstate)
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5792 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5793 case AXE_ANY_DIR:
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5794 if (camAuto)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5795 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5796 p(0) -= wmax;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5797 angle = 90;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5798 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5799
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5800 // FIXME: what's the correct offset?
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5801 //
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5802 // p[0] += (!xySym ? wmax : -wmax);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5803 // p[1] += (zSign ? hmax : -hmax);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5804
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5805 break;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5806
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5807 case AXE_VERT_DIR:
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5808 p(0) -= wmax;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5809 angle = 90;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5810 break;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5811
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5812 case AXE_HORZ_DIR:
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5813 p(1) += hmax;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5814 break;
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5815 }
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5816
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5817 if (zlabel_props.positionmode_is ("auto"))
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5818 {
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5819 p = xform.untransform (p(0), p(1), p(2), true);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5820 zlabel_props.set_position (p.extract_n (0, 3).transpose ());
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5821 zlabel_props.set_positionmode ("auto");
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5822 }
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5823
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5824 if (! is_empty && zlabel_props.rotationmode_is ("auto"))
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5825 {
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5826 zlabel_props.set_rotation (angle);
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5827 zlabel_props.set_rotationmode ("auto");
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5828 }
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5829 }
12910 e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5830 }
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5831
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5832 static bool updating_title_position = false;
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5833
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5834 void
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5835 axes::properties::update_title_position (void)
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5836 {
12910 e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5837 if (updating_title_position)
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5838 return;
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5839
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5840 text::properties& title_props
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5841 = reinterpret_cast<text::properties&>
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5842 (gh_manager::get_object (get_title ()).get_properties ());
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	5843
12910 e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5844 unwind_protect frame;
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5845 frame.protect_var (updating_title_position);
e77284b6dac6 avoid possible infinite recursion in autopositioning of labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12777 diff changeset	5846 updating_title_position = true;
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5847
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5848 if (title_props.positionmode_is ("auto"))
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5849 {
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5850 graphics_xform xform = get_transform ();
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5851
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5852 // FIXME: bbox should be stored in axes::properties
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5853 Matrix bbox = get_extent (false);
13910 2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5854
2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5855 ColumnVector p =
2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5856 graphics_xform::xform_vector (bbox(0)+bbox(2)/2,
2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5857 bbox(1)-10,
2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5858 (x_zlim(0)+x_zlim(1))/2);
2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5859
2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5860 if (x2Dtop)
2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5861 {
2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5862 Matrix ext (1, 2, 0.0);
2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5863 ext = get_ticklabel_extents (get_xtick ().matrix_value (),
2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5864 get_xticklabel ().all_strings (),
2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5865 get_xlim ().matrix_value ());
2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5866 p(1) -= ext(1);
2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5867 }
2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5868
2af665333b86 title positioning taking xaxislocation into account (bug #33418) Konstantinos Poulios <logari81@googlemail.com> parents: 13908 diff changeset	5869 p = xform.untransform (p(0), p(1), p(2), true);
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5870
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	5871 title_props.set_position (p.extract_n (0, 3).transpose ());
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5872 title_props.set_positionmode ("auto");
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	5873 }
12389 5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5874 }
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5875
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5876 void
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5877 axes::properties::update_autopos (const std::string& elem_type)
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5878 {
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5879 if (elem_type == "xlabel")
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5880 update_xlabel_position ();
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5881 else if (elem_type == "ylabel")
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5882 update_ylabel_position ();
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5883 else if (elem_type == "zlabel")
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5884 update_zlabel_position ();
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5885 else if (elem_type == "title")
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	5886 update_title_position ();
12440 2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	5887 else if (elem_type == "sync")
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	5888 sync_positions ();
12327 2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5889 }
2ad37783bf01 Move axes layout from opengl_renderer::draw_axes to axes::properties Konstantinos Poulios <logari81@googlemail.com> parents: 12221 diff changeset	5890
11167 51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5891 static void
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5892 normalized_aspectratios (Matrix& aspectratios, const Matrix& scalefactors,
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5893 double xlength, double ylength, double zlength)
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5894 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5895 double xval = xlength/scalefactors(0);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5896 double yval = ylength/scalefactors(1);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5897 double zval = zlength/scalefactors(2);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5898
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5899 double minval = xmin (xmin (xval, yval), zval);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5900
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5901 aspectratios(0) = xval/minval;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5902 aspectratios(1) = yval/minval;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	5903 aspectratios(2) = zval/minval;
11167 51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5904 }
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5905
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5906 static void
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5907 max_axes_scale (double& s, Matrix& limits, const Matrix& kids,
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5908 double pbfactor, double dafactor, char limit_type, bool tight)
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5909 {
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5910 if (tight)
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5911 {
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5912 double minval = octave_Inf;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5913 double maxval = -octave_Inf;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5914 double min_pos = octave_Inf;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	5915 double max_neg = -octave_Inf;
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	5916 get_children_limits (minval, maxval, min_pos, max_neg, kids, limit_type);
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	5917 if (xfinite (minval) && xfinite (maxval))
11167 51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5918 {
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5919 limits(0) = minval;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5920 limits(1) = maxval;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5921 s = xmax(s, (maxval - minval) / (pbfactor * dafactor));
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5922 }
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5923 }
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5924 else
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5925 s = xmax(s, (limits(1) - limits(0)) / (pbfactor * dafactor));
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5926 }
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5927
18761 868dcab453bd Distinguish axes when checking for recursion in axes limits updates (bug #40005). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18746 diff changeset	5928 static std::set<double> updating_aspectratios;
11167 51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5929
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5930 void
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5931 axes::properties::update_aspectratios (void)
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5932 {
18761 868dcab453bd Distinguish axes when checking for recursion in axes limits updates (bug #40005). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18746 diff changeset	5933 if (updating_aspectratios.find (get___myhandle__ ().value ()) !=
868dcab453bd Distinguish axes when checking for recursion in axes limits updates (bug #40005). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18746 diff changeset	5934 updating_aspectratios.end ())
11167 51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5935 return;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5936
7526 52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5937 Matrix xlimits = get_xlim ().matrix_value ();
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5938 Matrix ylimits = get_ylim ().matrix_value ();
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5939 Matrix zlimits = get_zlim ().matrix_value ();
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5940
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5941 double dx = (xlimits(1)-xlimits(0));
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5942 double dy = (ylimits(1)-ylimits(0));
52d58b0463ed graphics.cc, graphics.h.in: avoid some GCC warnings John W. Eaton <jwe@octave.org> parents: 7523 diff changeset	5943 double dz = (zlimits(1)-zlimits(0));
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5944
11167 51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5945 Matrix da = get_dataaspectratio ().matrix_value ();
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5946 Matrix pba = get_plotboxaspectratio ().matrix_value ();
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5947
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5948 if (dataaspectratiomode_is ("auto"))
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	5949 {
11167 51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5950 if (plotboxaspectratiomode_is ("auto"))
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5951 {
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5952 pba = Matrix (1, 3, 1.0);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5953 plotboxaspectratio.set (pba, false);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5954 }
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5955
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5956 normalized_aspectratios (da, pba, dx, dy, dz);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5957 dataaspectratio.set (da, false);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5958 }
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5959 else if (plotboxaspectratiomode_is ("auto"))
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5960 {
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5961 normalized_aspectratios (pba, da, dx, dy, dz);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5962 plotboxaspectratio.set (pba, false);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5963 }
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5964 else
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5965 {
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5966 double s = -octave_Inf;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5967 bool modified_limits = false;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5968 Matrix kids;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5969
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5970 if (xlimmode_is ("auto") && ylimmode_is ("auto") && zlimmode_is ("auto"))
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5971 {
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5972 modified_limits = true;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5973 kids = get_children ();
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5974 max_axes_scale (s, xlimits, kids, pba(0), da(0), 'x', true);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5975 max_axes_scale (s, ylimits, kids, pba(1), da(1), 'y', true);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5976 max_axes_scale (s, zlimits, kids, pba(2), da(2), 'z', true);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5977 }
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5978 else if (xlimmode_is ("auto") && ylimmode_is ("auto"))
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5979 {
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5980 modified_limits = true;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5981 max_axes_scale (s, zlimits, kids, pba(2), da(2), 'z', false);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5982 }
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5983 else if (ylimmode_is ("auto") && zlimmode_is ("auto"))
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5984 {
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5985 modified_limits = true;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5986 max_axes_scale (s, xlimits, kids, pba(0), da(0), 'x', false);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5987 }
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5988 else if (zlimmode_is ("auto") && xlimmode_is ("auto"))
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5989 {
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5990 modified_limits = true;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5991 max_axes_scale (s, ylimits, kids, pba(1), da(1), 'y', false);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5992 }
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5993
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5994 if (modified_limits)
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5995 {
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5996
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5997 unwind_protect frame;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5998 frame.protect_var (updating_aspectratios);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	5999
18761 868dcab453bd Distinguish axes when checking for recursion in axes limits updates (bug #40005). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18746 diff changeset	6000 updating_aspectratios.insert (get___myhandle__ ().value ());
11167 51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6001
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6002 dx = pba(0) *da(0);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6003 dy = pba(1) *da(1);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6004 dz = pba(2) *da(2);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6005 if (xisinf (s))
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6006 s = 1 / xmin (xmin (dx, dy), dz);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6007
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6008 if (xlimmode_is ("auto"))
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6009 {
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6010 dx = s * dx;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6011 xlimits(0) = 0.5 * (xlimits(0) + xlimits(1) - dx);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6012 xlimits(1) = xlimits(0) + dx;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6013 set_xlim (xlimits);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6014 set_xlimmode ("auto");
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6015 }
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6016
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6017 if (ylimmode_is ("auto"))
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6018 {
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6019 dy = s * dy;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6020 ylimits(0) = 0.5 * (ylimits(0) + ylimits(1) - dy);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6021 ylimits(1) = ylimits(0) + dy;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6022 set_ylim (ylimits);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6023 set_ylimmode ("auto");
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6024 }
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6025
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6026 if (zlimmode_is ("auto"))
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6027 {
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6028 dz = s * dz;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6029 zlimits(0) = 0.5 * (zlimits(0) + zlimits(1) - dz);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6030 zlimits(1) = zlimits(0) + dz;
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6031 set_zlim (zlimits);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6032 set_zlimmode ("auto");
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6033 }
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6034 }
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	6035 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6036 {
11167 51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6037 normalized_aspectratios (pba, da, dx, dy, dz);
51ac3a08e53c Fix {d,pb}aspectratios for OpenGL backends. Konstantinos Poulios <logari81@googlemail.com> parents: 11163 diff changeset	6038 plotboxaspectratio.set (pba, false);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6039 }
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	6040 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	6041 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	6042
12777 6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	6043 void
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	6044 axes::properties::update_font (void)
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	6045 {
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	6046 #ifdef HAVE_FREETYPE
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	6047 #ifdef HAVE_FONTCONFIG
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	6048 text_renderer.set_font (get ("fontname").string_value (),
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	6049 get ("fontweight").string_value (),
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	6050 get ("fontangle").string_value (),
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	6051 get ("fontsize").double_value ());
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	6052 #endif
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	6053 #endif
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	6054 }
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	6055
7447 25018e35b4cb [project @ 2008-02-05 22:38:57 by jwe] jwe parents: 7446 diff changeset	6056 // The INTERNAL flag defines whether position or outerposition is used.
25018e35b4cb [project @ 2008-02-05 22:38:57 by jwe] jwe parents: 7446 diff changeset	6057
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	6058 Matrix
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6059 axes::properties::get_boundingbox (bool internal,
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6060 const Matrix& parent_pix_size) const
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6061 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6062 Matrix pos = internal ? get_position ().matrix_value ()
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6063 : get_outerposition ().matrix_value ();
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6064 Matrix parent_size (parent_pix_size);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6065
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6066 if (parent_size.numel () == 0)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6067 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6068 graphics_object obj = gh_manager::get_object (get_parent ());
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6069
17607 07a4597fcbac graphics.cc: don't ask for (orphan) dummy axes parent properties. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17564 diff changeset	6070 if (obj.valid_object ())
07a4597fcbac graphics.cc: don't ask for (orphan) dummy axes parent properties. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17564 diff changeset	6071 parent_size =
07a4597fcbac graphics.cc: don't ask for (orphan) dummy axes parent properties. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17564 diff changeset	6072 obj.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2);
07a4597fcbac graphics.cc: don't ask for (orphan) dummy axes parent properties. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17564 diff changeset	6073 else
07a4597fcbac graphics.cc: don't ask for (orphan) dummy axes parent properties. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17564 diff changeset	6074 parent_size = default_figure_position ();
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6075 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6076
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6077 pos = convert_position (pos, get_units (), "pixels", parent_size);
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	6078
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	6079 pos(0)--;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	6080 pos(1)--;
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6081 pos(1) = parent_size(1) - pos(1) - pos(3);
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	6082
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	6083 return pos;
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	6084 }
65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	6085
12440 2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6086 Matrix
12496 245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6087 axes::properties::get_extent (bool with_text, bool only_text_height) const
12440 2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6088 {
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6089 graphics_xform xform = get_transform ();
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6090
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6091 Matrix ext (1, 4, 0.0);
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6092 ext(0) = octave_Inf;
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6093 ext(1) = octave_Inf;
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6094 ext(2) = -octave_Inf;
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6095 ext(3) = -octave_Inf;
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6096 for (int i = 0; i <= 1; i++)
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6097 for (int j = 0; j <= 1; j++)
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6098 for (int k = 0; k <= 1; k++)
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6099 {
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6100 ColumnVector p = xform.transform (i ? xPlaneN : xPlane,
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6101 j ? yPlaneN : yPlane,
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6102 k ? zPlaneN : zPlane, false);
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6103 ext(0) = std::min (ext(0), p(0));
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6104 ext(1) = std::min (ext(1), p(1));
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6105 ext(2) = std::max (ext(2), p(0));
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6106 ext(3) = std::max (ext(3), p(1));
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6107 }
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6108
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6109 if (with_text)
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6110 {
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6111 for (int i = 0; i < 4; i++)
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6112 {
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6113 graphics_handle text_handle;
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6114 if (i == 0)
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6115 text_handle = get_title ();
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6116 else if (i == 1)
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6117 text_handle = get_xlabel ();
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6118 else if (i == 2)
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6119 text_handle = get_ylabel ();
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6120 else if (i == 3)
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6121 text_handle = get_zlabel ();
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6122
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6123 text::properties& text_props
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6124 = reinterpret_cast<text::properties&>
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6125 (gh_manager::get_object (text_handle).get_properties ());
12440 2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6126
14483 6a736395ff7d fix wrong axes extents for text elements with custom units (bug #35856) Konstantinos Poulios <logari81@googlemail.com> parents: 14457 diff changeset	6127 Matrix text_pos = text_props.get_data_position ();
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	6128 text_pos = xform.transform (text_pos(0), text_pos(1), text_pos(2));
12965 22bc9ec80c2c allow multi-line string property for text objects using cell arrays or char matrices Ben Abbott <bpabbott@mac.com> parents: 12910 diff changeset	6129 if (text_props.get_string ().is_empty ())
12502 13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	6130 {
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	6131 ext(0) = std::min (ext(0), text_pos(0));
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	6132 ext(1) = std::min (ext(1), text_pos(1));
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	6133 ext(2) = std::max (ext(2), text_pos(0));
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	6134 ext(3) = std::max (ext(3), text_pos(1));
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	6135 }
13640f7f40bb improve calculation of axes tightinset for empty axes labels/title Konstantinos Poulios <logari81@googlemail.com> parents: 12496 diff changeset	6136 else
12440 2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6137 {
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6138 Matrix text_ext = text_props.get_extent_matrix ();
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6139
12496 245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6140 bool ignore_horizontal = false;
245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6141 bool ignore_vertical = false;
245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6142 if (only_text_height)
245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6143 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14798 diff changeset	6144 double text_rotation = text_props.get_rotation ();
12496 245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6145 if (text_rotation == 0. \|\| text_rotation == 180.)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6146 ignore_horizontal = true;
12496 245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6147 else if (text_rotation == 90. \|\| text_rotation == 270.)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6148 ignore_vertical = true;
12496 245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6149 }
245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6150
245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6151 if (! ignore_horizontal)
245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6152 {
245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6153 ext(0) = std::min (ext(0), text_pos(0)+text_ext(0));
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6154 ext(2) = std::max (ext(2),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6155 text_pos(0)+text_ext(0)+text_ext(2));
12496 245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6156 }
245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6157
245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6158 if (! ignore_vertical)
245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6159 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6160 ext(1) = std::min (ext(1),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6161 text_pos(1)-text_ext(1)-text_ext(3));
12496 245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6162 ext(3) = std::max (ext(3), text_pos(1)-text_ext(1));
245b5efb07c2 fix axes position synchronization for long text objects Konstantinos Poulios <logari81@gmail.com> parents: 12483 diff changeset	6163 }
12440 2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6164 }
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6165 }
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6166 }
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6167
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6168 ext(2) = ext(2)-ext(0);
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6169 ext(3) = ext(3)-ext(1);
13141 e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 13132 diff changeset	6170
12440 2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6171 return ext;
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6172 }
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	6173
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6174 static octave_value
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6175 convert_ticklabel_string (const octave_value& val)
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6176 {
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6177 octave_value retval = val;
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6178
16841 2ce1ddead134 Return a cellstr column vector for ticklabels (bug #34906). Rik <rik@octave.org> parents: 16840 diff changeset	6179 if (val.is_cellstr ())
2ce1ddead134 Return a cellstr column vector for ticklabels (bug #34906). Rik <rik@octave.org> parents: 16840 diff changeset	6180 {
2ce1ddead134 Return a cellstr column vector for ticklabels (bug #34906). Rik <rik@octave.org> parents: 16840 diff changeset	6181 // Always return a column vector for Matlab Compatibility
2ce1ddead134 Return a cellstr column vector for ticklabels (bug #34906). Rik <rik@octave.org> parents: 16840 diff changeset	6182 if (val.columns () > 1)
2ce1ddead134 Return a cellstr column vector for ticklabels (bug #34906). Rik <rik@octave.org> parents: 16840 diff changeset	6183 retval = val.reshape (dim_vector (val.numel (), 1));
2ce1ddead134 Return a cellstr column vector for ticklabels (bug #34906). Rik <rik@octave.org> parents: 16840 diff changeset	6184 }
2ce1ddead134 Return a cellstr column vector for ticklabels (bug #34906). Rik <rik@octave.org> parents: 16840 diff changeset	6185 else
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6186 {
16854 563f8f0a7e29 Handle ticklabel specification with '\|' the same way as Matlab (bug #39344). Rik <rik@octave.org> parents: 16841 diff changeset	6187 string_vector sv;
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6188 if (val.is_numeric_type ())
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6189 {
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6190 NDArray data = val.array_value ();
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6191 std::ostringstream oss;
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6192 oss.precision (5);
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6193 for (octave_idx_type i = 0; i < val.numel (); i++)
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6194 {
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6195 oss.str ("");
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6196 oss << data(i);
16854 563f8f0a7e29 Handle ticklabel specification with '\|' the same way as Matlab (bug #39344). Rik <rik@octave.org> parents: 16841 diff changeset	6197 sv.append (oss.str ());
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6198 }
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6199 }
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6200 else if (val.is_string () && val.rows () == 1)
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6201 {
16854 563f8f0a7e29 Handle ticklabel specification with '\|' the same way as Matlab (bug #39344). Rik <rik@octave.org> parents: 16841 diff changeset	6202 std::string valstr = val.string_value ();
563f8f0a7e29 Handle ticklabel specification with '\|' the same way as Matlab (bug #39344). Rik <rik@octave.org> parents: 16841 diff changeset	6203 std::istringstream iss (valstr);
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6204 std::string tmpstr;
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6205
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6206 // Split string with delimiter '\|'
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6207 while (std::getline (iss, tmpstr, '\|'))
16854 563f8f0a7e29 Handle ticklabel specification with '\|' the same way as Matlab (bug #39344). Rik <rik@octave.org> parents: 16841 diff changeset	6208 sv.append (tmpstr);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6209
16854 563f8f0a7e29 Handle ticklabel specification with '\|' the same way as Matlab (bug #39344). Rik <rik@octave.org> parents: 16841 diff changeset	6210 // If string ends with '\|' Matlab appends a null string
563f8f0a7e29 Handle ticklabel specification with '\|' the same way as Matlab (bug #39344). Rik <rik@octave.org> parents: 16841 diff changeset	6211 if (*valstr.rbegin () == '\|')
563f8f0a7e29 Handle ticklabel specification with '\|' the same way as Matlab (bug #39344). Rik <rik@octave.org> parents: 16841 diff changeset	6212 sv.append (std::string (""));
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6213 }
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6214 else
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6215 return retval;
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6216
16854 563f8f0a7e29 Handle ticklabel specification with '\|' the same way as Matlab (bug #39344). Rik <rik@octave.org> parents: 16841 diff changeset	6217 charMatrix chmat (sv, ' ');
563f8f0a7e29 Handle ticklabel specification with '\|' the same way as Matlab (bug #39344). Rik <rik@octave.org> parents: 16841 diff changeset	6218
563f8f0a7e29 Handle ticklabel specification with '\|' the same way as Matlab (bug #39344). Rik <rik@octave.org> parents: 16841 diff changeset	6219 retval = octave_value (chmat);
16841 2ce1ddead134 Return a cellstr column vector for ticklabels (bug #34906). Rik <rik@octave.org> parents: 16840 diff changeset	6220 }
2ce1ddead134 Return a cellstr column vector for ticklabels (bug #34906). Rik <rik@octave.org> parents: 16840 diff changeset	6221
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6222 return retval;
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6223 }
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6224
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6225 void
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6226 axes::properties::set_xticklabel (const octave_value& v)
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6227 {
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6228 if (!error_state)
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6229 {
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6230 if (xticklabel.set (convert_ticklabel_string (v), false))
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6231 {
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6232 set_xticklabelmode ("manual");
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6233 xticklabel.run_listeners (POSTSET);
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6234 mark_modified ();
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6235 }
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6236 else
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6237 set_xticklabelmode ("manual");
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6238 }
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6239 }
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6240
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6241 void
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6242 axes::properties::set_yticklabel (const octave_value& v)
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6243 {
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6244 if (!error_state)
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6245 {
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6246 if (yticklabel.set (convert_ticklabel_string (v), false))
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6247 {
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6248 set_yticklabelmode ("manual");
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6249 yticklabel.run_listeners (POSTSET);
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6250 mark_modified ();
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6251 }
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6252 else
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6253 set_yticklabelmode ("manual");
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6254 }
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6255 }
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6256
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6257 void
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6258 axes::properties::set_zticklabel (const octave_value& v)
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6259 {
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6260 if (!error_state)
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6261 {
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6262 if (zticklabel.set (convert_ticklabel_string (v), false))
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6263 {
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6264 set_zticklabelmode ("manual");
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6265 zticklabel.run_listeners (POSTSET);
969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6266 mark_modified ();
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6267 }
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6268 else
16840 969233a27bce maint: Use octave coding conventions for changeset fd5a4b7f59f7. Rik <rik@octave.org> parents: 16832 diff changeset	6269 set_zticklabelmode ("manual");
16750 fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6270 }
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6271 }
fd5a4b7f59f7 add format option to ticklabel (bug #34906) Stefan Mahr <dac922@gmx.de> parents: 16312 diff changeset	6272
17382 50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6273 // Almost identical to convert_ticklabel_string but it only accepts
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6274 // cellstr or string, not numeric input.
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6275 static octave_value
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6276 convert_linestyleorder_string (const octave_value& val)
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6277 {
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6278 octave_value retval = val;
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6279
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6280 if (val.is_cellstr ())
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6281 {
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6282 // Always return a column vector for Matlab Compatibility
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6283 if (val.columns () > 1)
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6284 retval = val.reshape (dim_vector (val.numel (), 1));
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6285 }
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6286 else
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6287 {
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6288 string_vector sv;
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6289 if (val.is_string () && val.rows () == 1)
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6290 {
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6291 std::string valstr = val.string_value ();
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6292 std::istringstream iss (valstr);
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6293 std::string tmpstr;
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6294
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6295 // Split string with delimiter '\|'
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6296 while (std::getline (iss, tmpstr, '\|'))
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6297 sv.append (tmpstr);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6298
17382 50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6299 // If string ends with '\|' Matlab appends a null string
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6300 if (*valstr.rbegin () == '\|')
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6301 sv.append (std::string (""));
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6302 }
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6303 else
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6304 return retval;
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6305
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6306 charMatrix chmat (sv, ' ');
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6307
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6308 retval = octave_value (chmat);
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6309 }
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6310
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6311 return retval;
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6312 }
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6313
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6314 void
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6315 axes::properties::set_linestyleorder (const octave_value& v)
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6316 {
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6317 if (!error_state)
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6318 {
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6319 linestyleorder.set (convert_linestyleorder_string (v), false);
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6320 }
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6321 }
50b2863d10a6 Create Matlab compatible linestyleorder char matrices (bug #34906) Rik <rik@octave.org> parents: 17319 diff changeset	6322
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6323 void
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6324 axes::properties::set_units (const octave_value& v)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6325 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6326 if (! error_state)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6327 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6328 caseless_str old_units = get_units ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6329 if (units.set (v, true))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6330 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6331 update_units (old_units);
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6332 mark_modified ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6333 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6334 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6335 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6336
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6337 void
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6338 axes::properties::update_units (const caseless_str& old_units)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6339 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6340 graphics_object obj = gh_manager::get_object (get_parent ());
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6341 Matrix parent_bb
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6342 = obj.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2);
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6343 caseless_str new_units = get_units ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6344 position.set (octave_value (convert_position (get_position ().matrix_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6345 old_units, new_units,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6346 parent_bb)),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6347 false);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6348 outerposition.set (octave_value (convert_position (get_outerposition ().matrix_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6349 old_units, new_units,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6350 parent_bb)),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6351 false);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6352 tightinset.set (octave_value (convert_position (get_tightinset ().matrix_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6353 old_units, new_units,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6354 parent_bb)),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6355 false);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6356 looseinset.set (octave_value (convert_position (get_looseinset ().matrix_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6357 old_units, new_units,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6358 parent_bb)),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6359 false);
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6360 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6361
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6362 void
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6363 axes::properties::set_fontunits (const octave_value& v)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6364 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6365 if (! error_state)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6366 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6367 caseless_str old_fontunits = get_fontunits ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6368 if (fontunits.set (v, true))
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6369 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6370 update_fontunits (old_fontunits);
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6371 mark_modified ();
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6372 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6373 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6374 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6375
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6376 void
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6377 axes::properties::update_fontunits (const caseless_str& old_units)
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6378 {
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6379 caseless_str new_units = get_fontunits ();
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6380 double parent_height = get_boundingbox (true).elem (3);
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6381 double fsz = get_fontsize ();
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6382
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6383 fsz = convert_font_size (fsz, old_units, new_units, parent_height);
10991 9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6384
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6385 set_fontsize (octave_value (fsz));
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6386 }
9d3a7ad94ee6 Respect the units and paperunits figure properties and the units and fontunits axes properties David Bateman <dbateman@free.fr> parents: 10990 diff changeset	6387
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6388 double
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6389 axes::properties::get_fontsize_points (double box_pix_height) const
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6390 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6391 double fs = get_fontsize ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6392 double parent_height = box_pix_height;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6393
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6394 if (fontunits_is ("normalized") && parent_height <= 0)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	6395 parent_height = get_boundingbox (true).elem (3);
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6396
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6397 return convert_font_size (fs, get_fontunits (), "points", parent_height);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6398 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	6399
7435 464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6400 ColumnVector
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6401 graphics_xform::xform_vector (double x, double y, double z)
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7868 diff changeset	6402 {
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7868 diff changeset	6403 return ::xform_vector (x, y, z);
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7868 diff changeset	6404 }
7435 464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6405
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6406 Matrix
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6407 graphics_xform::xform_eye (void)
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7868 diff changeset	6408 {
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7868 diff changeset	6409 return ::xform_matrix ();
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7868 diff changeset	6410 }
7435 464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6411
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6412 ColumnVector
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6413 graphics_xform::transform (double x, double y, double z,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6414 bool use_scale) const
7435 464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6415 {
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6416 if (use_scale)
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6417 {
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6418 x = sx.scale (x);
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6419 y = sy.scale (y);
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6420 z = sz.scale (z);
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6421 }
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6422
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6423 return ::transform (xform, x, y, z);
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6424 }
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6425
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6426 ColumnVector
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6427 graphics_xform::untransform (double x, double y, double z,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6428 bool use_scale) const
7435 464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6429 {
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6430 ColumnVector v = ::transform (xform_inv, x, y, z);
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6431
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6432 if (use_scale)
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6433 {
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6434 v(0) = sx.unscale (v(0));
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6435 v(1) = sy.unscale (v(1));
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6436 v(2) = sz.unscale (v(2));
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6437 }
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6438
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6439 return v;
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6440 }
464a55f1a5c2 [project @ 2008-02-01 06:47:48 by jwe] jwe parents: 7427 diff changeset	6441
6836 ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	6442 octave_value
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7176 diff changeset	6443 axes::get_default (const caseless_str& name) const
6836 ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	6444 {
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	6445 octave_value retval = default_properties.lookup (name);
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	6446
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	6447 if (retval.is_undefined ())
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	6448 {
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	6449 graphics_handle parent = get_parent ();
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	6450 graphics_object parent_obj = gh_manager::get_object (parent);
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	6451
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	6452 retval = parent_obj.get_default (name);
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	6453 }
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	6454
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	6455 return retval;
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	6456 }
ea6ae3af82d1 [project @ 2007-08-27 19:50:22 by jwe] jwe parents: 6829 diff changeset	6457
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6458 // FIXME: remove.
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6459 // FIXME: maybe this should go into array_property class?
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6460 /*
7836 4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	6461 static void
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6462 check_limit_vals (double& min_val, double& max_val,
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6463 double& min_pos, double& max_neg,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6464 const array_property& data)
7836 4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	6465 {
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	6466 double val = data.min_val ();
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	6467 if (xfinite (val) && val < min_val)
7836 4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	6468 min_val = val;
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	6469 val = data.max_val ();
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	6470 if (xfinite (val) && val > max_val)
7836 4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	6471 max_val = val;
4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	6472 val = data.min_pos ();
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	6473 if (xfinite (val) && val > 0 && val < min_pos)
7836 4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	6474 min_pos = val;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6475 val = data.max_neg ();
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	6476 if (xfinite (val) && val < 0 && val > max_neg)
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6477 max_neg = val;
7836 4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	6478 }
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6479 */
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6480
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6481 static void
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6482 check_limit_vals (double& min_val, double& max_val,
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6483 double& min_pos, double& max_neg,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6484 const octave_value& data)
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6485 {
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6486 if (data.is_matrix_type ())
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6487 {
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6488 Matrix m = data.matrix_value ();
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6489
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6490 if (! error_state && m.numel () == 4)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6491 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6492 double val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6493
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6494 val = m(0);
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	6495 if (xfinite (val) && val < min_val)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6496 min_val = val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6497
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6498 val = m(1);
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	6499 if (xfinite (val) && val > max_val)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6500 max_val = val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6501
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6502 val = m(2);
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	6503 if (xfinite (val) && val > 0 && val < min_pos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6504 min_pos = val;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6505
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6506 val = m(3);
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	6507 if (xfinite (val) && val < 0 && val > max_neg)
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6508 max_neg = val;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6509 }
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6510 }
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6511 }
7836 4fb2db9c87dd Turn cdata properties into array_property. Add min/max computation to array_property. Michael Goffioul <michael.goffioul@gmail.com> parents: 7835 diff changeset	6512
12508 919cadf334f8 Simplify calculation of number of tick labels. Bug #32692. Marco Caliari <marco.caliari@univr.it> parents: 12506 diff changeset	6513 // magform(x) Returns (a, b), where x = a * 10^b, abs (a) >= 1., and b is
919cadf334f8 Simplify calculation of number of tick labels. Bug #32692. Marco Caliari <marco.caliari@univr.it> parents: 12506 diff changeset	6514 // integer.
7827 3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6515
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7868 diff changeset	6516 static void
e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7868 diff changeset	6517 magform (double x, double& a, int& b)
7827 3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6518 {
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6519 if (x == 0)
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6520 {
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6521 a = 0;
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6522 b = 0;
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6523 }
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6524 else
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6525 {
13141 e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 13132 diff changeset	6526 b = static_cast<int> (gnulib::floor (std::log10 (std::abs (x))));
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 13132 diff changeset	6527 a = x / std::pow (10.0, b);
7827 3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6528 }
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6529 }
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6530
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6531 // A translation from Tom Holoryd's python code at
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6532 // http://kurage.nimh.nih.gov/tomh/tics.py
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6533 // FIXME: add log ticks
7827 3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6534
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6535 double
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6536 axes::properties::calc_tick_sep (double lo, double hi)
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6537 {
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6538 int ticint = 5;
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6539
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6540 // Reference: Lewart, C. R., "Algorithms SCALE1, SCALE2, and
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6541 // SCALE3 for Determination of Scales on Computer Generated
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6542 // Plots", Communications of the ACM, 10 (1973), 639-640.
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6543 // Also cited as ACM Algorithm 463.
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6544
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6545 double a;
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6546 int b, x;
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6547
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6548 magform ((hi-lo)/ticint, a, b);
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6549
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6550 static const double sqrt_2 = sqrt (2.0);
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6551 static const double sqrt_10 = sqrt (10.0);
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6552 static const double sqrt_50 = sqrt (50.0);
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6553
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6554 if (a < sqrt_2)
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6555 x = 1;
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6556 else if (a < sqrt_10)
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6557 x = 2;
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6558 else if (a < sqrt_50)
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6559 x = 5;
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6560 else
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6561 x = 10;
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6562
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6563 return x * std::pow (10., b);
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6564
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6565 }
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6566
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6567 // Attempt to make "nice" limits from the actual max and min of the
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6568 // data. For log plots, we will also use the smallest strictly positive
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6569 // value.
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6570
7827 3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6571 Matrix
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7868 diff changeset	6572 axes::properties::get_axis_limits (double xmin, double xmax,
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6573 double min_pos, double max_neg,
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6574 bool logscale)
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6575 {
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6576 Matrix retval;
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6577
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6578 double min_val = xmin;
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6579 double max_val = xmax;
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6580
13757 1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	6581 if (xisinf (min_val) && min_val > 0 && xisinf (max_val) && max_val < 0)
1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	6582 {
1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	6583 retval = default_lim (logscale);
1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	6584 return retval;
1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	6585 }
1e81e2e30af3 default limits for logscale plots John W. Eaton <jwe@octave.org> parents: 13756 diff changeset	6586 else if (! (xisinf (min_val) \|\| xisinf (max_val)))
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6587 {
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6588 if (logscale)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6589 {
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6590 if (xisinf (min_pos) && xisinf (max_neg))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6591 {
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6592 // TODO -- max_neg is needed for "loglog ([0 -Inf])"
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6593 // This is the only place where max_neg is needed.
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6594 // Is there another way?
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6595 retval = default_lim ();
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6596 retval(0) = pow (10., retval(0));
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6597 retval(1) = pow (10., retval(1));
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6598 return retval;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6599 }
13756 6dfebfa334cb allow negative data log plots with OpenGL+FLTK graphics (bug #34232) John W. Eaton <jwe@octave.org> parents: 13736 diff changeset	6600 if ((min_val <= 0 && max_val > 0))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6601 {
14062 5b49cafe0599 Use non-negative, non-positive with hyphens in error messages. Rik <octave@nomad.inbox5.com> parents: 14022 diff changeset	6602 warning ("axis: omitting non-positive data in log plot");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6603 min_val = min_pos;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6604 }
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6605 // FIXME: maybe this test should also be relative?
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6606 if (std::abs (min_val - max_val)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6607 < sqrt (std::numeric_limits<double>::epsilon ()))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6608 {
14691 e3da2a68d709 Fix memory exhausted bug with log plots of small negative constant data (bug #36493) Rik <octave@nomad.inbox5.com> parents: 14604 diff changeset	6609 // Widen range when too small
e3da2a68d709 Fix memory exhausted bug with log plots of small negative constant data (bug #36493) Rik <octave@nomad.inbox5.com> parents: 14604 diff changeset	6610 if (min_val >= 0)
e3da2a68d709 Fix memory exhausted bug with log plots of small negative constant data (bug #36493) Rik <octave@nomad.inbox5.com> parents: 14604 diff changeset	6611 {
e3da2a68d709 Fix memory exhausted bug with log plots of small negative constant data (bug #36493) Rik <octave@nomad.inbox5.com> parents: 14604 diff changeset	6612 min_val *= 0.9;
e3da2a68d709 Fix memory exhausted bug with log plots of small negative constant data (bug #36493) Rik <octave@nomad.inbox5.com> parents: 14604 diff changeset	6613 max_val *= 1.1;
e3da2a68d709 Fix memory exhausted bug with log plots of small negative constant data (bug #36493) Rik <octave@nomad.inbox5.com> parents: 14604 diff changeset	6614 }
e3da2a68d709 Fix memory exhausted bug with log plots of small negative constant data (bug #36493) Rik <octave@nomad.inbox5.com> parents: 14604 diff changeset	6615 else
e3da2a68d709 Fix memory exhausted bug with log plots of small negative constant data (bug #36493) Rik <octave@nomad.inbox5.com> parents: 14604 diff changeset	6616 {
e3da2a68d709 Fix memory exhausted bug with log plots of small negative constant data (bug #36493) Rik <octave@nomad.inbox5.com> parents: 14604 diff changeset	6617 min_val *= 1.1;
e3da2a68d709 Fix memory exhausted bug with log plots of small negative constant data (bug #36493) Rik <octave@nomad.inbox5.com> parents: 14604 diff changeset	6618 max_val *= 0.9;
e3da2a68d709 Fix memory exhausted bug with log plots of small negative constant data (bug #36493) Rik <octave@nomad.inbox5.com> parents: 14604 diff changeset	6619 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6620 }
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6621 if (min_val > 0)
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6622 {
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6623 // Log plots with all positive data
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6624 min_val = pow (10, gnulib::floor (log10 (min_val)));
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6625 max_val = pow (10, std::ceil (log10 (max_val)));
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6626 }
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6627 else
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6628 {
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6629 // Log plots with all negative data
13756 6dfebfa334cb allow negative data log plots with OpenGL+FLTK graphics (bug #34232) John W. Eaton <jwe@octave.org> parents: 13736 diff changeset	6630 min_val = -pow (10, std::ceil (log10 (-min_val)));
6dfebfa334cb allow negative data log plots with OpenGL+FLTK graphics (bug #34232) John W. Eaton <jwe@octave.org> parents: 13736 diff changeset	6631 max_val = -pow (10, gnulib::floor (log10 (-max_val)));
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6632 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6633 }
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6634 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6635 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6636 if (min_val == 0 && max_val == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6637 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6638 min_val = -1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6639 max_val = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6640 }
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17842 diff changeset	6641 // FIXME: maybe this test should also be relative?
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6642 else if (std::abs (min_val - max_val)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6643 < sqrt (std::numeric_limits<double>::epsilon ()))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6644 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6645 min_val -= 0.1 * std::abs (min_val);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6646 max_val += 0.1 * std::abs (max_val);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6647 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6648
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6649 double tick_sep = calc_tick_sep (min_val , max_val);
12549 570193964185 graphics.cc: Prevent ticks from being cropped. Ben Abbott <bpabbott@mac.com> parents: 12508 diff changeset	6650 double min_tick = gnulib::floor (min_val / tick_sep);
570193964185 graphics.cc: Prevent ticks from being cropped. Ben Abbott <bpabbott@mac.com> parents: 12508 diff changeset	6651 double max_tick = std::ceil (max_val / tick_sep);
570193964185 graphics.cc: Prevent ticks from being cropped. Ben Abbott <bpabbott@mac.com> parents: 12508 diff changeset	6652 // Prevent round-off from cropping ticks
570193964185 graphics.cc: Prevent ticks from being cropped. Ben Abbott <bpabbott@mac.com> parents: 12508 diff changeset	6653 min_val = std::min (min_val, tick_sep * min_tick);
570193964185 graphics.cc: Prevent ticks from being cropped. Ben Abbott <bpabbott@mac.com> parents: 12508 diff changeset	6654 max_val = std::max (max_val, tick_sep * max_tick);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6655 }
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6656 }
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6657
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6658 retval.resize (1, 2);
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6659
14022 de90542b7afc Return retval(1) before retval(0) to avoid re-sizing call on retval. Rik <octave@nomad.inbox5.com> parents: 14021 diff changeset	6660 retval(1) = max_val;
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6661 retval(0) = min_val;
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6662
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6663 return retval;
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6664 }
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6665
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	6666 void
7869 e6d5532f760e style fixes John W. Eaton <jwe@octave.org> parents: 7868 diff changeset	6667 axes::properties::calc_ticks_and_lims (array_property& lims,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6668 array_property& ticks,
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 11598 diff changeset	6669 array_property& mticks,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6670 bool limmode_is_auto, bool is_logscale)
7446 4bfbec4b0e24 [project @ 2008-02-04 21:17:18 by jwe] jwe parents: 7445 diff changeset	6671 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	6672 // FIXME: add log ticks and lims
7446 4bfbec4b0e24 [project @ 2008-02-04 21:17:18 by jwe] jwe parents: 7445 diff changeset	6673
4bfbec4b0e24 [project @ 2008-02-04 21:17:18 by jwe] jwe parents: 7445 diff changeset	6674 if (lims.get ().is_empty ())
4bfbec4b0e24 [project @ 2008-02-04 21:17:18 by jwe] jwe parents: 7445 diff changeset	6675 return;
4bfbec4b0e24 [project @ 2008-02-04 21:17:18 by jwe] jwe parents: 7445 diff changeset	6676
4bfbec4b0e24 [project @ 2008-02-04 21:17:18 by jwe] jwe parents: 7445 diff changeset	6677 double lo = (lims.get ().matrix_value ()) (0);
4bfbec4b0e24 [project @ 2008-02-04 21:17:18 by jwe] jwe parents: 7445 diff changeset	6678 double hi = (lims.get ().matrix_value ()) (1);
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6679 bool is_negative = lo < 0 && hi < 0;
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6680 double tmp;
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17842 diff changeset	6681 // FIXME: should this be checked for somewhere else? (i.e. set{x,y,z}lim)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	6682 if (hi < lo)
18736 ec55f6870efb Fix incorrect log axis minor ticks when axis range > 8 orders of magnitude (bug #39449). Rik <rik@octave.org> parents: 18717 diff changeset	6683 std::swap (hi, lo);
7857 09b1a9c88128 added (far from perfect) support for logscale ticks Shai Ayal <shaiay@users.sourceforge.net> parents: 7855 diff changeset	6684
09b1a9c88128 added (far from perfect) support for logscale ticks Shai Ayal <shaiay@users.sourceforge.net> parents: 7855 diff changeset	6685 if (is_logscale)
09b1a9c88128 added (far from perfect) support for logscale ticks Shai Ayal <shaiay@users.sourceforge.net> parents: 7855 diff changeset	6686 {
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6687 if (is_negative)
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6688 {
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6689 tmp = hi;
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6690 hi = std::log10 (-lo);
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6691 lo = std::log10 (-tmp);
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6692 }
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6693 else
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6694 {
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6695 hi = std::log10 (hi);
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6696 lo = std::log10 (lo);
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6697 }
7857 09b1a9c88128 added (far from perfect) support for logscale ticks Shai Ayal <shaiay@users.sourceforge.net> parents: 7855 diff changeset	6698 }
09b1a9c88128 added (far from perfect) support for logscale ticks Shai Ayal <shaiay@users.sourceforge.net> parents: 7855 diff changeset	6699
18736 ec55f6870efb Fix incorrect log axis minor ticks when axis range > 8 orders of magnitude (bug #39449). Rik <rik@octave.org> parents: 18717 diff changeset	6700 double tick_sep;
ec55f6870efb Fix incorrect log axis minor ticks when axis range > 8 orders of magnitude (bug #39449). Rik <rik@octave.org> parents: 18717 diff changeset	6701
ec55f6870efb Fix incorrect log axis minor ticks when axis range > 8 orders of magnitude (bug #39449). Rik <rik@octave.org> parents: 18717 diff changeset	6702 if (is_logscale)
ec55f6870efb Fix incorrect log axis minor ticks when axis range > 8 orders of magnitude (bug #39449). Rik <rik@octave.org> parents: 18717 diff changeset	6703 {
ec55f6870efb Fix incorrect log axis minor ticks when axis range > 8 orders of magnitude (bug #39449). Rik <rik@octave.org> parents: 18717 diff changeset	6704 if (! (xisinf (hi) \|\| xisinf (lo)))
ec55f6870efb Fix incorrect log axis minor ticks when axis range > 8 orders of magnitude (bug #39449). Rik <rik@octave.org> parents: 18717 diff changeset	6705 tick_sep = 1; // Tick is every order of magnitude (bug #39449)
ec55f6870efb Fix incorrect log axis minor ticks when axis range > 8 orders of magnitude (bug #39449). Rik <rik@octave.org> parents: 18717 diff changeset	6706 else
ec55f6870efb Fix incorrect log axis minor ticks when axis range > 8 orders of magnitude (bug #39449). Rik <rik@octave.org> parents: 18717 diff changeset	6707 tick_sep = 0;
ec55f6870efb Fix incorrect log axis minor ticks when axis range > 8 orders of magnitude (bug #39449). Rik <rik@octave.org> parents: 18717 diff changeset	6708 }
ec55f6870efb Fix incorrect log axis minor ticks when axis range > 8 orders of magnitude (bug #39449). Rik <rik@octave.org> parents: 18717 diff changeset	6709 else
ec55f6870efb Fix incorrect log axis minor ticks when axis range > 8 orders of magnitude (bug #39449). Rik <rik@octave.org> parents: 18717 diff changeset	6710 tick_sep = calc_tick_sep (lo , hi);
13106 c7512d0d52e8 src/graphics.cc: Ensure tick separation is in factors of 10 for log plots. Ben Abbott <bpabbott@mac.com> parents: 12587 diff changeset	6711
11450 5eb10763069f substitute and use LAPACK_LIBS in mkoctfile script John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	6712 int i1 = static_cast<int> (gnulib::floor (lo / tick_sep));
7827 3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6713 int i2 = static_cast<int> (std::ceil (hi / tick_sep));
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6714
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6715 if (limmode_is_auto)
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6716 {
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6717 // adjust limits to include min and max tics
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6718 Matrix tmp_lims (1,2);
12549 570193964185 graphics.cc: Prevent ticks from being cropped. Ben Abbott <bpabbott@mac.com> parents: 12508 diff changeset	6719 tmp_lims(0) = std::min (tick_sep * i1, lo);
570193964185 graphics.cc: Prevent ticks from being cropped. Ben Abbott <bpabbott@mac.com> parents: 12508 diff changeset	6720 tmp_lims(1) = std::max (tick_sep * i2, hi);
7827 3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6721
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	6722 if (is_logscale)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6723 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6724 tmp_lims(0) = std::pow (10.,tmp_lims(0));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6725 tmp_lims(1) = std::pow (10.,tmp_lims(1));
10941 97294dd3ccd4 graphics.cc: Fix axes limits underflow to zero for logscale. Ben Abbott <bpabbott@mac.com> parents: 10923 diff changeset	6726 if (tmp_lims(0) <= 0)
97294dd3ccd4 graphics.cc: Fix axes limits underflow to zero for logscale. Ben Abbott <bpabbott@mac.com> parents: 10923 diff changeset	6727 tmp_lims(0) = std::pow (10., lo);
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6728 if (is_negative)
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6729 {
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6730 tmp = tmp_lims(0);
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6731 tmp_lims(0) = -tmp_lims(1);
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6732 tmp_lims(1) = -tmp;
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6733 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6734 }
7827 3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6735 lims = tmp_lims;
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6736 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	6737
7827 3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6738 Matrix tmp_ticks (1, i2-i1+1);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	6739 for (int i = 0; i <= i2-i1; i++)
7857 09b1a9c88128 added (far from perfect) support for logscale ticks Shai Ayal <shaiay@users.sourceforge.net> parents: 7855 diff changeset	6740 {
09b1a9c88128 added (far from perfect) support for logscale ticks Shai Ayal <shaiay@users.sourceforge.net> parents: 7855 diff changeset	6741 tmp_ticks (i) = tick_sep * (i+i1);
09b1a9c88128 added (far from perfect) support for logscale ticks Shai Ayal <shaiay@users.sourceforge.net> parents: 7855 diff changeset	6742 if (is_logscale)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6743 tmp_ticks (i) = std::pow (10., tmp_ticks (i));
7857 09b1a9c88128 added (far from perfect) support for logscale ticks Shai Ayal <shaiay@users.sourceforge.net> parents: 7855 diff changeset	6744 }
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6745 if (is_logscale && is_negative)
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6746 {
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6747 Matrix rev_ticks (1, i2-i1+1);
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6748 rev_ticks = -tmp_ticks;
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6749 for (int i = 0; i <= i2-i1; i++)
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6750 tmp_ticks (i) = rev_ticks (i2-i1-i);
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6751 }
7827 3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6752
3584f37eac69 better tick and limit handling, still missing logscale support Shai Ayal <shaiay@sourceforge.net> parents: 7824 diff changeset	6753 ticks = tmp_ticks;
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 11598 diff changeset	6754
14321 a9a42d630bd5 use 8 minor tick marks per decade for log scale plots, not 9. John W. Eaton <jwe@octave.org> parents: 14312 diff changeset	6755 int n = is_logscale ? 8 : 4;
12157 0b9c1a7e350a fix wrong dimensions of minor ticks vector Konstantinos Poulios <logari81@googlemail.com> parents: 12126 diff changeset	6756 Matrix tmp_mticks (1, n * (tmp_ticks.numel () - 1));
12126 85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 11598 diff changeset	6757
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 11598 diff changeset	6758 for (int i = 0; i < tmp_ticks.numel ()-1; i++)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 11598 diff changeset	6759 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 11598 diff changeset	6760 double d = (tmp_ticks (i+1) - tmp_ticks (i)) / (n+1);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 11598 diff changeset	6761 for (int j = 0; j < n; j++)
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 11598 diff changeset	6762 {
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 11598 diff changeset	6763 tmp_mticks (ni+j) = tmp_ticks (i) + d (j+1);
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 11598 diff changeset	6764 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 11598 diff changeset	6765 }
85f9a5b211fd restructuring draw_axes, enabling minor ticks/grid in fltk, closing bug 31800 Konstantinos Poulios <logari81@googlemail.com> parents: 11598 diff changeset	6766 mticks = tmp_mticks;
7446 4bfbec4b0e24 [project @ 2008-02-04 21:17:18 by jwe] jwe parents: 7445 diff changeset	6767 }
4bfbec4b0e24 [project @ 2008-02-04 21:17:18 by jwe] jwe parents: 7445 diff changeset	6768
9347 3da821b161e9 imported patch ticklabel Michael Goffioul <michael.goffioul@gmail.com> parents: 9316 diff changeset	6769 void
3da821b161e9 imported patch ticklabel Michael Goffioul <michael.goffioul@gmail.com> parents: 9316 diff changeset	6770 axes::properties::calc_ticklabels (const array_property& ticks,
13211 78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6771 any_property& labels, bool logscale)
9347 3da821b161e9 imported patch ticklabel Michael Goffioul <michael.goffioul@gmail.com> parents: 9316 diff changeset	6772 {
3da821b161e9 imported patch ticklabel Michael Goffioul <michael.goffioul@gmail.com> parents: 9316 diff changeset	6773 Matrix values = ticks.get ().matrix_value ();
3da821b161e9 imported patch ticklabel Michael Goffioul <michael.goffioul@gmail.com> parents: 9316 diff changeset	6774 Cell c (values.dims ());
3da821b161e9 imported patch ticklabel Michael Goffioul <michael.goffioul@gmail.com> parents: 9316 diff changeset	6775 std::ostringstream os;
3da821b161e9 imported patch ticklabel Michael Goffioul <michael.goffioul@gmail.com> parents: 9316 diff changeset	6776
13211 78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6777 if (logscale)
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6778 {
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6779 double significand;
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6780 double exponent;
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6781 double exp_max = 0.;
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6782 double exp_min = 0.;
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6783
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6784 for (int i = 0; i < values.numel (); i++)
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6785 {
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6786 exp_max = std::max (exp_max, std::log10 (values(i)));
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6787 exp_min = std::max (exp_min, std::log10 (values(i)));
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6788 }
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6789
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6790 for (int i = 0; i < values.numel (); i++)
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6791 {
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6792 if (values(i) < 0.)
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6793 exponent = gnulib::floor (std::log10 (-values(i)));
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6794 else
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6795 exponent = gnulib::floor (std::log10 (values(i)));
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6796 significand = values(i) * std::pow (10., -exponent);
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6797 os.str (std::string ());
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6798 os << significand;
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6799 if (exponent < 0.)
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6800 {
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6801 os << "e-";
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6802 exponent = -exponent;
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6803 }
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6804 else
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6805 os << "e+";
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6806 if (exponent < 10. && (exp_max > 9 \|\| exp_min < -9))
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6807 os << "0";
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6808 os << exponent;
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6809 c(i) = os.str ();
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6810 }
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6811 }
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6812 else
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6813 {
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6814 for (int i = 0; i < values.numel (); i++)
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6815 {
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6816 os.str (std::string ());
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6817 os << values(i);
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6818 c(i) = os.str ();
78744376463a src/graphics.cc: Consistent log-scale axis tick labels. Ben Abbott <bpabbott@mac.com> parents: 13210 diff changeset	6819 }
9347 3da821b161e9 imported patch ticklabel Michael Goffioul <michael.goffioul@gmail.com> parents: 9316 diff changeset	6820 }
3da821b161e9 imported patch ticklabel Michael Goffioul <michael.goffioul@gmail.com> parents: 9316 diff changeset	6821
3da821b161e9 imported patch ticklabel Michael Goffioul <michael.goffioul@gmail.com> parents: 9316 diff changeset	6822 labels = c;
3da821b161e9 imported patch ticklabel Michael Goffioul <michael.goffioul@gmail.com> parents: 9316 diff changeset	6823 }
3da821b161e9 imported patch ticklabel Michael Goffioul <michael.goffioul@gmail.com> parents: 9316 diff changeset	6824
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6825 Matrix
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6826 axes::properties::get_ticklabel_extents (const Matrix& ticks,
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6827 const string_vector& ticklabels,
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6828 const Matrix& limits)
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6829 {
12777 6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	6830 #ifndef HAVE_FREETYPE
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6831 double fontsize = get ("fontsize").double_value ();
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6832 #endif
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6833
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6834 Matrix ext (1, 2, 0.0);
18099 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	6835 double wmax, hmax;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	6836 wmax = hmax = 0.;
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6837 int n = std::min (ticklabels.numel (), ticks.numel ());
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6838 for (int i = 0; i < n; i++)
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6839 {
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6840 double val = ticks(i);
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6841 if (limits(0) <= val && val <= limits(1))
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6842 {
16855 359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 16854 diff changeset	6843 std::string label (ticklabels(i));
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 16854 diff changeset	6844 label.erase (0, label.find_first_not_of (" "));
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 16854 diff changeset	6845 label = label.substr (0, label.find_last_not_of (" ")+1);
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6846 #ifdef HAVE_FREETYPE
17269 5b088598df1d Add simple TeX parser based on flex/bison. Michael Goffioul <michael.goffioul@gmail.com> parents: 17260 diff changeset	6847 ext = text_renderer.get_extent (label, 0.0, "none");
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6848 wmax = std::max (wmax, ext(0));
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6849 hmax = std::max (hmax, ext(1));
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6850 #else
16855 359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 16854 diff changeset	6851 // FIXME: find a better approximation
359ac80ecb30 Trim ticklabel strings and repeat them as necessary to fill tick marks (bug #39344) Rik <rik@octave.org> parents: 16854 diff changeset	6852 int len = label.length ();
12334 63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6853 wmax = std::max (wmax, 0.5fontsizelen);
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6854 hmax = fontsize;
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6855 #endif
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6856 }
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6857 }
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6858
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6859 ext(0) = wmax;
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6860 ext(1) = hmax;
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6861 return ext;
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6862 }
63dc132a1000 Move axes labels and title positioning to axes::properties Konstantinos Poulios <logari81@gmail.com> parents: 12327 diff changeset	6863
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	6864 void
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6865 get_children_limits (double& min_val, double& max_val,
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6866 double& min_pos, double& max_neg,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6867 const Matrix& kids, char limit_type)
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6868 {
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6869 octave_idx_type n = kids.numel ();
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6870
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6871 switch (limit_type)
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6872 {
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6873 case 'x':
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6874 for (octave_idx_type i = 0; i < n; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6875 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6876 graphics_object obj = gh_manager::get_object (kids(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6877
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6878 if (obj.is_xliminclude ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6879 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6880 octave_value lim = obj.get_xlim ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6881
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6882 check_limit_vals (min_val, max_val, min_pos, max_neg, lim);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6883 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6884 }
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6885 break;
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6886
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6887 case 'y':
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6888 for (octave_idx_type i = 0; i < n; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6889 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6890 graphics_object obj = gh_manager::get_object (kids(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6891
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6892 if (obj.is_yliminclude ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6893 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6894 octave_value lim = obj.get_ylim ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6895
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6896 check_limit_vals (min_val, max_val, min_pos, max_neg, lim);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6897 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6898 }
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6899 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	6900
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6901 case 'z':
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6902 for (octave_idx_type i = 0; i < n; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6903 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6904 graphics_object obj = gh_manager::get_object (kids(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6905
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6906 if (obj.is_zliminclude ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6907 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6908 octave_value lim = obj.get_zlim ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6909
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6910 check_limit_vals (min_val, max_val, min_pos, max_neg, lim);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6911 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6912 }
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6913 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	6914
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6915 case 'c':
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6916 for (octave_idx_type i = 0; i < n; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6917 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6918 graphics_object obj = gh_manager::get_object (kids(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6919
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6920 if (obj.is_climinclude ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6921 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6922 octave_value lim = obj.get_clim ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6923
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6924 check_limit_vals (min_val, max_val, min_pos, max_neg, lim);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6925 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6926 }
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6927 break;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	6928
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6929 case 'a':
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6930 for (octave_idx_type i = 0; i < n; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6931 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6932 graphics_object obj = gh_manager::get_object (kids(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6933
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6934 if (obj.is_aliminclude ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6935 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6936 octave_value lim = obj.get_alim ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6937
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6938 check_limit_vals (min_val, max_val, min_pos, max_neg, lim);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6939 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	6940 }
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6941 break;
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6942
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6943 default:
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6944 break;
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6945 }
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6946 }
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	6947
18761 868dcab453bd Distinguish axes when checking for recursion in axes limits updates (bug #40005). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18746 diff changeset	6948 static std::set<double> updating_axis_limits;
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	6949
7214 86d0b16f2bb2 [project @ 2007-11-29 03:40:04 by jwe] jwe parents: 7213 diff changeset	6950 void
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6951 axes::update_axis_limits (const std::string& axis_type,
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6952 const graphics_handle& h)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6953 {
18761 868dcab453bd Distinguish axes when checking for recursion in axes limits updates (bug #40005). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18746 diff changeset	6954 if (updating_axis_limits.find (get_handle ().value ()) !=
868dcab453bd Distinguish axes when checking for recursion in axes limits updates (bug #40005). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18746 diff changeset	6955 updating_axis_limits.end ())
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6956 return;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6957
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6958 Matrix kids = Matrix (1, 1, h.value ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	6959
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6960 double min_val = octave_Inf;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6961 double max_val = -octave_Inf;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6962 double min_pos = octave_Inf;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6963 double max_neg = -octave_Inf;
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6964
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6965 char update_type = 0;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6966
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6967 Matrix limits;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6968 double val;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6969
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6970 #define FIX_LIMITS \
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14798 diff changeset	6971 if (limits.numel () == 4) \
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6972 { \
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6973 val = limits(0); \
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	6974 if (xfinite (val)) \
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6975 min_val = val; \
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6976 val = limits(1); \
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	6977 if (xfinite (val)) \
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6978 max_val = val; \
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6979 val = limits(2); \
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	6980 if (xfinite (val)) \
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6981 min_pos = val; \
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6982 val = limits(3); \
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	6983 if (xfinite (val)) \
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6984 max_neg = val; \
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6985 } \
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6986 else \
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6987 { \
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	6988 limits.resize (4, 1); \
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6989 limits(0) = min_val; \
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6990 limits(1) = max_val; \
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6991 limits(2) = min_pos; \
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	6992 limits(3) = max_neg; \
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6993 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6994
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6995 if (axis_type == "xdata" \|\| axis_type == "xscale"
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6996 \|\| axis_type == "xlimmode" \|\| axis_type == "xliminclude"
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6997 \|\| axis_type == "xlim")
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6998 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	6999 if (xproperties.xlimmode_is ("auto"))
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7000 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7001 limits = xproperties.get_xlim ().matrix_value ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7002 FIX_LIMITS ;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7003
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7004 get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'x');
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7005
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7006 limits = xproperties.get_axis_limits (min_val, max_val,
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7007 min_pos, max_neg,
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7008 xproperties.xscale_is ("log"));
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7009
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7010 update_type = 'x';
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7011 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7012 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7013 else if (axis_type == "ydata" \|\| axis_type == "yscale"
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7014 \|\| axis_type == "ylimmode" \|\| axis_type == "yliminclude"
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7015 \|\| axis_type == "ylim")
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7016 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7017 if (xproperties.ylimmode_is ("auto"))
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7018 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7019 limits = xproperties.get_ylim ().matrix_value ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7020 FIX_LIMITS ;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7021
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7022 get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'y');
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7023
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7024 limits = xproperties.get_axis_limits (min_val, max_val,
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7025 min_pos, max_neg,
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7026 xproperties.yscale_is ("log"));
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7027
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7028 update_type = 'y';
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7029 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7030 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7031 else if (axis_type == "zdata" \|\| axis_type == "zscale"
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7032 \|\| axis_type == "zlimmode" \|\| axis_type == "zliminclude"
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7033 \|\| axis_type == "zlim")
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7034 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7035 if (xproperties.zlimmode_is ("auto"))
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7036 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7037 limits = xproperties.get_zlim ().matrix_value ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7038 FIX_LIMITS ;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7039
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7040 get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'z');
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7041
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7042 limits = xproperties.get_axis_limits (min_val, max_val,
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7043 min_pos, max_neg,
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7044 xproperties.zscale_is ("log"));
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7045
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7046 update_type = 'z';
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7047 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7048 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7049 else if (axis_type == "cdata" \|\| axis_type == "climmode"
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7050 \|\| axis_type == "cdatamapping" \|\| axis_type == "climinclude"
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7051 \|\| axis_type == "clim")
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7052 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7053 if (xproperties.climmode_is ("auto"))
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7054 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7055 limits = xproperties.get_clim ().matrix_value ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7056 FIX_LIMITS ;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7057
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7058 get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'c');
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7059
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7060 if (min_val > max_val)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7061 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7062 min_val = min_pos = 0;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7063 max_val = 1;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7064 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7065 else if (min_val == max_val)
13247 e36c2f4ea8f5 Set clim correctly for patch objects: Kai Habel <kai.habel@gmx.de> parents: 13236 diff changeset	7066 {
e36c2f4ea8f5 Set clim correctly for patch objects: Kai Habel <kai.habel@gmx.de> parents: 13236 diff changeset	7067 max_val = min_val + 1;
e36c2f4ea8f5 Set clim correctly for patch objects: Kai Habel <kai.habel@gmx.de> parents: 13236 diff changeset	7068 min_val -= 1;
e36c2f4ea8f5 Set clim correctly for patch objects: Kai Habel <kai.habel@gmx.de> parents: 13236 diff changeset	7069 }
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7070
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7071 limits.resize (1, 2);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7072
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7073 limits(0) = min_val;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7074 limits(1) = max_val;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7075
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7076 update_type = 'c';
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7077 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7078
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7079 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7080 else if (axis_type == "alphadata" \|\| axis_type == "alimmode"
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7081 \|\| axis_type == "alphadatamapping" \|\| axis_type == "aliminclude"
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7082 \|\| axis_type == "alim")
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7083 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7084 if (xproperties.alimmode_is ("auto"))
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7085 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7086 limits = xproperties.get_alim ().matrix_value ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7087 FIX_LIMITS ;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7088
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7089 get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'a');
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7090
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7091 if (min_val > max_val)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7092 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7093 min_val = min_pos = 0;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7094 max_val = 1;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7095 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7096 else if (min_val == max_val)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7097 max_val = min_val + 1;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7098
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7099 limits.resize (1, 2);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7100
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7101 limits(0) = min_val;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7102 limits(1) = max_val;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7103
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7104 update_type = 'a';
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7105 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7106
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7107 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7108
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7109 #undef FIX_LIMITS
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7110
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7111 unwind_protect frame;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7112 frame.protect_var (updating_axis_limits);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7113
18761 868dcab453bd Distinguish axes when checking for recursion in axes limits updates (bug #40005). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18746 diff changeset	7114 updating_axis_limits.insert (get_handle ().value ());
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7115
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7116 switch (update_type)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7117 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7118 case 'x':
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7119 xproperties.set_xlim (limits);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7120 xproperties.set_xlimmode ("auto");
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7121 xproperties.update_xlim ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7122 break;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7123
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7124 case 'y':
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7125 xproperties.set_ylim (limits);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7126 xproperties.set_ylimmode ("auto");
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7127 xproperties.update_ylim ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7128 break;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7129
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7130 case 'z':
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7131 xproperties.set_zlim (limits);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7132 xproperties.set_zlimmode ("auto");
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7133 xproperties.update_zlim ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7134 break;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7135
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7136 case 'c':
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7137 xproperties.set_clim (limits);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7138 xproperties.set_climmode ("auto");
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7139 break;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7140
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7141 case 'a':
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7142 xproperties.set_alim (limits);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7143 xproperties.set_alimmode ("auto");
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7144 break;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7145
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7146 default:
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7147 break;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7148 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7149
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7150 xproperties.update_transform ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7151
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7152 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7153
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7154 void
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7155 axes::update_axis_limits (const std::string& axis_type)
7214 86d0b16f2bb2 [project @ 2007-11-29 03:40:04 by jwe] jwe parents: 7213 diff changeset	7156 {
18761 868dcab453bd Distinguish axes when checking for recursion in axes limits updates (bug #40005). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18746 diff changeset	7157 if ((updating_axis_limits.find (get_handle ().value ()) !=
868dcab453bd Distinguish axes when checking for recursion in axes limits updates (bug #40005). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18746 diff changeset	7158 updating_axis_limits.end ()) \|\|
868dcab453bd Distinguish axes when checking for recursion in axes limits updates (bug #40005). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18746 diff changeset	7159 (updating_aspectratios.find (get_handle ().value ()) !=
868dcab453bd Distinguish axes when checking for recursion in axes limits updates (bug #40005). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18746 diff changeset	7160 updating_aspectratios.end ()))
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7161 return;
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7162
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7163 Matrix kids = xproperties.get_children ();
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7164
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7165 double min_val = octave_Inf;
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7166 double max_val = -octave_Inf;
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7167 double min_pos = octave_Inf;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7168 double max_neg = -octave_Inf;
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7169
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7170 char update_type = 0;
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7171
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7172 Matrix limits;
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7173
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7174 if (axis_type == "xdata" \|\| axis_type == "xscale"
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7175 \|\| axis_type == "xlimmode" \|\| axis_type == "xliminclude"
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7176 \|\| axis_type == "xlim")
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7177 {
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	7178 if (xproperties.xlimmode_is ("auto"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7179 {
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7180 get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'x');
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7181
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7182 limits = xproperties.get_axis_limits (min_val, max_val,
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7183 min_pos, max_neg,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7184 xproperties.xscale_is ("log"));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7185
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7186 update_type = 'x';
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7187 }
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7188 }
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7189 else if (axis_type == "ydata" \|\| axis_type == "yscale"
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7190 \|\| axis_type == "ylimmode" \|\| axis_type == "yliminclude"
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7191 \|\| axis_type == "ylim")
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7192 {
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	7193 if (xproperties.ylimmode_is ("auto"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7194 {
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7195 get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'y');
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7196
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7197 limits = xproperties.get_axis_limits (min_val, max_val,
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7198 min_pos, max_neg,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7199 xproperties.yscale_is ("log"));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7200
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7201 update_type = 'y';
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7202 }
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7203 }
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7204 else if (axis_type == "zdata" \|\| axis_type == "zscale"
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7205 \|\| axis_type == "zlimmode" \|\| axis_type == "zliminclude"
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7206 \|\| axis_type == "zlim")
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7207 {
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	7208 if (xproperties.zlimmode_is ("auto"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7209 {
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7210 get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'z');
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7211
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7212 limits = xproperties.get_axis_limits (min_val, max_val,
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7213 min_pos, max_neg,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7214 xproperties.zscale_is ("log"));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7215
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7216 update_type = 'z';
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7217 }
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7218 }
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7219 else if (axis_type == "cdata" \|\| axis_type == "climmode"
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7220 \|\| axis_type == "cdatamapping" \|\| axis_type == "climinclude"
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7221 \|\| axis_type == "clim")
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7222 {
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	7223 if (xproperties.climmode_is ("auto"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7224 {
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7225 get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'c');
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7226
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7227 if (min_val > max_val)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7228 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7229 min_val = min_pos = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7230 max_val = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7231 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7232 else if (min_val == max_val)
13247 e36c2f4ea8f5 Set clim correctly for patch objects: Kai Habel <kai.habel@gmx.de> parents: 13236 diff changeset	7233 {
e36c2f4ea8f5 Set clim correctly for patch objects: Kai Habel <kai.habel@gmx.de> parents: 13236 diff changeset	7234 max_val = min_val + 1;
e36c2f4ea8f5 Set clim correctly for patch objects: Kai Habel <kai.habel@gmx.de> parents: 13236 diff changeset	7235 min_val -= 1;
e36c2f4ea8f5 Set clim correctly for patch objects: Kai Habel <kai.habel@gmx.de> parents: 13236 diff changeset	7236 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7237
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7238 limits.resize (1, 2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7239
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7240 limits(0) = min_val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7241 limits(1) = max_val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7242
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7243 update_type = 'c';
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7244 }
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7245
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7246 }
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7247 else if (axis_type == "alphadata" \|\| axis_type == "alimmode"
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7248 \|\| axis_type == "alphadatamapping" \|\| axis_type == "aliminclude"
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7249 \|\| axis_type == "alim")
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7250 {
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7251 if (xproperties.alimmode_is ("auto"))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7252 {
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7253 get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'a');
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7254
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7255 if (min_val > max_val)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7256 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7257 min_val = min_pos = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7258 max_val = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7259 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7260 else if (min_val == max_val)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7261 max_val = min_val + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7262
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7263 limits.resize (1, 2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7264
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7265 limits(0) = min_val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7266 limits(1) = max_val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7267
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7268 update_type = 'a';
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7269 }
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7270
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7271 }
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7272
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10056 diff changeset	7273 unwind_protect frame;
2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10056 diff changeset	7274 frame.protect_var (updating_axis_limits);
2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10056 diff changeset	7275
18761 868dcab453bd Distinguish axes when checking for recursion in axes limits updates (bug #40005). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18746 diff changeset	7276 updating_axis_limits.insert (get_handle ().value ());
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7277
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7278 switch (update_type)
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7279 {
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7280 case 'x':
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7281 xproperties.set_xlim (limits);
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7282 xproperties.set_xlimmode ("auto");
7446 4bfbec4b0e24 [project @ 2008-02-04 21:17:18 by jwe] jwe parents: 7445 diff changeset	7283 xproperties.update_xlim ();
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7284 break;
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7285
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7286 case 'y':
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7287 xproperties.set_ylim (limits);
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7288 xproperties.set_ylimmode ("auto");
7446 4bfbec4b0e24 [project @ 2008-02-04 21:17:18 by jwe] jwe parents: 7445 diff changeset	7289 xproperties.update_ylim ();
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7290 break;
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7291
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7292 case 'z':
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7293 xproperties.set_zlim (limits);
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7294 xproperties.set_zlimmode ("auto");
7446 4bfbec4b0e24 [project @ 2008-02-04 21:17:18 by jwe] jwe parents: 7445 diff changeset	7295 xproperties.update_zlim ();
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7296 break;
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7297
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7298 case 'c':
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7299 xproperties.set_clim (limits);
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7300 xproperties.set_climmode ("auto");
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7301 break;
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7302
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7303 case 'a':
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7304 xproperties.set_alim (limits);
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7305 xproperties.set_alimmode ("auto");
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7306 break;
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7307
7222 dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7308 default:
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7309 break;
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7310 }
dd8b3bbeeaf9 [project @ 2007-11-30 06:23:25 by jwe] jwe parents: 7214 diff changeset	7311
7427 65f0a8ced9d2 [project @ 2008-01-28 22:42:18 by jwe] jwe parents: 7419 diff changeset	7312 xproperties.update_transform ();
7214 86d0b16f2bb2 [project @ 2007-11-29 03:40:04 by jwe] jwe parents: 7213 diff changeset	7313 }
86d0b16f2bb2 [project @ 2007-11-29 03:40:04 by jwe] jwe parents: 7213 diff changeset	7314
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7315 inline
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	7316 double force_in_range (double x, double lower, double upper)
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7317 {
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7318 if (x < lower)
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	7319 return lower;
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7320 else if (x > upper)
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	7321 return upper;
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7322 else
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	7323 return x;
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7324 }
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7325
14311 d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7326 static Matrix
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7327 do_zoom (double val, double factor, const Matrix& lims, bool is_logscale)
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7328 {
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7329 Matrix new_lims = lims;
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7330
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7331 double lo = lims(0);
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7332 double hi = lims(1);
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7333
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7334 bool is_negative = lo < 0 && hi < 0;
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7335
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7336 if (is_logscale)
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7337 {
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7338 if (is_negative)
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7339 {
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7340 double tmp = hi;
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7341 hi = std::log10 (-lo);
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7342 lo = std::log10 (-tmp);
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7343 val = std::log10 (-val);
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7344 }
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7345 else
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7346 {
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7347 hi = std::log10 (hi);
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7348 lo = std::log10 (lo);
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7349 val = std::log10 (val);
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7350 }
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7351 }
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7352
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7353 // Perform the zooming
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7354 lo = val + factor * (lo - val);
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7355 hi = val + factor * (hi - val);
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7356
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7357 if (is_logscale)
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7358 {
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7359 if (is_negative)
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7360 {
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7361 double tmp = -std::pow (10.0, hi);
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7362 hi = -std::pow (10.0, lo);
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7363 lo = tmp;
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7364 }
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7365 else
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7366 {
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7367 lo = std::pow (10.0, lo);
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7368 hi = std::pow (10.0, hi);
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7369 }
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7370 }
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7371
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7372 new_lims(0) = lo;
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7373 new_lims(1) = hi;
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7374
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7375 return new_lims;
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7376 }
d4f37aa5d126 fix zooming for logscale figures with fltk+opengl John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	7377
7855 f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7378 void
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7379 axes::properties::zoom_about_point (double x, double y, double factor,
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7380 bool push_to_zoom_stack)
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7381 {
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7382 // FIXME: Do we need error checking here?
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7383 Matrix xlims = get_xlim ().matrix_value ();
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7384 Matrix ylims = get_ylim ().matrix_value ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	7385
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7386 // Get children axes limits
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7387 Matrix kids = get_children ();
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7388 double minx = octave_Inf;
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7389 double maxx = -octave_Inf;
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7390 double min_pos_x = octave_Inf;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7391 double max_neg_x = -octave_Inf;
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7392 get_children_limits (minx, maxx, min_pos_x, max_neg_x, kids, 'x');
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7393
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7394 double miny = octave_Inf;
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7395 double maxy = -octave_Inf;
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7396 double min_pos_y = octave_Inf;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7397 double max_neg_y = -octave_Inf;
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7398 get_children_limits (miny, maxy, min_pos_y, max_neg_y, kids, 'y');
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	7399
14324 5a2b012b10c7 allow zooming for logscale plots John W. Eaton <jwe@octave.org> parents: 14323 diff changeset	7400 xlims = do_zoom (x, factor, xlims, xscale_is ("log"));
5a2b012b10c7 allow zooming for logscale plots John W. Eaton <jwe@octave.org> parents: 14323 diff changeset	7401 ylims = do_zoom (y, factor, ylims, yscale_is ("log"));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	7402
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7403 zoom (xlims, ylims, push_to_zoom_stack);
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7404 }
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7405
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7406 void
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7407 axes::properties::zoom (const Matrix& xl, const Matrix& yl,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7408 bool push_to_zoom_stack)
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7409 {
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7410 if (push_to_zoom_stack)
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7411 {
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7412 zoom_stack.push_front (xlimmode.get ());
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7413 zoom_stack.push_front (xlim.get ());
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7414 zoom_stack.push_front (ylimmode.get ());
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7415 zoom_stack.push_front (ylim.get ());
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7416 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	7417
7855 f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7418 xlim = xl;
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7419 xlimmode = "manual";
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7420 ylim = yl;
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7421 ylimmode = "manual";
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7422
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7423 update_transform ();
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7424 update_xlim (false);
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7425 update_ylim (false);
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7426 }
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7427
14314 17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7428 static Matrix
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7429 do_translate (double x0, double x1, const Matrix& lims, bool is_logscale)
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7430 {
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7431 Matrix new_lims = lims;
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7432
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7433 double lo = lims(0);
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7434 double hi = lims(1);
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7435
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7436 bool is_negative = lo < 0 && hi < 0;
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7437
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7438 double delta;
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7439
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7440 if (is_logscale)
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7441 {
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7442 if (is_negative)
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7443 {
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7444 double tmp = hi;
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7445 hi = std::log10 (-lo);
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7446 lo = std::log10 (-tmp);
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7447 x0 = -x0;
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7448 x1 = -x1;
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7449 }
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7450 else
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7451 {
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7452 hi = std::log10 (hi);
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7453 lo = std::log10 (lo);
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7454 }
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7455
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7456 delta = std::log10 (x0) - std::log10 (x1);
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7457 }
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7458 else
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7459 {
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7460 delta = x0 - x1;
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7461 }
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7462
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7463 // Perform the translation
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7464 lo += delta;
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7465 hi += delta;
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7466
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7467 if (is_logscale)
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7468 {
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7469 if (is_negative)
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7470 {
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7471 double tmp = -std::pow (10.0, hi);
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7472 hi = -std::pow (10.0, lo);
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7473 lo = tmp;
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7474 }
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7475 else
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7476 {
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7477 lo = std::pow (10.0, lo);
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7478 hi = std::pow (10.0, hi);
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7479 }
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7480 }
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7481
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7482 new_lims(0) = lo;
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7483 new_lims(1) = hi;
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7484
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7485 return new_lims;
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7486 }
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7487
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7488 void
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7489 axes::properties::translate_view (double x0, double x1, double y0, double y1)
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7490 {
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7491 // FIXME: Do we need error checking here?
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7492 Matrix xlims = get_xlim ().matrix_value ();
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7493 Matrix ylims = get_ylim ().matrix_value ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	7494
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7495 // Get children axes limits
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7496 Matrix kids = get_children ();
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7497 double minx = octave_Inf;
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7498 double maxx = -octave_Inf;
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7499 double min_pos_x = octave_Inf;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7500 double max_neg_x = -octave_Inf;
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7501 get_children_limits (minx, maxx, min_pos_x, max_neg_x, kids, 'x');
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	7502
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7503 double miny = octave_Inf;
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7504 double maxy = -octave_Inf;
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7505 double min_pos_y = octave_Inf;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7506 double max_neg_y = -octave_Inf;
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7507 get_children_limits (miny, maxy, min_pos_y, max_neg_y, kids, 'y');
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	7508
14314 17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7509 xlims = do_translate (x0, x1, xlims, xscale_is ("log"));
17de694961f5 make panning work for logscale axes John W. Eaton <jwe@octave.org> parents: 14313 diff changeset	7510 ylims = do_translate (y0, y1, ylims, yscale_is ("log"));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	7511
9455 ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7512 zoom (xlims, ylims, false);
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7513 }
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7514
ee8a035f3997 imported patch fltk_zoom shaia@mars.bioc parents: 9443 diff changeset	7515 void
10792 91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10733 diff changeset	7516 axes::properties::rotate_view (double delta_el, double delta_az)
91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10733 diff changeset	7517 {
91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10733 diff changeset	7518 Matrix v = get_view ().matrix_value ();
91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10733 diff changeset	7519
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	7520 v(1) += delta_el;
10917 888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	7521
15017 dd4ad69e4ab9 maint: Fix a few Octave coding convention violations. Rik <rik@octave.org> parents: 14861 diff changeset	7522 if (v(1) > 90)
10917 888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	7523 v(1) = 90;
15017 dd4ad69e4ab9 maint: Fix a few Octave coding convention violations. Rik <rik@octave.org> parents: 14861 diff changeset	7524 if (v(1) < -90)
10917 888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	7525 v(1) = -90;
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	7526
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	7527 v(0) = fmod (v(0) - delta_az + 720,360);
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	7528
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	7529 set_view (v);
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14798 diff changeset	7530 update_transform ();
10792 91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10733 diff changeset	7531 }
91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10733 diff changeset	7532
91342260063e mouse rotation for fltk backend Shai Ayal <shaiay@users.sourceforge.net> parents: 10733 diff changeset	7533 void
7855 f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7534 axes::properties::unzoom (void)
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7535 {
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7536 if (zoom_stack.size () >= 4)
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7537 {
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7538 ylim = zoom_stack.front ();
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7539 zoom_stack.pop_front ();
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7540 ylimmode = zoom_stack.front ();
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7541 zoom_stack.pop_front ();
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7542 xlim = zoom_stack.front ();
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7543 zoom_stack.pop_front ();
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7544 xlimmode = zoom_stack.front ();
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7545 zoom_stack.pop_front ();
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7546
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7547 update_transform ();
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7548 update_xlim (false);
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7549 update_ylim (false);
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7550 }
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7551 }
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7552
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7553 void
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7554 axes::properties::clear_zoom_stack (void)
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7555 {
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7556 while (zoom_stack.size () > 4)
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7557 zoom_stack.pop_front ();
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7558
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7559 unzoom ();
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7560 }
f317f14516cb Add zoom stack facility in axes object. Michael Goffioul <michael.goffioul@gmail.com> parents: 7849 diff changeset	7561
10722 755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	7562 void
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	7563 axes::reset_default_properties (void)
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	7564 {
10733 f72a761a784c eliminate code duplication in reset_default_properties methods John W. Eaton <jwe@octave.org> parents: 10722 diff changeset	7565 ::reset_default_properties (default_properties);
10722 755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	7566 }
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	7567
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7568 void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7569 axes::initialize (const graphics_object& go)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7570 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7571 base_graphics_object::initialize (go);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7572
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7573 xinitialize (xproperties.get_title ());
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7574 xinitialize (xproperties.get_xlabel ());
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7575 xinitialize (xproperties.get_ylabel ());
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7576 xinitialize (xproperties.get_zlabel ());
17098 786bcce466e9 Initialize the tightinset during initialization of axes. Ben Abbott <bpabbott@mac.com> parents: 17081 diff changeset	7577
786bcce466e9 Initialize the tightinset during initialization of axes. Ben Abbott <bpabbott@mac.com> parents: 17081 diff changeset	7578 xproperties.sync_positions ();
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7579 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7580
7363 c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	7581 // ---------------------------------------------------------------------
c31e5dab4f85 [project @ 2008-01-12 08:21:57 by jwe] jwe parents: 7317 diff changeset	7582
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7583 Matrix
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7584 line::properties::compute_xlim (void) const
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7585 {
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7586 Matrix m (1, 4);
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7587
10596 24e915c602e7 Remove line object props ldata, udata, xldata, xudata. Ben Abbott <bpabbott@mac.com> parents: 10565 diff changeset	7588 m(0) = xdata.min_val ();
24e915c602e7 Remove line object props ldata, udata, xldata, xudata. Ben Abbott <bpabbott@mac.com> parents: 10565 diff changeset	7589 m(1) = xdata.max_val ();
24e915c602e7 Remove line object props ldata, udata, xldata, xudata. Ben Abbott <bpabbott@mac.com> parents: 10565 diff changeset	7590 m(2) = xdata.min_pos ();
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7591 m(3) = xdata.max_neg ();
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7592
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7593 return m;
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7594 }
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7595
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7596 Matrix
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7597 line::properties::compute_ylim (void) const
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7598 {
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7599 Matrix m (1, 4);
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7600
10596 24e915c602e7 Remove line object props ldata, udata, xldata, xudata. Ben Abbott <bpabbott@mac.com> parents: 10565 diff changeset	7601 m(0) = ydata.min_val ();
24e915c602e7 Remove line object props ldata, udata, xldata, xudata. Ben Abbott <bpabbott@mac.com> parents: 10565 diff changeset	7602 m(1) = ydata.max_val ();
24e915c602e7 Remove line object props ldata, udata, xldata, xudata. Ben Abbott <bpabbott@mac.com> parents: 10565 diff changeset	7603 m(2) = ydata.min_pos ();
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7604 m(3) = ydata.max_neg ();
7862 8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7605
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7606 return m;
8f3459a90bf3 Redesign axis limit computation handling (using hidden limit properties in child objects) Michael Goffioul <michael.goffioul@gmail.com> parents: 7860 diff changeset	7607 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	7608
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	7609 // ---------------------------------------------------------------------
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	7610
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7611 Matrix
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7612 text::properties::get_data_position (void) const
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7613 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7614 Matrix pos = get_position ().matrix_value ();
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7615
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7616 if (! units_is ("data"))
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7617 pos = convert_text_position (pos, *this, get_units (), "data");
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7618
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7619 return pos;
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7620 }
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7621
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7622 Matrix
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7623 text::properties::get_extent_matrix (void) const
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7624 {
14413 4f160344236a 2011-04-26 Daniel Wagenaar <daw@caltech.edu> Ben Abbott <bpabbott@mac.com> parents: 14395 diff changeset	7625 // FIXME: Should this function also add the (x,y) base position?
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7626 return extent.get ().matrix_value ();
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7627 }
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7628
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7629 octave_value
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7630 text::properties::get_extent (void) const
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7631 {
14413 4f160344236a 2011-04-26 Daniel Wagenaar <daw@caltech.edu> Ben Abbott <bpabbott@mac.com> parents: 14395 diff changeset	7632 // FIXME: This doesn't work right for 3D plots.
4f160344236a 2011-04-26 Daniel Wagenaar <daw@caltech.edu> Ben Abbott <bpabbott@mac.com> parents: 14395 diff changeset	7633 // (It doesn't in Matlab either, at least not in version 6.5.)
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7634 Matrix m = extent.get ().matrix_value ();
14413 4f160344236a 2011-04-26 Daniel Wagenaar <daw@caltech.edu> Ben Abbott <bpabbott@mac.com> parents: 14395 diff changeset	7635 Matrix pos = get_position ().matrix_value ();
4f160344236a 2011-04-26 Daniel Wagenaar <daw@caltech.edu> Ben Abbott <bpabbott@mac.com> parents: 14395 diff changeset	7636 Matrix p = convert_text_position (pos, *this, get_units (), "pixels");
4f160344236a 2011-04-26 Daniel Wagenaar <daw@caltech.edu> Ben Abbott <bpabbott@mac.com> parents: 14395 diff changeset	7637
4f160344236a 2011-04-26 Daniel Wagenaar <daw@caltech.edu> Ben Abbott <bpabbott@mac.com> parents: 14395 diff changeset	7638 m(0) += p(0);
4f160344236a 2011-04-26 Daniel Wagenaar <daw@caltech.edu> Ben Abbott <bpabbott@mac.com> parents: 14395 diff changeset	7639 m(1) += p(1);
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7640
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7641 return convert_text_position (m, *this, "pixels", get_units ());
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7642 }
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7643
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7644 void
12777 6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	7645 text::properties::update_font (void)
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7646 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7647 #ifdef HAVE_FREETYPE
10526 660c244d3206 Don't call text_renderer.set_font if HAVE_FONTCONFIG is not set (bug #29570) David Bateman <dbateman@free.fr> parents: 10402 diff changeset	7648 #ifdef HAVE_FONTCONFIG
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7649 renderer.set_font (get ("fontname").string_value (),
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7650 get ("fontweight").string_value (),
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7651 get ("fontangle").string_value (),
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7652 get ("fontsize").double_value ());
10526 660c244d3206 Don't call text_renderer.set_font if HAVE_FONTCONFIG is not set (bug #29570) David Bateman <dbateman@free.fr> parents: 10402 diff changeset	7653 #endif
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7654 renderer.set_color (get_color_rgb ());
12777 6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	7655 #endif
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	7656 }
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	7657
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	7658 void
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	7659 text::properties::update_text_extent (void)
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	7660 {
6c1d0f03c331 Avoid redundant calls to set_font of text renderers (Bug #31305) Konstantinos Poulios <logari81@gmail.com> parents: 12685 diff changeset	7661 #ifdef HAVE_FREETYPE
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7662
18099 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	7663 int halign = 0;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	7664 int valign = 0;
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7665
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7666 if (horizontalalignment_is ("center"))
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7667 halign = 1;
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7668 else if (horizontalalignment_is ("right"))
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7669 halign = 2;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	7670
16206 9ba5c5ed3aeb Add new verticalalignment option 'cap' for OpenGL plotting. Rik <rik@octave.org> parents: 16204 diff changeset	7671 if (verticalalignment_is ("middle"))
9ba5c5ed3aeb Add new verticalalignment option 'cap' for OpenGL plotting. Rik <rik@octave.org> parents: 16204 diff changeset	7672 valign = 1;
9ba5c5ed3aeb Add new verticalalignment option 'cap' for OpenGL plotting. Rik <rik@octave.org> parents: 16204 diff changeset	7673 else if (verticalalignment_is ("top"))
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7674 valign = 2;
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7675 else if (verticalalignment_is ("baseline"))
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7676 valign = 3;
16206 9ba5c5ed3aeb Add new verticalalignment option 'cap' for OpenGL plotting. Rik <rik@octave.org> parents: 16204 diff changeset	7677 else if (verticalalignment_is ("cap"))
9ba5c5ed3aeb Add new verticalalignment option 'cap' for OpenGL plotting. Rik <rik@octave.org> parents: 16204 diff changeset	7678 valign = 4;
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7679
2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7680 Matrix bbox;
12965 22bc9ec80c2c allow multi-line string property for text objects using cell arrays or char matrices Ben Abbott <bpabbott@mac.com> parents: 12910 diff changeset	7681
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7682 // FIXME: string should be parsed only when modified, for efficiency
12965 22bc9ec80c2c allow multi-line string property for text objects using cell arrays or char matrices Ben Abbott <bpabbott@mac.com> parents: 12910 diff changeset	7683
22bc9ec80c2c allow multi-line string property for text objects using cell arrays or char matrices Ben Abbott <bpabbott@mac.com> parents: 12910 diff changeset	7684 octave_value string_prop = get_string ();
22bc9ec80c2c allow multi-line string property for text objects using cell arrays or char matrices Ben Abbott <bpabbott@mac.com> parents: 12910 diff changeset	7685
22bc9ec80c2c allow multi-line string property for text objects using cell arrays or char matrices Ben Abbott <bpabbott@mac.com> parents: 12910 diff changeset	7686 string_vector sv = string_prop.all_strings ();
22bc9ec80c2c allow multi-line string property for text objects using cell arrays or char matrices Ben Abbott <bpabbott@mac.com> parents: 12910 diff changeset	7687
22bc9ec80c2c allow multi-line string property for text objects using cell arrays or char matrices Ben Abbott <bpabbott@mac.com> parents: 12910 diff changeset	7688 renderer.text_to_pixels (sv.join ("\n"), pixels, bbox,
17319 27fc61cfbc6e Use interpreter property when rendering text objects (bug #39830). Michael Goffioul <michael.goffioul@gmail.com> parents: 17286 diff changeset	7689 halign, valign, get_rotation (),
27fc61cfbc6e Use interpreter property when rendering text objects (bug #39830). Michael Goffioul <michael.goffioul@gmail.com> parents: 17286 diff changeset	7690 get_interpreter ());
14413 4f160344236a 2011-04-26 Daniel Wagenaar <daw@caltech.edu> Ben Abbott <bpabbott@mac.com> parents: 14395 diff changeset	7691 /* The bbox is relative to the text's position.
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14798 diff changeset	7692 We'll leave it that way, because get_position () does not return
14413 4f160344236a 2011-04-26 Daniel Wagenaar <daw@caltech.edu> Ben Abbott <bpabbott@mac.com> parents: 14395 diff changeset	7693 valid results when the text is first constructed.
4f160344236a 2011-04-26 Daniel Wagenaar <daw@caltech.edu> Ben Abbott <bpabbott@mac.com> parents: 14395 diff changeset	7694 Conversion to proper coordinates is performed in get_extent. */
11455 2be9e22796d2 improvements in text-extent calculation Konstantinos Poulios <logari81@googlemail.com> parents: 11450 diff changeset	7695 set_extent (bbox);
12965 22bc9ec80c2c allow multi-line string property for text objects using cell arrays or char matrices Ben Abbott <bpabbott@mac.com> parents: 12910 diff changeset	7696
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7697 #endif
12440 2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	7698
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	7699 if (autopos_tag_is ("xlabel") \|\| autopos_tag_is ("ylabel") \|\|
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	7700 autopos_tag_is ("zlabel") \|\| autopos_tag_is ("title"))
2ed62b9f949e synchronization of axes position and outerposition Konstantinos Poulios <logari81@googlemail.com> parents: 12422 diff changeset	7701 update_autopos ("sync");
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7702 }
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7703
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7704 void
12389 5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	7705 text::properties::request_autopos (void)
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	7706 {
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	7707 if (autopos_tag_is ("xlabel") \|\| autopos_tag_is ("ylabel") \|\|
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	7708 autopos_tag_is ("zlabel") \|\| autopos_tag_is ("title"))
12422 a3be83af8cfa simplifications in position updating functions for axes labels and titles Konstantinos Poulios <logari81@gmail.com> parents: 12389 diff changeset	7709 update_autopos (get_autopos_tag ());
12389 5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	7710 }
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	7711
5367bd36b9f8 implement autopositioning requests from text objects to axes Konstantinos Poulios <logari81@googlemail.com> parents: 12348 diff changeset	7712 void
10402 9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7713 text::properties::update_units (void)
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7714 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7715 if (! units_is ("data"))
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7716 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7717 set_xliminclude ("off");
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7718 set_yliminclude ("off");
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7719 set_zliminclude ("off");
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7720 }
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7721
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7722 Matrix pos = get_position ().matrix_value ();
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7723
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7724 pos = convert_text_position (pos, *this, cached_units, get_units ());
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7725 // FIXME: if the current axes view is 2D, then one should
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7726 // probably drop the z-component of "pos" and leave "zliminclude"
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7727 // to "off".
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7728 set_position (pos);
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7729
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7730 if (units_is ("data"))
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7731 {
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7732 set_xliminclude ("on");
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7733 set_yliminclude ("on");
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7734 // FIXME: see above
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7735 set_zliminclude ("off");
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7736 }
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7737
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7738 cached_units = get_units ();
9f2bf537a651 Implement text extent property Michael Goffioul <michael.goffioul@gmail.com> parents: 10315 diff changeset	7739 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	7740
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7741 double
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7742 text::properties::get_fontsize_points (double box_pix_height) const
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7743 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7744 double fs = get_fontsize ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7745 double parent_height = box_pix_height;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7746
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7747 if (fontunits_is ("normalized") && parent_height <= 0)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7748 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7749 graphics_object go (gh_manager::get_object (get___myhandle__ ()));
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7750 graphics_object ax (go.get_ancestor ("axes"));
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7751
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	7752 parent_height = ax.get_properties ().get_boundingbox (true).elem (3);
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7753 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7754
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7755 return convert_font_size (fs, get_fontunits (), "points", parent_height);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7756 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	7757
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	7758 // ---------------------------------------------------------------------
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	7759
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9605 diff changeset	7760 octave_value
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9605 diff changeset	7761 image::properties::get_color_data (void) const
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9605 diff changeset	7762 {
73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9605 diff changeset	7763 return convert_cdata (*this, get_cdata (),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7764 cdatamapping_is ("scaled"), 3);
9680 73153525df9a initial implementation of OpenGL image rendering Shai Ayal <shaiay@users.sourceforge.net> parents: 9605 diff changeset	7765 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	7766
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	7767 // ---------------------------------------------------------------------
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	7768
7833 8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	7769 octave_value
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	7770 patch::properties::get_color_data (void) const
8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	7771 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14798 diff changeset	7772 octave_value fvc = get_facevertexcdata ();
11168 36442102c340 Fix treatment of facevertexcdata if facecolor is 'none' with the fltk backend David Bateman <dbateman@free.fr> parents: 11167 diff changeset	7773 if (fvc.is_undefined () \|\| fvc.is_empty ())
36442102c340 Fix treatment of facevertexcdata if facecolor is 'none' with the fltk backend David Bateman <dbateman@free.fr> parents: 11167 diff changeset	7774 return Matrix ();
36442102c340 Fix treatment of facevertexcdata if facecolor is 'none' with the fltk backend David Bateman <dbateman@free.fr> parents: 11167 diff changeset	7775 else
36442102c340 Fix treatment of facevertexcdata if facecolor is 'none' with the fltk backend David Bateman <dbateman@free.fr> parents: 11167 diff changeset	7776 return convert_cdata (*this, fvc,cdatamapping_is ("scaled"), 2);
7833 8ff92634982d Add initial support for patch rendering through GLU tessellation (no transparency, no border, no markers yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7829 diff changeset	7777 }
6807 0089a504fdd6 [project @ 2007-08-10 17:34:59 by jwe] jwe parents: 6790 diff changeset	7778
0089a504fdd6 [project @ 2007-08-10 17:34:59 by jwe] jwe parents: 6790 diff changeset	7779 // ---------------------------------------------------------------------
0089a504fdd6 [project @ 2007-08-10 17:34:59 by jwe] jwe parents: 6790 diff changeset	7780
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7781 octave_value
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7782 surface::properties::get_color_data (void) const
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7783 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7784 return convert_cdata (*this, get_cdata (), cdatamapping_is ("scaled"), 3);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7785 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7786
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7787 inline void
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7788 cross_product (double x1, double y1, double z1,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7789 double x2, double y2, double z2,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7790 double& x, double& y, double& z)
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7791 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7792 x += (y1 * z2 - z1 * y2);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7793 y += (z1 * x2 - x1 * z2);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7794 z += (x1 * y2 - y1 * x2);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7795 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7796
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7797 void
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7798 surface::properties::update_normals (void)
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7799 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7800 if (normalmode_is ("auto"))
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7801 {
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7802 Matrix x = get_xdata ().matrix_value ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7803 Matrix y = get_ydata ().matrix_value ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7804 Matrix z = get_zdata ().matrix_value ();
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7805
8449 448188853722 Calculate surface normals for boundaries, use more neighboring Kai Habel parents: 8341 diff changeset	7806
18099 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	7807 int p = z.columns ();
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	7808 int q = z.rows ();
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	7809 int i1, i2, i3, j1, j2, j3;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	7810 i1 = i2 = i3 = 0;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17861 diff changeset	7811 j1 = j2 = j3 = 0;
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7812
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7813 bool x_mat = (x.rows () == q);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7814 bool y_mat = (y.columns () == p);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7815
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7816 NDArray n (dim_vector (q, p, 3), 0.0);
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7817
8449 448188853722 Calculate surface normals for boundaries, use more neighboring Kai Habel parents: 8341 diff changeset	7818 for (int i = 0; i < p; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7819 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7820 if (y_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7821 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7822 i1 = i - 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7823 i2 = i;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7824 i3 = i + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7825 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7826
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7827 for (int j = 0; j < q; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7828 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7829 if (x_mat)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7830 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7831 j1 = j - 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7832 j2 = j;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7833 j3 = j + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7834 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7835
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7836 double& nx = n(j, i, 0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7837 double& ny = n(j, i, 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7838 double& nz = n(j, i, 2);
8449 448188853722 Calculate surface normals for boundaries, use more neighboring Kai Habel parents: 8341 diff changeset	7839
448188853722 Calculate surface normals for boundaries, use more neighboring Kai Habel parents: 8341 diff changeset	7840 if ((j > 0) && (i > 0))
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7841 // upper left quadrangle
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7842 cross_product
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7843 (x(j1,i-1)-x(j2,i), y(j-1,i1)-y(j,i2), z(j-1,i-1)-z(j,i),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7844 x(j2,i-1)-x(j1,i), y(j,i1)-y(j-1,i2), z(j,i-1)-z(j-1,i),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7845 nx, ny, nz);
8449 448188853722 Calculate surface normals for boundaries, use more neighboring Kai Habel parents: 8341 diff changeset	7846
448188853722 Calculate surface normals for boundaries, use more neighboring Kai Habel parents: 8341 diff changeset	7847 if ((j > 0) && (i < (p -1)))
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7848 // upper right quadrangle
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7849 cross_product
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7850 (x(j1,i+1)-x(j2,i), y(j-1,i3)-y(j,i2), z(j-1,i+1)-z(j,i),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7851 x(j1,i)-x(j2,i+1), y(j-1,i2)-y(j,i3), z(j-1,i)-z(j,i+1),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7852 nx, ny, nz);
8449 448188853722 Calculate surface normals for boundaries, use more neighboring Kai Habel parents: 8341 diff changeset	7853
448188853722 Calculate surface normals for boundaries, use more neighboring Kai Habel parents: 8341 diff changeset	7854 if ((j < (q - 1)) && (i > 0))
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7855 // lower left quadrangle
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7856 cross_product
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7857 (x(j2,i-1)-x(j3,i), y(j,i1)-y(j+1,i2), z(j,i-1)-z(j+1,i),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7858 x(j3,i-1)-x(j2,i), y(j+1,i1)-y(j,i2), z(j+1,i-1)-z(j,i),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7859 nx, ny, nz);
8449 448188853722 Calculate surface normals for boundaries, use more neighboring Kai Habel parents: 8341 diff changeset	7860
448188853722 Calculate surface normals for boundaries, use more neighboring Kai Habel parents: 8341 diff changeset	7861 if ((j < (q - 1)) && (i < (p -1)))
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7862 // lower right quadrangle
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7863 cross_product
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7864 (x(j3,i)-x(j2,i+1), y(j+1,i2)-y(j,i3), z(j+1,i)-z(j,i+1),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7865 x(j3,i+1)-x(j2,i), y(j+1,i3)-y(j,i2), z(j+1,i+1)-z(j,i),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	7866 nx, ny, nz);
8449 448188853722 Calculate surface normals for boundaries, use more neighboring Kai Habel parents: 8341 diff changeset	7867
11450 5eb10763069f substitute and use LAPACK_LIBS in mkoctfile script John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	7868 double d = -std::max (std::max (fabs (nx), fabs (ny)), fabs (nz));
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7869
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7870 nx /= d;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7871 ny /= d;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7872 nz /= d;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7873 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	7874 }
7829 8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7875 vertexnormals = n;
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7876 }
8ca8e97e8c0a Add rendering interface for surface object (no implementation yet). Michael Goffioul <michael.goffioul@gmail.com> parents: 7828 diff changeset	7877 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	7878
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	7879 // ---------------------------------------------------------------------
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	7880
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	7881 void
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7882 hggroup::properties::update_limits (void) const
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7883 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7884 graphics_object obj = gh_manager::get_object (__myhandle__);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7885
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7886 if (obj)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7887 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7888 obj.update_axis_limits ("xlim");
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7889 obj.update_axis_limits ("ylim");
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7890 obj.update_axis_limits ("zlim");
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7891 obj.update_axis_limits ("clim");
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7892 obj.update_axis_limits ("alim");
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7893 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7894 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7895
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	7896 void
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7897 hggroup::properties::update_limits (const graphics_handle& h) const
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7898 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7899 graphics_object obj = gh_manager::get_object (__myhandle__);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7900
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7901 if (obj)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7902 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7903 obj.update_axis_limits ("xlim", h);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7904 obj.update_axis_limits ("ylim", h);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7905 obj.update_axis_limits ("zlim", h);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7906 obj.update_axis_limits ("clim", h);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7907 obj.update_axis_limits ("alim", h);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7908 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7909 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7910
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7911 static bool updating_hggroup_limits = false;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7912
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7913 void
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7914 hggroup::update_axis_limits (const std::string& axis_type,
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7915 const graphics_handle& h)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7916 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7917 if (updating_hggroup_limits)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7918 return;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7919
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7920 Matrix kids = Matrix (1, 1, h.value ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	7921
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7922 double min_val = octave_Inf;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7923 double max_val = -octave_Inf;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7924 double min_pos = octave_Inf;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7925 double max_neg = -octave_Inf;
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7926
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7927 Matrix limits;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7928 double val;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7929
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7930 char update_type = 0;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7931
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7932 if (axis_type == "xlim" \|\| axis_type == "xliminclude")
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7933 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7934 limits = xproperties.get_xlim ().matrix_value ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7935 update_type = 'x';
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7936 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7937 else if (axis_type == "ylim" \|\| axis_type == "yliminclude")
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7938 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7939 limits = xproperties.get_ylim ().matrix_value ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7940 update_type = 'y';
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7941 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7942 else if (axis_type == "zlim" \|\| axis_type == "zliminclude")
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7943 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7944 limits = xproperties.get_zlim ().matrix_value ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7945 update_type = 'z';
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7946 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7947 else if (axis_type == "clim" \|\| axis_type == "climinclude")
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7948 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7949 limits = xproperties.get_clim ().matrix_value ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7950 update_type = 'c';
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7951 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7952 else if (axis_type == "alim" \|\| axis_type == "aliminclude")
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7953 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7954 limits = xproperties.get_alim ().matrix_value ();
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7955 update_type = 'a';
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7956 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7957
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14798 diff changeset	7958 if (limits.numel () == 4)
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7959 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7960 val = limits(0);
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	7961 if (xfinite (val))
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7962 min_val = val;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7963 val = limits(1);
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	7964 if (xfinite (val))
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7965 max_val = val;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7966 val = limits(2);
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	7967 if (xfinite (val))
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7968 min_pos = val;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7969 val = limits(3);
16971 259c1f295a1e Use xfinite to replace some (isinf \|\| isnan) instances in C++ code. Rik <rik@octave.org> parents: 16892 diff changeset	7970 if (xfinite (val))
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7971 max_neg = val;
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7972 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7973 else
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7974 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	7975 limits.resize (4,1);
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7976 limits(0) = min_val;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7977 limits(1) = max_val;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7978 limits(2) = min_pos;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7979 limits(3) = max_neg;
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7980 }
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7981
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7982 get_children_limits (min_val, max_val, min_pos, max_neg, kids, update_type);
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7983
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7984 unwind_protect frame;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7985 frame.protect_var (updating_hggroup_limits);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7986
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7987 updating_hggroup_limits = true;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7988
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7989 if (limits(0) != min_val \|\| limits(1) != max_val
e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7990 \|\| limits(2) != min_pos \|\| limits(3) != max_neg)
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7991 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7992 limits(0) = min_val;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7993 limits(1) = max_val;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7994 limits(2) = min_pos;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	7995 limits(3) = max_neg;
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7996
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7997 switch (update_type)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7998 {
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	7999 case 'x':
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8000 xproperties.set_xlim (limits);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8001 break;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8002
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8003 case 'y':
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8004 xproperties.set_ylim (limits);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8005 break;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8006
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8007 case 'z':
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8008 xproperties.set_zlim (limits);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8009 break;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8010
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8011 case 'c':
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8012 xproperties.set_clim (limits);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8013 break;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8014
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8015 case 'a':
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8016 xproperties.set_alim (limits);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8017 break;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8018
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8019 default:
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8020 break;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8021 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8022
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8023 base_graphics_object::update_axis_limits (axis_type, h);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8024 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8025 }
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8026
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8027 void
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8028 hggroup::update_axis_limits (const std::string& axis_type)
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8029 {
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8030 if (updating_hggroup_limits)
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8031 return;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8032
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8033 Matrix kids = xproperties.get_children ();
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8034
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8035 double min_val = octave_Inf;
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8036 double max_val = -octave_Inf;
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8037 double min_pos = octave_Inf;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	8038 double max_neg = -octave_Inf;
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8039
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8040 char update_type = 0;
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8041
8081 b1634dd9ebe7 Make hggroup to react on [xyzac]liminclude changes in its children. Michael Goffioul parents: 8075 diff changeset	8042 if (axis_type == "xlim" \|\| axis_type == "xliminclude")
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8043 {
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	8044 get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'x');
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	8045
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8046 update_type = 'x';
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8047 }
8081 b1634dd9ebe7 Make hggroup to react on [xyzac]liminclude changes in its children. Michael Goffioul parents: 8075 diff changeset	8048 else if (axis_type == "ylim" \|\| axis_type == "yliminclude")
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8049 {
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	8050 get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'y');
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8051
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8052 update_type = 'y';
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8053 }
8081 b1634dd9ebe7 Make hggroup to react on [xyzac]liminclude changes in its children. Michael Goffioul parents: 8075 diff changeset	8054 else if (axis_type == "zlim" \|\| axis_type == "zliminclude")
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8055 {
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	8056 get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'z');
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8057
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8058 update_type = 'z';
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8059 }
8081 b1634dd9ebe7 Make hggroup to react on [xyzac]liminclude changes in its children. Michael Goffioul parents: 8075 diff changeset	8060 else if (axis_type == "clim" \|\| axis_type == "climinclude")
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8061 {
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	8062 get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'c');
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8063
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8064 update_type = 'c';
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8065 }
8081 b1634dd9ebe7 Make hggroup to react on [xyzac]liminclude changes in its children. Michael Goffioul parents: 8075 diff changeset	8066 else if (axis_type == "alim" \|\| axis_type == "aliminclude")
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8067 {
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	8068 get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'a');
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8069
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8070 update_type = 'a';
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8071 }
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8072
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8073 unwind_protect frame;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8074 frame.protect_var (updating_hggroup_limits);
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8075
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8076 updating_hggroup_limits = true;
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11168 diff changeset	8077
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	8078 Matrix limits (1, 4, 0.0);
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8079
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8080 limits(0) = min_val;
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8081 limits(1) = max_val;
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8082 limits(2) = min_pos;
13132 e3e8ca96f923 Support log scale plots with all negative data. Ben Abbott <bpabbott@mac.com> parents: 13130 diff changeset	8083 limits(3) = max_neg;
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8084
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8085 switch (update_type)
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8086 {
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8087 case 'x':
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8088 xproperties.set_xlim (limits);
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8089 break;
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8090
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8091 case 'y':
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8092 xproperties.set_ylim (limits);
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8093 break;
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8094
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8095 case 'z':
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8096 xproperties.set_zlim (limits);
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8097 break;
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8098
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8099 case 'c':
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8100 xproperties.set_clim (limits);
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8101 break;
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8102
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8103 case 'a':
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8104 xproperties.set_alim (limits);
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8105 break;
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8106
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8107 default:
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8108 break;
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8109 }
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8110
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8111 base_graphics_object::update_axis_limits (axis_type);
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8112 }
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8113
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8114 // ---------------------------------------------------------------------
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8115
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8116 octave_value
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8117 uicontrol::properties::get_extent (void) const
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8118 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8119 Matrix m = extent.get ().matrix_value ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8120
13736 deb69dab4514 Avoid some compilation warnings. Michael Goffioul <michael.goffioul@gmail.com> parents: 13713 diff changeset	8121 graphics_object parent_obj =
deb69dab4514 Avoid some compilation warnings. Michael Goffioul <michael.goffioul@gmail.com> parents: 13713 diff changeset	8122 gh_manager::get_object (get_parent ());
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8123 Matrix parent_bbox = parent_obj.get_properties ().get_boundingbox (true),
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8124 parent_size = parent_bbox.extract_n (0, 2, 1, 2);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8125
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8126 return convert_position (m, "pixels", get_units (), parent_size);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8127 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8128
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8129 void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8130 uicontrol::properties::update_text_extent (void)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8131 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8132 #ifdef HAVE_FREETYPE
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8133
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8134 text_element *elt;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8135 ft_render text_renderer;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8136 Matrix box;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8137
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8138 // FIXME: parsed content should be cached for efficiency
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8139 // FIXME: support multiline text
13908 32a77debff75 strip trailing spaces Konstantinos Poulios <logari81@googlemail.com> parents: 13897 diff changeset	8140
17269 5b088598df1d Add simple TeX parser based on flex/bison. Michael Goffioul <michael.goffioul@gmail.com> parents: 17260 diff changeset	8141 elt = text_parser::parse (get_string_string (), "none");
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8142 #ifdef HAVE_FONTCONFIG
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8143 text_renderer.set_font (get_fontname (),
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8144 get_fontweight (),
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8145 get_fontangle (),
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8146 get_fontsize ());
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8147 #endif
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8148 box = text_renderer.get_extent (elt, 0);
17192 755ec7bce733 corefcn/graphics.cc: Fix memory leak in uicontrol::properties::update_text_extent. Michael Goffioul <michael.goffioul@gmail.com> parents: 17150 diff changeset	8149 delete elt;
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8150
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8151 Matrix ext (1, 4, 0.0);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8152
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8153 // FIXME: also handle left and bottom components
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8154
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8155 ext(0) = ext(1) = 1;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8156 ext(2) = box(0);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8157 ext(3) = box(1);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8158
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8159 set_extent (ext);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8160
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8161 #endif
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8162 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8163
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8164 void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8165 uicontrol::properties::update_units (void)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8166 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8167 Matrix pos = get_position ().matrix_value ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8168
13736 deb69dab4514 Avoid some compilation warnings. Michael Goffioul <michael.goffioul@gmail.com> parents: 13713 diff changeset	8169 graphics_object parent_obj = gh_manager::get_object (get_parent ());
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8170 Matrix parent_bbox = parent_obj.get_properties ().get_boundingbox (true),
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8171 parent_size = parent_bbox.extract_n (0, 2, 1, 2);
13908 32a77debff75 strip trailing spaces Konstantinos Poulios <logari81@googlemail.com> parents: 13897 diff changeset	8172
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8173 pos = convert_position (pos, cached_units, get_units (), parent_size);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8174 set_position (pos);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8175
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8176 cached_units = get_units ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8177 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8178
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8179 void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8180 uicontrol::properties::set_style (const octave_value& st)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8181 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14798 diff changeset	8182 if (get___object__ ().is_empty ())
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8183 style = st;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8184 else
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8185 error ("set: cannot change the style of a uicontrol object after creation.");
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8186 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8187
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8188 Matrix
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8189 uicontrol::properties::get_boundingbox (bool,
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8190 const Matrix& parent_pix_size) const
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8191 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8192 Matrix pos = get_position ().matrix_value ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8193 Matrix parent_size (parent_pix_size);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8194
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8195 if (parent_size.numel () == 0)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8196 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8197 graphics_object obj = gh_manager::get_object (get_parent ());
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8198
17608 e7692efcbd0d graphics.cc: don't ask for (orphan) dummy axes parent properties. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17607 diff changeset	8199 if (obj.valid_object ())
e7692efcbd0d graphics.cc: don't ask for (orphan) dummy axes parent properties. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17607 diff changeset	8200 parent_size =
e7692efcbd0d graphics.cc: don't ask for (orphan) dummy axes parent properties. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17607 diff changeset	8201 obj.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2);
e7692efcbd0d graphics.cc: don't ask for (orphan) dummy axes parent properties. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17607 diff changeset	8202 else
e7692efcbd0d graphics.cc: don't ask for (orphan) dummy axes parent properties. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 17607 diff changeset	8203 parent_size = default_figure_position ();
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8204 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8205
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8206 pos = convert_position (pos, get_units (), "pixels", parent_size);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8207
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8208 pos(0)--;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8209 pos(1)--;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8210 pos(1) = parent_size(1) - pos(1) - pos(3);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8211
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8212 return pos;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8213 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8214
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8215 void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8216 uicontrol::properties::set_fontunits (const octave_value& v)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8217 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8218 if (! error_state)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8219 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8220 caseless_str old_fontunits = get_fontunits ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8221 if (fontunits.set (v, true))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8222 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8223 update_fontunits (old_fontunits);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8224 mark_modified ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8225 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8226 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8227 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8228
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8229 void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8230 uicontrol::properties::update_fontunits (const caseless_str& old_units)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8231 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8232 caseless_str new_units = get_fontunits ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8233 double parent_height = get_boundingbox (false).elem (3);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8234 double fsz = get_fontsize ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8235
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8236 fsz = convert_font_size (fsz, old_units, new_units, parent_height);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8237
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8238 fontsize.set (octave_value (fsz), true);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8239 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8240
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8241 double
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8242 uicontrol::properties::get_fontsize_points (double box_pix_height) const
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8243 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8244 double fs = get_fontsize ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8245 double parent_height = box_pix_height;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8246
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8247 if (fontunits_is ("normalized") && parent_height <= 0)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	8248 parent_height = get_boundingbox (false).elem (3);
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8249
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8250 return convert_font_size (fs, get_fontunits (), "points", parent_height);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8251 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8252
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8253 // ---------------------------------------------------------------------
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8254
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8255 Matrix
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8256 uipanel::properties::get_boundingbox (bool internal,
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8257 const Matrix& parent_pix_size) const
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8258 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8259 Matrix pos = get_position ().matrix_value ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8260 Matrix parent_size (parent_pix_size);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8261
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8262 if (parent_size.numel () == 0)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8263 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8264 graphics_object obj = gh_manager::get_object (get_parent ());
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8265
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8266 parent_size =
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8267 obj.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2);
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8268 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8269
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8270 pos = convert_position (pos, get_units (), "pixels", parent_size);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8271
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8272 pos(0)--;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8273 pos(1)--;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8274 pos(1) = parent_size(1) - pos(1) - pos(3);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8275
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8276 if (internal)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8277 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8278 double outer_height = pos(3);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8279
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8280 pos(0) = pos(1) = 0;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8281
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8282 if (! bordertype_is ("none"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8283 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8284 double bw = get_borderwidth ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8285 double mul = 1.0;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8286
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8287 if (bordertype_is ("etchedin") \|\| bordertype_is ("etchedout"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8288 mul = 2.0;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8289
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8290 pos(0) += mul * bw;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8291 pos(1) += mul * bw;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8292 pos(2) -= 2 * mul * bw;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8293 pos(3) -= 2 * mul * bw;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8294 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8295
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8296 if (! get_title ().empty ())
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8297 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8298 double fs = get_fontsize ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8299
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8300 if (! fontunits_is ("pixels"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8301 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8302 double res = xget (0, "screenpixelsperinch").double_value ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8303
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8304 if (fontunits_is ("points"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8305 fs *= (res / 72.0);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8306 else if (fontunits_is ("inches"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8307 fs *= res;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8308 else if (fontunits_is ("centimeters"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8309 fs *= (res / 2.54);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8310 else if (fontunits_is ("normalized"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8311 fs *= outer_height;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8312 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8313
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8314 if (titleposition_is ("lefttop") \|\| titleposition_is ("centertop")
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8315 \|\| titleposition_is ("righttop"))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8316 pos(1) += (fs / 2);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8317 pos(3) -= (fs / 2);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8318 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8319 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8320
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8321 return pos;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8322 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8323
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8324 void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8325 uipanel::properties::set_units (const octave_value& v)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8326 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8327 if (! error_state)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8328 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8329 caseless_str old_units = get_units ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8330 if (units.set (v, true))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8331 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8332 update_units (old_units);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8333 mark_modified ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8334 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8335 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8336 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8337
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8338 void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8339 uipanel::properties::update_units (const caseless_str& old_units)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8340 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8341 Matrix pos = get_position ().matrix_value ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8342
13736 deb69dab4514 Avoid some compilation warnings. Michael Goffioul <michael.goffioul@gmail.com> parents: 13713 diff changeset	8343 graphics_object parent_obj = gh_manager::get_object (get_parent ());
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8344 Matrix parent_bbox = parent_obj.get_properties ().get_boundingbox (true),
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8345 parent_size = parent_bbox.extract_n (0, 2, 1, 2);
13908 32a77debff75 strip trailing spaces Konstantinos Poulios <logari81@googlemail.com> parents: 13897 diff changeset	8346
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8347 pos = convert_position (pos, old_units, get_units (), parent_size);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8348 set_position (pos);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8349 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8350
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8351 void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8352 uipanel::properties::set_fontunits (const octave_value& v)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8353 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8354 if (! error_state)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8355 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8356 caseless_str old_fontunits = get_fontunits ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8357 if (fontunits.set (v, true))
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8358 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8359 update_fontunits (old_fontunits);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8360 mark_modified ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8361 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8362 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8363 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8364
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8365 void
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8366 uipanel::properties::update_fontunits (const caseless_str& old_units)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8367 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8368 caseless_str new_units = get_fontunits ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8369 double parent_height = get_boundingbox (false).elem (3);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8370 double fsz = get_fontsize ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8371
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8372 fsz = convert_font_size (fsz, old_units, new_units, parent_height);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8373
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8374 set_fontsize (octave_value (fsz));
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8375 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8376
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8377 double
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8378 uipanel::properties::get_fontsize_points (double box_pix_height) const
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8379 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8380 double fs = get_fontsize ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8381 double parent_height = box_pix_height;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8382
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8383 if (fontunits_is ("normalized") && parent_height <= 0)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	8384 parent_height = get_boundingbox (false).elem (3);
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8385
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8386 return convert_font_size (fs, get_fontunits (), "points", parent_height);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8387 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8388
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8389 // ---------------------------------------------------------------------
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8390
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8391 octave_value
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8392 uitoolbar::get_default (const caseless_str& name) const
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8393 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8394 octave_value retval = default_properties.lookup (name);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8395
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8396 if (retval.is_undefined ())
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8397 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8398 graphics_handle parent = get_parent ();
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8399 graphics_object parent_obj = gh_manager::get_object (parent);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8400
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8401 retval = parent_obj.get_default (name);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8402 }
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8403
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8404 return retval;
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8405 }
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8406
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8407 void
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8408 uitoolbar::reset_default_properties (void)
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8409 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8410 ::reset_default_properties (default_properties);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8411 }
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8412
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8413 // ---------------------------------------------------------------------
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8414
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8415 octave_value
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7176 diff changeset	8416 base_graphics_object::get_default (const caseless_str& name) const
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8417 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8418 graphics_handle parent = get_parent ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8419 graphics_object parent_obj = gh_manager::get_object (parent);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8420
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8421 return parent_obj.get_default (type () + name);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8422 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8423
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8424 octave_value
7189 e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman] dbateman parents: 7176 diff changeset	8425 base_graphics_object::get_factory_default (const caseless_str& name) const
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8426 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8427 graphics_object parent_obj = gh_manager::get_object (0);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8428
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8429 return parent_obj.get_factory_default (type () + name);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8430 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8431
7286 c0c6aa5afff4 [project @ 2007-12-11 16:52:56 by jwe] jwe parents: 7283 diff changeset	8432 // We use a random value for the handle to avoid issues with plots and
c0c6aa5afff4 [project @ 2007-12-11 16:52:56 by jwe] jwe parents: 7283 diff changeset	8433 // scalar values for the first argument.
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8434 gh_manager::gh_manager (void)
7286 c0c6aa5afff4 [project @ 2007-12-11 16:52:56 by jwe] jwe parents: 7283 diff changeset	8435 : handle_map (), handle_free_list (),
12164 18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12159 diff changeset	8436 next_handle (-1.0 - (rand () + 1.0) / (RAND_MAX + 2.0)),
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8437 figure_list (), graphics_lock (), event_queue (),
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8438 callback_objects (), event_processing (0)
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8439 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8440 handle_map[0] = graphics_object (new root_figure ());
7847 40b16e04172a Make backend switching work. Michael Goffioul <michael.goffioul@gmail.com> parents: 7844 diff changeset	8441
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	8442 // Make sure the default graphics toolkit is registered.
14021 e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	8443 gtk_manager::default_toolkit ();
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8444 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8445
13992 e1f76bfe0452 apply singleton_cleanup to a few more classes John W. Eaton <jwe@octave.org> parents: 13955 diff changeset	8446 void
e1f76bfe0452 apply singleton_cleanup to a few more classes John W. Eaton <jwe@octave.org> parents: 13955 diff changeset	8447 gh_manager::create_instance (void)
e1f76bfe0452 apply singleton_cleanup to a few more classes John W. Eaton <jwe@octave.org> parents: 13955 diff changeset	8448 {
e1f76bfe0452 apply singleton_cleanup to a few more classes John W. Eaton <jwe@octave.org> parents: 13955 diff changeset	8449 instance = new gh_manager ();
e1f76bfe0452 apply singleton_cleanup to a few more classes John W. Eaton <jwe@octave.org> parents: 13955 diff changeset	8450
14014 907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	8451 if (instance)
907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	8452 singleton_cleanup_list::add (cleanup_instance);
13992 e1f76bfe0452 apply singleton_cleanup to a few more classes John W. Eaton <jwe@octave.org> parents: 13955 diff changeset	8453 }
e1f76bfe0452 apply singleton_cleanup to a few more classes John W. Eaton <jwe@octave.org> parents: 13955 diff changeset	8454
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8455 graphics_handle
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8456 gh_manager::do_make_graphics_handle (const std::string& go_name,
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	8457 const graphics_handle& p,
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	8458 bool integer_figure_handle,
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	8459 bool do_createfcn,
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8460 bool do_notify_toolkit)
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8461 {
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	8462 graphics_handle h = get_handle (integer_figure_handle);
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8463
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8464 base_graphics_object *go = 0;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8465
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	8466 go = make_graphics_object_from_type (go_name, h, p);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	8467
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8468 if (go)
7370 74d64ead0cd7 [project @ 2008-01-14 19:12:45 by jwe] jwe parents: 7367 diff changeset	8469 {
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	8470 graphics_object obj (go);
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	8471
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	8472 handle_map[h] = obj;
7370 74d64ead0cd7 [project @ 2008-01-14 19:12:45 by jwe] jwe parents: 7367 diff changeset	8473 if (do_createfcn)
74d64ead0cd7 [project @ 2008-01-14 19:12:45 by jwe] jwe parents: 7367 diff changeset	8474 go->get_properties ().execute_createfcn ();
8058 ca39c21fa4b8 [mq]: generic_octave_to_backend_nofitication John W. Eaton <jwe@octave.org> parents: 8052 diff changeset	8475
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	8476 // Notify graphics toolkit.
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8477 if (do_notify_toolkit)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8478 obj.initialize ();
7370 74d64ead0cd7 [project @ 2008-01-14 19:12:45 by jwe] jwe parents: 7367 diff changeset	8479 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8480 else
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14325 diff changeset	8481 error ("gh_manager::do_make_graphics_handle: invalid object type '%s'",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8482 go_name.c_str ());
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8483
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8484 return h;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8485 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8486
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8487 graphics_handle
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8488 gh_manager::do_make_figure_handle (double val, bool do_notify_toolkit)
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8489 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8490 graphics_handle h = val;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8491
8058 ca39c21fa4b8 [mq]: generic_octave_to_backend_nofitication John W. Eaton <jwe@octave.org> parents: 8052 diff changeset	8492 base_graphics_object* go = new figure (h, 0);
8059 75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	8493 graphics_object obj (go);
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	8494
75c99d3f97d7 Octave to backend notification scheme John W. Eaton <jwe@octave.org> parents: 8058 diff changeset	8495 handle_map[h] = obj;
8058 ca39c21fa4b8 [mq]: generic_octave_to_backend_nofitication John W. Eaton <jwe@octave.org> parents: 8052 diff changeset	8496
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	8497 // Notify graphics toolkit.
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8498 if (do_notify_toolkit)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8499 obj.initialize ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	8500
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8501 return h;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8502 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8503
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8504 void
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8505 gh_manager::do_push_figure (const graphics_handle& h)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8506 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8507 do_pop_figure (h);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8508
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8509 figure_list.push_front (h);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8510 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8511
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8512 void
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8513 gh_manager::do_pop_figure (const graphics_handle& h)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8514 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8515 for (figure_list_iterator p = figure_list.begin ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8516 p != figure_list.end ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8517 p++)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8518 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8519 if (*p == h)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8520 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8521 figure_list.erase (p);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8522 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8523 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8524 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8525 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8526
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8527 class
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8528 callback_event : public base_graphics_event
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8529 {
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8530 public:
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8531 callback_event (const graphics_handle& h, const std::string& name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8532 const octave_value& data = Matrix ())
17652 57750dc54ab6 maint: Correct indentation in graphics.cc, graphics.in.h. No code changes. Rik <rik@octave.org> parents: 17641 diff changeset	8533 : base_graphics_event (), handle (h), callback_name (name),
57750dc54ab6 maint: Correct indentation in graphics.cc, graphics.in.h. No code changes. Rik <rik@octave.org> parents: 17641 diff changeset	8534 callback (), callback_data (data) { }
13908 32a77debff75 strip trailing spaces Konstantinos Poulios <logari81@googlemail.com> parents: 13897 diff changeset	8535
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8536 callback_event (const graphics_handle& h, const octave_value& cb,
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8537 const octave_value& data = Matrix ())
17652 57750dc54ab6 maint: Correct indentation in graphics.cc, graphics.in.h. No code changes. Rik <rik@octave.org> parents: 17641 diff changeset	8538 : base_graphics_event (), handle (h), callback_name (),
57750dc54ab6 maint: Correct indentation in graphics.cc, graphics.in.h. No code changes. Rik <rik@octave.org> parents: 17641 diff changeset	8539 callback (cb), callback_data (data) { }
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8540
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8541 void execute (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8542 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8543 if (callback.is_defined ())
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8544 gh_manager::execute_callback (handle, callback, callback_data);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8545 else
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8546 gh_manager::execute_callback (handle, callback_name, callback_data);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8547 }
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8548
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8549 private:
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8550 callback_event (void)
17652 57750dc54ab6 maint: Correct indentation in graphics.cc, graphics.in.h. No code changes. Rik <rik@octave.org> parents: 17641 diff changeset	8551 : base_graphics_event (), handle (), callback_name (), callback_data ()
12164 18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12159 diff changeset	8552 { }
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8553
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8554 private:
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8555 graphics_handle handle;
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8556 std::string callback_name;
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8557 octave_value callback;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8558 octave_value callback_data;
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8559 };
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8560
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8561 class
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8562 function_event : public base_graphics_event
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8563 {
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8564 public:
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8565 function_event (graphics_event::event_fcn fcn, void* data = 0)
17652 57750dc54ab6 maint: Correct indentation in graphics.cc, graphics.in.h. No code changes. Rik <rik@octave.org> parents: 17641 diff changeset	8566 : base_graphics_event (), function (fcn), function_data (data)
57750dc54ab6 maint: Correct indentation in graphics.cc, graphics.in.h. No code changes. Rik <rik@octave.org> parents: 17641 diff changeset	8567 { }
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8568
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8569 void execute (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8570 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8571 function (function_data);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8572 }
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8573
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8574 private:
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	8575
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8576 graphics_event::event_fcn function;
12164 18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12159 diff changeset	8577
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8578 void* function_data;
12164 18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12159 diff changeset	8579
18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12159 diff changeset	8580 // function_event objects must be created with at least a function.
18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12159 diff changeset	8581 function_event (void);
18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12159 diff changeset	8582
18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12159 diff changeset	8583 // No copying!
18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12159 diff changeset	8584
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	8585 function_event (const function_event&);
ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	8586
ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	8587 function_event & operator = (const function_event&);
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8588 };
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8589
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8590 class
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8591 set_event : public base_graphics_event
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8592 {
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8593 public:
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8594 set_event (const graphics_handle& h, const std::string& name,
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8595 const octave_value& value, bool do_notify_toolkit = true)
17652 57750dc54ab6 maint: Correct indentation in graphics.cc, graphics.in.h. No code changes. Rik <rik@octave.org> parents: 17641 diff changeset	8596 : base_graphics_event (), handle (h), property_name (name),
57750dc54ab6 maint: Correct indentation in graphics.cc, graphics.in.h. No code changes. Rik <rik@octave.org> parents: 17641 diff changeset	8597 property_value (value), notify_toolkit (do_notify_toolkit) { }
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8598
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8599 void execute (void)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8600 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8601 gh_manager::auto_lock guard;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8602
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8603 graphics_object go = gh_manager::get_object (handle);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8604
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8605 if (go)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8606 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8607 property p = go.get_properties ().get_property (property_name);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8608
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8609 if (p.ok ())
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8610 p.set (property_value, true, notify_toolkit);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8611 }
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8612 }
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8613
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8614 private:
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8615 set_event (void)
12174 db1f49eaba6b whitespace fixes John W. Eaton <jwe@octave.org> parents: 12164 diff changeset	8616 : base_graphics_event (), handle (), property_name (), property_value ()
12164 18e9a8da7d18 eliminate some -Weffc++ warnings Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 12159 diff changeset	8617 { }
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8618
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8619 private:
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8620 graphics_handle handle;
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8621 std::string property_name;
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8622 octave_value property_value;
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8623 bool notify_toolkit;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8624 };
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8625
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8626 graphics_event
9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8627 graphics_event::create_callback_event (const graphics_handle& h,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8628 const std::string& name,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8629 const octave_value& data)
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8630 {
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8631 graphics_event e;
9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8632
9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8633 e.rep = new callback_event (h, name, data);
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8634
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8635 return e;
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8636 }
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8637
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8638 graphics_event
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8639 graphics_event::create_callback_event (const graphics_handle& h,
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8640 const octave_value& cb,
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8641 const octave_value& data)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8642 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8643 graphics_event e;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8644
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8645 e.rep = new callback_event (h, cb, data);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8646
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8647 return e;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8648 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8649
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8650 graphics_event
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8651 graphics_event::create_function_event (graphics_event::event_fcn fcn,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8652 void *data)
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8653 {
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8654 graphics_event e;
9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8655
9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8656 e.rep = new function_event (fcn, data);
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8657
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8658 return e;
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8659 }
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8660
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8661 graphics_event
9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8662 graphics_event::create_set_event (const graphics_handle& h,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8663 const std::string& name,
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8664 const octave_value& data,
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8665 bool notify_toolkit)
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8666 {
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8667 graphics_event e;
9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8668
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8669 e.rep = new set_event (h, name, data, notify_toolkit);
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8670
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8671 return e;
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8672 }
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8673
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8674 static void
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8675 xset_gcbo (const graphics_handle& h)
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8676 {
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8677 graphics_object go = gh_manager::get_object (0);
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8678 root_figure::properties& props =
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8679 dynamic_cast<root_figure::properties&> (go.get_properties ());
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8680
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8681 props.set_callbackobject (h.as_octave_value ());
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8682 }
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8683
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8684 void
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8685 gh_manager::do_restore_gcbo (void)
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8686 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8687 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8688
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8689 callback_objects.pop_front ();
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8690
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8691 xset_gcbo (callback_objects.empty ()
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8692 ? graphics_handle ()
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8693 : callback_objects.front ().get_handle ());
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8694 }
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8695
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8696 void
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8697 gh_manager::do_execute_listener (const graphics_handle& h,
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8698 const octave_value& l)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8699 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8700 if (octave_thread::is_octave_thread ())
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8701 gh_manager::execute_callback (h, l, octave_value ());
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8702 else
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8703 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8704 gh_manager::auto_lock guard;
13908 32a77debff75 strip trailing spaces Konstantinos Poulios <logari81@googlemail.com> parents: 13897 diff changeset	8705
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8706 do_post_event (graphics_event::create_callback_event (h, l));
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8707 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8708 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8709
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8710 void
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8711 gh_manager::do_execute_callback (const graphics_handle& h,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8712 const octave_value& cb_arg,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8713 const octave_value& data)
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8714 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8715 if (cb_arg.is_defined () && ! cb_arg.is_empty ())
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8716 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8717 octave_value_list args;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8718 octave_function *fcn = 0;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8719
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8720 args(0) = h.as_octave_value ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8721 if (data.is_defined ())
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8722 args(1) = data;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8723 else
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8724 args(1) = Matrix ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8725
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8726 unwind_protect_safe frame;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8727 frame.add_fcn (gh_manager::restore_gcbo);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8728
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8729 if (true)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8730 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8731 gh_manager::auto_lock guard;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8732
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8733 callback_objects.push_front (get_object (h));
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8734 xset_gcbo (h);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8735 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8736
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8737 BEGIN_INTERRUPT_WITH_EXCEPTIONS;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8738
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8739 // Copy CB because "function_value" method is non-const.
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8740
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8741 octave_value cb = cb_arg;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8742
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	8743 if (cb.is_function () \|\| cb.is_function_handle ())
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8744 fcn = cb.function_value ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8745 else if (cb.is_string ())
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8746 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8747 int status;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8748 std::string s = cb.string_value ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8749
13940 bf209050014f Use nargout = 0 in graphics callbacks specified as string. Michael Goffioul <michael.goffioul@gmail.com> parents: 13935 diff changeset	8750 eval_string (s, false, status, 0);
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8751 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8752 else if (cb.is_cell () && cb.length () > 0
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8753 && (cb.rows () == 1 \|\| cb.columns () == 1)
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	8754 && (cb.cell_value ()(0).is_function ()
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	8755 \|\| cb.cell_value ()(0).is_function_handle ()))
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8756 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8757 Cell c = cb.cell_value ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8758
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8759 fcn = c(0).function_value ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8760 if (! error_state)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8761 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8762 for (int i = 1; i < c.length () ; i++)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8763 args(1+i) = c(i);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8764 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8765 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8766 else
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8767 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8768 std::string nm = cb.class_name ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8769 error ("trying to execute non-executable object (class = %s)",
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8770 nm.c_str ());
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8771 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8772
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8773 if (fcn && ! error_state)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8774 feval (fcn, args);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8775
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8776 END_INTERRUPT_WITH_EXCEPTIONS;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8777 }
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8778 }
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8779
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8780 void
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8781 gh_manager::do_post_event (const graphics_event& e)
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8782 {
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8783 event_queue.push_back (e);
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8784
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8785 command_editor::add_event_hook (gh_manager::process_events);
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8786 }
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8787
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8788 void
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	8789 gh_manager::do_post_callback (const graphics_handle& h, const std::string& name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8790 const octave_value& data)
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8791 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8792 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8793
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8794 graphics_object go = get_object (h);
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8795
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8796 if (go.valid_object ())
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8797 {
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8798 if (callback_objects.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8799 do_post_event (graphics_event::create_callback_event (h, name, data));
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8800 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8801 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8802 const graphics_object& current = callback_objects.front ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8803
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8804 if (current.get_properties ().is_interruptible ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8805 do_post_event (graphics_event::create_callback_event (h, name,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8806 data));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8807 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8808 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8809 caseless_str busy_action (go.get_properties ().get_busyaction ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8810
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8811 if (busy_action.compare ("queue"))
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8812 do_post_event (graphics_event::create_callback_event (h, name,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8813 data));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8814 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8815 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8816 caseless_str cname (name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8817
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8818 if (cname.compare ("deletefcn") \|\| cname.compare ("createfcn")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8819 \|\| (go.isa ("figure")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8820 && (cname.compare ("closerequestfcn")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8821 \|\| cname.compare ("resizefcn"))))
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8822 do_post_event (
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8823 graphics_event::create_callback_event (h, name, data));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8824 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8825 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8826 }
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8827 }
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8828 }
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8829
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8830 void
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8831 gh_manager::do_post_function (graphics_event::event_fcn fcn, void* fcn_data)
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8832 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8833 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8834
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8835 do_post_event (graphics_event::create_function_event (fcn, fcn_data));
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8836 }
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8837
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8838 void
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	8839 gh_manager::do_post_set (const graphics_handle& h, const std::string& name,
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8840 const octave_value& value, bool notify_toolkit)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8841 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8842 gh_manager::auto_lock guard;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8843
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8844 do_post_event (graphics_event::create_set_event (h, name, value,
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8845 notify_toolkit));
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8846 }
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8847
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8848 int
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8849 gh_manager::do_process_events (bool force)
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8850 {
7964 9cd3ee5298a0 Use common rep/class pattern for graphics events John W. Eaton <jwe@octave.org> parents: 7936 diff changeset	8851 graphics_event e;
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8852 bool old_Vdrawnow_requested = Vdrawnow_requested;
13935 e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8853 bool events_executed = false;
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8854
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8855 do
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8856 {
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8857 e = graphics_event ();
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8858
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8859 gh_manager::lock ();
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8860
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8861 if (! event_queue.empty ())
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8862 {
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8863 if (callback_objects.empty () \|\| force)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8864 {
13935 e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8865 e = event_queue.front ();
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8866
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8867 event_queue.pop_front ();
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8868 }
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8869 else
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8870 {
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8871 const graphics_object& go = callback_objects.front ();
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8872
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8873 if (go.get_properties ().is_interruptible ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8874 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8875 e = event_queue.front ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8876
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8877 event_queue.pop_front ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8878 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	8879 }
13935 e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8880 }
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8881
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8882 gh_manager::unlock ();
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8883
13935 e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8884 if (e.ok ())
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8885 {
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8886 e.execute ();
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8887 events_executed = true;
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8888 }
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8889 }
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8890 while (e.ok ());
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8891
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8892 gh_manager::lock ();
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8893
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8894 if (event_queue.empty () && event_processing == 0)
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8895 command_editor::remove_event_hook (gh_manager::process_events);
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8896
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8897 gh_manager::unlock ();
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8898
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8899 if (events_executed)
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8900 flush_octave_stdout ();
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8901
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8902 if (Vdrawnow_requested && ! old_Vdrawnow_requested)
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8903 {
15423 53d073233fa4 call more built-in functions directly John W. Eaton <jwe@octave.org> parents: 15220 diff changeset	8904 Fdrawnow ();
13935 e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8905
e48e8253ce58 Re-allow recursive graphics event processing. Michael Goffioul <michael.goffioul@gmail.com> parents: 13929 diff changeset	8906 Vdrawnow_requested = false;
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8907 }
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8908
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8909 return 0;
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8910 }
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8911
13908 32a77debff75 strip trailing spaces Konstantinos Poulios <logari81@googlemail.com> parents: 13897 diff changeset	8912 void
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8913 gh_manager::do_enable_event_processing (bool enable)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8914 {
13736 deb69dab4514 Avoid some compilation warnings. Michael Goffioul <michael.goffioul@gmail.com> parents: 13713 diff changeset	8915 gh_manager::auto_lock guard;
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8916
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8917 if (enable)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8918 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8919 event_processing++;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8920
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8921 command_editor::add_event_hook (gh_manager::process_events);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8922 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8923 else
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8924 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8925 event_processing--;
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8926
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8927 if (event_queue.empty () && event_processing == 0)
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8928 command_editor::remove_event_hook (gh_manager::process_events);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8929 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8930 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8931
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8932 property_list::plist_map_type
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8933 root_figure::init_factory_properties (void)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8934 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8935 property_list::plist_map_type plist_map;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8936
6844 9ac351b05b51 [project @ 2007-08-30 00:46:23 by jwe] jwe parents: 6841 diff changeset	8937 plist_map["figure"] = figure::properties::factory_defaults ();
9ac351b05b51 [project @ 2007-08-30 00:46:23 by jwe] jwe parents: 6841 diff changeset	8938 plist_map["axes"] = axes::properties::factory_defaults ();
9ac351b05b51 [project @ 2007-08-30 00:46:23 by jwe] jwe parents: 6841 diff changeset	8939 plist_map["line"] = line::properties::factory_defaults ();
9ac351b05b51 [project @ 2007-08-30 00:46:23 by jwe] jwe parents: 6841 diff changeset	8940 plist_map["text"] = text::properties::factory_defaults ();
9ac351b05b51 [project @ 2007-08-30 00:46:23 by jwe] jwe parents: 6841 diff changeset	8941 plist_map["image"] = image::properties::factory_defaults ();
9ac351b05b51 [project @ 2007-08-30 00:46:23 by jwe] jwe parents: 6841 diff changeset	8942 plist_map["patch"] = patch::properties::factory_defaults ();
9ac351b05b51 [project @ 2007-08-30 00:46:23 by jwe] jwe parents: 6841 diff changeset	8943 plist_map["surface"] = surface::properties::factory_defaults ();
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	8944 plist_map["hggroup"] = hggroup::properties::factory_defaults ();
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11076 diff changeset	8945 plist_map["uimenu"] = uimenu::properties::factory_defaults ();
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8946 plist_map["uicontrol"] = uicontrol::properties::factory_defaults ();
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8947 plist_map["uipanel"] = uipanel::properties::factory_defaults ();
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8948 plist_map["uicontextmenu"] = uicontextmenu::properties::factory_defaults ();
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8949 plist_map["uitoolbar"] = uitoolbar::properties::factory_defaults ();
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8950 plist_map["uipushtool"] = uipushtool::properties::factory_defaults ();
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	8951 plist_map["uitoggletool"] = uitoggletool::properties::factory_defaults ();
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8952
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8953 return plist_map;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8954 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8955
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8956 // ---------------------------------------------------------------------
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8957
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8958 DEFUN (ishandle, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	8959 "-- texinfo --\n\
6678 49724abe1236 [project @ 2007-05-31 19:44:45 by jwe] jwe parents: 6595 diff changeset	8960 @deftypefn {Built-in Function} {} ishandle (@var{h})\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8961 Return true if @var{h} is a graphics handle and false otherwise.\n\
17123 bcada0a4f8a7 isaxes.m: New function to determine if object is axes handle. Rik <rik@octave.org> parents: 17098 diff changeset	8962 \n\
11431 0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11385 diff changeset	8963 @var{h} may also be a matrix of handles in which case a logical\n\
0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11385 diff changeset	8964 array is returned that is true where the elements of @var{h} are\n\
0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11385 diff changeset	8965 graphics handles and false where they are not.\n\
17123 bcada0a4f8a7 isaxes.m: New function to determine if object is axes handle. Rik <rik@octave.org> parents: 17098 diff changeset	8966 @seealso{isaxes, isfigure}\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8967 @end deftypefn")
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8968 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	8969 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	8970
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8971 octave_value retval;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8972
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8973 if (args.length () == 1)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8974 retval = is_handle (args(0));
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8975 else
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8976 print_usage ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8977
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8978 return retval;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8979 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	8980
13327 f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8981 static bool
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8982 is_handle_visible (const graphics_handle& h)
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8983 {
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8984 return h.ok () && gh_manager::is_handle_visible (h);
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8985 }
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8986
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8987 static bool
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8988 is_handle_visible (double val)
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8989 {
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8990 return is_handle_visible (gh_manager::lookup (val));
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8991 }
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8992
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8993 static octave_value
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8994 is_handle_visible (const octave_value& val)
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8995 {
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8996 octave_value retval = false;
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8997
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8998 if (val.is_real_scalar () && is_handle_visible (val.double_value ()))
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	8999 retval = true;
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9000 else if (val.is_numeric_type () && val.is_real_type ())
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9001 {
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9002 const NDArray handles = val.array_value ();
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9003
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9004 if (! error_state)
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9005 {
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9006 boolNDArray result (handles.dims ());
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9007
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9008 for (octave_idx_type i = 0; i < handles.numel (); i++)
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9009 result.xelem (i) = is_handle_visible (handles (i));
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9010
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9011 retval = result;
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9012 }
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9013 }
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9014
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9015 return retval;
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9016 }
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9017
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9018 DEFUN (__is_handle_visible__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9019 "-- texinfo --\n\
13327 f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9020 @deftypefn {Built-in Function} __is_handle_visible__ (@var{h})\n\
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9021 Undocumented internal function.\n\
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9022 @end deftypefn")
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9023 {
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9024 octave_value retval;
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9025
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9026 if (args.length () == 1)
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9027 retval = is_handle_visible (args(0));
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9028 else
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9029 print_usage ();
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9030
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9031 return retval;
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9032 }
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible John W. Eaton <jwe@octave.org> parents: 13324 diff changeset	9033
10722 755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9034 DEFUN (reset, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9035 "-- texinfo --\n\
10722 755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9036 @deftypefn {Built-in Function} {} reset (@var{h}, @var{property})\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	9037 Remove any defaults set for the handle @var{h}. The default figure\n\
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17269 diff changeset	9038 properties of @qcode{\"position\"}, @qcode{\"units\"},\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17269 diff changeset	9039 @qcode{\"windowstyle\"} and @qcode{\"paperunits\"} and the default axes\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17269 diff changeset	9040 properties of @qcode{\"position\"} and @qcode{\"units\"} are not reset.\n\
17443 0aa77acf22f5 doc: Add seealso references between cla, clf, reset functions. Rik <rik@octave.org> parents: 17382 diff changeset	9041 @seealso{cla, clf}\n\
10722 755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9042 @end deftypefn")
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9043 {
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9044 int nargin = args.length ();
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9045
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9046 if (nargin != 1)
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9047 print_usage ();
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9048 else
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9049 {
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9050 // get vector of graphics handles
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9051 ColumnVector hcv (args(0).vector_value ());
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9052
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9053 if (! error_state)
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9054 {
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9055 // loop over graphics objects
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	9056 for (octave_idx_type n = 0; n < hcv.length (); n++)
10722 755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9057 gh_manager::get_object (hcv(n)).reset_default_properties ();
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9058 }
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9059 }
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9060
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9061 return octave_value ();
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9062 }
755fcb5baad3 Add the reset built function David Bateman <dbateman@free.fr> parents: 10717 diff changeset	9063
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	9064 DEFUN (set, args, nargout,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9065 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10792 diff changeset	9066 @deftypefn {Built-in Function} {} set (@var{h}, @var{property}, @var{value}, @dots{})\n\
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9067 @deftypefnx {Built-in Function} {} set (@var{h}, @var{properties}, @var{values})\n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9068 @deftypefnx {Built-in Function} {} set (@var{h}, @var{pv})\n\
18576 3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9069 @deftypefnx {Built-in Function} {@var{value_list} =} set (@var{h}, @var{property})\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9070 @deftypefnx {Built-in Function} {@var{all_value_list} =} set (@var{h})\n\
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9071 Set named property values for the graphics handle (or vector of graphics\n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9072 handles) @var{h}.\n\
18576 3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9073 There are three ways to give the property names and values:\n\
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9074 \n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9075 @itemize\n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9076 @item as a comma separated list of @var{property}, @var{value} pairs\n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9077 \n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9078 Here, each @var{property} is a string containing the property name, each\n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9079 @var{value} is a value of the appropriate type for the property.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10792 diff changeset	9080 \n\
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9081 @item as a cell array of strings @var{properties} containing property names\n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9082 and a cell array @var{values} containing property values.\n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9083 \n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9084 In this case, the number of columns of @var{values} must match the number of\n\
10846 a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	9085 elements in @var{properties}. The first column of @var{values} contains\n\
a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	9086 values for the first entry in @var{properties}, etc. The number of rows of\n\
a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	9087 @var{values} must be 1 or match the number of elements of @var{h}. In the\n\
a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	9088 first case, each handle in @var{h} will be assigned the same values. In the\n\
a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	9089 latter case, the first handle in @var{h} will be assigned the values from\n\
a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	9090 the first row of @var{values} and so on.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10792 diff changeset	9091 \n\
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9092 @item as a structure array @var{pv}\n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9093 \n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9094 Here, the field names of @var{pv} represent the property names, and the field\n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9095 values give the property values. In contrast to the previous case, all\n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9096 elements of @var{pv} will be set in all handles in @var{h} independent of\n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9097 the dimensions of @var{pv}.\n\
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9098 @end itemize\n\
18576 3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9099 \n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9100 @code{set} is also used to query the list of values a named property will\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9101 take. @code{@var{clist} = set (@var{h}, \"property\")} will return the list\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9102 of possible values for @qcode{\"property\"} in the cell list @var{clist}.\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9103 If no output variable is used then the list is formatted and printed to the\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9104 screen.\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9105 \n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9106 If no property is specified (@code{@var{slist} = set (@var{h})}) then a\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9107 structure @var{slist} is returned where the fieldnames are the properties of\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9108 the object @var{h} and the fields are the list of possible values for each\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9109 property. If no output variable is used then the list is formatted and\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9110 printed to the screen.\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9111 \n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9112 For example,\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9113 \n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9114 @example\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9115 @group\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9116 hf = figure ();\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9117 set (hf, \"paperorientation\")\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9118 @result{} paperorientation: [ landscape \| @{portrait@} \| rotated ]\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9119 @end group\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9120 @end example\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9121 \n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9122 @noindent\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9123 shows the paperorientation property can take three values with the default\n\
3dac2a233386 doc: Add documentation about using set() to query graphics properties. Rik <rik@octave.org> parents: 18499 diff changeset	9124 being @qcode{\"portrait\"}.\n\
16814 64e7bb01fce2 doc: Improve documentation for 2-D plot functions Rik <rik@octave.org> parents: 16750 diff changeset	9125 @seealso{get}\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9126 @end deftypefn")
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9127 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9128 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	9129
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9130 octave_value retval;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9131
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9132 int nargin = args.length ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9133
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9134 if (nargin > 0)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9135 {
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9136 // get vector of graphics handles
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9137 ColumnVector hcv (args(0).vector_value ());
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9138
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9139 if (! error_state)
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9140 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9141 bool request_drawnow = false;
6733 d6e615183a80 [project @ 2007-06-15 18:21:22 by jwe] jwe parents: 6732 diff changeset	9142
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9143 // loop over graphics objects
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	9144 for (octave_idx_type n = 0; n < hcv.length (); n++)
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9145 {
4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9146 graphics_object obj = gh_manager::get_object (hcv(n));
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9147
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9148 if (obj)
4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9149 {
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9150 if (nargin == 3 && args(1).is_cellstr ()
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9151 && args(2).is_cell ())
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9152 {
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9153 if (args(2).cell_value ().rows () == 1)
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9154 {
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9155 obj.set (args(1).cellstr_value (),
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9156 args(2).cell_value (), 0);
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9157 }
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9158 else if (hcv.length () == args(2).cell_value ().rows ())
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9159 {
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9160 obj.set (args(1).cellstr_value (),
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9161 args(2).cell_value (), n);
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9162 }
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9163 else
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9164 {
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	9165 error ("set: number of graphics handles must match number of value rows (%d != %d)",
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9166 hcv.length (), args(2).cell_value ().rows ());
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9167 break;
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9168
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9169 }
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9170 }
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9171 else if (nargin == 2 && args(1).is_map ())
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9172 {
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9173 obj.set (args(1).map_value ());
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9174 }
18117 ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9175 else if (nargin == 2 && args(1).is_string ())
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9176 {
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9177 std::string property = args(1).string_value ();
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9178
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9179 octave_map pmap = obj.values_as_struct ();
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9180
18580 5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	9181 if (obj.has_readonly_property (property))
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	9182 if (nargout != 0)
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	9183 retval = Matrix ();
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	9184 else
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	9185 octave_stdout << "set: " << property
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	9186 <<" is read-only" << std::endl;
5264b0ec9f97 Make set() omit read-only properties when called with 1 or 2 arguments (bug #41629). pantxo <pantxo.diribarne@gmail.com> parents: 18576 diff changeset	9187 else if (pmap.isfield (property))
18117 ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9188 {
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9189 if (nargout != 0)
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9190 retval = pmap.getfield (property)(0);
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9191 else
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9192 {
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9193 std::string s = obj.value_as_string (property);
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9194 if (! error_state)
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9195 octave_stdout << s;
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9196 }
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9197 }
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9198 else
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9199 {
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9200 error ("set: unknown property");
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9201 break;
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9202 }
ca84d3c9dc24 set: allow retrieving allowed values for individual properties Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18111 diff changeset	9203 }
10717 9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	9204 else if (nargin == 1)
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	9205 {
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	9206 if (nargout != 0)
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	9207 retval = obj.values_as_struct ();
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	9208 else
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	9209 {
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	9210 std::string s = obj.values_as_string ();
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	9211 if (! error_state)
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	9212 octave_stdout << s;
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	9213 }
9d4a198614ab Add functionality set(handle) David Bateman <dbateman@free.fr> parents: 10711 diff changeset	9214 }
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9215 else
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9216 {
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9217 obj.set (args.splice (0, 1));
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9218 request_drawnow = true;
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9219 }
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9220 }
4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9221 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9222 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9223 error ("set: invalid handle (= %g)", hcv(n));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9224 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9225 }
10056 33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9226
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9227 if (error_state)
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9228 break;
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9229
33ba83a06a42 Fix set function to allow cell and struct arguments. Thorsten Meyer <thorsten.meyier@gmx.de> parents: 9972 diff changeset	9230 request_drawnow = true;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9231 }
6733 d6e615183a80 [project @ 2007-06-15 18:21:22 by jwe] jwe parents: 6732 diff changeset	9232
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9233 if (! error_state && request_drawnow)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9234 Vdrawnow_requested = true;
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9235 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9236 else
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9237 error ("set: expecting graphics handle as first argument");
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9238 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9239 else
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9240 print_usage ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9241
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9242 return retval;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9243 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9244
13210 d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9245 static std::string
18118 ec9b35e60f95 style fixes in graphics.in.h and graphics.cc John W. Eaton <jwe@octave.org> parents: 18117 diff changeset	9246 get_graphics_object_type (double val)
13210 d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9247 {
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9248 std::string retval;
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9249
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9250 graphics_object obj = gh_manager::get_object (val);
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9251
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9252 if (obj)
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9253 retval = obj.type ();
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9254 else
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9255 error ("get: invalid handle (= %g)", val);
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9256
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9257 return retval;
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9258 }
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9259
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9260 DEFUN (get, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9261 "-- texinfo --\n\
16814 64e7bb01fce2 doc: Improve documentation for 2-D plot functions Rik <rik@octave.org> parents: 16750 diff changeset	9262 @deftypefn {Built-in Function} {@var{val} =} get (@var{h})\n\
64e7bb01fce2 doc: Improve documentation for 2-D plot functions Rik <rik@octave.org> parents: 16750 diff changeset	9263 @deftypefnx {Built-in Function} {@var{val} =} get (@var{h}, @var{p})\n\
64e7bb01fce2 doc: Improve documentation for 2-D plot functions Rik <rik@octave.org> parents: 16750 diff changeset	9264 Return the value of the named property @var{p} from the graphics handle\n\
64e7bb01fce2 doc: Improve documentation for 2-D plot functions Rik <rik@octave.org> parents: 16750 diff changeset	9265 @var{h}. If @var{p} is omitted, return the complete property list for\n\
64e7bb01fce2 doc: Improve documentation for 2-D plot functions Rik <rik@octave.org> parents: 16750 diff changeset	9266 @var{h}. If @var{h} is a vector, return a cell array including the property\n\
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9267 values or lists respectively.\n\
16814 64e7bb01fce2 doc: Improve documentation for 2-D plot functions Rik <rik@octave.org> parents: 16750 diff changeset	9268 @seealso{set}\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9269 @end deftypefn")
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9270 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9271 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	9272
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9273 octave_value retval;
8896 f155e9d1f086 graphics.cc (Fget, F__get__): return column vector, not row vector John W. Eaton <jwe@octave.org> parents: 8812 diff changeset	9274
f155e9d1f086 graphics.cc (Fget, F__get__): return column vector, not row vector John W. Eaton <jwe@octave.org> parents: 8812 diff changeset	9275 Cell vals;
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9276
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9277 int nargin = args.length ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9278
13955 ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9279 bool use_cell_format = false;
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9280
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9281 if (nargin == 1 \|\| nargin == 2)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9282 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14798 diff changeset	9283 if (args(0).is_empty ())
12678 69cd5ebe5fb5 Stop obscure warnings when get() called with null matrix input (bug #32642) Rik <octave@nomad.inbox5.com> parents: 12587 diff changeset	9284 {
69cd5ebe5fb5 Stop obscure warnings when get() called with null matrix input (bug #32642) Rik <octave@nomad.inbox5.com> parents: 12587 diff changeset	9285 retval = Matrix ();
69cd5ebe5fb5 Stop obscure warnings when get() called with null matrix input (bug #32642) Rik <octave@nomad.inbox5.com> parents: 12587 diff changeset	9286 return retval;
69cd5ebe5fb5 Stop obscure warnings when get() called with null matrix input (bug #32642) Rik <octave@nomad.inbox5.com> parents: 12587 diff changeset	9287 }
69cd5ebe5fb5 Stop obscure warnings when get() called with null matrix input (bug #32642) Rik <octave@nomad.inbox5.com> parents: 12587 diff changeset	9288
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9289 ColumnVector hcv (args(0).vector_value ());
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9290
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9291 if (! error_state)
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9292 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9293 octave_idx_type len = hcv.length ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9294
13210 d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9295 if (nargin == 1 && len > 1)
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9296 {
13210 d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9297 std::string t0 = get_graphics_object_type (hcv(0));
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9298
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9299 if (! error_state)
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9300 {
13210 d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9301 for (octave_idx_type n = 1; n < len; n++)
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9302 {
13210 d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9303 std::string t = get_graphics_object_type (hcv(n));
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9304
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9305 if (error_state)
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9306 break;
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9307
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9308 if (t != t0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9309 {
13210 d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9310 error ("get: vector of handles must all have same type");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9311 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9312 }
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9313 }
13210 d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9314
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9315 }
13210 d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9316 }
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9317
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9318 if (! error_state)
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9319 {
13955 ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9320 if (nargin > 1 && args(1).is_cellstr ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9321 {
13955 ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9322 Array<std::string> plist = args(1).cellstr_value ();
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9323
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9324 if (! error_state)
13210 d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9325 {
13955 ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9326 octave_idx_type plen = plist.numel ();
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9327
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9328 use_cell_format = true;
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9329
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9330 vals.resize (dim_vector (len, plen));
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9331
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9332 for (octave_idx_type n = 0; ! error_state && n < len; n++)
13210 d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9333 {
13955 ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9334 graphics_object obj = gh_manager::get_object (hcv(n));
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9335
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9336 if (obj)
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9337 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9338 for (octave_idx_type m = 0;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9339 ! error_state && m < plen;
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9340 m++)
13955 ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9341 {
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9342 caseless_str property = plist(m);
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9343
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9344 vals(n, m) = obj.get (property);
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9345 }
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9346 }
13210 d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9347 else
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9348 {
13955 ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9349 error ("get: invalid handle (= %g)", hcv(n));
13210 d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9350 break;
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9351 }
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9352 }
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9353 }
d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9354 else
13955 ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9355 error ("get: expecting property name or cell array of property names as second argument");
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9356 }
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9357 else
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9358 {
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9359 caseless_str property;
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9360
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9361 if (nargin > 1)
13210 d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9362 {
13955 ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9363 property = args(1).string_value ();
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9364
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9365 if (error_state)
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9366 error ("get: expecting property name or cell array of property names as second argument");
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9367 }
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9368
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9369 vals.resize (dim_vector (len, 1));
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9370
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9371 if (! error_state)
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9372 {
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9373 for (octave_idx_type n = 0; ! error_state && n < len; n++)
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9374 {
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9375 graphics_object obj = gh_manager::get_object (hcv(n));
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9376
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9377 if (obj)
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9378 {
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9379 if (nargin == 1)
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9380 vals(n) = obj.get ();
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9381 else
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9382 vals(n) = obj.get (property);
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9383 }
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9384 else
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9385 {
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9386 error ("get: invalid handle (= %g)", hcv(n));
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9387 break;
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9388 }
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9389 }
13210 d0f9d7353ee5 return get(h) as a struct array when h is a vector of handles John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	9390 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9391 }
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9392 }
4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9393 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9394 else
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9395 error ("get: expecting graphics handle as first argument");
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9396 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9397 else
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9398 print_usage ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9399
6733 d6e615183a80 [project @ 2007-06-15 18:21:22 by jwe] jwe parents: 6732 diff changeset	9400 if (! error_state)
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9401 {
13955 ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9402 if (use_cell_format)
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9403 retval = vals;
11456 fbdb95640852 get: return empty matrix if no values are found John W. Eaton <jwe@octave.org> parents: 11455 diff changeset	9404 else
13955 ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9405 {
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9406 octave_idx_type len = vals.numel ();
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9407
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9408 if (len == 0)
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9409 retval = Matrix ();
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9410 else if (len == 1)
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9411 retval = vals(0);
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9412 else if (len > 1 && nargin == 1)
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9413 {
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9414 OCTAVE_LOCAL_BUFFER (octave_scalar_map, tmp, len);
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9415
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9416 for (octave_idx_type n = 0; n < len; n++)
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9417 tmp[n] = vals(n).scalar_map_value ();
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9418
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9419 retval = octave_map::cat (0, len, tmp);
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9420 }
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9421 else
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9422 retval = vals;
ffbbe6719ef5 Implement support for cellstr argument in get() function. Michael Goffioul <michael.goffioul@gmail.com> parents: 13940 diff changeset	9423 }
6732 4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9424 }
4ba39e63b005 [project @ 2007-06-15 18:07:29 by jwe] jwe parents: 6727 diff changeset	9425
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9426 return retval;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9427 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9428
11456 fbdb95640852 get: return empty matrix if no values are found John W. Eaton <jwe@octave.org> parents: 11455 diff changeset	9429 /*
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14413 diff changeset	9430 %!assert (get (findobj (0, "Tag", "nonexistenttag"), "nonexistentproperty"), [])
11456 fbdb95640852 get: return empty matrix if no values are found John W. Eaton <jwe@octave.org> parents: 11455 diff changeset	9431 */
fbdb95640852 get: return empty matrix if no values are found John W. Eaton <jwe@octave.org> parents: 11455 diff changeset	9432
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8740 diff changeset	9433 // Return all properties from the graphics handle @var{h}.
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8740 diff changeset	9434 // If @var{h} is a vector, return a cell array including the
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8740 diff changeset	9435 // property values or lists respectively.
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8740 diff changeset	9436
7379 a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9437 DEFUN (__get__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9438 "-- texinfo --\n\
7379 a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9439 @deftypefn {Built-in Function} {} __get__ (@var{h})\n\
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8740 diff changeset	9440 Undocumented internal function.\n\
7379 a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9441 @end deftypefn")
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9442 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9443 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	9444
7379 a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9445 octave_value retval;
8896 f155e9d1f086 graphics.cc (Fget, F__get__): return column vector, not row vector John W. Eaton <jwe@octave.org> parents: 8812 diff changeset	9446
f155e9d1f086 graphics.cc (Fget, F__get__): return column vector, not row vector John W. Eaton <jwe@octave.org> parents: 8812 diff changeset	9447 Cell vals;
7379 a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9448
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9449 int nargin = args.length ();
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9450
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9451 if (nargin == 1)
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9452 {
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9453 ColumnVector hcv (args(0).vector_value ());
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9454
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9455 if (! error_state)
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9456 {
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9457 octave_idx_type len = hcv.length ();
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9458
8896 f155e9d1f086 graphics.cc (Fget, F__get__): return column vector, not row vector John W. Eaton <jwe@octave.org> parents: 8812 diff changeset	9459 vals.resize (dim_vector (len, 1));
7379 a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9460
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9461 for (octave_idx_type n = 0; n < len; n++)
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9462 {
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9463 graphics_object obj = gh_manager::get_object (hcv(n));
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9464
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9465 if (obj)
8896 f155e9d1f086 graphics.cc (Fget, F__get__): return column vector, not row vector John W. Eaton <jwe@octave.org> parents: 8812 diff changeset	9466 vals(n) = obj.get (true);
7379 a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9467 else
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9468 {
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9469 error ("get: invalid handle (= %g)", hcv(n));
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9470 break;
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9471 }
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9472 }
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9473 }
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9474 else
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9475 error ("get: expecting graphics handle as first argument");
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9476 }
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9477 else
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9478 print_usage ();
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9479
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9480 if (! error_state)
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9481 {
8896 f155e9d1f086 graphics.cc (Fget, F__get__): return column vector, not row vector John W. Eaton <jwe@octave.org> parents: 8812 diff changeset	9482 octave_idx_type len = vals.numel ();
7379 a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9483
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9484 if (len > 1)
8896 f155e9d1f086 graphics.cc (Fget, F__get__): return column vector, not row vector John W. Eaton <jwe@octave.org> parents: 8812 diff changeset	9485 retval = vals;
7379 a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9486 else if (len == 1)
8896 f155e9d1f086 graphics.cc (Fget, F__get__): return column vector, not row vector John W. Eaton <jwe@octave.org> parents: 8812 diff changeset	9487 retval = vals(0);
7379 a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9488 }
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9489
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9490 return retval;
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9491 }
a78c7bccda91 [project @ 2008-01-15 18:42:29 by jwe] jwe parents: 7378 diff changeset	9492
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9493 static octave_value
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9494 make_graphics_object (const std::string& go_name,
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9495 bool integer_figure_handle,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9496 const octave_value_list& args)
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9497 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9498 octave_value retval;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9499
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9500 double val = octave_NaN;
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9501
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9502 octave_value_list xargs = args.splice (0, 1);
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9503
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9504 caseless_str p ("parent");
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9505
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9506 for (int i = 0; i < xargs.length (); i++)
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9507 if (xargs(i).is_string ()
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9508 && p.compare (xargs(i).string_value ()))
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9509 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9510 if (i < (xargs.length () - 1))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9511 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9512 val = xargs(i+1).double_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9513
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9514 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9515 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9516 xargs = xargs.splice (i, 2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9517 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9518 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9519 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9520 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9521 error ("__go_%s__: missing value for parent property",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9522 go_name.c_str ());
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9523 }
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9524
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9525 if (! error_state && xisnan (val))
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9526 val = args(0).double_value ();
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9527
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9528 if (! error_state)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9529 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9530 graphics_handle parent = gh_manager::lookup (val);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9531
7056 2002804df782 [project @ 2007-10-24 00:32:44 by jwe] jwe parents: 7030 diff changeset	9532 if (parent.ok ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9533 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9534 graphics_handle h
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9535 = gh_manager::make_graphics_handle (go_name, parent,
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9536 integer_figure_handle,
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9537 false, false);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9538
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9539 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9540 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9541 adopt (parent, h);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9542
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9543 xset (h, xargs);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9544 xcreatefcn (h);
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9545 xinitialize (h);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9546
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9547 retval = h.value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9548
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9549 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9550 Vdrawnow_requested = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9551 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9552 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9553 error ("__go%s__: unable to create graphics handle",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9554 go_name.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9555 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9556 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9557 error ("__go_%s__: invalid parent", go_name.c_str ());
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9558 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9559 else
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9560 error ("__go_%s__: invalid parent", go_name.c_str ());
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9561
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9562 return retval;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9563 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9564
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9565 DEFUN (__go_figure__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9566 "-- texinfo --\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9567 @deftypefn {Built-in Function} {} __go_figure__ (@var{fignum})\n\
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6938 diff changeset	9568 Undocumented internal function.\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9569 @end deftypefn")
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9570 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9571 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	9572
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9573 octave_value retval;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9574
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9575 if (args.length () > 0)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9576 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9577 double val = args(0).double_value ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9578
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9579 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9580 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9581 if (is_figure (val))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9582 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9583 graphics_handle h = gh_manager::lookup (val);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9584
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9585 xset (h, args.splice (0, 1));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9586
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9587 retval = h.value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9588 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9589 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9590 {
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9591 bool int_fig_handle = true;
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9592
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9593 octave_value_list xargs = args.splice (0, 1);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9594
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9595 graphics_handle h = octave_NaN;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9596
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9597 if (xisnan (val))
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9598 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9599 caseless_str p ("integerhandle");
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9600
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9601 for (int i = 0; i < xargs.length (); i++)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9602 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9603 if (xargs(i).is_string ()
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9604 && p.compare (xargs(i).string_value ()))
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9605 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9606 if (i < (xargs.length () - 1))
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9607 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9608 std::string pval = xargs(i+1).string_value ();
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9609
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9610 if (! error_state)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9611 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9612 caseless_str on ("on");
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9613 int_fig_handle = on.compare (pval);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9614 xargs = xargs.splice (i, 2);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9615 break;
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9616 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9617 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9618 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9619 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9620
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9621 h = gh_manager::make_graphics_handle ("figure", 0,
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9622 int_fig_handle,
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9623 false, false);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9624
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9625 if (! int_fig_handle)
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9626 {
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9627 // We need to intiailize the integerhandle
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9628 // property without calling the set_integerhandle
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9629 // method, because doing that will generate a new
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9630 // handle value...
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9631
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9632 graphics_object go = gh_manager::get_object (h);
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9633 go.get_properties ().init_integerhandle ("off");
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9634 }
7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9635 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9636 else if (val > 0 && D_NINT (val) == val)
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9637 h = gh_manager::make_figure_handle (val, false);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9638
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9639 if (! error_state && h.ok ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9640 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9641 adopt (0, h);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9642
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9643 gh_manager::push_figure (h);
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9644
13816 7ee18dc46bbb new and improved non-integer figure handles John W. Eaton <jwe@octave.org> parents: 13804 diff changeset	9645 xset (h, xargs);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9646 xcreatefcn (h);
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9647 xinitialize (h);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9648
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9649 retval = h.value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9650 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9651 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9652 error ("__go_figure__: failed to create figure handle");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9653 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9654 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9655 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9656 error ("__go_figure__: expecting figure number to be double value");
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9657 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9658 else
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9659 print_usage ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9660
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9661 return retval;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9662 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9663
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9664 #define GO_BODY(TYPE) \
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9665 gh_manager::auto_lock guard; \
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	9666 \
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9667 octave_value retval; \
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9668 \
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9669 if (args.length () > 0) \
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9670 retval = make_graphics_object (#TYPE, false, args); \
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9671 else \
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9672 print_usage (); \
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9673 \
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9674 return retval
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9675
10917 888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9676 int
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9677 calc_dimensions (const graphics_object& go)
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9678 {
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9679
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9680 int nd = 2;
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9681
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9682 if (go.isa ("surface"))
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9683 nd = 3;
17564 234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9684 else if ((go.isa ("line") \|\| go.isa ("patch"))
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9685 && ! go.get ("zdata").is_empty ())
10917 888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9686 nd = 3;
17564 234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9687 else
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9688 {
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9689 Matrix kids = go.get_properties ().get_children ();
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9690
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9691 for (octave_idx_type i = 0; i < kids.length (); i++)
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9692 {
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9693 graphics_handle hnd = gh_manager::lookup (kids(i));
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9694
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9695 if (hnd.ok ())
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9696 {
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9697 const graphics_object& kid = gh_manager::get_object (hnd);
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9698
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9699 if (kid.valid_object ())
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9700 nd = calc_dimensions (kid);
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9701
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9702 if (nd == 3)
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9703 break;
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9704 }
10917 888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9705 }
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9706 }
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9707
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9708 return nd;
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9709 }
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9710
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9711 DEFUN (__calc_dimensions__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9712 "-- texinfo --\n\
10917 888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9713 @deftypefn {Built-in Function} {} __calc_dimensions__ (@var{axes})\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	9714 Internal function. Determine the number of dimensions in a graphics\n\
10917 888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9715 object, whether 2 or 3.\n\
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9716 @end deftypefn")
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9717 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9718 gh_manager::auto_lock guard;
10917 888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9719
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9720 octave_value retval;
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9721
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9722 int nargin = args.length ();
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9723
17564 234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9724 if (nargin != 1)
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9725 print_usage ();
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9726
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9727 double h = args(0).double_value ();
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9728
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9729 if (! error_state)
234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9730 retval = calc_dimensions (gh_manager::get_object (h));
10917 888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9731 else
17564 234731d524c2 axis.m: Fix 'axis tight' with pcolor plots. Rik <rik@octave.org> parents: 17544 diff changeset	9732 error ("__calc_dimensions__: expecting graphics handle as only argument");
10917 888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9733
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9734 return retval;
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9735 }
888c75785221 Improvements to FLTK backend rotation Jordi Guti?rrez Hermoso <jordigh@gmail.com> parents: 10846 diff changeset	9736
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9737 DEFUN (__go_axes__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9738 "-- texinfo --\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9739 @deftypefn {Built-in Function} {} __go_axes__ (@var{parent})\n\
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6938 diff changeset	9740 Undocumented internal function.\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9741 @end deftypefn")
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9742 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9743 GO_BODY (axes);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9744 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9745
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9746 DEFUN (__go_line__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9747 "-- texinfo --\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9748 @deftypefn {Built-in Function} {} __go_line__ (@var{parent})\n\
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6938 diff changeset	9749 Undocumented internal function.\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9750 @end deftypefn")
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9751 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9752 GO_BODY (line);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9753 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9754
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9755 DEFUN (__go_text__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9756 "-- texinfo --\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9757 @deftypefn {Built-in Function} {} __go_text__ (@var{parent})\n\
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6938 diff changeset	9758 Undocumented internal function.\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9759 @end deftypefn")
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9760 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9761 GO_BODY (text);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9762 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9763
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9764 DEFUN (__go_image__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9765 "-- texinfo --\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9766 @deftypefn {Built-in Function} {} __go_image__ (@var{parent})\n\
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6938 diff changeset	9767 Undocumented internal function.\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9768 @end deftypefn")
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9769 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9770 GO_BODY (image);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9771 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9772
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9773 DEFUN (__go_surface__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9774 "-- texinfo --\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9775 @deftypefn {Built-in Function} {} __go_surface__ (@var{parent})\n\
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6938 diff changeset	9776 Undocumented internal function.\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9777 @end deftypefn")
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9778 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9779 GO_BODY (surface);
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9780 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9781
6807 0089a504fdd6 [project @ 2007-08-10 17:34:59 by jwe] jwe parents: 6790 diff changeset	9782 DEFUN (__go_patch__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9783 "-- texinfo --\n\
6807 0089a504fdd6 [project @ 2007-08-10 17:34:59 by jwe] jwe parents: 6790 diff changeset	9784 @deftypefn {Built-in Function} {} __go_patch__ (@var{parent})\n\
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6938 diff changeset	9785 Undocumented internal function.\n\
6807 0089a504fdd6 [project @ 2007-08-10 17:34:59 by jwe] jwe parents: 6790 diff changeset	9786 @end deftypefn")
0089a504fdd6 [project @ 2007-08-10 17:34:59 by jwe] jwe parents: 6790 diff changeset	9787 {
0089a504fdd6 [project @ 2007-08-10 17:34:59 by jwe] jwe parents: 6790 diff changeset	9788 GO_BODY (patch);
0089a504fdd6 [project @ 2007-08-10 17:34:59 by jwe] jwe parents: 6790 diff changeset	9789 }
0089a504fdd6 [project @ 2007-08-10 17:34:59 by jwe] jwe parents: 6790 diff changeset	9790
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9791 DEFUN (__go_hggroup__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9792 "-- texinfo --\n\
7865 b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9793 @deftypefn {Built-in Function} {} __go_hggroup__ (@var{parent})\n\
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9794 Undocumented internal function.\n\
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9795 @end deftypefn")
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9796 {
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9797 GO_BODY (hggroup);
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9798 }
b74039822fd2 Add support for hggroup Michael Goffioul <michael.goffioul@gmail.com> parents: 7864 diff changeset	9799
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11076 diff changeset	9800 DEFUN (__go_uimenu__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9801 "-- texinfo --\n\
11155 f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11076 diff changeset	9802 @deftypefn {Built-in Function} {} __go_uimenu__ (@var{parent})\n\
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11076 diff changeset	9803 Undocumented internal function.\n\
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11076 diff changeset	9804 @end deftypefn")
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11076 diff changeset	9805 {
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11076 diff changeset	9806 GO_BODY (uimenu);
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11076 diff changeset	9807 }
f0e9befd6a1c add uimenu graphic object to fltk backend Kai Habel <kai.habel@gmx.de> parents: 11076 diff changeset	9808
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9809 DEFUN (__go_uicontrol__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9810 "-- texinfo --\n\
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9811 @deftypefn {Built-in Function} {} __go_uicontrol__ (@var{parent})\n\
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9812 Undocumented internal function.\n\
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9813 @end deftypefn")
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9814 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9815 GO_BODY (uicontrol);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9816 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9817
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9818 DEFUN (__go_uipanel__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9819 "-- texinfo --\n\
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9820 @deftypefn {Built-in Function} {} __go_uipanel__ (@var{parent})\n\
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9821 Undocumented internal function.\n\
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9822 @end deftypefn")
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9823 {
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9824 GO_BODY (uipanel);
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9825 }
834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9826
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9827 DEFUN (__go_uicontextmenu__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9828 "-- texinfo --\n\
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9829 @deftypefn {Built-in Function} {} __go_uicontextmenu__ (@var{parent})\n\
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9830 Undocumented internal function.\n\
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9831 @end deftypefn")
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9832 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9833 GO_BODY (uicontextmenu);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9834 }
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9835
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9836 DEFUN (__go_uitoolbar__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9837 "-- texinfo --\n\
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9838 @deftypefn {Built-in Function} {} __go_uitoolbar__ (@var{parent})\n\
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9839 Undocumented internal function.\n\
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9840 @end deftypefn")
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9841 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9842 GO_BODY (uitoolbar);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9843 }
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9844
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9845 DEFUN (__go_uipushtool__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9846 "-- texinfo --\n\
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9847 @deftypefn {Built-in Function} {} __go_uipushtool__ (@var{parent})\n\
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9848 Undocumented internal function.\n\
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9849 @end deftypefn")
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9850 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9851 GO_BODY (uipushtool);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9852 }
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9853
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9854 DEFUN (__go_uitoggletool__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9855 "-- texinfo --\n\
13703 22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9856 @deftypefn {Built-in Function} {} __go_uitoggletool__ (@var{parent})\n\
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9857 Undocumented internal function.\n\
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9858 @end deftypefn")
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9859 {
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9860 GO_BODY (uitoggletool);
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9861 }
22ce748da25f Add missing UI objects: uicontextmenu, uitoolbar, uipushtool and uitoggletool. Michael Goffioul <michael.goffioul@gmail.com> parents: 13327 diff changeset	9862
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9863 DEFUN (__go_delete__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9864 "-- texinfo --\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9865 @deftypefn {Built-in Function} {} __go_delete__ (@var{h})\n\
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6938 diff changeset	9866 Undocumented internal function.\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9867 @end deftypefn")
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9868 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9869 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	9870
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9871 octave_value_list retval;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9872
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9873 if (args.length () == 1)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9874 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9875 graphics_handle h = octave_NaN;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9876
18111 b560bac0fca2 maint: Don't use space between 'args' and '(' when doing indexing. Rik <rik@octave.org> parents: 18099 diff changeset	9877 const NDArray vals = args(0).array_value ();
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9878
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9879 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9880 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9881 // Check is all the handles to delete are valid first
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9882 // as callbacks might delete one of the handles we
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9883 // later want to delete
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9884 for (octave_idx_type i = 0; i < vals.numel (); i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9885 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9886 h = gh_manager::lookup (vals.elem (i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9887
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9888 if (! h.ok ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9889 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	9890 error ("delete: invalid graphics object (= %g)",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9891 vals.elem (i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9892 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9893 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9894 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9895
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9896 if (! error_state)
14014 907d03def9d5 explicitly close figures in clean_up_and_exit instead of using an atexit function John W. Eaton <jwe@octave.org> parents: 14006 diff changeset	9897 delete_graphics_objects (vals);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9898 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9899 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9900 error ("delete: invalid graphics object");
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9901 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9902 else
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9903 print_usage ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9904
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9905 return retval;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9906 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9907
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9908 DEFUN (__go_axes_init__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9909 "-- texinfo --\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9910 @deftypefn {Built-in Function} {} __go_axes_init__ (@var{h}, @var{mode})\n\
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6938 diff changeset	9911 Undocumented internal function.\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9912 @end deftypefn")
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9913 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9914 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	9915
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9916 octave_value retval;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9917
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9918 int nargin = args.length ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9919
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9920 std::string mode = "";
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9921
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9922 if (nargin == 2)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9923 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9924 mode = args(1).string_value ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9925
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9926 if (error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9927 return retval;
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9928 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9929
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9930 if (nargin == 1 \|\| nargin == 2)
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9931 {
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9932 graphics_handle h = octave_NaN;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9933
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9934 double val = args(0).double_value ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9935
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9936 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9937 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9938 h = gh_manager::lookup (val);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9939
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9940 if (h.ok ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9941 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9942 graphics_object obj = gh_manager::get_object (h);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9943
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9944 obj.set_defaults (mode);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9945
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9946 h = gh_manager::lookup (val);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9947 if (! h.ok ())
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9948 error ("__go_axes_init__: axis deleted during initialization (= %g)",
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9949 val);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9950 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9951 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9952 error ("__go_axes_init__: invalid graphics object (= %g)", val);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9953 }
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9954 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	9955 error ("__go_axes_init__: invalid graphics object");
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9956 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9957 else
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9958 print_usage ();
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9959
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9960 return retval;
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9961 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9962
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9963 DEFUN (__go_handles__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9964 "-- texinfo --\n\
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9965 @deftypefn {Built-in Function} {} __go_handles__ (@var{show_hidden})\n\
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6938 diff changeset	9966 Undocumented internal function.\n\
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9967 @end deftypefn")
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9968 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9969 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	9970
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9971 bool show_hidden = false;
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9972
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9973 if (args.length () > 0)
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9974 show_hidden = args(0).bool_value ();
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9975
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9976 return octave_value (gh_manager::handle_list (show_hidden));
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9977 }
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9978
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9979 DEFUN (__go_figure_handles__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9980 "-- texinfo --\n\
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9981 @deftypefn {Built-in Function} {} __go_figure_handles__ (@var{show_hidden})\n\
6945 6bbf56a9718a [project @ 2007-10-02 20:47:22 by jwe] jwe parents: 6938 diff changeset	9982 Undocumented internal function.\n\
6425 0cc5ca7b1e91 [project @ 2007-03-21 15:57:19 by jwe] jwe parents: 6424 diff changeset	9983 @end deftypefn")
0cc5ca7b1e91 [project @ 2007-03-21 15:57:19 by jwe] jwe parents: 6424 diff changeset	9984 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	9985 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	9986
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9987 bool show_hidden = false;
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9988
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9989 if (args.length () > 0)
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9990 show_hidden = args(0).bool_value ();
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9991
195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	9992 return octave_value (gh_manager::figure_handle_list (show_hidden));
6406 f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9993 }
f7c06f96bd18 [project @ 2007-03-14 18:26:00 by jwe] jwe parents: diff changeset	9994
7967 6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	9995 DEFUN (__go_execute_callback__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	9996 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10792 diff changeset	9997 @deftypefn {Built-in Function} {} __go_execute_callback__ (@var{h}, @var{name})\n\
7967 6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	9998 @deftypefnx {Built-in Function} {} __go_execute_callback__ (@var{h}, @var{name}, @var{param})\n\
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	9999 Undocumented internal function.\n\
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10000 @end deftypefn")
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10001 {
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10002 octave_value retval;
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10003
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10004 int nargin = args.length ();
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10005
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10006 if (nargin == 2 \|\| nargin == 3)
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10007 {
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10008 double val = args(0).double_value ();
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10009
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10010 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10011 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10012 graphics_handle h = gh_manager::lookup (val);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10013
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10014 if (h.ok ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10015 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10016 std::string name = args(1).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10017
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10018 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10019 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10020 if (nargin == 2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10021 gh_manager::execute_callback (h, name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10022 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10023 gh_manager::execute_callback (h, name, args(2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10024 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10025 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10026 error ("__go_execute_callback__: invalid callback name");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10027 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10028 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10029 error ("__go_execute_callback__: invalid graphics object (= %g)",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10030 val);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10031 }
7967 6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10032 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10033 error ("__go_execute_callback__: invalid graphics object");
7967 6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10034 }
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10035 else
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10036 print_usage ();
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10037
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10038 return retval;
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10039 }
6add0f974aee Add __go_execute_callback__ John W. Eaton <jwe@octave.org> parents: 7964 diff changeset	10040
11076 b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10041 DEFUN (__image_pixel_size__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10042 "-- texinfo --\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	10043 @deftypefn {Built-in Function} {@var{px}, @var{py}} __image_pixel_size__ (@var{h})\n\
11076 b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10044 Internal function: returns the pixel size of the image in normalized units.\n\
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10045 @end deftypefn")
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10046 {
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10047 octave_value retval;
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10048
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10049 int nargin = args.length ();
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10050
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10051 if (nargin == 1)
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10052 {
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10053 double h = args(0).double_value ();
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10054
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10055 if (! error_state)
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10056 {
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10057 graphics_object fobj = gh_manager::get_object (h);
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10058 if (fobj && fobj.isa ("image"))
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10059 {
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10060 image::properties& ip =
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10061 dynamic_cast<image::properties&> (fobj.get_properties ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11576 diff changeset	10062
11076 b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10063 Matrix dp = Matrix (1, 2, 0);
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10064 dp(0, 0) = ip.pixel_xsize ();
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10065 dp(0, 1) = ip.pixel_ysize ();
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10066 retval = dp;
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10067 }
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10068 else
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10069 error ("__image_pixel_size__: object is not an image");
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10070 }
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10071 else
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10072 error ("__image_pixel_size__: argument is not a handle");
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10073 }
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10074 else
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10075 print_usage ();
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10076
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10077 return retval;
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10078 }
b748b86cb8c1 fix images with width or height of 1 Shai Ayal <shaiay@users.sourceforge.net> parents: 11074 diff changeset	10079
14021 e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10080 gtk_manager *gtk_manager::instance = 0;
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10081
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10082 void
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10083 gtk_manager::create_instance (void)
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10084 {
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10085 instance = new gtk_manager ();
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10086
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10087 if (instance)
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10088 singleton_cleanup_list::add (cleanup_instance);
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10089 }
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10090
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10091 graphics_toolkit
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10092 gtk_manager::do_get_toolkit (void) const
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10093 {
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10094 graphics_toolkit retval;
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10095
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10096 const_loaded_toolkits_iterator pl = loaded_toolkits.find (dtk);
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10097
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10098 if (pl == loaded_toolkits.end ())
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10099 {
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10100 const_available_toolkits_iterator pa = available_toolkits.find (dtk);
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10101
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10102 if (pa != available_toolkits.end ())
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10103 {
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10104 octave_value_list args;
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10105 args(0) = dtk;
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10106 feval ("graphics_toolkit", args);
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10107
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10108 if (! error_state)
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10109 pl = loaded_toolkits.find (dtk);
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10110
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10111 if (error_state \|\| pl == loaded_toolkits.end ())
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10112 error ("failed to load %s graphics toolkit", dtk.c_str ());
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10113 else
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10114 retval = pl->second;
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10115 }
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10116 else
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14325 diff changeset	10117 error ("default graphics toolkit '%s' is not available!",
14021 e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10118 dtk.c_str ());
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10119 }
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10120 else
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10121 retval = pl->second;
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10122
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10123 return retval;
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10124 }
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10125
18571 ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10126 void
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10127 gtk_manager::do_register_toolkit (const std::string& name)
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10128 {
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10129 if (dtk.empty () \|\| name == "qt"
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10130 \|\| (name == "fltk"
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10131 && available_toolkits.find ("qt") == available_toolkits.end ()))
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10132 dtk = name;
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10133
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10134 available_toolkits.insert (name);
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10135 }
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10136
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10137 void
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10138 gtk_manager::do_unregister_toolkit (const std::string& name)
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10139 {
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10140 available_toolkits.erase (name);
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10141
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10142 if (dtk == name)
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10143 {
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10144 if (available_toolkits.empty ())
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10145 dtk.clear ();
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10146 else
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10147 {
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10148 const_available_toolkits_iterator pa = available_toolkits.begin ();
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10149
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10150 dtk = *pa++;
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10151
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10152 while (pa != available_toolkits.end ())
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10153 {
18714 ee7b23a48947 Clean up a few compiler warnings. Rik <rik@octave.org> parents: 18711 diff changeset	10154 std::string tk_name = *pa++;
ee7b23a48947 Clean up a few compiler warnings. Rik <rik@octave.org> parents: 18711 diff changeset	10155
ee7b23a48947 Clean up a few compiler warnings. Rik <rik@octave.org> parents: 18711 diff changeset	10156 if (tk_name == "qt"
ee7b23a48947 Clean up a few compiler warnings. Rik <rik@octave.org> parents: 18711 diff changeset	10157 \|\| (tk_name == "fltk"
ee7b23a48947 Clean up a few compiler warnings. Rik <rik@octave.org> parents: 18711 diff changeset	10158 && available_toolkits.find ("qt")
ee7b23a48947 Clean up a few compiler warnings. Rik <rik@octave.org> parents: 18711 diff changeset	10159 == available_toolkits.end ()))
ee7b23a48947 Clean up a few compiler warnings. Rik <rik@octave.org> parents: 18711 diff changeset	10160 dtk = tk_name;
18571 ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10161 }
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10162 }
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10163 }
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10164 }
ca1648b2e673 set default toolkit when registering toolkits (bug #41665). Michael C. Grant <mcg@cvxr.com> and John W. Eaton <jwe@octave.org> parents: 18498 diff changeset	10165
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	10166 DEFUN (available_graphics_toolkits, , ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10167 "-- texinfo --\n\
12215 4ae2a74ed04c Add fltk_gui_mode, fltk_mouse_wheel_zoom to documentation. Rik <octave@nomad.inbox5.com> parents: 12189 diff changeset	10168 @deftypefn {Built-in Function} {} available_graphics_toolkits ()\n\
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	10169 Return a cell array of registered graphics toolkits.\n\
14134 84f38aeb9f0e doc: Add register_graphics_toolkit() and loaded_graphics_toolkits() to documentation Rik <octave@nomad.inbox5.com> parents: 14062 diff changeset	10170 @seealso{graphics_toolkit, register_graphics_toolkit}\n\
7835 ca8b97bb952c added the function available_backends Shai Ayal <shaiay@sourceforge.net> parents: 7833 diff changeset	10171 @end deftypefn")
ca8b97bb952c added the function available_backends Shai Ayal <shaiay@sourceforge.net> parents: 7833 diff changeset	10172 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	10173 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	10174
14021 e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10175 return octave_value (gtk_manager::available_toolkits_list ());
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10176 }
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10177
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10178 DEFUN (register_graphics_toolkit, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10179 "-- texinfo --\n\
14021 e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10180 @deftypefn {Built-in Function} {} register_graphics_toolkit (@var{toolkit})\n\
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10181 List @var{toolkit} as an available graphics toolkit.\n\
14134 84f38aeb9f0e doc: Add register_graphics_toolkit() and loaded_graphics_toolkits() to documentation Rik <octave@nomad.inbox5.com> parents: 14062 diff changeset	10182 @seealso{available_graphics_toolkits}\n\
14021 e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10183 @end deftypefn")
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10184 {
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10185 octave_value retval;
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10186
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10187 gh_manager::auto_lock guard;
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10188
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10189 if (args.length () == 1)
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10190 {
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10191 std::string name = args(0).string_value ();
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10192
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10193 if (! error_state)
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10194 gtk_manager::register_toolkit (name);
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10195 else
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10196 error ("register_graphics_toolkit: expecting character string");
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10197 }
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10198 else
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10199 print_usage ();
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10200
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10201 return retval;
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10202 }
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10203
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10204 DEFUN (loaded_graphics_toolkits, , ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10205 "-- texinfo --\n\
14021 e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10206 @deftypefn {Built-in Function} {} loaded_graphics_toolkits ()\n\
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10207 Return a cell array of the currently loaded graphics toolkits.\n\
14134 84f38aeb9f0e doc: Add register_graphics_toolkit() and loaded_graphics_toolkits() to documentation Rik <octave@nomad.inbox5.com> parents: 14062 diff changeset	10208 @seealso{available_graphics_toolkits}\n\
14021 e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10209 @end deftypefn")
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10210 {
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10211 gh_manager::auto_lock guard;
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10212
e3bed294b117 refactor graphics_toolkit class (bug #31583) John W. Eaton <jwe@octave.org> parents: 14016 diff changeset	10213 return octave_value (gtk_manager::loaded_toolkits_list ());
7835 ca8b97bb952c added the function available_backends Shai Ayal <shaiay@sourceforge.net> parents: 7833 diff changeset	10214 }
ca8b97bb952c added the function available_backends Shai Ayal <shaiay@sourceforge.net> parents: 7833 diff changeset	10215
7408 246f905cb984 [project @ 2008-01-22 19:42:47 by jwe] jwe parents: 7403 diff changeset	10216 DEFUN (drawnow, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10217 "-- texinfo --\n\
9316 c539ec5726e7 Update some of Advanced Plotting documentation. Rik <rdrider0-list@yahoo.com> parents: 9311 diff changeset	10218 @deftypefn {Built-in Function} {} drawnow ()\n\
c539ec5726e7 Update some of Advanced Plotting documentation. Rik <rdrider0-list@yahoo.com> parents: 9311 diff changeset	10219 @deftypefnx {Built-in Function} {} drawnow (\"expose\")\n\
c539ec5726e7 Update some of Advanced Plotting documentation. Rik <rdrider0-list@yahoo.com> parents: 9311 diff changeset	10220 @deftypefnx {Built-in Function} {} drawnow (@var{term}, @var{file}, @var{mono}, @var{debug_file})\n\
c539ec5726e7 Update some of Advanced Plotting documentation. Rik <rdrider0-list@yahoo.com> parents: 9311 diff changeset	10221 Update figure windows and their children. The event queue is flushed and\n\
c539ec5726e7 Update some of Advanced Plotting documentation. Rik <rdrider0-list@yahoo.com> parents: 9311 diff changeset	10222 any callbacks generated are executed. With the optional argument\n\
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17269 diff changeset	10223 @qcode{\"expose\"}, only graphic objects are updated and no other events or\n\
9316 c539ec5726e7 Update some of Advanced Plotting documentation. Rik <rdrider0-list@yahoo.com> parents: 9311 diff changeset	10224 callbacks are processed.\n\
c539ec5726e7 Update some of Advanced Plotting documentation. Rik <rdrider0-list@yahoo.com> parents: 9311 diff changeset	10225 The third calling form of @code{drawnow} is for debugging and is\n\
c539ec5726e7 Update some of Advanced Plotting documentation. Rik <rdrider0-list@yahoo.com> parents: 9311 diff changeset	10226 undocumented.\n\
7408 246f905cb984 [project @ 2008-01-22 19:42:47 by jwe] jwe parents: 7403 diff changeset	10227 @end deftypefn")
246f905cb984 [project @ 2008-01-22 19:42:47 by jwe] jwe parents: 7403 diff changeset	10228 {
246f905cb984 [project @ 2008-01-22 19:42:47 by jwe] jwe parents: 7403 diff changeset	10229 static int drawnow_executing = 0;
246f905cb984 [project @ 2008-01-22 19:42:47 by jwe] jwe parents: 7403 diff changeset	10230
246f905cb984 [project @ 2008-01-22 19:42:47 by jwe] jwe parents: 7403 diff changeset	10231 octave_value retval;
246f905cb984 [project @ 2008-01-22 19:42:47 by jwe] jwe parents: 7403 diff changeset	10232
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	10233 gh_manager::lock ();
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	10234
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10056 diff changeset	10235 unwind_protect frame;
2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10056 diff changeset	10236 frame.protect_var (Vdrawnow_requested, false);
2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10056 diff changeset	10237
2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10056 diff changeset	10238 frame.protect_var (drawnow_executing);
7409 73036cdd855d [project @ 2008-01-22 20:31:59 by jwe] jwe parents: 7408 diff changeset	10239
73036cdd855d [project @ 2008-01-22 20:31:59 by jwe] jwe parents: 7408 diff changeset	10240 if (++drawnow_executing <= 1)
7408 246f905cb984 [project @ 2008-01-22 19:42:47 by jwe] jwe parents: 7403 diff changeset	10241 {
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	10242 if (args.length () == 0 \|\| args.length () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10243 {
13801 195ff3561152 allow figure handles to be non-integers John W. Eaton <jwe@octave.org> parents: 13799 diff changeset	10244 Matrix hlist = gh_manager::figure_handle_list (true);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10245
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10246 for (int i = 0; ! error_state && i < hlist.length (); i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10247 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10248 graphics_handle h = gh_manager::lookup (hlist(i));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10249
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10250 if (h.ok () && h != 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10251 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10252 graphics_object go = gh_manager::get_object (h);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10253 figure::properties& fprops
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10254 = dynamic_cast <figure::properties&> (go.get_properties ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10255
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10256 if (fprops.is_modified ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10257 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10258 if (fprops.is_visible ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10259 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10260 gh_manager::unlock ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10261
11576 8ac9687dbe9f rename backend to graphics_toolkit John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	10262 fprops.get_toolkit ().redraw_figure (go);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10263
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10264 gh_manager::lock ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10265 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10266
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10267 fprops.set_modified (false);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10268 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10269 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10270 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10271
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10272 bool do_events = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10273
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10274 if (args.length () == 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10275 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10276 caseless_str val (args(0).string_value ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10277
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10278 if (! error_state && val.compare ("expose"))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10279 do_events = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10280 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10281 {
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14325 diff changeset	10282 error ("drawnow: invalid argument, expected 'expose' as argument");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10283 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10284 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10285 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10286
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10287 if (do_events)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10288 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10289 gh_manager::unlock ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10290
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10291 gh_manager::process_events ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10292
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10293 gh_manager::lock ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10294 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10295 }
7409 73036cdd855d [project @ 2008-01-22 20:31:59 by jwe] jwe parents: 7408 diff changeset	10296 else if (args.length () >= 2 && args.length () <= 4)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10297 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10298 std::string term, file, debug_file;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10299 bool mono;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10300
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10301 term = args(0).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10302
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10303 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10304 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10305 file = args(1).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10306
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10307 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10308 {
12449 2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10309 size_t pos = file.find_first_not_of ("\|");
2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10310 if (pos > 0)
2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10311 file = file.substr (pos);
2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10312 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10313 {
12449 2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10314 pos = file.find_last_of (file_ops::dir_sep_chars ());
2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10315
2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10316 if (pos != std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10317 {
12449 2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10318 std::string dirname = file.substr (0, pos+1);
2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10319
2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10320 file_stat fs (dirname);
2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10321
2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10322 if (! (fs && fs.is_dir ()))
2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10323 {
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14325 diff changeset	10324 error ("drawnow: nonexistent directory '%s'",
12449 2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10325 dirname.c_str ());
2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10326
2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10327 return retval;
2f0d1e12806d invoke/terminate printing process synchronously with rendering (#32319) Konstantinos Poulios <logari81@gmail.com> parents: 12445 diff changeset	10328 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10329 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10330 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10331
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10332 mono = (args.length () >= 3 ? args(2).bool_value () : false);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10333
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10334 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10335 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10336 debug_file = (args.length () > 3 ? args(3).string_value ()
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10337 : "");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10338
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10339 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10340 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10341 graphics_handle h = gcf ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10342
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10343 if (h.ok ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10344 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10345 graphics_object go = gh_manager::get_object (h);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10346
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10347 gh_manager::unlock ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10348
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10349 go.get_toolkit ().print_figure (go, term, file,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10350 mono, debug_file);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10351
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10352 gh_manager::lock ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10353 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10354 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10355 error ("drawnow: nothing to draw");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10356 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10357 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12467 diff changeset	10358 error ("drawnow: invalid DEBUG_FILE, expected a string value");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10359 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10360 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12467 diff changeset	10361 error ("drawnow: invalid colormode MONO, expected a boolean value");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10362 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10363 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12467 diff changeset	10364 error ("drawnow: invalid FILE, expected a string value");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10365 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10366 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12467 diff changeset	10367 error ("drawnow: invalid terminal TERM, expected a string value");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10368 }
7408 246f905cb984 [project @ 2008-01-22 19:42:47 by jwe] jwe parents: 7403 diff changeset	10369 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10370 print_usage ();
7408 246f905cb984 [project @ 2008-01-22 19:42:47 by jwe] jwe parents: 7403 diff changeset	10371 }
7409 73036cdd855d [project @ 2008-01-22 20:31:59 by jwe] jwe parents: 7408 diff changeset	10372
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	10373 gh_manager::unlock ();
78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	10374
7408 246f905cb984 [project @ 2008-01-22 19:42:47 by jwe] jwe parents: 7403 diff changeset	10375 return retval;
246f905cb984 [project @ 2008-01-22 19:42:47 by jwe] jwe parents: 7403 diff changeset	10376 }
246f905cb984 [project @ 2008-01-22 19:42:47 by jwe] jwe parents: 7403 diff changeset	10377
7859 fdd465b00ec0 Rename add_listener to addlistener. Michael Goffioul <michael.goffioul@gmail.com> parents: 7857 diff changeset	10378 DEFUN (addlistener, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10379 "-- texinfo --\n\
7859 fdd465b00ec0 Rename add_listener to addlistener. Michael Goffioul <michael.goffioul@gmail.com> parents: 7857 diff changeset	10380 @deftypefn {Built-in Function} {} addlistener (@var{h}, @var{prop}, @var{fcn})\n\
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10381 Register @var{fcn} as listener for the property @var{prop} of the graphics\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10382 object @var{h}. Property listeners are executed (in order of registration)\n\
dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10383 when the property is set. The new value is already available when the\n\
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10384 listeners are executed.\n\
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10385 \n\
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10386 @var{prop} must be a string naming a valid property in @var{h}.\n\
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10387 \n\
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10388 @var{fcn} can be a function handle, a string or a cell array whose first\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10389 element is a function handle. If @var{fcn} is a function handle, the\n\
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10390 corresponding function should accept at least 2 arguments, that will be\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10391 set to the object handle and the empty matrix respectively. If @var{fcn}\n\
dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10392 is a string, it must be any valid octave expression. If @var{fcn} is a cell\n\
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10393 array, the first element must be a function handle with the same signature\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10394 as described above. The next elements of the cell array are passed\n\
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10395 as additional arguments to the function.\n\
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10396 \n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10397 Example:\n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10398 \n\
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10399 @example\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 9040 diff changeset	10400 @group\n\
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10401 function my_listener (h, dummy, p1)\n\
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10402 fprintf (\"my_listener called with p1=%s\\n\", p1);\n\
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10403 endfunction\n\
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10404 \n\
7859 fdd465b00ec0 Rename add_listener to addlistener. Michael Goffioul <michael.goffioul@gmail.com> parents: 7857 diff changeset	10405 addlistener (gcf, \"position\", @{@@my_listener, \"my string\"@})\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 9040 diff changeset	10406 @end group\n\
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10407 @end example\n\
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10408 \n\
17486 b4343603f7ab doc: Add seealso links between hggroup, addproperty, addlistener. Rik <rik@octave.org> parents: 17483 diff changeset	10409 @seealso{addproperty, hggroup}\n\
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10410 @end deftypefn")
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10411 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	10412 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	10413
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10414 octave_value retval;
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10415
12506 0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10416 if (args.length () >= 3 && args.length () <= 4)
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10417 {
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10418 double h = args(0).double_value ();
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10419
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10420 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10421 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10422 std::string pname = args(1).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10423
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10424 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10425 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10426 graphics_handle gh = gh_manager::lookup (h);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10427
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10428 if (gh.ok ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10429 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10430 graphics_object go = gh_manager::get_object (gh);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10431
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10432 go.add_property_listener (pname, args(2), POSTSET);
12506 0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10433
0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10434 if (args.length () == 4)
0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10435 {
0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10436 caseless_str persistent = args(3).string_value ();
0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10437 if (persistent.compare ("persistent"))
0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10438 go.add_property_listener (pname, args(2), PERSISTENT);
0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10439 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10440 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10441 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10442 error ("addlistener: invalid graphics object (= %g)",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10443 h);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10444 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10445 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10446 error ("addlistener: invalid property name, expected a string value");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10447 }
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10448 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10449 error ("addlistener: invalid handle");
7849 3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10450 }
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10451 else
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10452 print_usage ();
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10453
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10454 return retval;
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10455 }
3249f64f69b2 Initial low-level support for property listeners. Michael Goffioul <michael.goffioul@gmail.com> parents: 7848 diff changeset	10456
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10457 DEFUN (dellistener, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10458 "-- texinfo --\n\
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10459 @deftypefn {Built-in Function} {} dellistener (@var{h}, @var{prop}, @var{fcn})\n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10460 Remove the registration of @var{fcn} as a listener for the property\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10461 @var{prop} of the graphics object @var{h}. The function @var{fcn} must\n\
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10462 be the same variable (not just the same value), as was passed to the\n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10463 original call to @code{addlistener}.\n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10464 \n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10465 If @var{fcn} is not defined then all listener functions of @var{prop}\n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10466 are removed.\n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10467 \n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10468 Example:\n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10469 \n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10470 @example\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 9040 diff changeset	10471 @group\n\
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10472 function my_listener (h, dummy, p1)\n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10473 fprintf (\"my_listener called with p1=%s\\n\", p1);\n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10474 endfunction\n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10475 \n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10476 c = @{@@my_listener, \"my string\"@};\n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10477 addlistener (gcf, \"position\", c);\n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10478 dellistener (gcf, \"position\", c);\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 9040 diff changeset	10479 @end group\n\
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10480 @end example\n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10481 \n\
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10482 @end deftypefn")
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10483 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	10484 gh_manager::auto_lock guard;
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10485
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10486 octave_value retval;
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10487
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10488 if (args.length () == 3 \|\| args.length () == 2)
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10489 {
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10490 double h = args(0).double_value ();
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10491
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10492 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10493 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10494 std::string pname = args(1).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10495
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10496 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10497 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10498 graphics_handle gh = gh_manager::lookup (h);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10499
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10500 if (gh.ok ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10501 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10502 graphics_object go = gh_manager::get_object (gh);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10503
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10504 if (args.length () == 2)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10505 go.delete_property_listener (pname, octave_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10506 POSTSET);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10507 else
12506 0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10508 {
0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10509 caseless_str persistent = args(2).string_value ();
0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10510 if (persistent.compare ("persistent"))
0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10511 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10512 go.delete_property_listener (pname, octave_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10513 PERSISTENT);
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10514 go.delete_property_listener (pname, octave_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10515 POSTSET);
12506 0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10516 }
0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10517 else
0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10518 go.delete_property_listener (pname, args(2), POSTSET);
0dda50ae4997 add a persistent mode for listeners Konstantinos Poulios <logari81@gmail.com> parents: 12502 diff changeset	10519 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10520 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10521 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10522 error ("dellistener: invalid graphics object (= %g)",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10523 h);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10524 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10525 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10526 error ("dellistener: invalid property name, expected a string value");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10527 }
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10528 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10529 error ("dellistener: invalid handle");
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10530 }
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10531 else
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10532 print_usage ();
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10533
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10534 return retval;
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10535 }
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8291 diff changeset	10536
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10537 DEFUN (addproperty, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10538 "-- texinfo --\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	10539 @deftypefn {Built-in Function} {} addproperty (@var{name}, @var{h}, @var{type})\n\
7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	10540 @deftypefnx {Built-in Function} {} addproperty (@var{name}, @var{h}, @var{type}, @var{arg}, @dots{})\n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10541 Create a new property named @var{name} in graphics object @var{h}.\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10542 @var{type} determines the type of the property to create. @var{args}\n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10543 usually contains the default value of the property, but additional\n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10544 arguments might be given, depending on the type of the property.\n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10545 \n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10546 The supported property types are:\n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10547 \n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10548 @table @code\n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10549 @item string\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10550 A string property. @var{arg} contains the default string value.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10792 diff changeset	10551 \n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10552 @item any\n\
16826 a4969508008e doc: Periodic spellcheck of the documentation. Rik <rik@octave.org> parents: 16814 diff changeset	10553 An @nospell{un-typed} property. This kind of property can hold any octave\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10554 value. @var{args} contains the default value.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10792 diff changeset	10555 \n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10556 @item radio\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10557 A string property with a limited set of accepted values. The first\n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10558 argument must be a string with all accepted values separated by\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10559 a vertical bar ('\|'). The default value can be marked by enclosing\n\
dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10560 it with a '@{' '@}' pair. The default value may also be given as\n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10561 an optional second string argument.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10792 diff changeset	10562 \n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10563 @item boolean\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10564 A boolean property. This property type is equivalent to a radio\n\
dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10565 property with \"on\|off\" as accepted values. @var{arg} contains\n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10566 the default property value.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10792 diff changeset	10567 \n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10568 @item double\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10569 A scalar double property. @var{arg} contains the default value.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10792 diff changeset	10570 \n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10571 @item handle\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10572 A handle property. This kind of property holds the handle of a\n\
dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10573 graphics object. @var{arg} contains the default handle value.\n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10574 When no default value is given, the property is initialized to\n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10575 the empty matrix.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10792 diff changeset	10576 \n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10577 @item data\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10578 A data (matrix) property. @var{arg} contains the default data\n\
dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10579 value. When no default value is given, the data is initialized to\n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10580 the empty matrix.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10792 diff changeset	10581 \n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10582 @item color\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10583 A color property. @var{arg} contains the default color value.\n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10584 When no default color is given, the property is set to black.\n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10585 An optional second string argument may be given to specify an\n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10586 additional set of accepted string values (like a radio property).\n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10587 @end table\n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10588 \n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10589 @var{type} may also be the concatenation of a core object type and\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10590 a valid property name for that object type. The property created\n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10591 then has the same characteristics as the referenced property (type,\n\
9040 dbd0c77e575e Cleanup documentation file plot.texi Rik <rdrider0-list@yahoo.com> parents: 8961 diff changeset	10592 possible values, hidden state@dots{}). This allows to clone an existing\n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10593 property into the graphics object @var{h}.\n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10594 \n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10595 Examples:\n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10596 \n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10597 @example\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 9040 diff changeset	10598 @group\n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10599 addproperty (\"my_property\", gcf, \"string\", \"a string value\");\n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10600 addproperty (\"my_radio\", gcf, \"radio\", \"val_1\|val_2\|@{val_3@}\");\n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10601 addproperty (\"my_style\", gcf, \"linelinestyle\", \"--\");\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 9040 diff changeset	10602 @end group\n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10603 @end example\n\
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10604 \n\
17486 b4343603f7ab doc: Add seealso links between hggroup, addproperty, addlistener. Rik <rik@octave.org> parents: 17483 diff changeset	10605 @seealso{addlistener, hggroup}\n\
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10606 @end deftypefn")
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10607 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	10608 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	10609
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10610 octave_value retval;
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10611
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10612 if (args.length () >= 3)
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10613 {
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10614 std::string name = args(0).string_value ();
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10615
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10616 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10617 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10618 double h = args(1).double_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10619
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10620 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10621 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10622 graphics_handle gh = gh_manager::lookup (h);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10623
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10624 if (gh.ok ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10625 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10626 graphics_object go = gh_manager::get_object (gh);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10627
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10628 std::string type = args(2).string_value ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10629
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10630 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10631 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10632 if (! go.get_properties ().has_property (name))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10633 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10634 property p = property::create (name, gh, type,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10635 args.splice (0, 3));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10636
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10637 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10638 go.get_properties ().insert_property (name, p);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10639 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10640 else
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14325 diff changeset	10641 error ("addproperty: a '%s' property already exists in the graphics object",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10642 name.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10643 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10644 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12467 diff changeset	10645 error ("addproperty: invalid property TYPE, expected a string value");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10646 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10647 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10648 error ("addproperty: invalid graphics object (= %g)", h);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10649 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10650 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10651 error ("addproperty: invalid handle value");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10652 }
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10653 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12467 diff changeset	10654 error ("addproperty: invalid property NAME, expected a string value");
7864 56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10655 }
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10656 else
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10657 print_usage ();
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10658
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10659 return retval;
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10660 }
56f781f38f0b Add dynamic property creation Michael Goffioul <michael.goffioul@gmail.com> parents: 7862 diff changeset	10661
6595 55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10662 octave_value
7447 25018e35b4cb [project @ 2008-02-05 22:38:57 by jwe] jwe parents: 7446 diff changeset	10663 get_property_from_handle (double handle, const std::string& property,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10664 const std::string& func)
6595 55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10665 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	10666 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	10667
6595 55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10668 graphics_object obj = gh_manager::get_object (handle);
55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10669 octave_value retval;
55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10670
55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10671 if (obj)
9582 bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	10672 retval = obj.get (caseless_str (property));
6595 55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10673 else
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14798 diff changeset	10674 error ("%s: invalid handle (= %g)", func.c_str (), handle);
6595 55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10675
55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10676 return retval;
55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10677 }
55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10678
55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10679 bool
7447 25018e35b4cb [project @ 2008-02-05 22:38:57 by jwe] jwe parents: 7446 diff changeset	10680 set_property_in_handle (double handle, const std::string& property,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10681 const octave_value& arg, const std::string& func)
6595 55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10682 {
13281 834f904a3dcb Add support for full asynchronous graphics toolkit running in a separate Michael Goffioul <michael.goffioul@gmail.com> parents: 13247 diff changeset	10683 gh_manager::auto_lock guard;
7936 78400fde223e Support for backend-to-octave event management John W. Eaton <jwe@octave.org> parents: 7924 diff changeset	10684
6595 55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10685 graphics_object obj = gh_manager::get_object (handle);
55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10686 int ret = false;
55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10687
55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10688 if (obj)
55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10689 {
9582 bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	10690 obj.set (caseless_str (property), arg);
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	10691
bdcfb756d721 improve error messages for ambiguous graphics property names John W. Eaton <jwe@octave.org> parents: 9561 diff changeset	10692 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10301 diff changeset	10693 ret = true;
6595 55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10694 }
55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10695 else
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14798 diff changeset	10696 error ("%s: invalid handle (= %g)", func.c_str (), handle);
6595 55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10697
55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10698 return ret;
55586d763de1 [project @ 2007-04-27 15:31:10 by dbateman] dbateman parents: 6568 diff changeset	10699 }
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10700
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10701 static bool
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10702 compare_property_values (const octave_value& o1, const octave_value& o2)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10703 {
18111 b560bac0fca2 maint: Don't use space between 'args' and '(' when doing indexing. Rik <rik@octave.org> parents: 18099 diff changeset	10704 octave_value_list args(2);
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10705
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10706 args(0) = o1;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10707 args(1) = o2;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10708
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10709 octave_value_list result = feval ("isequal", args, 1);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10710
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10711 if (! error_state && result.length () > 0)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10712 return result(0).bool_value ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10713
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10714 return false;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10715 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10716
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10717 static std::map<uint32_t, bool> waitfor_results;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10718
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10719 static void
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10720 cleanup_waitfor_id (uint32_t id)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10721 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10722 waitfor_results.erase (id);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10723 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10724
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10725 static void
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10726 do_cleanup_waitfor_listener (const octave_value& listener,
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10727 listener_mode mode = POSTSET)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10728 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10729 Cell c = listener.cell_value ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10730
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10731 if (c.numel () >= 4)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10732 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10733 double h = c(2).double_value ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10734
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10735 if (! error_state)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10736 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10737 caseless_str pname = c(3).string_value ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10738
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10739 if (! error_state)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10740 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10741 gh_manager::auto_lock guard;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10742
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10743 graphics_handle handle = gh_manager::lookup (h);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10744
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10745 if (handle.ok ())
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10746 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10747 graphics_object go = gh_manager::get_object (handle);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10748
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10749 if (go.get_properties ().has_property (pname))
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10750 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10751 go.get_properties ().delete_listener (pname, listener,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10752 mode);
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10753 if (mode == POSTSET)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10754 go.get_properties ().delete_listener (pname, listener,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10755 PERSISTENT);
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10756 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10757 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10758 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10759 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10760 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10761 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10762
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10763 static void
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	10764 cleanup_waitfor_postset_listener (const octave_value& listener)
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10765 { do_cleanup_waitfor_listener (listener, POSTSET); }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10766
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10767 static void
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	10768 cleanup_waitfor_predelete_listener (const octave_value& listener)
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10769 { do_cleanup_waitfor_listener (listener, PREDELETE); }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10770
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10771 static octave_value_list
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10772 waitfor_listener (const octave_value_list& args, int)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10773 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10774 if (args.length () > 3)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10775 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10776 uint32_t id = args(2).uint32_scalar_value ().value ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10777
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10778 if (! error_state)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10779 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10780 if (args.length () > 5)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10781 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10782 double h = args(0).double_value ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10783
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10784 if (! error_state)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10785 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10786 caseless_str pname = args(4).string_value ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10787
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10788 if (! error_state)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10789 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10790 gh_manager::auto_lock guard;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10791
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10792 graphics_handle handle = gh_manager::lookup (h);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10793
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10794 if (handle.ok ())
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10795 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10796 graphics_object go = gh_manager::get_object (handle);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10797 octave_value pvalue = go.get (pname);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10798
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10799 if (compare_property_values (pvalue, args(5)))
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10800 waitfor_results[id] = true;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10801 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10802 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10803 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10804 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10805 else
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10806 waitfor_results[id] = true;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10807 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10808 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10809
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10810 return octave_value_list ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10811 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10812
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10813 static octave_value_list
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10814 waitfor_del_listener (const octave_value_list& args, int)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10815 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10816 if (args.length () > 2)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10817 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10818 uint32_t id = args(2).uint32_scalar_value ().value ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10819
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10820 if (! error_state)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10821 waitfor_results[id] = true;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10822 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10823
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10824 return octave_value_list ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10825 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10826
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10827 DEFUN (waitfor, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	10828 "-- texinfo --\n\
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10829 @deftypefn {Built-in Function} {} waitfor (@var{h})\n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10830 @deftypefnx {Built-in Function} {} waitfor (@var{h}, @var{prop})\n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10831 @deftypefnx {Built-in Function} {} waitfor (@var{h}, @var{prop}, @var{value})\n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10832 @deftypefnx {Built-in Function} {} waitfor (@dots{}, \"timeout\", @var{timeout})\n\
13929 9cae456085c2 Grammarcheck of documentation before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 13925 diff changeset	10833 Suspend the execution of the current program until a condition is\n\
17483 710309214e0d doc: Add seealso links between waitfor, waitforbuttonpress, and ginput. Rik <rik@octave.org> parents: 17443 diff changeset	10834 satisfied on the graphics handle @var{h}.\n\
710309214e0d doc: Add seealso links between waitfor, waitforbuttonpress, and ginput. Rik <rik@octave.org> parents: 17443 diff changeset	10835 \n\
710309214e0d doc: Add seealso links between waitfor, waitforbuttonpress, and ginput. Rik <rik@octave.org> parents: 17443 diff changeset	10836 While the program is suspended graphics events are still being processed\n\
710309214e0d doc: Add seealso links between waitfor, waitforbuttonpress, and ginput. Rik <rik@octave.org> parents: 17443 diff changeset	10837 normally, allowing callbacks to modify the state of graphics objects. This\n\
710309214e0d doc: Add seealso links between waitfor, waitforbuttonpress, and ginput. Rik <rik@octave.org> parents: 17443 diff changeset	10838 function is reentrant and can be called from a callback, while another\n\
710309214e0d doc: Add seealso links between waitfor, waitforbuttonpress, and ginput. Rik <rik@octave.org> parents: 17443 diff changeset	10839 @code{waitfor} call is pending at the top-level.\n\
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10840 \n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10841 In the first form, program execution is suspended until the graphics object\n\
13929 9cae456085c2 Grammarcheck of documentation before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 13925 diff changeset	10842 @var{h} is destroyed. If the graphics handle is invalid, the function\n\
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10843 returns immediately.\n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10844 \n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10845 In the second form, execution is suspended until the graphics object is\n\
13929 9cae456085c2 Grammarcheck of documentation before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 13925 diff changeset	10846 destroyed or the property named @var{prop} is modified. If the graphics\n\
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10847 handle is invalid or the property does not exist, the function returns\n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10848 immediately.\n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10849 \n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10850 In the third form, execution is suspended until the graphics object is\n\
13929 9cae456085c2 Grammarcheck of documentation before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 13925 diff changeset	10851 destroyed or the property named @var{prop} is set to @var{value}. The\n\
9cae456085c2 Grammarcheck of documentation before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 13925 diff changeset	10852 function @code{isequal} is used to compare property values. If the graphics\n\
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10853 handle is invalid, the property does not exist or the property is already\n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10854 set to @var{value}, the function returns immediately.\n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10855 \n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10856 An optional timeout can be specified using the property @code{timeout}.\n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10857 This timeout value is the number of seconds to wait for the condition to be\n\
13929 9cae456085c2 Grammarcheck of documentation before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 13925 diff changeset	10858 true. @var{timeout} must be at least 1. If a smaller value is specified, a\n\
9cae456085c2 Grammarcheck of documentation before 3.6.0 release. Rik <octave@nomad.inbox5.com> parents: 13925 diff changeset	10859 warning is issued and a value of 1 is used instead. If the timeout value is\n\
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10860 not an integer, it is truncated towards 0.\n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10861 \n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10862 To define a condition on a property named @code{timeout}, use the string\n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10863 @code{\\timeout} instead.\n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10864 \n\
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10865 In all cases, typing CTRL-C stops program execution immediately.\n\
17483 710309214e0d doc: Add seealso links between waitfor, waitforbuttonpress, and ginput. Rik <rik@octave.org> parents: 17443 diff changeset	10866 @seealso{waitforbuttonpress, isequal}\n\
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10867 @end deftypefn")
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10868 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10869 if (args.length () > 0)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10870 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10871 double h = args(0).double_value ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10872
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10873 if (! error_state)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10874 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10875 caseless_str pname;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10876
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10877 unwind_protect frame;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10878
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10879 static uint32_t id_counter = 0;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10880 uint32_t id = 0;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10881
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10882 int max_arg_index = 0;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10883 int timeout_index = -1;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10884
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10885 int timeout = 0;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10886
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10887 if (args.length () > 1)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10888 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10889 pname = args(1).string_value ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10890 if (! error_state
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10891 && ! pname.empty ()
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10892 && ! pname.compare ("timeout"))
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10893 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10894 if (pname.compare ("\\timeout"))
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10895 pname = "timeout";
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10896
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10897 static octave_value wf_listener;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10898
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10899 if (! wf_listener.is_defined ())
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10900 wf_listener =
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10901 octave_value (new octave_builtin (waitfor_listener,
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10902 "waitfor_listener"));
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10903
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10904 max_arg_index++;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10905 if (args.length () > 2)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10906 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10907 if (args(2).is_string ())
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10908 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10909 caseless_str s = args(2).string_value ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10910
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10911 if (! error_state)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10912 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10913 if (s.compare ("timeout"))
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10914 timeout_index = 2;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10915 else
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10916 max_arg_index++;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10917 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10918 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10919 else
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10920 max_arg_index++;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10921 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10922
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10923 Cell listener (1, max_arg_index >= 2 ? 5 : 4);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10924
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10925 id = id_counter++;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10926 frame.add_fcn (cleanup_waitfor_id, id);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10927 waitfor_results[id] = false;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10928
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10929 listener(0) = wf_listener;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10930 listener(1) = octave_uint32 (id);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10931 listener(2) = h;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10932 listener(3) = pname;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10933
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10934 if (max_arg_index >= 2)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10935 listener(4) = args(2);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10936
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10937 octave_value ov_listener (listener);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10938
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10939 gh_manager::auto_lock guard;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10940
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10941 graphics_handle handle = gh_manager::lookup (h);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10942
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10943 if (handle.ok ())
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10944 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10945 graphics_object go = gh_manager::get_object (handle);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10946
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10947 if (max_arg_index >= 2
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10948 && compare_property_values (go.get (pname),
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10949 args(2)))
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10950 waitfor_results[id] = true;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10951 else
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10952 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10953
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10954 frame.add_fcn (cleanup_waitfor_postset_listener,
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10955 ov_listener);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10956 go.add_property_listener (pname, ov_listener,
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10957 POSTSET);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10958 go.add_property_listener (pname, ov_listener,
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10959 PERSISTENT);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10960
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10961 if (go.get_properties ()
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10962 .has_dynamic_property (pname))
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10963 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10964 static octave_value wf_del_listener;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10965
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10966 if (! wf_del_listener.is_defined ())
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10967 wf_del_listener =
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10968 octave_value (new octave_builtin
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10969 (waitfor_del_listener,
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10970 "waitfor_del_listener"));
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10971
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10972 Cell del_listener (1, 4);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10973
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10974 del_listener(0) = wf_del_listener;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10975 del_listener(1) = octave_uint32 (id);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10976 del_listener(2) = h;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10977 del_listener(3) = pname;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10978
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10979 octave_value ov_del_listener (del_listener);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10980
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10981 frame.add_fcn (cleanup_waitfor_predelete_listener,
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10982 ov_del_listener);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10983 go.add_property_listener (pname, ov_del_listener,
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10984 PREDELETE);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10985 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10986 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10987 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10988 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10989 else if (error_state \|\| pname.empty ())
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10990 error ("waitfor: invalid property name, expected a non-empty string value");
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10991 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10992
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10993 if (! error_state
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10994 && timeout_index < 0
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10995 && args.length () > (max_arg_index + 1))
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10996 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10997 caseless_str s = args(max_arg_index + 1).string_value ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10998
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	10999 if (! error_state)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11000 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11001 if (s.compare ("timeout"))
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11002 timeout_index = max_arg_index + 1;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11003 else
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14325 diff changeset	11004 error ("waitfor: invalid parameter '%s'", s.c_str ());
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11005 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11006 else
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14325 diff changeset	11007 error ("waitfor: invalid parameter, expected 'timeout'");
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11008 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11009
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11010 if (! error_state && timeout_index >= 0)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11011 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11012 if (args.length () > (timeout_index + 1))
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11013 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11014 timeout = static_cast<int>
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	11015 (args(timeout_index + 1).scalar_value ());
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11016
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11017 if (! error_state)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11018 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11019 if (timeout < 1)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11020 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11021 warning ("waitfor: the timeout value must be >= 1, using 1 instead");
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11022 timeout = 1;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11023 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11024 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11025 else
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11026 error ("waitfor: invalid timeout value, expected a value >= 1");
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11027 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11028 else
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11029 error ("waitfor: missing timeout value");
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11030 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11031
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11032 // FIXME: There is still a "hole" in the following loop. The code
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11033 // assumes that an object handle is unique, which is a fair
17483 710309214e0d doc: Add seealso links between waitfor, waitforbuttonpress, and ginput. Rik <rik@octave.org> parents: 17443 diff changeset	11034 // assumption, except for figures. If a figure is destroyed
13924 3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11035 // then recreated with the same figure ID, within the same
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11036 // run of event hooks, then the figure destruction won't be
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11037 // caught and the loop will not stop. This is an unlikely
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11038 // possibility in practice, though.
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11039 //
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11040 // Using deletefcn callback is also unreliable as it could be
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11041 // modified during a callback execution and the waitfor loop
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11042 // would not stop.
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11043 //
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11044 // The only "good" implementation would require object
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11045 // listeners, similar to property listeners.
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11046
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11047 time_t start = 0;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11048
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11049 if (timeout > 0)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11050 start = time (0);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11051
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11052 while (! error_state)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11053 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11054 if (true)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11055 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11056 gh_manager::auto_lock guard;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11057
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11058 graphics_handle handle = gh_manager::lookup (h);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11059
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11060 if (handle.ok ())
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11061 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11062 if (! pname.empty () && waitfor_results[id])
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11063 break;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11064 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11065 else
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11066 break;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11067 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11068
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11069 octave_usleep (100000);
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11070
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11071 OCTAVE_QUIT;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11072
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11073 command_editor::run_event_hooks ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11074
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11075 if (timeout > 0)
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11076 {
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11077 if (start + timeout < time (0))
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11078 break;
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11079 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11080 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11081 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11082 else
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11083 error ("waitfor: invalid handle value.");
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11084 }
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11085 else
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11086 print_usage ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11087
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11088 return octave_value ();
3b654a0753b1 Implement waitfor, uiwait and uiresume. Michael Goffioul <michael.goffioul@gmail.com> parents: 13910 diff changeset	11089 }

Mercurial > octave-nkf

annotate libinterp/corefcn/graphics.cc @ 18807:70ea5a2856fe