Mercurial > octave-nkf
annotate src/graphics.cc @ 10265:8c583af2cf64
validate text object children of axes objects
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 04 Feb 2010 03:56:28 -0500 |
| parents | cd96d29c5efa |
| children | 4b124317dc38 |
| rev | line source |
|---|---|
| 6406 | 1 /* |
| 2 | |
| 8920 | 3 Copyright (C) 2007, 2008, 2009 John W. Eaton |
| 6406 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 6406 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 6406 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 27 #include <cctype> | |
| 7222 | 28 #include <cfloat> |
| 7286 | 29 #include <cstdlib> |
| 6406 | 30 |
| 31 #include <algorithm> | |
| 32 #include <list> | |
| 33 #include <map> | |
| 34 #include <set> | |
| 35 #include <string> | |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
36 #include <sstream> |
| 6406 | 37 |
| 7409 | 38 #include "file-ops.h" |
| 39 #include "file-stat.h" | |
| 40 | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
41 #include "cmd-edit.h" |
| 6705 | 42 #include "defun.h" |
|
8560
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
43 #include "display.h" |
| 6705 | 44 #include "error.h" |
| 6595 | 45 #include "graphics.h" |
| 7409 | 46 #include "input.h" |
| 6705 | 47 #include "ov.h" |
| 48 #include "oct-obj.h" | |
| 49 #include "oct-map.h" | |
| 50 #include "ov-fcn-handle.h" | |
| 51 #include "parse.h" | |
| 7409 | 52 #include "toplev.h" |
| 7222 | 53 #include "unwind-prot.h" |
| 6595 | 54 |
|
9238
0ae2b6617005
Use display information from the root object to compute bounding boxes
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9185
diff
changeset
|
55 // forward declaration |
|
0ae2b6617005
Use display information from the root object to compute bounding boxes
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9185
diff
changeset
|
56 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
|
57 |
| 6406 | 58 static void |
| 59 gripe_set_invalid (const std::string& pname) | |
| 60 { | |
| 61 error ("set: invalid value for %s property", pname.c_str ()); | |
| 62 } | |
| 63 | |
|
9584
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
64 // 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
|
65 // 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
|
66 // 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
|
67 |
|
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
68 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
|
69 validate_property_name (const std::string& who, const std::string& what, |
|
9582
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
70 const std::set<std::string>& pnames, |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
71 const caseless_str& pname) |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
72 { |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
73 size_t len = pname.length (); |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
74 std::set<std::string> matches; |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
75 |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
76 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
|
77 p != pnames.end (); p++) |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
78 { |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
79 if (pname.compare (*p, len)) |
|
9584
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
80 { |
|
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
81 if (len == p->length ()) |
|
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
82 { |
|
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
83 // Exact match. |
|
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
84 return pname; |
|
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
85 } |
|
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
86 |
|
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
87 matches.insert (*p); |
|
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
88 } |
|
9582
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
89 } |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
90 |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
91 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
|
92 |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
93 if (num_matches == 0) |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
94 { |
|
9585
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
95 error ("%s: unknown %s property %s", |
|
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
96 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
|
97 } |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
98 else if (num_matches > 1) |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
99 { |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
100 string_vector sv (matches); |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
101 |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
102 std::ostringstream os; |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
103 |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
104 sv.list_in_columns (os); |
|
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 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
|
107 |
|
9585
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
108 error ("%s: ambiguous %s property name %s; possible matches:\n\n%s", |
|
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
109 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
|
110 } |
|
9584
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
111 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
|
112 { |
|
9584
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
113 // 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
|
114 |
|
9582
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
115 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
|
116 |
|
9584
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
117 warning_with_id ("Octave:abbreviated-property-match", |
|
9585
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
118 "%s: allowing %s to match %s property %s", |
|
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
119 who.c_str (), pname.c_str (), what.c_str (), |
|
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
120 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
|
121 |
|
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
122 return possible_match; |
|
9582
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
123 } |
|
9584
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
124 |
|
0fcbfddaa87f
allow abbreviated graphics property names to match, with optional warning
John W. Eaton <jwe@octave.org>
parents:
9582
diff
changeset
|
125 return caseless_str (); |
|
9582
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
126 } |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
127 |
| 7363 | 128 static Matrix |
| 129 jet_colormap (void) | |
| 130 { | |
| 131 Matrix cmap (64, 3, 0.0); | |
| 132 | |
| 133 for (octave_idx_type i = 0; i < 64; i++) | |
| 134 { | |
| 135 // This is the jet colormap. It would be nice to be able | |
| 136 // to feval the jet function but since there is a static | |
| 137 // property object that includes a colormap_property | |
| 138 // object, we need to initialize this before main is even | |
| 139 // called, so calling an interpreted function is not | |
| 140 // possible. | |
| 141 | |
| 142 double x = i / 63.0; | |
| 143 | |
| 144 if (x >= 3.0/8.0 && x < 5.0/8.0) | |
| 145 cmap(i,0) = 4.0 * x - 3.0/2.0; | |
| 146 else if (x >= 5.0/8.0 && x < 7.0/8.0) | |
| 147 cmap(i,0) = 1.0; | |
| 148 else if (x >= 7.0/8.0) | |
| 149 cmap(i,0) = -4.0 * x + 9.0/2.0; | |
| 150 | |
| 151 if (x >= 1.0/8.0 && x < 3.0/8.0) | |
| 152 cmap(i,1) = 4.0 * x - 1.0/2.0; | |
| 153 else if (x >= 3.0/8.0 && x < 5.0/8.0) | |
| 154 cmap(i,1) = 1.0; | |
| 155 else if (x >= 5.0/8.0 && x < 7.0/8.0) | |
| 156 cmap(i,1) = -4.0 * x + 7.0/2.0; | |
| 157 | |
| 158 if (x < 1.0/8.0) | |
| 159 cmap(i,2) = 4.0 * x + 1.0/2.0; | |
| 160 else if (x >= 1.0/8.0 && x < 3.0/8.0) | |
| 161 cmap(i,2) = 1.0; | |
| 162 else if (x >= 3.0/8.0 && x < 5.0/8.0) | |
| 163 cmap(i,2) = -4.0 * x + 5.0/2.0; | |
| 164 } | |
| 165 | |
| 166 return cmap; | |
| 167 } | |
| 168 | |
|
8560
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
169 static double |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
170 default_screendepth (void) |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
171 { |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
172 return display_info::depth (); |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
173 } |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
174 |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
175 static Matrix |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
176 default_screensize (void) |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
177 { |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
178 Matrix retval (1, 4, 1.0); |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
179 |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
180 retval(2) = display_info::width (); |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
181 retval(3) = display_info::height (); |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
182 |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
183 return retval; |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
184 } |
|
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 static double |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
187 default_screenpixelsperinch (void) |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
188 { |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
189 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
|
190 } |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
191 |
| 7363 | 192 static Matrix |
| 193 default_colororder (void) | |
| 194 { | |
| 195 Matrix retval (7, 3, 0.0); | |
| 196 | |
| 197 retval(0,2) = 1.0; | |
| 198 | |
| 199 retval(1,1) = 0.5; | |
| 200 | |
| 201 retval(2,0) = 1.0; | |
| 202 | |
| 203 retval(3,1) = 0.75; | |
| 204 retval(3,2) = 0.75; | |
| 205 | |
| 206 retval(4,0) = 0.75; | |
| 207 retval(4,2) = 0.75; | |
| 208 | |
| 209 retval(5,0) = 0.75; | |
| 210 retval(5,1) = 0.75; | |
| 211 | |
| 212 retval(6,0) = 0.25; | |
| 213 retval(6,1) = 0.25; | |
| 214 retval(6,2) = 0.25; | |
| 215 | |
| 216 return retval; | |
| 217 } | |
| 218 | |
| 219 static Matrix | |
| 220 default_lim (void) | |
| 221 { | |
| 222 Matrix m (1, 2, 0); | |
| 223 m(1) = 1; | |
| 224 return m; | |
| 225 } | |
| 226 | |
| 227 static Matrix | |
| 228 default_data (void) | |
| 229 { | |
| 230 Matrix retval (1, 2); | |
| 231 | |
| 232 retval(0) = 0; | |
| 233 retval(1) = 1; | |
| 234 | |
| 235 return retval; | |
| 236 } | |
| 237 | |
| 7427 | 238 static Matrix |
| 239 default_axes_position (void) | |
| 240 { | |
| 241 Matrix m (1, 4, 0.0); | |
| 242 m(0) = 0.13; | |
| 243 m(1) = 0.11; | |
| 244 m(2) = 0.775; | |
| 245 m(3) = 0.815; | |
| 246 return m; | |
| 247 } | |
| 248 | |
| 249 static Matrix | |
| 250 default_axes_outerposition (void) | |
| 251 { | |
| 252 Matrix m (1, 4, 0.0); | |
| 253 m(2) = m(3) = 1.0; | |
| 254 return m; | |
| 255 } | |
| 256 | |
| 7445 | 257 static Matrix |
|
8599
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
258 default_axes_tick (void) |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
259 { |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
260 Matrix m (1, 6, 0.0); |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
261 m(0) = 0.0; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
262 m(1) = 0.2; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
263 m(2) = 0.4; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
264 m(3) = 0.6; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
265 m(4) = 0.8; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
266 m(5) = 1.0; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
267 return m; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
268 } |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
269 |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
270 static Matrix |
|
8740
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8687
diff
changeset
|
271 default_axes_ticklength (void) |
|
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8687
diff
changeset
|
272 { |
|
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8687
diff
changeset
|
273 Matrix m (1, 2, 0.01); |
|
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8687
diff
changeset
|
274 m(1) = 0.025; |
|
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8687
diff
changeset
|
275 return m; |
|
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8687
diff
changeset
|
276 } |
|
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8687
diff
changeset
|
277 |
|
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8687
diff
changeset
|
278 static Matrix |
| 7445 | 279 default_figure_position (void) |
| 280 { | |
| 281 Matrix m (1, 4, 0.0); | |
| 282 m(0) = 300; | |
| 283 m(1) = 200; | |
| 284 m(2) = 560; | |
| 285 m(3) = 420; | |
| 286 return m; | |
| 287 } | |
| 288 | |
| 7427 | 289 static Matrix |
|
8599
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
290 default_figure_papersize (void) |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
291 { |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
292 Matrix m (1, 2, 0.0); |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
293 m(0) = 8.5; |
|
8961
6b87f2f34fdd
graphics.cc: Fix default "papersize" property value.
Ben Abbott <bpabbott@mac.com>
parents:
8944
diff
changeset
|
294 m(1) = 11.0; |
|
8599
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
295 return m; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
296 } |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
297 |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
298 static Matrix |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
299 default_figure_paperposition (void) |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
300 { |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
301 Matrix m (1, 4, 0.0); |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
302 m(0) = 0.25; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
303 m(1) = 2.50; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
304 m(2) = 8.00; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
305 m(3) = 6.00; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
306 return m; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
307 } |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
308 |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
309 static Matrix |
| 7427 | 310 convert_position (const Matrix& pos, const caseless_str& from_units, |
| 311 const caseless_str& to_units, | |
|
9238
0ae2b6617005
Use display information from the root object to compute bounding boxes
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9185
diff
changeset
|
312 const Matrix& parent_dim = Matrix (1, 2, 0.0)) |
| 7427 | 313 { |
| 314 Matrix retval (1, 4); | |
| 315 double res = 0; | |
| 316 | |
| 317 if (from_units.compare ("pixels")) | |
| 318 retval = pos; | |
| 319 else if (from_units.compare ("normalized")) | |
| 320 { | |
| 321 retval(0) = pos(0) * parent_dim(0) + 1; | |
| 322 retval(1) = pos(1) * parent_dim(1) + 1; | |
| 323 retval(2) = pos(2) * parent_dim(0); | |
| 324 retval(3) = pos(3) * parent_dim(1); | |
| 325 } | |
| 326 else if (from_units.compare ("characters")) | |
| 327 { | |
|
9238
0ae2b6617005
Use display information from the root object to compute bounding boxes
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9185
diff
changeset
|
328 if (res <= 0) |
|
0ae2b6617005
Use display information from the root object to compute bounding boxes
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9185
diff
changeset
|
329 res = xget (0, "screenpixelsperinch").double_value (); |
|
8599
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
330 |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
331 double f = 0.0; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
332 |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
333 // FIXME -- this assumes the system font is Helvetica 10pt |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
334 // (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
|
335 f = 12.0 * res / 74.951; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
336 |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
337 if (f > 0) |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
338 { |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
339 retval(0) = 0.5 * pos(0) * f; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
340 retval(1) = pos(1) * f; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
341 retval(2) = 0.5 * pos(2) * f; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
342 retval(3) = pos(3) * f; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
343 } |
| 7427 | 344 } |
| 345 else | |
| 346 { | |
|
9238
0ae2b6617005
Use display information from the root object to compute bounding boxes
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9185
diff
changeset
|
347 if (res <= 0) |
|
0ae2b6617005
Use display information from the root object to compute bounding boxes
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9185
diff
changeset
|
348 res = xget (0, "screenpixelsperinch").double_value (); |
| 7427 | 349 |
| 350 double f = 0.0; | |
| 351 | |
| 352 if (from_units.compare ("points")) | |
| 353 f = res / 72.0; | |
| 354 else if (from_units.compare ("inches")) | |
| 355 f = res; | |
| 356 else if (from_units.compare ("centimeters")) | |
| 357 f = res / 2.54; | |
| 358 | |
| 359 if (f > 0) | |
| 360 { | |
| 361 retval(0) = pos(0) * f + 1; | |
| 362 retval(1) = pos(1) * f + 1; | |
| 363 retval(2) = pos(2) * f; | |
| 364 retval(3) = pos(3) * f; | |
| 365 } | |
| 366 } | |
| 367 | |
| 368 if (! to_units.compare ("pixels")) | |
| 369 { | |
| 370 if (to_units.compare ("normalized")) | |
| 371 { | |
| 372 retval(0) = (retval(0) - 1) / parent_dim(0); | |
| 373 retval(1) = (retval(1) - 1) / parent_dim(1); | |
| 374 retval(2) /= parent_dim(0); | |
| 375 retval(3) /= parent_dim(1); | |
| 376 } | |
| 377 else if (to_units.compare ("characters")) | |
| 378 { | |
|
9238
0ae2b6617005
Use display information from the root object to compute bounding boxes
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9185
diff
changeset
|
379 if (res <= 0) |
|
0ae2b6617005
Use display information from the root object to compute bounding boxes
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9185
diff
changeset
|
380 res = xget (0, "screenpixelsperinch").double_value (); |
|
8599
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
381 |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
382 double f = 0.0; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
383 |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
384 f = 12.0 * res / 74.951; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
385 |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
386 if (f > 0) |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
387 { |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
388 retval(0) = 2 * retval(0) / f; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
389 retval(1) = retval(1) / f; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
390 retval(2) = 2 * retval(2) / f; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
391 retval(3) = retval(3) / f; |
|
b4fb0a52b15e
Improve default property compatibility.
Ben Abbott <bpabbott@mac.com>
parents:
8560
diff
changeset
|
392 } |
| 7427 | 393 } |
| 394 else | |
| 395 { | |
| 396 if (res <= 0) | |
|
9238
0ae2b6617005
Use display information from the root object to compute bounding boxes
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9185
diff
changeset
|
397 res = xget (0, "screenpixelsperinch").double_value (); |
| 7427 | 398 |
| 399 double f = 0.0; | |
| 400 | |
| 401 if (to_units.compare ("points")) | |
| 402 f = res / 72.0; | |
| 403 else if (to_units.compare ("inches")) | |
| 404 f = res; | |
| 405 else if (to_units.compare ("centimeters")) | |
| 406 f = res / 2.54; | |
| 407 | |
| 408 if (f > 0) | |
| 409 { | |
| 410 retval(0) = (retval(0) - 1) / f; | |
| 411 retval(1) = (retval(1) - 1) / f; | |
| 412 retval(2) /= f; | |
| 413 retval(3) /= f; | |
| 414 } | |
| 415 } | |
| 416 } | |
| 417 | |
| 418 return retval; | |
| 419 } | |
| 420 | |
|
7829
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
421 static graphics_object |
|
7878
b4ac6bb4114b
graphics.cc (execute_callback, xget_ancestor): pass args by const reference and make explicit copies
John W. Eaton <jwe@octave.org>
parents:
7871
diff
changeset
|
422 xget_ancestor (const graphics_object& go_arg, const std::string& type) |
|
7829
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
423 { |
|
7878
b4ac6bb4114b
graphics.cc (execute_callback, xget_ancestor): pass args by const reference and make explicit copies
John W. Eaton <jwe@octave.org>
parents:
7871
diff
changeset
|
424 graphics_object go = go_arg; |
|
b4ac6bb4114b
graphics.cc (execute_callback, xget_ancestor): pass args by const reference and make explicit copies
John W. Eaton <jwe@octave.org>
parents:
7871
diff
changeset
|
425 |
|
7829
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
426 do |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
427 { |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
428 if (go.valid_object ()) |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
429 { |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
430 if (go.isa (type)) |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
431 return go; |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
432 else |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
433 go = gh_manager::get_object (go.get_parent ()); |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
434 } |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
435 else |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
436 return graphics_object (); |
| 7869 | 437 } |
| 438 while (true); | |
|
7829
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
439 } |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
440 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
441 static octave_value |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
442 convert_cdata (const base_properties& props, const octave_value& cdata, |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
443 bool is_scaled, int cdim) |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
444 { |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
445 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
|
446 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
447 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
|
448 return cdata; |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
449 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
450 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
|
451 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
|
452 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
453 graphics_object go = gh_manager::get_object (props.get___myhandle__ ()); |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
454 graphics_object fig = xget_ancestor (go, "figure"); |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
455 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
456 if (fig.valid_object ()) |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
457 { |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
458 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
|
459 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
460 if (! error_state) |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
461 cmap = _cmap; |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
462 } |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
463 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
464 if (is_scaled) |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
465 { |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
466 graphics_object ax = xget_ancestor (go, "axes"); |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
467 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
468 if (ax.valid_object ()) |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
469 { |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
470 Matrix _clim = ax.get (caseless_str ("clim")).matrix_value (); |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
471 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
472 if (! error_state) |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
473 clim = _clim; |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
474 } |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
475 } |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
476 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
477 dv.resize (cdim); |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
478 dv(cdim-1) = 3; |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
479 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
480 NDArray a (dv); |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
481 |
|
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
|
482 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
|
483 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
|
484 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
485 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
|
486 const double *cmapv = cmap.data (); |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
487 const double *cv = 0; |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
488 const octave_uint8 *icv = 0; |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
489 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
490 if (cdata.is_integer_type ()) |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
491 icv = cdata.uint8_array_value ().data (); |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
492 else |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
493 cv = cdata.array_value ().data (); |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
494 |
|
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
|
495 for (octave_idx_type i = 0; i < lda; i++) |
|
7829
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
496 { |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
497 double x = (cv ? cv[i] : double (icv[i])); |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
498 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
499 if (is_scaled) |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
500 x = xround ((nc - 1) * (x - clim(0)) / (clim(1) - clim(0))); |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
501 else |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
502 x = xround (x - 1); |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
503 |
|
9423
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
504 if (xisnan (x)) |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
505 { |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
506 av[i] = x; |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
507 av[i+lda] = x; |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
508 av[i+2*lda] = x; |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
509 } |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
510 else |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
511 { |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
512 if (x < 0) |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
513 x = 0; |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
514 else if (x >= nc) |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
515 x = (nc - 1); |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
516 |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
517 octave_idx_type idx = static_cast<octave_idx_type> (x); |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
518 |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
519 av[i] = cmapv[idx]; |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
520 av[i+lda] = cmapv[idx+nc]; |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
521 av[i+2*lda] = cmapv[idx+2*nc]; |
|
f284e2a26ff9
graphics.cc (convert_cdata): return NaN for NaN values in cdata
John W. Eaton <jwe@octave.org>
parents:
9422
diff
changeset
|
522 } |
|
7829
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
523 } |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
524 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
525 return octave_value (a); |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
526 } |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
527 |
|
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
|
528 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
|
529 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
|
530 get_array_limits (const Array<T>& m, double& emin, double& emax, |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
531 double& eminp) |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
532 { |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
533 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
|
534 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
|
535 |
|
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
|
536 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
|
537 { |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
538 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
|
539 |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
540 if (! (xisinf (e) || xisnan (e))) |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
541 { |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
542 if (e < emin) |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
543 emin = e; |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
544 |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
545 if (e > emax) |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
546 emax = e; |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
547 |
|
9434
ac2617d4e30c
graphics.cc (get_array_limits): require min_pos value to be greater than zero
John W. Eaton <jwe@octave.org>
parents:
9423
diff
changeset
|
548 if (e > 0 && e < eminp) |
|
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
|
549 eminp = e; |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
550 } |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
551 } |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
552 } |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
553 |
|
7864
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
554 static bool |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
555 lookup_object_name (const caseless_str& name, caseless_str& go_name, |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
556 caseless_str& rest) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
557 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
558 int len = name.length (); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
559 int offset = 0; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
560 bool result = false; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
561 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
562 if (len >= 4) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
563 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
564 caseless_str pfx = name.substr (0, 4); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
565 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
566 if (pfx.compare ("axes") || pfx.compare ("line") |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
567 || pfx.compare ("text")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
568 offset = 4; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
569 else if (len >= 5) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
570 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
571 pfx = name.substr (0, 5); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
572 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
573 if (pfx.compare ("image") || pfx.compare ("patch")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
574 offset = 5; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
575 else if (len >= 6) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
576 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
577 pfx = name.substr (0, 6); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
578 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
579 if (pfx.compare ("figure")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
580 offset = 6; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
581 else if (len >= 7) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
582 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
583 pfx = name.substr (0, 7); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
584 |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
585 if (pfx.compare ("surface") || pfx.compare ("hggroup")) |
|
7864
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
586 offset = 7; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
587 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
588 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
589 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
590 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
591 if (offset > 0) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
592 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
593 go_name = pfx; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
594 rest = name.substr (offset); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
595 result = true; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
596 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
597 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
598 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
599 return result; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
600 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
601 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
602 static base_graphics_object* |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
603 make_graphics_object_from_type (const caseless_str& type, |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
604 const graphics_handle& h = graphics_handle (), |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
605 const graphics_handle& p = graphics_handle ()) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
606 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
607 base_graphics_object *go = 0; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
608 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
609 if (type.compare ("figure")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
610 go = new figure (h, p); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
611 else if (type.compare ("axes")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
612 go = new axes (h, p); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
613 else if (type.compare ("line")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
614 go = new line (h, p); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
615 else if (type.compare ("text")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
616 go = new text (h, p); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
617 else if (type.compare ("image")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
618 go = new image (h, p); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
619 else if (type.compare ("patch")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
620 go = new patch (h, p); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
621 else if (type.compare ("surface")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
622 go = new surface (h, p); |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
623 else if (type.compare ("hggroup")) |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
624 go = new hggroup (h, p); |
|
7864
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
625 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
626 return go; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
627 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
628 |
| 6406 | 629 // --------------------------------------------------------------------- |
| 630 | |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
631 bool |
|
8058
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
632 base_property::set (const octave_value& v, bool do_run ) |
|
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
633 { |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
634 if (do_set (v)) |
|
8058
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
635 { |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
636 |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
637 // notify backend |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
638 if (id >= 0) |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
639 { |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
640 graphics_object go = gh_manager::get_object (parent); |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
641 if (go) |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
642 { |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
643 graphics_backend backend = go.get_backend(); |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
644 if (backend) |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
645 backend.property_changed (go, id); |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
646 } |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
647 } |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
648 |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
649 // run listeners |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
650 if (do_run && ! error_state) |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
651 run_listeners (POSTSET); |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
652 |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
653 return true; |
|
8058
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
654 } |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
655 |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
656 return false; |
|
8058
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
657 } |
|
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
658 |
|
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
659 |
|
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
660 void |
|
7849
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
661 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
|
662 { |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
663 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
|
664 |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
665 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
|
666 { |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
667 gh_manager::execute_callback (parent, l(i), octave_value ()); |
|
7849
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
668 |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
669 if (error_state) |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
670 break; |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
671 } |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
672 } |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
673 |
| 6705 | 674 radio_values::radio_values (const std::string& opt_string) |
| 6406 | 675 { |
| 6705 | 676 size_t beg = 0; |
| 677 size_t len = opt_string.length (); | |
| 678 bool done = len == 0; | |
| 6681 | 679 |
| 6705 | 680 while (! done) |
| 681 { | |
| 682 size_t end = opt_string.find ('|', beg); | |
| 6681 | 683 |
| 6705 | 684 if (end == std::string::npos) |
| 685 { | |
| 686 end = len; | |
| 687 done = true; | |
| 688 } | |
| 6681 | 689 |
| 6705 | 690 std::string t = opt_string.substr (beg, end-beg); |
| 6681 | 691 |
| 6705 | 692 // Might want more error checking here... |
| 693 if (t[0] == '{') | |
| 694 { | |
| 695 t = t.substr (1, t.length () - 2); | |
| 696 default_val = t; | |
| 697 } | |
| 698 else if (beg == 0) // ensure default value | |
| 699 default_val = t; | |
| 6681 | 700 |
| 6705 | 701 possible_vals.insert (t); |
| 6681 | 702 |
| 6705 | 703 beg = end + 1; |
| 704 } | |
| 705 } | |
| 6681 | 706 |
| 6705 | 707 bool |
| 6761 | 708 color_values::str2rgb (std::string str) |
| 6681 | 709 { |
| 6705 | 710 double tmp_rgb[3] = {0, 0, 0}; |
| 711 bool retval = true; | |
| 6761 | 712 unsigned int len = str.length(); |
| 6681 | 713 |
| 6925 | 714 std::transform (str.begin (), str.end (), str.begin (), tolower); |
| 715 | |
| 6761 | 716 if (str.compare(0, len, "blue", 0, len) == 0) |
| 717 tmp_rgb[2] = 1; | |
| 7869 | 718 else if (str.compare(0, len, "black", 0, len) == 0 |
| 719 || str.compare(0, len, "k", 0, len) == 0) | |
| 6761 | 720 tmp_rgb[0] = tmp_rgb[1] = tmp_rgb[2] = 0; |
| 721 else if (str.compare(0, len, "red", 0, len) == 0) | |
| 722 tmp_rgb[0] = 1; | |
| 723 else if (str.compare(0, len, "green", 0, len) == 0) | |
| 724 tmp_rgb[1] = 1; | |
| 725 else if (str.compare(0, len, "yellow", 0, len) == 0) | |
| 726 tmp_rgb[0] = tmp_rgb[1] = 1; | |
| 727 else if (str.compare(0, len, "magenta", 0, len) == 0) | |
| 728 tmp_rgb[0] = tmp_rgb[2] = 1; | |
| 729 else if (str.compare(0, len, "cyan", 0, len) == 0) | |
| 730 tmp_rgb[1] = tmp_rgb[2] = 1; | |
| 7869 | 731 else if (str.compare(0, len, "white", 0, len) == 0 |
| 732 || str.compare(0, len, "w", 0, len) == 0) | |
| 6761 | 733 tmp_rgb[0] = tmp_rgb[1] = tmp_rgb[2] = 1; |
| 734 else | |
| 735 retval = false; | |
| 6406 | 736 |
| 6705 | 737 if (retval) |
| 738 { | |
| 739 for (int i = 0; i < 3; i++) | |
| 7363 | 740 xrgb(i) = tmp_rgb[i]; |
| 6705 | 741 } |
| 6563 | 742 |
| 6705 | 743 return retval; |
| 744 } | |
| 6681 | 745 |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
746 bool |
|
7849
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
747 color_property::do_set (const octave_value& val) |
| 6790 | 748 { |
| 749 if (val.is_string ()) | |
| 750 { | |
| 751 std::string s = val.string_value (); | |
| 752 | |
| 753 if (! s.empty ()) | |
| 754 { | |
| 6898 | 755 if (radio_val.contains (s)) |
| 6790 | 756 { |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
757 if (current_type != radio_t || current_val != s) |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
758 { |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
759 current_val = s; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
760 current_type = radio_t; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
761 return true; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
762 } |
| 6790 | 763 } |
| 764 else | |
| 765 { | |
| 766 color_values col (s); | |
| 767 if (! error_state) | |
| 768 { | |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
769 if (current_type != color_t || col != color_val) |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
770 { |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
771 color_val = col; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
772 current_type = color_t; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
773 return true; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
774 } |
| 6790 | 775 } |
| 776 else | |
| 7363 | 777 error ("invalid value for color property \"%s\" (value = %s)", |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
778 get_name ().c_str (), s.c_str ()); |
| 6790 | 779 } |
| 780 } | |
| 781 else | |
| 7363 | 782 error ("invalid value for color property \"%s\"", |
| 783 get_name ().c_str ()); | |
| 6790 | 784 } |
|
9311
868fbeb2e365
allow ranges and other matrices in set
Jaroslav Hajek <highegg@gmail.com>
parents:
9238
diff
changeset
|
785 else if (val.is_numeric_type ()) |
| 6790 | 786 { |
| 787 Matrix m = val.matrix_value (); | |
| 788 | |
| 789 if (m.numel () == 3) | |
| 790 { | |
| 791 color_values col (m (0), m (1), m(2)); | |
| 792 if (! error_state) | |
| 793 { | |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
794 if (current_type != color_t || col != color_val) |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
795 { |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
796 color_val = col; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
797 current_type = color_t; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
798 return true; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
799 } |
| 6790 | 800 } |
| 801 } | |
| 802 else | |
| 7363 | 803 error ("invalid value for color property \"%s\"", |
| 804 get_name ().c_str ()); | |
| 6790 | 805 } |
| 806 else | |
| 7363 | 807 error ("invalid value for color property \"%s\"", |
| 808 get_name ().c_str ()); | |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
809 |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
810 return false; |
| 6790 | 811 } |
| 812 | |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
813 bool |
|
7849
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
814 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
|
815 { |
|
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
816 if (val.is_string ()) |
|
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
817 { |
|
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
818 std::string s = val.string_value (); |
|
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
819 |
|
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
820 if (! s.empty () && radio_val.contains (s)) |
|
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
821 { |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
822 if (current_type != radio_t || s != current_val) |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
823 { |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
824 current_val = s; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
825 current_type = radio_t; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
826 return true; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
827 } |
|
7844
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
828 } |
|
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
829 else |
|
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
830 error ("invalid value for double_radio property \"%s\"", |
|
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
831 get_name ().c_str ()); |
|
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
832 } |
|
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
833 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
|
834 { |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
835 double new_dval = val.double_value (); |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
836 |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
837 if (current_type != double_t || new_dval != dval) |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
838 { |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
839 dval = new_dval; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
840 current_type = double_t; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
841 return true; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
842 } |
|
7844
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
843 } |
|
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
844 else |
|
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
845 error ("invalid value for double_radio property \"%s\"", |
|
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
846 get_name ().c_str ()); |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
847 |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
848 return false; |
|
7844
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
849 } |
|
3d60445d3638
Add new double_radio_property class for alpha values.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7843
diff
changeset
|
850 |
| 7363 | 851 bool |
| 852 array_property::validate (const octave_value& v) | |
| 853 { | |
| 7364 | 854 bool xok = false; |
| 7363 | 855 |
| 8333 | 856 // FIXME -- should we always support []? |
|
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
|
857 if (v.is_empty () && v.is_numeric_type ()) |
| 7363 | 858 return true; |
| 859 | |
| 860 // check value type | |
| 861 if (type_constraints.size () > 0) | |
| 862 { | |
| 863 for (std::list<std::string>::const_iterator it = type_constraints.begin (); | |
| 7364 | 864 ! xok && it != type_constraints.end (); ++it) |
|
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
|
865 if ((*it) == v.class_name ()) |
| 7364 | 866 xok = true; |
| 7363 | 867 } |
| 868 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
|
869 xok = v.is_numeric_type (); |
| 7363 | 870 |
| 7364 | 871 if (xok) |
| 7363 | 872 { |
| 873 dim_vector vdims = v.dims (); | |
| 874 int vlen = vdims.length (); | |
| 875 | |
| 7364 | 876 xok = false; |
| 7363 | 877 |
| 878 // check value size | |
| 879 if (size_constraints.size () > 0) | |
| 880 for (std::list<dim_vector>::const_iterator it = size_constraints.begin (); | |
| 7364 | 881 ! xok && it != size_constraints.end (); ++it) |
| 7363 | 882 { |
| 883 dim_vector itdims = (*it); | |
| 884 | |
| 885 if (itdims.length () == vlen) | |
| 886 { | |
| 7364 | 887 xok = true; |
| 7363 | 888 |
| 7364 | 889 for (int i = 0; xok && i < vlen; i++) |
| 7363 | 890 if (itdims(i) >= 0 && itdims(i) != vdims(i)) |
| 7364 | 891 xok = false; |
| 7363 | 892 } |
| 893 } | |
| 894 else | |
| 895 return true; | |
| 896 } | |
| 897 | |
| 7364 | 898 return xok; |
| 7363 | 899 } |
| 900 | |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
901 bool |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
902 array_property::is_equal (const octave_value& v) const |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
903 { |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
904 if (data.type_name () == v.type_name ()) |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
905 { |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
906 if (data.dims () == v.dims ()) |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
907 { |
|
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
|
908 |
|
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
|
909 #define CHECK_ARRAY_EQUAL(T,F,A) \ |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
910 { \ |
|
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
|
911 if (data.numel () == 1) \ |
|
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
|
912 return data.F ## scalar_value () == \ |
|
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
|
913 v.F ## scalar_value (); \ |
|
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
|
914 else \ |
|
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
|
915 { \ |
|
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
|
916 /* Keep copy of array_value to allow sparse/bool arrays */ \ |
|
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
|
917 /* that are converted, to not be deallocated early */ \ |
|
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
|
918 const A m1 = data.F ## array_value (); \ |
|
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
|
919 const T* d1 = m1.data (); \ |
|
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
|
920 const A m2 = v.F ## array_value (); \ |
|
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
|
921 const T* d2 = m2.data ();\ |
|
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
|
922 \ |
|
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
|
923 bool flag = true; \ |
|
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
|
924 \ |
|
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
|
925 for (int i = 0; flag && i < data.numel (); i++) \ |
|
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
|
926 if (d1[i] != d2[i]) \ |
|
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
|
927 flag = false; \ |
|
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
|
928 \ |
|
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
|
929 return flag; \ |
|
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
|
930 } \ |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
931 } |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
932 |
|
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
|
933 if (data.is_double_type() || data.is_bool_type ()) |
|
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
|
934 CHECK_ARRAY_EQUAL (double, , NDArray) |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
935 else if (data.is_single_type ()) |
|
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
|
936 CHECK_ARRAY_EQUAL (float, float_, FloatNDArray) |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
937 else if (data.is_int8_type ()) |
|
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
|
938 CHECK_ARRAY_EQUAL (octave_int8, int8_, int8NDArray) |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
939 else if (data.is_int16_type ()) |
|
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
|
940 CHECK_ARRAY_EQUAL (octave_int16, int16_, int16NDArray) |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
941 else if (data.is_int32_type ()) |
|
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
|
942 CHECK_ARRAY_EQUAL (octave_int32, int32_, int32NDArray) |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
943 else if (data.is_int64_type ()) |
|
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
|
944 CHECK_ARRAY_EQUAL (octave_int64, int64_, int64NDArray) |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
945 else if (data.is_uint8_type ()) |
|
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
|
946 CHECK_ARRAY_EQUAL (octave_uint8, uint8_, uint8NDArray) |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
947 else if (data.is_uint16_type ()) |
|
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
|
948 CHECK_ARRAY_EQUAL (octave_uint16, uint16_, uint16NDArray) |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
949 else if (data.is_uint32_type ()) |
|
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
|
950 CHECK_ARRAY_EQUAL (octave_uint32, uint32_, uint32NDArray) |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
951 else if (data.is_uint64_type ()) |
|
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
|
952 CHECK_ARRAY_EQUAL (octave_uint64, uint64_, uint64NDArray) |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
953 } |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
954 } |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
955 |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
956 return false; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
957 } |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
958 |
| 7363 | 959 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
|
960 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
|
961 { |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
962 xmin = xminp = octave_Inf; |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
963 xmax = -octave_Inf; |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
964 |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
965 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
|
966 { |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
967 if (data.is_integer_type ()) |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
968 { |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
969 if (data.is_int8_type ()) |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
970 get_array_limits (data.int8_array_value (), xmin, xmax, xminp); |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
971 else if (data.is_uint8_type ()) |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
972 get_array_limits (data.uint8_array_value (), xmin, xmax, xminp); |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
973 else if (data.is_int16_type ()) |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
974 get_array_limits (data.int16_array_value (), xmin, xmax, xminp); |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
975 else if (data.is_uint16_type ()) |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
976 get_array_limits (data.uint16_array_value (), xmin, xmax, xminp); |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
977 else if (data.is_int32_type ()) |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
978 get_array_limits (data.int32_array_value (), xmin, xmax, xminp); |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
979 else if (data.is_uint32_type ()) |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
980 get_array_limits (data.uint32_array_value (), xmin, xmax, xminp); |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
981 else if (data.is_int64_type ()) |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
982 get_array_limits (data.int64_array_value (), xmin, xmax, xminp); |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
983 else if (data.is_uint64_type ()) |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
984 get_array_limits (data.uint64_array_value (), xmin, xmax, xminp); |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
985 } |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
986 else |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
987 get_array_limits (data.array_value (), xmin, xmax, xminp); |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
988 } |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
989 } |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
990 |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
991 bool |
|
7849
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
992 handle_property::do_set (const octave_value& v) |
| 7363 | 993 { |
| 994 double dv = v.double_value (); | |
| 995 | |
| 996 if (! error_state) | |
| 997 { | |
| 998 graphics_handle gh = gh_manager::lookup (dv); | |
| 999 | |
| 1000 if (xisnan (gh.value ()) || gh.ok ()) | |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
1001 { |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
1002 if (current_val != gh) |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
1003 { |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
1004 current_val = gh; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
1005 return true; |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
1006 } |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
1007 } |
| 7363 | 1008 else |
| 1009 error ("set: invalid graphics handle (= %g) for property \"%s\"", | |
| 7869 | 1010 dv, get_name ().c_str ()); |
| 7363 | 1011 } |
| 1012 else | |
| 1013 error ("set: invalid graphics handle for property \"%s\"", | |
| 7869 | 1014 get_name ().c_str ()); |
|
8063
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
1015 |
|
41bc700ff642
Trigger actions/listeners only for actual property change
Michael Goffioul
parents:
8062
diff
changeset
|
1016 return false; |
| 7363 | 1017 } |
| 1018 | |
| 1019 bool | |
| 7367 | 1020 callback_property::validate (const octave_value& v) const |
| 7363 | 1021 { |
| 7367 | 1022 // case 1: function handle |
| 1023 // case 2: cell array with first element being a function handle | |
| 1024 // case 3: string corresponding to known function name | |
| 1025 // case 4: evaluatable string | |
| 1026 // case 5: empty matrix | |
| 1027 | |
| 1028 if (v.is_function_handle ()) | |
| 1029 return true; | |
| 1030 else if (v.is_string ()) | |
| 1031 // complete validation will be done at execution-time | |
| 1032 return true; | |
| 1033 else if (v.is_cell () && v.length () > 0 | |
| 1034 && (v.rows() == 1 || v.columns () == 1) | |
| 1035 && v.cell_value ()(0).is_function_handle ()) | |
| 1036 return true; | |
| 1037 else if (v.is_empty ()) | |
| 1038 return true; | |
| 1039 | |
| 1040 return false; | |
| 7363 | 1041 } |
| 1042 | |
| 1043 void | |
| 7367 | 1044 callback_property::execute (const octave_value& data) const |
| 7363 | 1045 { |
| 7367 | 1046 if (callback.is_defined () && ! callback.is_empty ()) |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
1047 gh_manager::execute_callback (get_parent (), callback, data); |
|
7824
adb520646d7e
Fix execution of callback strings and allow execution of callback by name.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7822
diff
changeset
|
1048 } |
|
adb520646d7e
Fix execution of callback strings and allow execution of callback by name.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7822
diff
changeset
|
1049 |
|
7864
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1050 // Used to cache dummy graphics objects from which dynamic |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1051 // properties can be cloned. |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1052 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
|
1053 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1054 property |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1055 property::create (const std::string& name, const graphics_handle& h, |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1056 const caseless_str& type, const octave_value_list& args) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1057 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1058 property retval; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1059 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1060 if (type.compare ("string")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1061 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1062 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
|
1063 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1064 if (! error_state) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1065 retval = property (new string_property (name, h, val)); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1066 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1067 else if (type.compare ("any")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1068 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1069 octave_value val = |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1070 (args.length () > 0 ? args(0) : octave_value (Matrix ())); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1071 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1072 retval = property (new any_property (name, h, val)); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1073 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1074 else if (type.compare ("radio")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1075 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1076 if (args.length () > 0) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1077 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1078 std::string vals = args(0).string_value (); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1079 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1080 if (! error_state) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1081 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1082 retval = property (new radio_property (name, h, vals)); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1083 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1084 if (args.length () > 1) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1085 retval.set (args(1)); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1086 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1087 else |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1088 error ("addproperty: invalid argument for radio property, expected a string value"); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1089 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1090 else |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1091 error ("addproperty: missing possible values for radio property"); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1092 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1093 else if (type.compare ("double")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1094 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1095 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
|
1096 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1097 if (! error_state) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1098 retval = property (new double_property (name, h, d)); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1099 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1100 else if (type.compare ("handle")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1101 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1102 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
|
1103 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1104 if (! error_state) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1105 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1106 graphics_handle gh (hh); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1107 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1108 retval = property (new handle_property (name, h, gh)); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1109 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1110 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1111 else if (type.compare ("boolean")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1112 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1113 retval = property (new bool_property (name, h, false)); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1114 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1115 if (args.length () > 0) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1116 retval.set (args(0)); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1117 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1118 else if (type.compare ("data")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1119 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1120 retval = property (new array_property (name, h, Matrix ())); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1121 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1122 if (args.length () > 0) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1123 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1124 retval.set (args(0)); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1125 |
| 8333 | 1126 // FIXME -- additional argument could define constraints, |
| 1127 // but is this really useful? | |
|
7864
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1128 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1129 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1130 else if (type.compare ("color")) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1131 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1132 color_values cv (0, 0, 0); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1133 radio_values rv; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1134 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1135 if (args.length () > 1) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1136 rv = radio_values (args(1).string_value ()); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1137 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1138 if (! error_state) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1139 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1140 retval = property (new color_property (name, h, cv, rv)); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1141 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1142 if (! error_state) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1143 { |
| 7869 | 1144 if (args.length () > 0 && ! args(0).is_empty ()) |
|
7864
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1145 retval.set (args(0)); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1146 else |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1147 retval.set (rv.default_value ()); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1148 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1149 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1150 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1151 else |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1152 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1153 caseless_str go_name, go_rest; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1154 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1155 if (lookup_object_name (type, go_name, go_rest)) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1156 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1157 graphics_object go; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1158 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1159 std::map<caseless_str, graphics_object>::const_iterator it = |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1160 dprop_obj_map.find (go_name); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1161 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1162 if (it == dprop_obj_map.end ()) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1163 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1164 base_graphics_object *bgo = |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1165 make_graphics_object_from_type (go_name); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1166 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1167 if (bgo) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1168 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1169 go = graphics_object (bgo); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1170 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1171 dprop_obj_map[go_name] = go; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1172 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1173 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1174 else |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1175 go = it->second; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1176 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1177 if (go.valid_object ()) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1178 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1179 property prop = go.get_properties ().get_property (go_rest); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1180 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1181 if (! error_state) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1182 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1183 retval = prop.clone (); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1184 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1185 retval.set_parent (h); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1186 retval.set_name (name); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1187 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1188 if (args.length () > 0) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1189 retval.set (args(0)); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1190 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1191 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1192 else |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1193 error ("addproperty: invalid object type (= %s)", |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1194 go_name.c_str ()); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1195 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1196 else |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1197 error ("addproperty: unsupported type for dynamic property (= %s)", |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1198 type.c_str ()); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1199 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1200 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1201 return retval; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1202 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
1203 |
| 7363 | 1204 // --------------------------------------------------------------------- |
| 6681 | 1205 |
| 6705 | 1206 void |
| 7189 | 1207 property_list::set (const caseless_str& name, const octave_value& val) |
| 6681 | 1208 { |
| 6705 | 1209 size_t offset = 0; |
| 6681 | 1210 |
| 6705 | 1211 size_t len = name.length (); |
| 6681 | 1212 |
| 6705 | 1213 if (len > 4) |
| 1214 { | |
| 7189 | 1215 caseless_str pfx = name.substr (0, 4); |
| 6681 | 1216 |
| 6705 | 1217 if (pfx.compare ("axes") || pfx.compare ("line") |
| 1218 || pfx.compare ("text")) | |
| 1219 offset = 4; | |
| 1220 else if (len > 5) | |
| 1221 { | |
| 1222 pfx = name.substr (0, 5); | |
| 6681 | 1223 |
| 6807 | 1224 if (pfx.compare ("image") || pfx.compare ("patch")) |
| 6705 | 1225 offset = 5; |
| 1226 else if (len > 6) | |
| 1227 { | |
| 1228 pfx = name.substr (0, 6); | |
| 6681 | 1229 |
| 6705 | 1230 if (pfx.compare ("figure")) |
| 1231 offset = 6; | |
| 1232 else if (len > 7) | |
| 1233 { | |
| 1234 pfx = name.substr (0, 7); | |
| 6681 | 1235 |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
1236 if (pfx.compare ("surface") || pfx.compare ("hggroup")) |
| 6705 | 1237 offset = 7; |
| 1238 } | |
| 1239 } | |
| 1240 } | |
| 6681 | 1241 |
| 6705 | 1242 if (offset > 0) |
| 1243 { | |
| 1244 // FIXME -- should we validate property names and values here? | |
| 6406 | 1245 |
| 6705 | 1246 std::string pname = name.substr (offset); |
| 6406 | 1247 |
| 6705 | 1248 std::transform (pfx.begin (), pfx.end (), pfx.begin (), tolower); |
| 1249 std::transform (pname.begin (), pname.end (), pname.begin (), tolower); | |
| 6406 | 1250 |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1251 bool has_property = false; |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1252 if (pfx == "axes") |
|
9585
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
1253 has_property = axes::properties::has_core_property (pname); |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1254 else if (pfx == "line") |
|
9585
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
1255 has_property = line::properties::has_core_property (pname); |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1256 else if (pfx == "text") |
|
9585
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
1257 has_property = text::properties::has_core_property (pname); |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1258 else if (pfx == "image") |
|
9585
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
1259 has_property = image::properties::has_core_property (pname); |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1260 else if (pfx == "patch") |
|
9585
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
1261 has_property = patch::properties::has_core_property (pname); |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1262 else if (pfx == "figure") |
|
9585
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
1263 has_property = figure::properties::has_core_property (pname); |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1264 else if (pfx == "surface") |
|
9585
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
1265 has_property = surface::properties::has_core_property (pname); |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1266 else if (pfx == "hggroup") |
|
9585
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
1267 has_property = hggroup::properties::has_core_property (pname); |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1268 |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1269 if (has_property) |
| 6705 | 1270 { |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1271 bool remove = false; |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1272 if (val.is_string ()) |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1273 { |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1274 caseless_str tval = val.string_value (); |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1275 |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1276 remove = tval.compare ("remove"); |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1277 } |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1278 |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1279 pval_map_type& pval_map = plist_map[pfx]; |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1280 |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1281 if (remove) |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1282 { |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1283 pval_map_iterator p = pval_map.find (pname); |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1284 |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1285 if (p != pval_map.end ()) |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1286 pval_map.erase (p); |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1287 } |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1288 else |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1289 pval_map[pname] = val; |
| 6705 | 1290 } |
| 1291 else | |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1292 error ("invalid %s property `%s'", pfx.c_str (), pname.c_str ()); |
| 6705 | 1293 } |
| 1294 } | |
| 6406 | 1295 |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1296 if (! error_state && offset == 0) |
| 6705 | 1297 error ("invalid default property specification"); |
| 1298 } | |
| 6406 | 1299 |
| 6705 | 1300 octave_value |
| 7189 | 1301 property_list::lookup (const caseless_str& name) const |
| 6705 | 1302 { |
| 1303 octave_value retval; | |
| 6406 | 1304 |
| 6705 | 1305 size_t offset = 0; |
| 6406 | 1306 |
| 6705 | 1307 size_t len = name.length (); |
| 6406 | 1308 |
| 6705 | 1309 if (len > 4) |
| 1310 { | |
| 7189 | 1311 caseless_str pfx = name.substr (0, 4); |
| 6406 | 1312 |
| 6705 | 1313 if (pfx.compare ("axes") || pfx.compare ("line") |
| 1314 || pfx.compare ("text")) | |
| 1315 offset = 4; | |
| 1316 else if (len > 5) | |
| 1317 { | |
| 1318 pfx = name.substr (0, 5); | |
| 6406 | 1319 |
| 6807 | 1320 if (pfx.compare ("image") || pfx.compare ("patch")) |
| 6705 | 1321 offset = 5; |
| 1322 else if (len > 6) | |
| 1323 { | |
| 1324 pfx = name.substr (0, 6); | |
| 6406 | 1325 |
| 6705 | 1326 if (pfx.compare ("figure")) |
| 1327 offset = 6; | |
| 1328 else if (len > 7) | |
| 1329 { | |
| 1330 pfx = name.substr (0, 7); | |
| 6406 | 1331 |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
1332 if (pfx.compare ("surface") || pfx.compare ("hggroup")) |
| 6705 | 1333 offset = 7; |
| 1334 } | |
| 1335 } | |
| 1336 } | |
| 6406 | 1337 |
| 6705 | 1338 if (offset > 0) |
| 1339 { | |
| 1340 std::string pname = name.substr (offset); | |
| 6406 | 1341 |
| 6705 | 1342 std::transform (pfx.begin (), pfx.end (), pfx.begin (), tolower); |
| 1343 std::transform (pname.begin (), pname.end (), pname.begin (), tolower); | |
| 6406 | 1344 |
| 6705 | 1345 plist_map_const_iterator p = find (pfx); |
| 6432 | 1346 |
| 6705 | 1347 if (p != end ()) |
| 1348 { | |
| 1349 const pval_map_type& pval_map = p->second; | |
| 6406 | 1350 |
| 6705 | 1351 pval_map_const_iterator q = pval_map.find (pname); |
| 6406 | 1352 |
| 6705 | 1353 if (q != pval_map.end ()) |
| 1354 retval = q->second; | |
| 1355 } | |
| 1356 } | |
| 1357 } | |
| 6406 | 1358 |
| 6705 | 1359 return retval; |
| 1360 } | |
| 6406 | 1361 |
| 6705 | 1362 Octave_map |
| 1363 property_list::as_struct (const std::string& prefix_arg) const | |
| 1364 { | |
| 1365 Octave_map m; | |
| 6406 | 1366 |
| 6705 | 1367 for (plist_map_const_iterator p = begin (); p != end (); p++) |
| 1368 { | |
| 1369 std::string prefix = prefix_arg + p->first; | |
| 6406 | 1370 |
| 6705 | 1371 const pval_map_type pval_map = p->second; |
| 6406 | 1372 |
| 6705 | 1373 for (pval_map_const_iterator q = pval_map.begin (); |
| 1374 q != pval_map.end (); | |
| 1375 q++) | |
| 1376 m.assign (prefix + q->first, q->second); | |
| 1377 } | |
| 6406 | 1378 |
| 6705 | 1379 return m; |
| 1380 } | |
| 6432 | 1381 |
| 6874 | 1382 graphics_handle::graphics_handle (const octave_value& a) |
| 1383 : val (octave_NaN) | |
| 1384 { | |
| 1385 if (a.is_empty ()) | |
| 1386 /* do nothing */; | |
| 1387 else | |
| 1388 { | |
| 1389 double tval = a.double_value (); | |
| 1390 | |
| 1391 if (! error_state) | |
| 1392 val = tval; | |
| 1393 else | |
| 1394 error ("invalid graphics handle"); | |
| 1395 } | |
| 1396 } | |
| 1397 | |
|
10056
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1398 // 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
|
1399 |
| 6705 | 1400 void |
| 1401 graphics_object::set (const octave_value_list& args) | |
| 1402 { | |
| 1403 int nargin = args.length (); | |
| 6406 | 1404 |
| 6705 | 1405 if (nargin == 0) |
| 1406 rep->defaults (); | |
| 1407 else if (nargin % 2 == 0) | |
| 1408 { | |
| 1409 for (int i = 0; i < nargin; i += 2) | |
| 1410 { | |
| 7189 | 1411 caseless_str name = args(i).string_value (); |
| 6406 | 1412 |
| 6705 | 1413 if (! error_state) |
| 1414 { | |
| 1415 octave_value val = args(i+1); | |
| 6406 | 1416 |
|
10056
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1417 set_value_or_default (name, val); |
| 6406 | 1418 |
| 6705 | 1419 if (error_state) |
| 1420 break; | |
| 1421 } | |
| 1422 else | |
| 1423 error ("set: expecting argument %d to be a property name", i); | |
| 1424 } | |
| 1425 } | |
| 1426 else | |
| 1427 error ("set: invalid number of arguments"); | |
| 1428 } | |
| 6406 | 1429 |
|
10056
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1430 /* |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1431 %!# test set with name, value pairs |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1432 %!test |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1433 %! set(gcf, "visible", "off"); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1434 %! h = plot (1:10, 10:-1:1); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1435 %! set (h, "linewidth", 10, "marker", "x"); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1436 %! assert (get (h, "linewidth"), 10); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1437 %! assert (get (h, "marker"), "x"); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1438 */ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1439 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1440 // 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
|
1441 void |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1442 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
|
1443 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
|
1444 { |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1445 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
|
1446 { |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1447 error("set: number of names must match number of value columns (%d != %d)", |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1448 names.numel (), values.columns ()); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1449 } |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1450 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1451 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
|
1452 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1453 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
|
1454 { |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1455 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
|
1456 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
|
1457 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1458 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
|
1459 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1460 if (error_state) |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1461 break; |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1462 } |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1463 } |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1464 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1465 /* |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1466 %!# test set with cell array arguments |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1467 %!test |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1468 %! set (gcf, "visible", "off"); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1469 %! h = plot (1:10, 10:-1:1); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1470 %! set (h, {"linewidth", "marker"}, {10, "x"}); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1471 %! assert (get(h, "linewidth"), 10); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1472 %! assert (get(h, "marker"), "x"); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1473 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1474 %!# test set with multiple handles and cell array arguments |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1475 %!test |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1476 %! set (gcf, "visible", "off"); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1477 %! h = plot (1:10, 10:-1:1, 1:10, 1:10); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1478 %! set (h, {"linewidth", "marker"}, {10, "x"; 5, "o"}); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1479 %! assert (get (h, "linewidth"), {10; 5}); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1480 %! assert (get (h, "marker"), {"x"; "o"}); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1481 %! set (h, {"linewidth", "marker"}, {10, "x"}); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1482 %! assert (get (h, "linewidth"), {10; 10}); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1483 %! assert (get (h, "marker"), {"x"; "x"}); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1484 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1485 %!error <set: number of graphics handles must match number of value rows> |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1486 %! set (gcf, "visible", "off"); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1487 %! h = plot (1:10, 10:-1:1, 1:10, 1:10); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1488 %! set (h, {"linewidth", "marker"}, {10, "x"; 5, "o"; 7, "."}); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1489 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1490 %!error <set: number of names must match number of value columns> |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1491 %! set (gcf, "visible", "off"); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1492 %! h = plot (1:10, 10:-1:1, 1:10, 1:10); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1493 %! set (h, {"linewidth"}, {10, "x"; 5, "o"}); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1494 */ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1495 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1496 // 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
|
1497 void |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1498 graphics_object::set (const Octave_map& m) |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1499 { |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1500 for (Octave_map::const_iterator p = m.begin (); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1501 p != m.end (); p++) |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1502 { |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1503 caseless_str name = m.key (p); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1504 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1505 octave_value val = octave_value (m.contents (p).elem (m.numel () - 1)); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1506 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1507 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
|
1508 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1509 if (error_state) |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1510 break; |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1511 } |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1512 } |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1513 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1514 /* |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1515 %!# test set with struct arguments |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1516 %!test |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1517 %! set (gcf, "visible", "off"); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1518 %! h = plot (1:10, 10:-1:1); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1519 %! set (h, struct ("linewidth", 10, "marker", "x")); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1520 %! assert (get (h, "linewidth"), 10); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1521 %! assert (get (h, "marker"), "x"); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1522 %! h = plot (1:10, 10:-1:1, 1:10, 1:10); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1523 %! set (h, struct ("linewidth", {5, 10})); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1524 %! assert (get(h, "linewidth"), {10; 10}); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1525 */ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1526 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1527 // 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
|
1528 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1529 void |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1530 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
|
1531 const octave_value& val) |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1532 { |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1533 if (val.is_string ()) |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1534 { |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1535 caseless_str tval = val.string_value (); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1536 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1537 octave_value default_val; |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1538 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1539 if (tval.compare ("default")) |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1540 { |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1541 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
|
1542 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1543 if (error_state) |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1544 return; |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1545 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1546 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
|
1547 } |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1548 else if (tval.compare ("factory")) |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1549 { |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1550 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
|
1551 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1552 if (error_state) |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1553 return; |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1554 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1555 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
|
1556 } |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1557 else |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1558 rep->set (name, val); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1559 } |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1560 else |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1561 rep->set (name, val); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1562 } |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1563 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1564 /* |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1565 %!# test setting of default values |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1566 %!test |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1567 %! set (gcf, "visible", "off"); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1568 %! h = plot (1:10, 10:-1:1); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1569 %! set (0, "defaultlinelinewidth", 20); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1570 %! set (h, "linewidth", "default"); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1571 %! assert (get (h, "linewidth"), 20); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1572 %! set (h, "linewidth", "factory"); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1573 %! assert (get (h, "linewidth"), 0.5); |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1574 */ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
1575 |
|
8234
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1576 static double |
|
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1577 make_handle_fraction (void) |
|
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1578 { |
|
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1579 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
|
1580 |
|
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1581 return (rand () + 1.0) / maxrand; |
|
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1582 } |
| 6406 | 1583 |
| 6705 | 1584 graphics_handle |
| 1585 gh_manager::get_handle (const std::string& go_name) | |
| 1586 { | |
| 1587 graphics_handle retval; | |
| 6406 | 1588 |
| 6705 | 1589 if (go_name == "figure") |
| 1590 { | |
|
8234
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1591 // 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
|
1592 // figure number. |
|
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1593 |
| 6705 | 1594 // We always want the lowest unused figure number. |
| 6406 | 1595 |
| 6705 | 1596 retval = 1; |
| 6425 | 1597 |
| 6705 | 1598 while (handle_map.find (retval) != handle_map.end ()) |
| 1599 retval++; | |
| 1600 } | |
| 1601 else | |
| 1602 { | |
|
8234
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1603 // 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
|
1604 // 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
|
1605 // 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
|
1606 // time. |
|
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1607 |
| 6705 | 1608 free_list_iterator p = handle_free_list.begin (); |
| 6406 | 1609 |
| 6705 | 1610 if (p != handle_free_list.end ()) |
| 1611 { | |
| 1612 retval = *p; | |
| 1613 handle_free_list.erase (p); | |
| 1614 } | |
| 1615 else | |
| 7286 | 1616 { |
| 1617 retval = graphics_handle (next_handle); | |
| 1618 | |
|
8234
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1619 next_handle = ceil (next_handle) - 1.0 - make_handle_fraction (); |
| 7286 | 1620 } |
| 6705 | 1621 } |
| 6406 | 1622 |
| 6705 | 1623 return retval; |
| 1624 } | |
| 6406 | 1625 |
| 6705 | 1626 void |
| 1627 gh_manager::do_free (const graphics_handle& h) | |
| 1628 { | |
| 7056 | 1629 if (h.ok ()) |
| 6705 | 1630 { |
| 6874 | 1631 if (h.value () != 0) |
| 6705 | 1632 { |
| 6874 | 1633 iterator p = handle_map.find (h); |
| 1634 | |
| 1635 if (p != handle_map.end ()) | |
| 1636 { | |
| 8208 | 1637 base_properties& bp = p->second.get_properties (); |
| 1638 | |
| 1639 bp.set_beingdeleted (true); | |
| 1640 | |
| 1641 bp.delete_children (); | |
| 1642 | |
| 1643 octave_value val = bp.get_deletefcn (); | |
| 1644 | |
| 1645 bp.execute_deletefcn (); | |
| 7367 | 1646 |
|
8058
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
1647 // notify backend |
|
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
1648 graphics_backend backend = p->second.get_backend (); |
|
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
1649 if (backend) |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1650 backend.object_destroyed (p->second); |
| 8208 | 1651 |
| 1652 // Note: this will be valid only for first explicitly | |
| 1653 // deleted object. All its children will then have an | |
| 1654 // unknown backend. | |
| 1655 | |
|
8234
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1656 // Graphics handles for non-figure objects are negative |
|
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1657 // integers plus some random fractional part. To avoid |
|
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1658 // running out of integers, we recycle the integer part |
|
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1659 // but tack on a new random part each time. |
|
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1660 |
| 6874 | 1661 handle_map.erase (p); |
| 1662 | |
| 1663 if (h.value () < 0) | |
|
8234
8c4e79668a5e
generate new fractional parts for recycled graphics handles
John W. Eaton <jwe@octave.org>
parents:
8233
diff
changeset
|
1664 handle_free_list.insert (ceil (h.value ()) - make_handle_fraction ()); |
| 6874 | 1665 } |
| 1666 else | |
| 1667 error ("graphics_handle::free: invalid object %g", h.value ()); | |
| 6705 | 1668 } |
| 1669 else | |
| 6874 | 1670 error ("graphics_handle::free: can't delete root figure"); |
| 6705 | 1671 } |
| 1672 } | |
| 6406 | 1673 |
| 1674 gh_manager *gh_manager::instance = 0; | |
| 1675 | |
| 1676 static void | |
| 7189 | 1677 xset (const graphics_handle& h, const caseless_str& name, |
| 6406 | 1678 const octave_value& val) |
| 1679 { | |
| 1680 graphics_object obj = gh_manager::get_object (h); | |
| 1681 obj.set (name, val); | |
| 1682 } | |
| 1683 | |
| 1684 static void | |
| 1685 xset (const graphics_handle& h, const octave_value_list& args) | |
| 1686 { | |
| 1687 if (args.length () > 0) | |
| 1688 { | |
| 1689 graphics_object obj = gh_manager::get_object (h); | |
| 1690 obj.set (args); | |
| 1691 } | |
| 1692 } | |
| 1693 | |
| 1694 | |
| 1695 static octave_value | |
| 7189 | 1696 xget (const graphics_handle& h, const caseless_str& name) |
| 6406 | 1697 { |
| 1698 graphics_object obj = gh_manager::get_object (h); | |
| 1699 return obj.get (name); | |
| 1700 } | |
| 1701 | |
| 1702 static graphics_handle | |
| 1703 reparent (const octave_value& ov, const std::string& who, | |
| 1704 const std::string& property, const graphics_handle& new_parent, | |
| 1705 bool adopt = true) | |
| 1706 { | |
| 1707 graphics_handle h = octave_NaN; | |
| 1708 | |
| 1709 double val = ov.double_value (); | |
| 1710 | |
| 1711 if (! error_state) | |
| 1712 { | |
| 1713 h = gh_manager::lookup (val); | |
| 1714 | |
| 7056 | 1715 if (h.ok ()) |
| 6406 | 1716 { |
| 1717 graphics_object obj = gh_manager::get_object (h); | |
| 1718 | |
| 1719 graphics_handle parent_h = obj.get_parent (); | |
| 1720 | |
| 1721 graphics_object parent_obj = gh_manager::get_object (parent_h); | |
| 1722 | |
| 1723 parent_obj.remove_child (h); | |
| 1724 | |
| 1725 if (adopt) | |
| 6874 | 1726 obj.set ("parent", new_parent.value ()); |
| 6406 | 1727 else |
| 1728 obj.reparent (new_parent); | |
| 1729 } | |
| 1730 else | |
| 1731 error ("%s: invalid graphics handle (= %g) for %s", | |
| 1732 who.c_str (), val, property.c_str ()); | |
| 1733 } | |
| 1734 else | |
| 1735 error ("%s: expecting %s to be a graphics handle", | |
| 1736 who.c_str (), property.c_str ()); | |
| 1737 | |
| 1738 return h; | |
| 1739 } | |
| 1740 | |
| 1741 // This function is NOT equivalent to the scripting language function gcf. | |
| 1742 graphics_handle | |
| 1743 gcf (void) | |
| 1744 { | |
| 1745 octave_value val = xget (0, "currentfigure"); | |
| 1746 | |
| 1747 return val.is_empty () ? octave_NaN : val.double_value (); | |
| 1748 } | |
| 1749 | |
| 1750 // This function is NOT equivalent to the scripting language function gca. | |
| 1751 graphics_handle | |
| 1752 gca (void) | |
| 1753 { | |
| 1754 octave_value val = xget (gcf (), "currentaxes"); | |
| 1755 | |
| 1756 return val.is_empty () ? octave_NaN : val.double_value (); | |
| 1757 } | |
| 1758 | |
| 1759 static void | |
| 1760 adopt (const graphics_handle& p, const graphics_handle& h) | |
| 1761 { | |
| 1762 graphics_object parent_obj = gh_manager::get_object (p); | |
| 1763 | |
| 1764 parent_obj.adopt (h); | |
| 1765 } | |
| 1766 | |
| 1767 static bool | |
| 7056 | 1768 is_handle (const graphics_handle& h) |
| 1769 { | |
| 1770 return h.ok (); | |
| 1771 } | |
| 1772 | |
| 1773 static bool | |
| 6406 | 1774 is_handle (double val) |
| 1775 { | |
| 6874 | 1776 graphics_handle h = gh_manager::lookup (val); |
| 1777 | |
| 1778 return h.ok (); | |
| 6406 | 1779 } |
| 1780 | |
|
8183
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1781 static octave_value |
| 6406 | 1782 is_handle (const octave_value& val) |
| 1783 { | |
|
8183
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1784 octave_value retval = false; |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1785 |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1786 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
|
1787 retval = true; |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1788 else if (val.is_real_matrix ()) |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1789 { |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1790 if (val.is_string ()) |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1791 retval = boolNDArray (val.dims (), false); |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1792 else |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1793 { |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1794 const NDArray handles = val.array_value (); |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1795 |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1796 if (! error_state) |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1797 { |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1798 boolNDArray result (handles.dims ()); |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1799 |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1800 for (octave_idx_type i = 0; i < handles.numel (); i++) |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1801 result.xelem (i) = is_handle (handles (i)); |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1802 |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1803 retval = result; |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1804 } |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1805 } |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1806 } |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1807 |
|
277218396978
Handle arrays of handles in the Fishandle function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
1808 return retval; |
| 6406 | 1809 } |
| 1810 | |
| 1811 static bool | |
| 1812 is_figure (double val) | |
| 1813 { | |
| 1814 graphics_object obj = gh_manager::get_object (val); | |
| 1815 | |
| 1816 return obj && obj.isa ("figure"); | |
| 1817 } | |
| 1818 | |
| 7370 | 1819 static void |
| 1820 xcreatefcn (const graphics_handle& h) | |
| 1821 { | |
| 1822 graphics_object obj = gh_manager::get_object (h); | |
| 1823 obj.get_properties ().execute_createfcn (); | |
| 1824 } | |
| 1825 | |
| 6406 | 1826 // --------------------------------------------------------------------- |
| 1827 | |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1828 void |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1829 base_graphics_backend::property_changed (const graphics_handle& h, int id) |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1830 { |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1831 graphics_object go = gh_manager::get_object (h); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1832 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1833 property_changed (go, id); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1834 } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1835 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1836 void |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1837 base_graphics_backend::object_created (const graphics_handle& h) |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1838 { |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1839 graphics_object go = gh_manager::get_object (h); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1840 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1841 object_created (go); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1842 } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1843 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1844 void |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1845 base_graphics_backend::object_destroyed (const graphics_handle& h) |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1846 { |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1847 graphics_object go = gh_manager::get_object (h); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1848 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1849 object_destroyed (go); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1850 } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1851 // --------------------------------------------------------------------- |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
1852 |
| 6406 | 1853 static Matrix |
| 1854 maybe_set_children (const Matrix& kids, const octave_value& val) | |
| 1855 { | |
| 1856 const Matrix new_kids = val.matrix_value (); | |
| 1857 | |
| 1858 bool ok = true; | |
| 1859 | |
| 1860 if (! error_state) | |
| 1861 { | |
| 1862 if (kids.numel () == new_kids.numel ()) | |
| 1863 { | |
| 1864 Matrix t1 = kids; | |
| 1865 Matrix t2 = new_kids; | |
| 1866 | |
|
9883
3ec3b8e80b67
fix order of drawing objects with opengl renderer
Shai Ayal <shaiay@users.sourceforge.net>
parents:
9680
diff
changeset
|
1867 t1 = t1.sort (); |
|
3ec3b8e80b67
fix order of drawing objects with opengl renderer
Shai Ayal <shaiay@users.sourceforge.net>
parents:
9680
diff
changeset
|
1868 t2 = t2.sort (); |
| 6406 | 1869 |
| 1870 if (t1 != t2) | |
| 1871 ok = false; | |
| 8209 | 1872 } |
| 1873 else | |
| 6406 | 1874 ok = false; |
| 1875 | |
| 1876 if (! ok) | |
| 1877 error ("set: new children must be a permutation of existing children"); | |
| 1878 } | |
| 1879 else | |
| 1880 { | |
| 1881 ok = false; | |
| 1882 error ("set: expecting children to be array of graphics handles"); | |
| 1883 } | |
| 1884 | |
| 1885 return ok ? new_kids : kids; | |
| 1886 } | |
| 1887 | |
| 6705 | 1888 void |
| 1889 base_properties::set_from_list (base_graphics_object& obj, | |
| 1890 property_list& defaults) | |
| 6406 | 1891 { |
| 6705 | 1892 std::string go_name = graphics_object_name (); |
| 6406 | 1893 |
| 6705 | 1894 property_list::plist_map_const_iterator p = defaults.find (go_name); |
| 6406 | 1895 |
| 6705 | 1896 if (p != defaults.end ()) |
| 1897 { | |
| 1898 const property_list::pval_map_type pval_map = p->second; | |
| 6406 | 1899 |
| 6705 | 1900 for (property_list::pval_map_const_iterator q = pval_map.begin (); |
| 1901 q != pval_map.end (); | |
| 1902 q++) | |
| 1903 { | |
| 1904 std::string pname = q->first; | |
| 6406 | 1905 |
| 6705 | 1906 obj.set (pname, q->second); |
| 6406 | 1907 |
| 6705 | 1908 if (error_state) |
| 1909 { | |
| 1910 error ("error setting default property %s", pname.c_str ()); | |
| 1911 break; | |
| 1912 } | |
| 1913 } | |
| 1914 } | |
| 1915 } | |
| 6406 | 1916 |
| 7363 | 1917 octave_value |
|
8061
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1918 base_properties::get_dynamic (const caseless_str& name) const |
| 7363 | 1919 { |
| 1920 octave_value retval; | |
| 1921 | |
| 8090 | 1922 std::map<caseless_str, property, cmp_caseless_str>::const_iterator it = all_props.find (name); |
|
8061
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1923 |
|
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1924 if (it != all_props.end ()) |
|
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1925 retval = it->second.get (); |
| 7363 | 1926 else |
|
8061
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1927 error ("get: unknown property \"%s\"", name.c_str ()); |
| 7363 | 1928 |
| 1929 return retval; | |
| 1930 } | |
| 1931 | |
| 1932 octave_value | |
|
8061
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1933 base_properties::get_dynamic (bool all) const |
| 7363 | 1934 { |
| 1935 Octave_map m; | |
| 1936 | |
| 8090 | 1937 for (std::map<caseless_str, property, cmp_caseless_str>::const_iterator it = all_props.begin (); |
| 7363 | 1938 it != all_props.end (); ++it) |
| 7379 | 1939 if (all || ! it->second.is_hidden ()) |
| 1940 m.assign (it->second.get_name (), it->second.get ()); | |
| 7363 | 1941 |
| 1942 return m; | |
| 1943 } | |
| 1944 | |
|
9582
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
1945 std::set<std::string> |
| 9972 | 1946 base_properties::dynamic_property_names (void) const |
| 1947 { | |
| 1948 return dynamic_properties; | |
|
9582
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
1949 } |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
1950 |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1951 bool |
| 9972 | 1952 base_properties::has_dynamic_property (const std::string& pname) |
| 1953 { | |
| 1954 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
|
1955 |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1956 return dynprops.find (pname) != dynprops.end (); |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1957 } |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1958 |
| 7363 | 1959 void |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1960 base_properties::set_dynamic (const caseless_str& pname, |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1961 const octave_value& val) |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1962 { |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1963 std::map<caseless_str, property, cmp_caseless_str>::iterator it = all_props.find (pname); |
|
8061
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1964 |
|
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1965 if (it != all_props.end ()) |
|
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1966 it->second.set (val); |
| 7363 | 1967 else |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1968 error ("set: unknown property \"%s\"", pname.c_str ()); |
|
8061
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1969 |
|
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1970 if (! error_state) |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1971 { |
| 9972 | 1972 dynamic_properties.insert (pname); |
|
9185
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1973 |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1974 mark_modified (); |
|
1e5c11890f85
check for invalid property names when setting defaults
John W. Eaton <jwe@octave.org>
parents:
9181
diff
changeset
|
1975 } |
| 7363 | 1976 } |
| 1977 | |
| 1978 property | |
|
8061
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1979 base_properties::get_property_dynamic (const caseless_str& name) |
| 7363 | 1980 { |
| 8090 | 1981 std::map<caseless_str, property, cmp_caseless_str>::const_iterator it = all_props.find (name); |
|
8061
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1982 |
|
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1983 if (it == all_props.end ()) |
|
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1984 { |
|
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1985 error ("get_property: unknown property \"%s\"", name.c_str ()); |
|
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1986 return property (); |
|
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1987 } |
| 7363 | 1988 else |
|
8061
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
1989 return it->second; |
| 7363 | 1990 } |
| 1991 | |
| 6705 | 1992 void |
| 1993 base_properties::remove_child (const graphics_handle& h) | |
| 6406 | 1994 { |
| 6705 | 1995 octave_idx_type k = -1; |
| 1996 octave_idx_type n = children.numel (); | |
| 1997 for (octave_idx_type i = 0; i < n; i++) | |
| 6406 | 1998 { |
| 6874 | 1999 if (h.value () == children(i)) |
| 6406 | 2000 { |
| 6705 | 2001 k = i; |
| 2002 break; | |
| 6406 | 2003 } |
| 2004 } | |
| 2005 | |
| 6705 | 2006 if (k >= 0) |
| 6406 | 2007 { |
|
8233
beaf723a49eb
graphics.cc (base_properties::remove_child): handle children as a column vector instead of a row vector
John W. Eaton <jwe@octave.org>
parents:
8228
diff
changeset
|
2008 Matrix new_kids (n-1, 1); |
| 6705 | 2009 octave_idx_type j = 0; |
| 2010 for (octave_idx_type i = 0; i < n; i++) | |
| 2011 { | |
| 2012 if (i != k) | |
| 2013 new_kids(j++) = children(i); | |
| 2014 } | |
| 2015 children = new_kids; | |
| 7378 | 2016 mark_modified (); |
| 6406 | 2017 } |
| 6705 | 2018 } |
| 6406 | 2019 |
| 6836 | 2020 void |
| 2021 base_properties::set_parent (const octave_value& val) | |
| 6705 | 2022 { |
| 2023 double tmp = val.double_value (); | |
| 6406 | 2024 |
| 6705 | 2025 graphics_handle new_parent = octave_NaN; |
| 6406 | 2026 |
| 6705 | 2027 if (! error_state) |
| 2028 { | |
| 2029 new_parent = gh_manager::lookup (tmp); | |
| 6406 | 2030 |
| 7056 | 2031 if (new_parent.ok ()) |
| 6705 | 2032 { |
| 7363 | 2033 graphics_object parent_obj = gh_manager::get_object (get_parent ()); |
| 6406 | 2034 |
| 6705 | 2035 parent_obj.remove_child (__myhandle__); |
| 6406 | 2036 |
| 7363 | 2037 parent = new_parent.as_octave_value (); |
| 6406 | 2038 |
| 7363 | 2039 ::adopt (parent.handle_value (), __myhandle__); |
| 6705 | 2040 } |
| 2041 else | |
| 2042 error ("set: invalid graphics handle (= %g) for parent", tmp); | |
| 2043 } | |
| 2044 else | |
| 2045 error ("set: expecting parent to be a graphics handle"); | |
| 2046 } | |
| 6432 | 2047 |
| 6705 | 2048 void |
|
8061
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
2049 base_properties::set_children (const octave_value& val) |
|
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
2050 { |
|
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
2051 children = maybe_set_children (children, val); |
|
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
2052 } |
|
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
2053 |
|
f819e8992367
Auto-generate base_properties
John W. Eaton <jwe@octave.org>
parents:
8059
diff
changeset
|
2054 void |
| 6836 | 2055 base_properties::mark_modified (void) |
| 2056 { | |
| 7363 | 2057 __modified__ = "on"; |
| 2058 graphics_object parent_obj = gh_manager::get_object (get_parent ()); | |
| 7379 | 2059 if (parent_obj) |
| 2060 parent_obj.mark_modified (); | |
| 6836 | 2061 } |
| 2062 | |
| 2063 void | |
| 2064 base_properties::override_defaults (base_graphics_object& obj) | |
| 2065 { | |
| 7363 | 2066 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
|
2067 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
2068 if (parent_obj) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
2069 parent_obj.override_defaults (obj); |
| 6836 | 2070 } |
| 2071 | |
| 2072 void | |
| 7214 | 2073 base_properties::update_axis_limits (const std::string& axis_type) const |
| 2074 { | |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
2075 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
|
2076 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
2077 if (obj) |
| 7214 | 2078 obj.update_axis_limits (axis_type); |
| 2079 } | |
| 2080 | |
| 2081 void | |
| 6836 | 2082 base_properties::delete_children (void) |
| 2083 { | |
| 2084 octave_idx_type n = children.numel (); | |
| 2085 | |
| 8208 | 2086 // A callback function might have already deleted the child, |
| 2087 // so check before deleting | |
| 6836 | 2088 for (octave_idx_type i = 0; i < n; i++) |
| 8208 | 2089 { |
| 2090 graphics_object go = gh_manager::get_object (children(i)); | |
| 2091 | |
| 2092 if (go.valid_object ()) | |
| 2093 gh_manager::free (children(i)); | |
| 2094 } | |
| 6836 | 2095 } |
| 2096 | |
| 7419 | 2097 graphics_backend |
| 2098 base_properties::get_backend (void) const | |
| 2099 { | |
| 2100 graphics_object go = gh_manager::get_object (get_parent ()); | |
| 2101 | |
| 2102 if (go) | |
| 2103 return go.get_backend (); | |
| 2104 else | |
| 2105 return graphics_backend (); | |
| 2106 } | |
| 2107 | |
|
7828
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2108 void |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2109 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
|
2110 { |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2111 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
|
2112 |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2113 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
|
2114 { |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2115 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
|
2116 |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2117 if (go.valid_object ()) |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2118 go.get_properties ().update_boundingbox (); |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2119 } |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2120 } |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2121 |
|
7849
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
2122 void |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
2123 base_properties::add_listener (const caseless_str& nm, const octave_value& v, |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
2124 listener_mode mode) |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
2125 { |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
2126 property p = get_property (nm); |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
2127 |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
2128 if (! error_state && p.ok ()) |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
2129 p.add_listener (v, mode); |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
2130 } |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
2131 |
|
8299
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2132 void |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2133 base_properties::delete_listener (const caseless_str& nm, |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2134 const octave_value& v, listener_mode mode) |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2135 { |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2136 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
|
2137 |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2138 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
|
2139 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
|
2140 } |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2141 |
| 7363 | 2142 // --------------------------------------------------------------------- |
| 2143 | |
| 7408 | 2144 class gnuplot_backend : public base_graphics_backend |
| 2145 { | |
| 2146 public: | |
| 2147 gnuplot_backend (void) | |
| 2148 : base_graphics_backend ("gnuplot") { } | |
| 2149 | |
| 2150 ~gnuplot_backend (void) { } | |
| 2151 | |
| 2152 bool is_valid (void) const { return true; } | |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2153 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2154 void object_destroyed (const graphics_object& go) |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2155 { |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2156 if (go.isa ("figure")) |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2157 { |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2158 const figure::properties& props = |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2159 dynamic_cast<const figure::properties&> (go.get_properties ()); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2160 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2161 send_quit (props.get___plot_stream__ ()); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2162 } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2163 } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2164 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2165 void property_changed (const graphics_object& go, int id) |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2166 { |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2167 if (go.isa ("figure")) |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2168 { |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2169 graphics_object obj (go); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2170 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2171 figure::properties& props = |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2172 dynamic_cast<figure::properties&> (obj.get_properties ()); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2173 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2174 switch (id) |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2175 { |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2176 case base_properties::VISIBLE: |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2177 if (! props.is_visible ()) |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2178 { |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2179 send_quit (props.get___plot_stream__ ()); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2180 props.set___plot_stream__ (Matrix ()); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2181 props.set___enhanced__ (false); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2182 } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2183 break; |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2184 } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2185 } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2186 } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2187 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2188 void redraw_figure (const graphics_object& go) const |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2189 { |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2190 octave_value_list args; |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2191 args(0) = go.get_handle ().as_octave_value (); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2192 feval ("gnuplot_drawnow", args); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2193 } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2194 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2195 void print_figure (const graphics_object& go, const std::string& term, |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2196 const std::string& file, bool mono, |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2197 const std::string& debug_file) const |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2198 { |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2199 octave_value_list args; |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2200 if (! debug_file.empty ()) |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2201 args(4) = debug_file; |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2202 args(3) = mono; |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2203 args(2) = file; |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2204 args(1) = term; |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2205 args(0) = go.get_handle ().as_octave_value (); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2206 feval ("gnuplot_drawnow", args); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2207 } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2208 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2209 Matrix get_canvas_size (const graphics_handle&) const |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2210 { |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2211 Matrix sz (1, 2, 0.0); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2212 return sz; |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2213 } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2214 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2215 double get_screen_resolution (void) const |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2216 { return 72.0; } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2217 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2218 Matrix get_screen_size (void) const |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2219 { return Matrix (1, 2, 0.0); } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2220 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2221 private: |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2222 void send_quit (const octave_value& pstream) const |
| 7408 | 2223 { |
|
9561
c60a9e1a0372
try to avoid gnuplot zombies
John W. Eaton <jwe@octave.org>
parents:
9455
diff
changeset
|
2224 if (! pstream.is_empty ()) |
| 7408 | 2225 { |
| 2226 octave_value_list args; | |
|
7680
a0ec02774303
Use popen2 for communication with gnuplot
David Bateman <dbateman@free.fr>
parents:
7527
diff
changeset
|
2227 Matrix fids = pstream.matrix_value (); |
|
a0ec02774303
Use popen2 for communication with gnuplot
David Bateman <dbateman@free.fr>
parents:
7527
diff
changeset
|
2228 |
|
a0ec02774303
Use popen2 for communication with gnuplot
David Bateman <dbateman@free.fr>
parents:
7527
diff
changeset
|
2229 if (! error_state) |
|
a0ec02774303
Use popen2 for communication with gnuplot
David Bateman <dbateman@free.fr>
parents:
7527
diff
changeset
|
2230 { |
|
a0ec02774303
Use popen2 for communication with gnuplot
David Bateman <dbateman@free.fr>
parents:
7527
diff
changeset
|
2231 args(1) = "\nquit;\n"; |
|
9561
c60a9e1a0372
try to avoid gnuplot zombies
John W. Eaton <jwe@octave.org>
parents:
9455
diff
changeset
|
2232 args(0) = fids(0); |
|
7680
a0ec02774303
Use popen2 for communication with gnuplot
David Bateman <dbateman@free.fr>
parents:
7527
diff
changeset
|
2233 feval ("fputs", args); |
|
9561
c60a9e1a0372
try to avoid gnuplot zombies
John W. Eaton <jwe@octave.org>
parents:
9455
diff
changeset
|
2234 |
|
7680
a0ec02774303
Use popen2 for communication with gnuplot
David Bateman <dbateman@free.fr>
parents:
7527
diff
changeset
|
2235 args.resize (1); |
|
a0ec02774303
Use popen2 for communication with gnuplot
David Bateman <dbateman@free.fr>
parents:
7527
diff
changeset
|
2236 feval ("fflush", args); |
|
a0ec02774303
Use popen2 for communication with gnuplot
David Bateman <dbateman@free.fr>
parents:
7527
diff
changeset
|
2237 feval ("pclose", args); |
|
9561
c60a9e1a0372
try to avoid gnuplot zombies
John W. Eaton <jwe@octave.org>
parents:
9455
diff
changeset
|
2238 |
|
7680
a0ec02774303
Use popen2 for communication with gnuplot
David Bateman <dbateman@free.fr>
parents:
7527
diff
changeset
|
2239 if (fids.numel () > 1) |
|
a0ec02774303
Use popen2 for communication with gnuplot
David Bateman <dbateman@free.fr>
parents:
7527
diff
changeset
|
2240 { |
|
9561
c60a9e1a0372
try to avoid gnuplot zombies
John W. Eaton <jwe@octave.org>
parents:
9455
diff
changeset
|
2241 args(0) = fids(1); |
|
7680
a0ec02774303
Use popen2 for communication with gnuplot
David Bateman <dbateman@free.fr>
parents:
7527
diff
changeset
|
2242 feval ("pclose", args); |
|
9561
c60a9e1a0372
try to avoid gnuplot zombies
John W. Eaton <jwe@octave.org>
parents:
9455
diff
changeset
|
2243 |
|
c60a9e1a0372
try to avoid gnuplot zombies
John W. Eaton <jwe@octave.org>
parents:
9455
diff
changeset
|
2244 if (fids.numel () > 2) |
|
c60a9e1a0372
try to avoid gnuplot zombies
John W. Eaton <jwe@octave.org>
parents:
9455
diff
changeset
|
2245 { |
|
c60a9e1a0372
try to avoid gnuplot zombies
John W. Eaton <jwe@octave.org>
parents:
9455
diff
changeset
|
2246 args(0) = fids(2); |
|
c60a9e1a0372
try to avoid gnuplot zombies
John W. Eaton <jwe@octave.org>
parents:
9455
diff
changeset
|
2247 feval ("waitpid", args); |
|
c60a9e1a0372
try to avoid gnuplot zombies
John W. Eaton <jwe@octave.org>
parents:
9455
diff
changeset
|
2248 } |
|
7680
a0ec02774303
Use popen2 for communication with gnuplot
David Bateman <dbateman@free.fr>
parents:
7527
diff
changeset
|
2249 } |
|
a0ec02774303
Use popen2 for communication with gnuplot
David Bateman <dbateman@free.fr>
parents:
7527
diff
changeset
|
2250 } |
| 7408 | 2251 } |
| 2252 } | |
| 2253 }; | |
| 2254 | |
| 2255 graphics_backend | |
| 2256 graphics_backend::default_backend (void) | |
| 2257 { | |
| 2258 if (available_backends.size () == 0) | |
| 2259 register_backend (new gnuplot_backend ()); | |
| 2260 | |
| 2261 return available_backends["gnuplot"]; | |
| 2262 } | |
| 2263 | |
| 2264 std::map<std::string, graphics_backend> graphics_backend::available_backends; | |
| 2265 | |
| 2266 // --------------------------------------------------------------------- | |
| 2267 | |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
2268 void |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
2269 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
|
2270 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
2271 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
|
2272 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
2273 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
|
2274 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
2275 if (parent_obj) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
2276 parent_obj.update_axis_limits (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
|
2277 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
2278 else |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
2279 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
|
2280 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
2281 |
|
8299
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2282 void |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2283 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
|
2284 { |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2285 Octave_map m = get (true).map_value (); |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2286 |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2287 for (Octave_map::const_iterator pa = m.begin (); pa != m.end (); pa++) |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2288 { |
|
9585
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
2289 // FIXME -- there has to be a better way. I think we want to |
|
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
2290 // 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
|
2291 // 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
|
2292 |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
10056
diff
changeset
|
2293 unwind_protect frame; |
|
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
10056
diff
changeset
|
2294 |
|
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
10056
diff
changeset
|
2295 frame.protect_var (discard_error_messages); |
|
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
10056
diff
changeset
|
2296 frame.protect_var (error_state); |
|
9585
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
2297 |
|
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
2298 discard_error_messages = true; |
|
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
2299 |
|
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
2300 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
|
2301 |
|
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
2302 if (! error_state && p.ok ()) |
|
06b8b51dca48
also handle user-defined graphics properties in new property name validation scheme
John W. Eaton <jwe@octave.org>
parents:
9584
diff
changeset
|
2303 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
|
2304 } |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2305 } |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2306 |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
2307 // --------------------------------------------------------------------- |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
2308 |
| 7363 | 2309 #include "graphics-props.cc" |
| 2310 | |
| 2311 // --------------------------------------------------------------------- | |
| 2312 | |
| 6836 | 2313 void |
| 7363 | 2314 root_figure::properties::set_currentfigure (const octave_value& v) |
| 6874 | 2315 { |
| 7378 | 2316 graphics_handle val (v); |
| 7363 | 2317 |
| 6874 | 2318 if (error_state) |
| 2319 return; | |
| 2320 | |
| 7059 | 2321 if (xisnan (val.value ()) || is_handle (val)) |
| 6874 | 2322 { |
| 2323 currentfigure = val; | |
| 2324 | |
| 7363 | 2325 gh_manager::push_figure (val); |
| 6874 | 2326 } |
| 2327 else | |
| 2328 gripe_set_invalid ("currentfigure"); | |
| 2329 } | |
| 2330 | |
|
7822
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2331 void |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2332 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
|
2333 { |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2334 graphics_handle val (v); |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2335 |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2336 if (error_state) |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2337 return; |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2338 |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2339 if (xisnan (val.value ())) |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2340 { |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2341 if (! cbo_stack.empty ()) |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2342 { |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2343 val = cbo_stack.front (); |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2344 |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2345 cbo_stack.pop_front (); |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2346 } |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2347 |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2348 callbackobject = val; |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2349 } |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2350 else if (is_handle (val)) |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2351 { |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2352 if (get_callbackobject ().ok ()) |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2353 cbo_stack.push_front (get_callbackobject ()); |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2354 |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2355 callbackobject = val; |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2356 } |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2357 else |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2358 gripe_set_invalid ("callbackobject"); |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2359 } |
|
edbaa13397ee
Implement callbackobject property in root object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7820
diff
changeset
|
2360 |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2361 void |
|
8560
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2362 root_figure::properties::update_units (void) |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2363 { |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2364 caseless_str xunits = get_units (); |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2365 |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2366 Matrix ss = default_screensize (); |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2367 |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2368 double dpi = get_screenpixelsperinch (); |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2369 |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2370 if (xunits.compare ("inches")) |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2371 { |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2372 ss(0) = 0; |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2373 ss(1) = 0; |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2374 ss(2) /= dpi; |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2375 ss(3) /= dpi; |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2376 } |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2377 else if (xunits.compare ("centimeters")) |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2378 { |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2379 ss(0) = 0; |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2380 ss(1) = 0; |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2381 ss(2) *= 2.54 / dpi; |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2382 ss(3) *= 2.54 / dpi; |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2383 } |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2384 else if (xunits.compare ("normalized")) |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2385 { |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2386 ss = Matrix (1, 4, 1.0); |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2387 } |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2388 else if (xunits.compare ("points")) |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2389 { |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2390 ss(0) = 0; |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2391 ss(1) = 0; |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2392 ss(2) *= 72 / dpi; |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2393 ss(3) *= 72 / dpi; |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2394 } |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2395 |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2396 set_screensize (ss); |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2397 } |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2398 |
|
5cc594679cdc
get display characteristics from system
John W. Eaton <jwe@octave.org>
parents:
8557
diff
changeset
|
2399 void |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2400 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
|
2401 { |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2402 gh_manager::pop_figure (gh); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2403 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2404 graphics_handle cf = gh_manager::current_figure (); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2405 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2406 xset (0, "currentfigure", cf.value ()); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2407 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2408 base_properties::remove_child (gh); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2409 } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2410 |
| 6406 | 2411 property_list |
| 2412 root_figure::factory_properties = root_figure::init_factory_properties (); | |
| 2413 | |
| 2414 // --------------------------------------------------------------------- | |
| 2415 | |
| 7363 | 2416 void |
| 2417 figure::properties::set_currentaxes (const octave_value& v) | |
| 2418 { | |
| 7378 | 2419 graphics_handle val (v); |
| 6705 | 2420 |
| 6874 | 2421 if (error_state) |
| 2422 return; | |
| 2423 | |
| 7070 | 2424 if (xisnan (val.value ()) || is_handle (val)) |
| 6874 | 2425 currentaxes = val; |
| 2426 else | |
| 2427 gripe_set_invalid ("currentaxes"); | |
| 2428 } | |
| 2429 | |
| 2430 void | |
|
8266
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2431 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
|
2432 { |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2433 base_properties::remove_child (gh); |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2434 |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2435 if (gh == currentaxes.handle_value ()) |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2436 { |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2437 graphics_handle new_currentaxes; |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2438 |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2439 for (octave_idx_type i = 0; i < children.numel (); i++) |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2440 { |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2441 graphics_handle kid = children(i); |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2442 |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2443 graphics_object go = gh_manager::get_object (kid); |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2444 |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2445 if (go.isa ("axes")) |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2446 { |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2447 new_currentaxes = kid; |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2448 break; |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2449 } |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2450 } |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2451 |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2452 currentaxes = new_currentaxes; |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2453 } |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2454 } |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2455 |
|
81b124f463f9
properly update currentaxes when axes are deleted
John W. Eaton <jwe@octave.org>
parents:
8249
diff
changeset
|
2456 void |
| 6874 | 2457 figure::properties::set_visible (const octave_value& val) |
| 2458 { | |
| 2459 std::string s = val.string_value (); | |
| 2460 | |
| 2461 if (! error_state) | |
| 2462 { | |
| 2463 if (s == "on") | |
| 2464 xset (0, "currentfigure", __myhandle__.value ()); | |
| 2465 | |
| 2466 visible = val; | |
| 2467 } | |
| 2468 } | |
| 2469 | |
| 7445 | 2470 Matrix |
| 7447 | 2471 figure::properties::get_boundingbox (bool) const |
| 7445 | 2472 { |
|
9238
0ae2b6617005
Use display information from the root object to compute bounding boxes
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9185
diff
changeset
|
2473 Matrix screen_size = xget (0, "screensize").matrix_value ().extract_n (0, 2, 1, 2); |
| 7445 | 2474 Matrix pos; |
| 2475 | |
| 2476 pos = convert_position (get_position ().matrix_value (), get_units (), | |
|
9238
0ae2b6617005
Use display information from the root object to compute bounding boxes
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9185
diff
changeset
|
2477 "pixels", screen_size); |
| 7445 | 2478 |
| 2479 pos(0)--; | |
| 2480 pos(1)--; | |
| 7447 | 2481 pos(1) = screen_size(1) - pos(1) - pos(3); |
| 7445 | 2482 |
| 2483 return pos; | |
| 2484 } | |
| 2485 | |
|
7828
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2486 void |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2487 figure::properties::set_boundingbox (const Matrix& bb) |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2488 { |
|
9238
0ae2b6617005
Use display information from the root object to compute bounding boxes
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9185
diff
changeset
|
2489 Matrix screen_size = xget (0, "screensize").matrix_value ().extract_n (0, 2, 1, 2); |
|
7828
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2490 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
|
2491 |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2492 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
|
2493 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
|
2494 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
|
2495 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
|
2496 |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2497 set_position (pos); |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2498 } |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2499 |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2500 void |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2501 figure::properties::set_position (const octave_value& v) |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2502 { |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2503 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
|
2504 { |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2505 Matrix old_bb, new_bb; |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2506 |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2507 old_bb = get_boundingbox (); |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2508 position = v; |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2509 new_bb = get_boundingbox (); |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2510 |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2511 if (old_bb != new_bb) |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2512 { |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2513 if (old_bb(2) != new_bb(2) || old_bb(3) != new_bb(3)) |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2514 { |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2515 execute_resizefcn (); |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2516 update_boundingbox (); |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2517 } |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2518 } |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2519 |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2520 mark_modified (); |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2521 } |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2522 } |
|
4739b6a1925c
Implement resize handler mechanism (call resizefcn on figure resize and notify children).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7827
diff
changeset
|
2523 |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2524 std::string |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2525 figure::properties::get_title (void) const |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2526 { |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2527 if (is_numbertitle ()) |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2528 { |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2529 std::ostringstream os; |
|
8062
e04a4beeb283
graphics.cc (figure::properties::get_title): avoid gcc warning
John W. Eaton <jwe@octave.org>
parents:
8061
diff
changeset
|
2530 std::string nm = get_name (); |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2531 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2532 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
|
2533 if (! nm.empty ()) |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2534 os << ": " << get_name (); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2535 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2536 return os.str (); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2537 } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2538 else |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2539 return get_name (); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2540 } |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
2541 |
| 6836 | 2542 octave_value |
| 7189 | 2543 figure::get_default (const caseless_str& name) const |
| 6836 | 2544 { |
| 2545 octave_value retval = default_properties.lookup (name); | |
| 2546 | |
| 2547 if (retval.is_undefined ()) | |
| 2548 { | |
| 2549 graphics_handle parent = get_parent (); | |
| 2550 graphics_object parent_obj = gh_manager::get_object (parent); | |
| 2551 | |
| 2552 retval = parent_obj.get_default (name); | |
| 2553 } | |
| 2554 | |
| 2555 return retval; | |
| 2556 } | |
| 2557 | |
| 6406 | 2558 // --------------------------------------------------------------------- |
| 2559 | |
| 8249 | 2560 void |
| 2561 axes::properties::init (void) | |
| 2562 { | |
| 2563 position.add_constraint (dim_vector (1, 4)); | |
| 2564 position.add_constraint (dim_vector (0, 0)); | |
| 2565 outerposition.add_constraint (dim_vector (1, 4)); | |
| 2566 colororder.add_constraint (dim_vector (-1, 3)); | |
| 2567 dataaspectratio.add_constraint (dim_vector (1, 3)); | |
| 2568 plotboxaspectratio.add_constraint (dim_vector (1, 3)); | |
| 2569 xlim.add_constraint (2); | |
| 2570 ylim.add_constraint (2); | |
| 2571 zlim.add_constraint (2); | |
| 2572 clim.add_constraint (2); | |
| 2573 alim.add_constraint (2); | |
| 2574 xtick.add_constraint (dim_vector (1, -1)); | |
| 2575 ytick.add_constraint (dim_vector (1, -1)); | |
| 2576 ztick.add_constraint (dim_vector (1, -1)); | |
| 2577 Matrix vw (1, 2, 0); | |
| 2578 vw(1) = 90; | |
| 2579 view = vw; | |
| 2580 view.add_constraint (dim_vector (1, 2)); | |
| 2581 cameraposition.add_constraint (dim_vector (1, 3)); | |
| 2582 Matrix upv (1, 3, 0.0); | |
| 2583 upv(2) = 1.0; | |
| 2584 cameraupvector = upv; | |
| 2585 cameraupvector.add_constraint (dim_vector (1, 3)); | |
| 2586 currentpoint.add_constraint (dim_vector (2, 3)); | |
| 2587 ticklength.add_constraint (dim_vector (1, 2)); | |
| 2588 tightinset.add_constraint (dim_vector (1, 4)); | |
| 2589 | |
| 2590 x_zlim.resize (1, 2); | |
|
8557
ab82e19002c4
better compatibility for axis label properties
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
2591 |
| 8249 | 2592 sx = "linear"; |
| 2593 sy = "linear"; | |
| 2594 sz = "linear"; | |
| 2595 | |
|
9403
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2596 calc_ticklabels (xtick, xticklabel, xscale.is ("log")); |
|
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2597 calc_ticklabels (ytick, yticklabel, yscale.is ("log")); |
|
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2598 calc_ticklabels (ztick, zticklabel, zscale.is ("log")); |
|
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2599 |
| 8249 | 2600 xset (xlabel.handle_value (), "handlevisibility", "off"); |
| 2601 xset (ylabel.handle_value (), "handlevisibility", "off"); | |
| 2602 xset (zlabel.handle_value (), "handlevisibility", "off"); | |
| 2603 xset (title.handle_value (), "handlevisibility", "off"); | |
| 2604 | |
|
8557
ab82e19002c4
better compatibility for axis label properties
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
2605 xset (xlabel.handle_value (), "horizontalalignment", "center"); |
|
ab82e19002c4
better compatibility for axis label properties
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
2606 xset (ylabel.handle_value (), "horizontalalignment", "center"); |
|
ab82e19002c4
better compatibility for axis label properties
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
2607 xset (zlabel.handle_value (), "horizontalalignment", "right"); |
|
ab82e19002c4
better compatibility for axis label properties
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
2608 xset (title.handle_value (), "horizontalalignment", "center"); |
|
ab82e19002c4
better compatibility for axis label properties
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
2609 |
|
ab82e19002c4
better compatibility for axis label properties
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
2610 xset (xlabel.handle_value (), "verticalalignment", "cap"); |
|
ab82e19002c4
better compatibility for axis label properties
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
2611 xset (ylabel.handle_value (), "verticalalignment", "bottom"); |
|
ab82e19002c4
better compatibility for axis label properties
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
2612 xset (title.handle_value (), "verticalalignment", "bottom"); |
|
ab82e19002c4
better compatibility for axis label properties
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
2613 |
|
ab82e19002c4
better compatibility for axis label properties
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
2614 xset (ylabel.handle_value (), "rotation", 90.0); |
|
9403
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2615 xset (zlabel.handle_value (), "visible", "off"); |
|
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2616 |
|
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2617 xset (xlabel.handle_value (), "clipping", "off"); |
|
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2618 xset (ylabel.handle_value (), "clipping", "off"); |
|
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2619 xset (zlabel.handle_value (), "clipping", "off"); |
|
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2620 xset (title.handle_value (), "clipping", "off"); |
|
8557
ab82e19002c4
better compatibility for axis label properties
John W. Eaton <jwe@octave.org>
parents:
8503
diff
changeset
|
2621 |
| 8249 | 2622 adopt (xlabel.handle_value ()); |
| 2623 adopt (ylabel.handle_value ()); | |
| 2624 adopt (zlabel.handle_value ()); | |
| 2625 adopt (title.handle_value ()); | |
| 2626 } | |
| 2627 | |
|
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
|
2628 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
|
2629 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
|
2630 { |
| 8208 | 2631 #if 0 |
|
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
|
2632 // FIXME -- this should take font metrics into consideration, |
| 8208 | 2633 // and also the fact that the colorbox leaves the outerposition |
| 2634 // alone but alters the position. For now just don't adjust the | |
| 2635 // positions relative to each other. | |
| 2636 | |
|
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
|
2637 if (activepositionproperty.is ("outerposition")) |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2638 { |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2639 Matrix outpos = outerposition.get ().matrix_value (); |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2640 Matrix defpos = default_axes_position (); |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2641 Matrix pos(outpos); |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2642 pos(0) = outpos(0) + defpos(0) * outpos(2); |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2643 pos(1) = outpos(1) + defpos(1) * outpos(3); |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2644 pos(2) = outpos(2) * defpos(2); |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2645 pos(3) = outpos(3) * defpos(3); |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2646 position = pos; |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2647 } |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2648 else |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2649 { |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2650 Matrix pos = position.get ().matrix_value (); |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2651 pos(0) -= pos(2)*0.05; |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2652 pos(1) -= pos(3)*0.05; |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2653 pos(2) *= 1.1; |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2654 pos(3) *= 1.1; |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2655 outerposition = pos; |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2656 } |
| 8208 | 2657 #endif |
|
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
|
2658 |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2659 update_transform (); |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2660 } |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2661 |
| 7363 | 2662 void |
| 8249 | 2663 axes::properties::set_text_child (handle_property& hp, |
| 2664 const std::string& who, | |
| 2665 const octave_value& v) | |
| 6962 | 2666 { |
|
10265
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2667 graphics_handle val; |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2668 |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2669 if (v.is_string ()) |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2670 { |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2671 val = gh_manager::make_graphics_handle ("text", __myhandle__, false); |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2672 |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2673 xset (val, "string", v); |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2674 } |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2675 else |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2676 { |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2677 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
|
2678 |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2679 if (go.isa ("text")) |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2680 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
|
2681 else |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2682 { |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2683 std::string cname = v.class_name (); |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2684 |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2685 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
|
2686 who.c_str (), cname.c_str ()); |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2687 } |
|
8c583af2cf64
validate text object children of axes objects
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
2688 } |
| 6962 | 2689 |
| 6874 | 2690 if (! error_state) |
| 2691 { | |
| 8249 | 2692 xset (val, "handlevisibility", "off"); |
| 2693 | |
| 2694 gh_manager::free (hp.handle_value ()); | |
| 2695 | |
| 2696 base_properties::remove_child (hp.handle_value ()); | |
| 2697 | |
| 2698 hp = val; | |
| 2699 | |
| 2700 adopt (hp.handle_value ()); | |
| 6874 | 2701 } |
| 2702 } | |
| 2703 | |
| 2704 void | |
| 7363 | 2705 axes::properties::set_xlabel (const octave_value& v) |
| 6874 | 2706 { |
| 8249 | 2707 set_text_child (xlabel, "xlabel", v); |
| 6874 | 2708 } |
| 2709 | |
| 2710 void | |
| 7363 | 2711 axes::properties::set_ylabel (const octave_value& v) |
| 6874 | 2712 { |
| 8249 | 2713 set_text_child (ylabel, "ylabel", v); |
| 6874 | 2714 } |
| 2715 | |
| 2716 void | |
| 7363 | 2717 axes::properties::set_zlabel (const octave_value& v) |
| 6874 | 2718 { |
| 8249 | 2719 set_text_child (zlabel, "zlabel", v); |
| 2720 } | |
| 2721 | |
| 2722 void | |
| 2723 axes::properties::set_title (const octave_value& v) | |
| 2724 { | |
| 2725 set_text_child (title, "title", v); | |
| 6874 | 2726 } |
| 2727 | |
| 2728 void | |
| 6844 | 2729 axes::properties::set_defaults (base_graphics_object& obj, |
| 6890 | 2730 const std::string& mode) |
| 6705 | 2731 { |
| 2732 box = "on"; | |
| 2733 key = "off"; | |
| 2734 keybox = "off"; | |
|
8291
53f35799b235
Add support for left/right argument to the legend function
David Bateman <dbateman@free.fr>
parents:
8266
diff
changeset
|
2735 keyreverse = "off"; |
| 7363 | 2736 keypos = 1.0; |
| 6962 | 2737 colororder = default_colororder (); |
| 6705 | 2738 dataaspectratio = Matrix (1, 3, 1.0); |
| 2739 dataaspectratiomode = "auto"; | |
| 7363 | 2740 layer = "bottom"; |
| 6705 | 2741 |
| 2742 Matrix tlim (1, 2, 0.0); | |
| 2743 tlim(1) = 1; | |
| 2744 xlim = tlim; | |
| 2745 ylim = tlim; | |
| 2746 zlim = tlim; | |
| 6807 | 2747 |
| 2748 Matrix cl (1, 2, 0); | |
| 2749 cl(1) = 1; | |
| 2750 clim = cl; | |
| 2751 | |
| 7363 | 2752 xlimmode = "auto"; |
| 2753 ylimmode = "auto"; | |
| 2754 zlimmode = "auto"; | |
| 2755 climmode = "auto"; | |
| 8208 | 2756 |
| 6705 | 2757 xgrid = "off"; |
| 2758 ygrid = "off"; | |
| 2759 zgrid = "off"; | |
| 2760 xminorgrid = "off"; | |
| 2761 yminorgrid = "off"; | |
| 2762 zminorgrid = "off"; | |
| 2763 xtick = Matrix (); | |
| 2764 ytick = Matrix (); | |
| 2765 ztick = Matrix (); | |
| 2766 xtickmode = "auto"; | |
| 2767 ytickmode = "auto"; | |
| 2768 ztickmode = "auto"; | |
| 2769 xticklabel = ""; | |
| 2770 yticklabel = ""; | |
| 2771 zticklabel = ""; | |
| 2772 xticklabelmode = "auto"; | |
| 2773 yticklabelmode = "auto"; | |
| 2774 zticklabelmode = "auto"; | |
| 7453 | 2775 color = color_values (1, 1, 1); |
| 7364 | 2776 xcolor = color_values ("black"); |
| 2777 ycolor = color_values ("black"); | |
| 2778 zcolor = color_values ("black"); | |
| 7363 | 2779 xscale = "linear"; |
| 2780 yscale = "linear"; | |
| 2781 zscale = "linear"; | |
| 6705 | 2782 xdir = "normal"; |
| 2783 ydir = "normal"; | |
| 2784 zdir = "normal"; | |
| 7363 | 2785 yaxislocation = "left"; |
| 2786 xaxislocation = "bottom"; | |
| 6705 | 2787 |
| 7427 | 2788 // Note: camera properties will be set through update_transform |
| 2789 camerapositionmode = "auto"; | |
| 2790 cameratargetmode = "auto"; | |
| 2791 cameraupvectormode = "auto"; | |
| 2792 cameraviewanglemode = "auto"; | |
| 2793 plotboxaspectratio = Matrix (1, 3, 1.0); | |
| 2794 drawmode = "normal"; | |
|
7820
cb4838d70ab2
Fix default value for axes gridlinestyle and minorgridlinestyle.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7680
diff
changeset
|
2795 gridlinestyle = ":"; |
| 7427 | 2796 linestyleorder = "-"; |
| 2797 linewidth = 0.5; | |
|
7820
cb4838d70ab2
Fix default value for axes gridlinestyle and minorgridlinestyle.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7680
diff
changeset
|
2798 minorgridlinestyle = ":"; |
| 7427 | 2799 // Note: plotboxaspectratio will be set through update_aspectratiors |
| 2800 plotboxaspectratiomode = "auto"; | |
| 2801 projection = "orthographic"; | |
| 2802 tickdir = "in"; | |
| 2803 tickdirmode = "auto"; | |
|
8740
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8687
diff
changeset
|
2804 ticklength = default_axes_ticklength (); |
| 7427 | 2805 tightinset = Matrix (1, 4, 0.0); |
| 2806 | |
| 2807 sx = "linear"; | |
| 2808 sy = "linear"; | |
| 2809 sz = "linear"; | |
| 2810 | |
| 6705 | 2811 Matrix tview (1, 2, 0.0); |
| 2812 tview(1) = 90; | |
| 2813 view = tview; | |
| 2814 | |
| 6765 | 2815 visible = "on"; |
| 6705 | 2816 nextplot = "replace"; |
| 2817 | |
| 2818 if (mode != "replace") | |
| 2819 { | |
|
8228
53dbbd331498
Preserve font and position properties when axes are replace in the handle code
David Bateman <dbateman@free.fr>
parents:
8209
diff
changeset
|
2820 fontangle = "normal"; |
|
8944
cb0e9facc342
make default fontname * instead of Helvetica
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
2821 fontname = OCTAVE_DEFAULT_FONTNAME; |
|
8228
53dbbd331498
Preserve font and position properties when axes are replace in the handle code
David Bateman <dbateman@free.fr>
parents:
8209
diff
changeset
|
2822 fontsize = 12; |
|
53dbbd331498
Preserve font and position properties when axes are replace in the handle code
David Bateman <dbateman@free.fr>
parents:
8209
diff
changeset
|
2823 fontunits = "points"; |
|
53dbbd331498
Preserve font and position properties when axes are replace in the handle code
David Bateman <dbateman@free.fr>
parents:
8209
diff
changeset
|
2824 fontweight = "normal"; |
|
53dbbd331498
Preserve font and position properties when axes are replace in the handle code
David Bateman <dbateman@free.fr>
parents:
8209
diff
changeset
|
2825 |
| 6406 | 2826 Matrix touterposition (1, 4, 0.0); |
| 2827 touterposition(2) = 1; | |
| 2828 touterposition(3) = 1; | |
| 2829 outerposition = touterposition; | |
|
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
|
2830 |
|
67edbcb19665
rudimentry (i.e. no font metrics) sync of axes.position and axes.outerposition
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7859
diff
changeset
|
2831 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
|
2832 |
|
53dbbd331498
Preserve font and position properties when axes are replace in the handle code
David Bateman <dbateman@free.fr>
parents:
8209
diff
changeset
|
2833 activepositionproperty = "outerposition"; |
| 6406 | 2834 } |
| 2835 | |
| 6705 | 2836 delete_children (); |
| 6406 | 2837 |
| 6705 | 2838 children = Matrix (); |
| 6432 | 2839 |
| 8249 | 2840 xlabel = gh_manager::make_graphics_handle ("text", __myhandle__, false); |
| 2841 ylabel = gh_manager::make_graphics_handle ("text", __myhandle__, false); | |
| 2842 zlabel = gh_manager::make_graphics_handle ("text", __myhandle__, false); | |
| 2843 title = gh_manager::make_graphics_handle ("text", __myhandle__, false); | |
| 2844 | |
| 2845 xset (xlabel.handle_value (), "handlevisibility", "off"); | |
| 2846 xset (ylabel.handle_value (), "handlevisibility", "off"); | |
| 2847 xset (zlabel.handle_value (), "handlevisibility", "off"); | |
| 2848 xset (title.handle_value (), "handlevisibility", "off"); | |
| 2849 | |
| 8636 | 2850 xset (xlabel.handle_value (), "horizontalalignment", "center"); |
| 2851 xset (ylabel.handle_value (), "horizontalalignment", "center"); | |
| 2852 xset (zlabel.handle_value (), "horizontalalignment", "right"); | |
| 2853 xset (title.handle_value (), "horizontalalignment", "center"); | |
| 2854 | |
| 2855 xset (xlabel.handle_value (), "verticalalignment", "cap"); | |
| 2856 xset (ylabel.handle_value (), "verticalalignment", "bottom"); | |
| 2857 xset (title.handle_value (), "verticalalignment", "bottom"); | |
| 2858 | |
| 2859 xset (ylabel.handle_value (), "rotation", 90.0); | |
|
9403
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2860 xset (zlabel.handle_value (), "visible", "off"); |
|
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2861 |
|
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2862 xset (xlabel.handle_value (), "clipping", "off"); |
|
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2863 xset (ylabel.handle_value (), "clipping", "off"); |
|
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2864 xset (zlabel.handle_value (), "clipping", "off"); |
|
4af6e29449c1
[mq]: graphics_text_engine
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9396
diff
changeset
|
2865 xset (title.handle_value (), "clipping", "off"); |
| 8636 | 2866 |
| 8249 | 2867 adopt (xlabel.handle_value ()); |
| 2868 adopt (ylabel.handle_value ()); | |
| 2869 adopt (zlabel.handle_value ()); | |
| 2870 adopt (title.handle_value ()); | |
| 2871 | |
| 7427 | 2872 update_transform (); |
| 2873 | |
| 6705 | 2874 override_defaults (obj); |
| 2875 } | |
| 2876 | |
| 8208 | 2877 void |
| 2878 axes::properties::delete_text_child (handle_property& hp) | |
| 6874 | 2879 { |
| 8208 | 2880 graphics_handle h = hp.handle_value (); |
| 2881 | |
| 2882 if (h.ok ()) | |
| 2883 { | |
| 2884 graphics_object go = gh_manager::get_object (h); | |
| 2885 | |
| 2886 if (go.valid_object ()) | |
| 2887 gh_manager::free (h); | |
| 8249 | 2888 |
| 2889 base_properties::remove_child (h); | |
| 8208 | 2890 } |
| 2891 | |
| 8249 | 2892 // FIXME -- is it necessary to check whether the axes object is |
| 2893 // being deleted now? I think this function is only called when an | |
| 2894 // individual child object is delete and not when the parent axes | |
| 2895 // object is deleted. | |
| 2896 | |
| 8208 | 2897 if (! is_beingdeleted ()) |
| 8249 | 2898 { |
| 2899 hp = gh_manager::make_graphics_handle ("text", __myhandle__, false); | |
| 2900 | |
| 2901 xset (hp.handle_value (), "handlevisibility", "off"); | |
| 2902 | |
| 2903 adopt (hp.handle_value ()); | |
| 2904 } | |
| 6705 | 2905 } |
| 6406 | 2906 |
| 6705 | 2907 void |
| 6844 | 2908 axes::properties::remove_child (const graphics_handle& h) |
| 6705 | 2909 { |
| 8249 | 2910 if (xlabel.handle_value ().ok () && h == xlabel.handle_value ()) |
| 8208 | 2911 delete_text_child (xlabel); |
| 7363 | 2912 else if (ylabel.handle_value ().ok () && h == ylabel.handle_value ()) |
| 8208 | 2913 delete_text_child (ylabel); |
| 7363 | 2914 else if (zlabel.handle_value ().ok () && h == zlabel.handle_value ()) |
| 8208 | 2915 delete_text_child (zlabel); |
| 8249 | 2916 else if (title.handle_value ().ok () && h == title.handle_value ()) |
| 2917 delete_text_child (title); | |
| 6705 | 2918 else |
| 2919 base_properties::remove_child (h); | |
| 2920 } | |
| 6406 | 2921 |
| 8249 | 2922 Matrix |
| 2923 base_properties::get_children (void) const | |
| 6705 | 2924 { |
| 8249 | 2925 Matrix retval = children; |
| 2926 | |
| 2927 graphics_object go = gh_manager::get_object (0); | |
| 2928 | |
| 2929 root_figure::properties& props = | |
| 2930 dynamic_cast<root_figure::properties&> (go.get_properties ()); | |
| 2931 | |
| 2932 if (! props.is_showhiddenhandles ()) | |
| 2933 { | |
| 2934 octave_idx_type k = 0; | |
| 2935 | |
| 2936 for (octave_idx_type i = 0; i < children.numel (); i++) | |
| 2937 { | |
| 2938 graphics_handle kid = children (i); | |
| 2939 | |
| 2940 if (gh_manager::is_handle_visible (kid)) | |
| 2941 retval(k++) = children(i); | |
| 2942 } | |
| 2943 | |
| 2944 retval.resize (k, 1); | |
| 2945 } | |
| 2946 | |
| 2947 return retval;; | |
| 6705 | 2948 } |
| 6406 | 2949 |
| 7427 | 2950 inline Matrix |
| 2951 xform_matrix (void) | |
| 2952 { | |
| 2953 Matrix m (4, 4, 0.0); | |
| 2954 for (int i = 0; i < 4; i++) | |
| 2955 m(i,i) = 1; | |
| 2956 return m; | |
| 2957 } | |
| 2958 | |
| 2959 inline ColumnVector | |
| 2960 xform_vector (void) | |
| 2961 { | |
| 2962 ColumnVector v (4, 0.0); | |
| 2963 v(3) = 1; | |
| 2964 return v; | |
| 2965 } | |
| 2966 | |
| 2967 inline ColumnVector | |
| 2968 xform_vector (double x, double y, double z) | |
| 2969 { | |
| 2970 ColumnVector v (4, 1.0); | |
| 2971 v(0) = x; v(1) = y; v(2) = z; | |
| 2972 return v; | |
| 2973 } | |
| 2974 | |
| 2975 inline ColumnVector | |
| 2976 transform (const Matrix& m, double x, double y, double z) | |
| 2977 { | |
| 2978 return (m * xform_vector (x, y, z)); | |
| 2979 } | |
| 2980 | |
| 2981 inline Matrix | |
| 2982 xform_scale (double x, double y, double z) | |
| 2983 { | |
| 2984 Matrix m (4, 4, 0.0); | |
| 2985 m(0,0) = x; m(1,1) = y; m(2,2) = z; m(3,3) = 1; | |
| 2986 return m; | |
| 2987 } | |
| 2988 | |
| 2989 inline Matrix | |
| 2990 xform_translate (double x, double y, double z) | |
| 2991 { | |
| 2992 Matrix m = xform_matrix (); | |
| 2993 m(0,3) = x; m(1,3) = y; m(2,3) = z; m(3,3) = 1; | |
| 2994 return m; | |
| 2995 } | |
| 2996 | |
| 2997 inline void | |
| 2998 scale (Matrix& m, double x, double y, double z) | |
| 2999 { | |
| 3000 m = m * xform_scale (x, y, z); | |
| 3001 } | |
| 3002 | |
| 3003 inline void | |
| 3004 translate (Matrix& m, double x, double y, double z) | |
| 3005 { | |
| 3006 m = m * xform_translate (x, y, z); | |
| 3007 } | |
| 3008 | |
| 3009 inline void | |
| 3010 xform (ColumnVector& v, const Matrix& m) | |
| 3011 { | |
| 3012 v = m*v; | |
| 3013 } | |
| 3014 | |
| 3015 inline void | |
| 3016 scale (ColumnVector& v, double x, double y, double z) | |
| 3017 { | |
| 3018 v(0) *= x; | |
| 3019 v(1) *= y; | |
| 3020 v(2) *= z; | |
| 3021 } | |
| 3022 | |
| 3023 inline void | |
| 3024 translate (ColumnVector& v, double x, double y, double z) | |
| 3025 { | |
| 3026 v(0) += x; | |
| 3027 v(1) += y; | |
| 3028 v(2) += z; | |
| 3029 } | |
| 3030 | |
| 3031 inline void | |
| 3032 normalize (ColumnVector& v) | |
| 3033 { | |
| 3034 double fact = 1.0/sqrt(v(0)*v(0)+v(1)*v(1)+v(2)*v(2)); | |
| 3035 scale (v, fact, fact, fact); | |
| 3036 } | |
| 3037 | |
| 3038 inline double | |
| 3039 dot (const ColumnVector& v1, const ColumnVector& v2) | |
| 3040 { | |
| 3041 return (v1(0)*v2(0)+v1(1)*v2(1)+v1(2)*v2(2)); | |
| 3042 } | |
| 3043 | |
| 3044 inline double | |
| 3045 norm (const ColumnVector& v) | |
| 3046 { | |
| 3047 return sqrt (dot (v, v)); | |
| 3048 } | |
| 3049 | |
| 3050 inline ColumnVector | |
| 3051 cross (const ColumnVector& v1, const ColumnVector& v2) | |
| 3052 { | |
| 3053 ColumnVector r = xform_vector (); | |
| 3054 r(0) = v1(1)*v2(2)-v1(2)*v2(1); | |
| 3055 r(1) = v1(2)*v2(0)-v1(0)*v2(2); | |
| 3056 r(2) = v1(0)*v2(1)-v1(1)*v2(0); | |
| 3057 return r; | |
| 3058 } | |
| 3059 | |
| 3060 inline Matrix | |
| 3061 unit_cube (void) | |
| 3062 { | |
| 3063 static double data[32] = { | |
| 3064 0,0,0,1, | |
| 3065 1,0,0,1, | |
| 3066 0,1,0,1, | |
| 3067 0,0,1,1, | |
| 3068 1,1,0,1, | |
| 3069 1,0,1,1, | |
| 3070 0,1,1,1, | |
| 3071 1,1,1,1}; | |
| 3072 Matrix m (4, 8); | |
| 3073 memcpy (m.fortran_vec (), data, sizeof(double)*32); | |
| 3074 return m; | |
| 3075 } | |
| 3076 | |
| 3077 inline ColumnVector | |
| 3078 cam2xform (const Array<double>& m) | |
| 3079 { | |
| 3080 ColumnVector retval (4, 1.0); | |
| 3081 memcpy (retval.fortran_vec (), m.fortran_vec (), sizeof(double)*3); | |
| 3082 return retval; | |
| 3083 } | |
| 3084 | |
| 3085 inline RowVector | |
| 3086 xform2cam (const ColumnVector& v) | |
| 3087 { | |
| 3088 return v.extract_n (0, 3).transpose (); | |
| 3089 } | |
| 3090 | |
| 3091 void | |
| 3092 axes::properties::update_camera (void) | |
| 3093 { | |
| 3094 double xd = (xdir_is ("normal") ? 1 : -1); | |
| 3095 double yd = (ydir_is ("normal") ? 1 : -1); | |
| 3096 double zd = (zdir_is ("normal") ? 1 : -1); | |
| 3097 | |
|
7526
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3098 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
|
3099 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
|
3100 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
|
3101 |
|
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3102 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
|
3103 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
|
3104 double zo = zlimits(zd > 0 ? 0 : 1); |
| 7427 | 3105 |
| 3106 Matrix pb = get_plotboxaspectratio ().matrix_value (); | |
| 3107 | |
| 3108 bool autocam = (camerapositionmode_is ("auto") | |
| 3109 && cameratargetmode_is ("auto") | |
| 3110 && cameraupvectormode_is ("auto") | |
| 3111 && cameraviewanglemode_is ("auto")); | |
| 3112 bool dowarp = (autocam && dataaspectratiomode_is("auto") | |
| 3113 && plotboxaspectratiomode_is ("auto")); | |
| 3114 | |
| 3115 ColumnVector c_eye (xform_vector ()); | |
| 3116 ColumnVector c_center (xform_vector ()); | |
| 3117 ColumnVector c_upv (xform_vector ()); | |
| 3118 | |
| 3119 if (cameratargetmode_is ("auto")) | |
| 3120 { | |
|
7526
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3121 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
|
3122 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
|
3123 c_center(2) = (zlimits(0)+zlimits(1))/2; |
| 7427 | 3124 |
| 3125 cameratarget = xform2cam (c_center); | |
| 3126 } | |
| 3127 else | |
| 3128 c_center = cam2xform (get_cameratarget ().matrix_value ()); | |
| 3129 | |
| 3130 if (camerapositionmode_is ("auto")) | |
| 3131 { | |
|
7526
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3132 Matrix tview = get_view ().matrix_value (); |
|
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3133 double az = tview(0), el = tview(1); |
| 7427 | 3134 double d = 5*sqrt(pb(0)*pb(0)+pb(1)*pb(1)+pb(2)*pb(2)); |
| 3135 | |
| 3136 if (el == 90 || el == -90) | |
| 3137 c_eye(2) = d*signum(el); | |
| 3138 else | |
| 3139 { | |
| 3140 az *= M_PI/180.0; | |
| 3141 el *= M_PI/180.0; | |
| 3142 c_eye(0) = d*cos(el)*sin(az); | |
| 3143 c_eye(1) = -d*cos(el)*cos(az); | |
| 3144 c_eye(2) = d*sin(el); | |
| 3145 } | |
|
7526
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3146 c_eye(0) = c_eye(0)*(xlimits(1)-xlimits(0))/(xd*pb(0))+c_center(0); |
|
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3147 c_eye(1) = c_eye(1)*(ylimits(1)-ylimits(0))/(yd*pb(1))+c_center(1); |
|
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3148 c_eye(2) = c_eye(2)*(zlimits(1)-zlimits(0))/(zd*pb(2))+c_center(2); |
| 7427 | 3149 |
| 3150 cameraposition = xform2cam (c_eye); | |
| 3151 } | |
| 3152 else | |
| 3153 c_eye = cam2xform (get_cameraposition ().matrix_value ()); | |
| 3154 | |
| 3155 if (cameraupvectormode_is ("auto")) | |
| 3156 { | |
|
7526
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3157 Matrix tview = get_view ().matrix_value (); |
|
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3158 double az = tview(0), el = tview(1); |
| 7427 | 3159 |
| 3160 if (el == 90 || el == -90) | |
| 3161 { | |
|
7526
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3162 c_upv(0) = -sin(az*M_PI/180.0)*(xlimits(1)-xlimits(0))/pb(0); |
|
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3163 c_upv(1) = cos(az*M_PI/180.0)*(ylimits(1)-ylimits(0))/pb(1); |
| 7427 | 3164 } |
| 3165 else | |
| 3166 c_upv(2) = 1; | |
| 3167 | |
| 3168 cameraupvector = xform2cam (c_upv); | |
| 3169 } | |
| 3170 else | |
| 3171 c_upv = cam2xform (get_cameraupvector ().matrix_value ()); | |
| 3172 | |
| 3173 Matrix x_view = xform_matrix (); | |
| 3174 Matrix x_projection = xform_matrix (); | |
| 3175 Matrix x_viewport = xform_matrix (); | |
| 3176 Matrix x_normrender = xform_matrix (); | |
| 3177 Matrix x_pre = xform_matrix (); | |
| 3178 | |
| 3179 x_render = xform_matrix (); | |
| 3180 x_render_inv = xform_matrix (); | |
| 3181 | |
| 3182 scale (x_pre, pb(0), pb(1), pb(2)); | |
| 3183 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
|
3184 scale (x_pre, xd/(xlimits(1)-xlimits(0)), yd/(ylimits(1)-ylimits(0)), |
|
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3185 zd/(zlimits(1)-zlimits(0))); |
| 7427 | 3186 translate (x_pre, -xo, -yo, -zo); |
| 3187 | |
| 3188 xform (c_eye, x_pre); | |
| 3189 xform (c_center, x_pre); | |
|
7526
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3190 scale (c_upv, pb(0)/(xlimits(1)-xlimits(0)), pb(1)/(ylimits(1)-ylimits(0)), |
|
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3191 pb(2)/(zlimits(1)-zlimits(0))); |
| 7427 | 3192 translate (c_center, -c_eye(0), -c_eye(1), -c_eye(2)); |
| 3193 | |
| 3194 ColumnVector F (c_center), f (F), UP (c_upv); | |
| 3195 normalize (f); | |
| 3196 normalize (UP); | |
| 3197 | |
| 7440 | 3198 if (std::abs (dot (f, UP)) > 1e-15) |
| 7427 | 3199 { |
| 3200 double fa = 1/sqrt(1-f(2)*f(2)); | |
| 3201 scale (UP, fa, fa, fa); | |
| 3202 } | |
| 3203 | |
| 3204 ColumnVector s = cross (f, UP); | |
| 3205 ColumnVector u = cross (s, f); | |
| 3206 | |
| 3207 scale (x_view, 1, 1, -1); | |
| 3208 Matrix l = xform_matrix (); | |
| 3209 l(0,0) = s(0); l(0,1) = s(1); l(0,2) = s(2); | |
| 3210 l(1,0) = u(0); l(1,1) = u(1); l(1,2) = u(2); | |
| 3211 l(2,0) = -f(0); l(2,1) = -f(1); l(2,2) = -f(2); | |
| 3212 x_view = x_view * l; | |
| 3213 translate (x_view, -c_eye(0), -c_eye(1), -c_eye(2)); | |
| 3214 scale (x_view, pb(0), pb(1), pb(2)); | |
| 3215 translate (x_view, -0.5, -0.5, -0.5); | |
| 3216 | |
| 3217 Matrix x_cube = x_view * unit_cube (); | |
| 3218 ColumnVector cmin = x_cube.row_min (), cmax = x_cube.row_max (); | |
| 3219 double xM = cmax(0)-cmin(0); | |
| 3220 double yM = cmax(1)-cmin(1); | |
| 3221 | |
| 7447 | 3222 Matrix bb = get_boundingbox (true); |
| 7427 | 3223 |
| 3224 double v_angle; | |
| 3225 | |
| 3226 if (cameraviewanglemode_is ("auto")) | |
| 3227 { | |
| 3228 double af; | |
| 3229 | |
| 8333 | 3230 // FIXME -- was this really needed? When compared to Matlab, it |
| 7427 | 3231 // does not seem to be required. Need investigation with concrete |
| 3232 // backend to see results visually. | |
| 3233 if (false && dowarp) | |
| 3234 af = 1.0 / (xM > yM ? xM : yM); | |
| 3235 else | |
| 3236 { | |
| 3237 if ((bb(2)/bb(3)) > (xM/yM)) | |
| 3238 af = 1.0 / yM; | |
| 3239 else | |
| 3240 af = 1.0 / xM; | |
| 3241 } | |
| 3242 v_angle = 2 * (180.0 / M_PI) * atan (1 / (2 * af * norm (F))); | |
| 3243 | |
| 3244 cameraviewangle = v_angle; | |
| 3245 } | |
| 3246 else | |
| 3247 v_angle = get_cameraviewangle (); | |
| 3248 | |
| 3249 double pf = 1 / (2 * tan ((v_angle / 2) * M_PI / 180.0) * norm (F)); | |
| 3250 scale (x_projection, pf, pf, 1); | |
| 3251 | |
| 3252 if (dowarp) | |
| 3253 { | |
| 3254 xM *= pf; | |
| 3255 yM *= pf; | |
| 7447 | 3256 translate (x_viewport, bb(0)+bb(2)/2, bb(1)+bb(3)/2, 0); |
| 7427 | 3257 scale (x_viewport, bb(2)/xM, -bb(3)/yM, 1); |
| 3258 } | |
| 3259 else | |
| 3260 { | |
| 3261 double pix = 1; | |
| 3262 if (autocam) | |
| 3263 { | |
| 3264 if ((bb(2)/bb(3)) > (xM/yM)) | |
| 3265 pix = bb(3); | |
| 3266 else | |
| 3267 pix = bb(2); | |
| 3268 } | |
| 3269 else | |
| 3270 pix = (bb(2) < bb(3) ? bb(2) : bb(3)); | |
| 7447 | 3271 translate (x_viewport, bb(0)+bb(2)/2, bb(1)+bb(3)/2, 0); |
| 7427 | 3272 scale (x_viewport, pix, -pix, 1); |
| 3273 } | |
| 3274 | |
| 3275 x_normrender = x_viewport * x_projection * x_view; | |
| 3276 | |
| 3277 x_cube = x_normrender * unit_cube (); | |
| 3278 cmin = x_cube.row_min (); | |
| 3279 cmax = x_cube.row_max (); | |
| 3280 x_zlim.resize (1, 2); | |
| 3281 x_zlim(0) = cmin(2); | |
| 3282 x_zlim(1) = cmax(2); | |
| 3283 | |
| 3284 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
|
3285 scale (x_render, xd/(xlimits(1)-xlimits(0)), yd/(ylimits(1)-ylimits(0)), |
|
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3286 zd/(zlimits(1)-zlimits(0))); |
| 7427 | 3287 translate (x_render, -xo, -yo, -zo); |
| 3288 | |
| 3289 x_viewtransform = x_view; | |
| 3290 x_projectiontransform = x_projection; | |
| 3291 x_viewporttransform = x_viewport; | |
| 3292 x_normrendertransform = x_normrender; | |
| 3293 x_rendertransform = x_render; | |
| 3294 | |
| 3295 x_render_inv = x_render.inverse (); | |
| 3296 | |
| 3297 // Note: these matrices are a slight modified version of the regular | |
| 3298 // matrices, more suited for OpenGL rendering (x_gl_mat1 => light | |
| 3299 // => x_gl_mat2) | |
| 3300 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
|
3301 scale (x_gl_mat1, xd/(xlimits(1)-xlimits(0)), yd/(ylimits(1)-ylimits(0)), |
|
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3302 zd/(zlimits(1)-zlimits(0))); |
| 7427 | 3303 translate (x_gl_mat1, -xo, -yo, -zo); |
| 3304 x_gl_mat2 = x_viewport * x_projection; | |
| 3305 } | |
| 3306 | |
| 3307 void | |
| 3308 axes::properties::update_aspectratios (void) | |
| 3309 { | |
|
7526
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3310 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
|
3311 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
|
3312 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
|
3313 |
|
52d58b0463ed
graphics.cc, graphics.h.in: avoid some GCC warnings
John W. Eaton <jwe@octave.org>
parents:
7523
diff
changeset
|
3314 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
|
3315 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
|
3316 double dz = (zlimits(1)-zlimits(0)); |
| 7427 | 3317 |
| 3318 if (dataaspectratiomode_is ("auto")) | |
| 3319 { | |
| 3320 double dmin = xmin (xmin (dx, dy), dz); | |
| 3321 Matrix da (1, 3, 0.0); | |
| 3322 | |
| 3323 da(0) = dx/dmin; | |
| 3324 da(1) = dy/dmin; | |
| 3325 da(2) = dz/dmin; | |
| 3326 | |
| 3327 dataaspectratio = da; | |
| 3328 } | |
| 3329 | |
| 3330 if (plotboxaspectratiomode_is ("auto")) | |
| 3331 { | |
| 3332 if (dataaspectratiomode_is ("auto")) | |
| 3333 plotboxaspectratio = Matrix (1, 3, 1.0); | |
| 3334 else | |
| 3335 { | |
| 3336 Matrix da = get_dataaspectratio ().matrix_value (); | |
| 3337 Matrix pba (1, 3, 0.0); | |
| 3338 | |
| 3339 pba(0) = dx/da(0); | |
| 3340 pba(1) = dy/da(1); | |
| 3341 pba(2) = dz/da(2); | |
| 3342 } | |
| 3343 } | |
| 3344 | |
| 8333 | 3345 // FIXME -- if plotboxaspectratiomode is "manual", limits |
| 3346 // and/or dataaspectratio might be adapted. | |
| 7427 | 3347 } |
| 3348 | |
| 7447 | 3349 // The INTERNAL flag defines whether position or outerposition is used. |
| 3350 | |
| 7427 | 3351 Matrix |
| 7447 | 3352 axes::properties::get_boundingbox (bool internal) const |
| 7427 | 3353 { |
| 7447 | 3354 graphics_object obj = gh_manager::get_object (get_parent ()); |
| 3355 Matrix parent_bb = obj.get_properties ().get_boundingbox (true); | |
| 3356 Matrix pos = (internal ? | |
| 3357 get_position ().matrix_value () | |
| 3358 : get_outerposition ().matrix_value ()); | |
| 3359 | |
| 3360 | |
| 3361 pos = convert_position (pos, get_units (), "pixels", | |
|
9238
0ae2b6617005
Use display information from the root object to compute bounding boxes
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9185
diff
changeset
|
3362 parent_bb.extract_n (0, 2, 1, 2)); |
| 7427 | 3363 pos(0)--; |
| 3364 pos(1)--; | |
| 7447 | 3365 pos(1) = parent_bb(3) - pos(1) - pos(3); |
| 7427 | 3366 |
| 3367 return pos; | |
| 3368 } | |
| 3369 | |
| 7435 | 3370 ColumnVector |
| 3371 graphics_xform::xform_vector (double x, double y, double z) | |
| 7869 | 3372 { |
| 3373 return ::xform_vector (x, y, z); | |
| 3374 } | |
| 7435 | 3375 |
| 3376 Matrix | |
| 3377 graphics_xform::xform_eye (void) | |
| 7869 | 3378 { |
| 3379 return ::xform_matrix (); | |
| 3380 } | |
| 7435 | 3381 |
| 3382 ColumnVector | |
| 3383 graphics_xform::transform (double x, double y, double z, | |
| 3384 bool use_scale) const | |
| 3385 { | |
| 3386 if (use_scale) | |
| 3387 { | |
| 3388 x = sx.scale (x); | |
| 3389 y = sy.scale (y); | |
| 3390 z = sz.scale (z); | |
| 3391 } | |
| 3392 | |
| 3393 return ::transform (xform, x, y, z); | |
| 3394 } | |
| 3395 | |
| 3396 ColumnVector | |
| 3397 graphics_xform::untransform (double x, double y, double z, | |
| 3398 bool use_scale) const | |
| 3399 { | |
| 3400 ColumnVector v = ::transform (xform_inv, x, y, z); | |
| 3401 | |
| 3402 if (use_scale) | |
| 3403 { | |
| 3404 v(0) = sx.unscale (v(0)); | |
| 3405 v(1) = sy.unscale (v(1)); | |
| 3406 v(2) = sz.unscale (v(2)); | |
| 3407 } | |
| 3408 | |
| 3409 return v; | |
| 3410 } | |
| 3411 | |
| 6836 | 3412 octave_value |
| 7189 | 3413 axes::get_default (const caseless_str& name) const |
| 6836 | 3414 { |
| 3415 octave_value retval = default_properties.lookup (name); | |
| 3416 | |
| 3417 if (retval.is_undefined ()) | |
| 3418 { | |
| 3419 graphics_handle parent = get_parent (); | |
| 3420 graphics_object parent_obj = gh_manager::get_object (parent); | |
| 3421 | |
| 3422 retval = parent_obj.get_default (name); | |
| 3423 } | |
| 3424 | |
| 3425 return retval; | |
| 3426 } | |
| 3427 | |
| 8333 | 3428 // FIXME -- remove. |
| 3429 // 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
|
3430 /* |
|
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
|
3431 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
|
3432 check_limit_vals (double& min_val, double& max_val, double& min_pos, |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
3433 const array_property& data) |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
3434 { |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
3435 double val = data.min_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
|
3436 if (! (xisinf (val) || xisnan (val)) && val < min_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
|
3437 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
|
3438 val = data.max_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
|
3439 if (! (xisinf (val) || xisnan (val)) && val > max_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
|
3440 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
|
3441 val = data.min_pos (); |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
3442 if (! (xisinf (val) || xisnan (val)) && val > 0 && val < min_pos) |
|
4fb2db9c87dd
Turn cdata properties into array_property. Add min/max computation to array_property.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7835
diff
changeset
|
3443 min_pos = 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
|
3444 } |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3445 */ |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3446 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3447 static void |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3448 check_limit_vals (double& min_val, double& max_val, double& min_pos, |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3449 const octave_value& data) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3450 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3451 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
|
3452 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3453 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
|
3454 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3455 if (! error_state && m.numel () == 3) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3456 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3457 double val; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3458 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3459 val = m(0); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3460 if (! (xisinf (val) || xisnan (val)) && val < min_val) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3461 min_val = val; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3462 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3463 val = m(1); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3464 if (! (xisinf (val) || xisnan (val)) && val > max_val) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3465 max_val = val; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3466 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3467 val = m(2); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3468 if (! (xisinf (val) || xisnan (val)) && val > 0 && val < min_pos) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3469 min_pos = val; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3470 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3471 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3472 } |
|
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
|
3473 |
|
7827
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3474 // magform(x) Returns (a, b), where x = a * 10^b, a >= 1., and b is |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3475 // integral. |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3476 |
| 7869 | 3477 static void |
| 3478 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
|
3479 { |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3480 if (x == 0) |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3481 { |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3482 a = 0; |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3483 b = 0; |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3484 } |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3485 else |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3486 { |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3487 double l = std::log10 (std::abs (x)); |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3488 double r = std::fmod (l, 1.); |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3489 a = std::pow (10.0, r); |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3490 b = static_cast<int> (l-r); |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3491 if (a < 1) |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3492 { |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3493 a *= 10; |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3494 b -= 1; |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3495 } |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3496 |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3497 if (x < 0) |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3498 a = -a; |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3499 } |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3500 } |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3501 |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3502 // 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
|
3503 // http://kurage.nimh.nih.gov/tomh/tics.py |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3504 // FIXME -- add log ticks |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3505 |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3506 double |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3507 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
|
3508 { |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3509 int ticint = 5; |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3510 |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3511 // 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
|
3512 // 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
|
3513 // 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
|
3514 // 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
|
3515 |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3516 double a; |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3517 int b, x; |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3518 |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3519 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
|
3520 |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3521 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
|
3522 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
|
3523 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
|
3524 |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3525 if (a < sqrt_2) |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3526 x = 1; |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3527 else if (a < sqrt_10) |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3528 x = 2; |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3529 else if (a < sqrt_50) |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3530 x = 5; |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3531 else |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3532 x = 10; |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3533 |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3534 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
|
3535 |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3536 } |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3537 |
| 7222 | 3538 // Attempt to make "nice" limits from the actual max and min of the |
| 3539 // data. For log plots, we will also use the smallest strictly positive | |
| 3540 // value. | |
| 3541 | |
|
7827
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3542 Matrix |
| 7869 | 3543 axes::properties::get_axis_limits (double xmin, double xmax, |
| 3544 double min_pos, bool logscale) | |
| 7222 | 3545 { |
| 3546 Matrix retval; | |
| 3547 | |
| 3548 double min_val = xmin; | |
| 3549 double max_val = xmax; | |
| 3550 | |
| 3551 if (! (xisinf (min_val) || xisinf (max_val))) | |
| 3552 { | |
| 3553 if (logscale) | |
| 3554 { | |
| 3555 if (xisinf (min_pos)) | |
| 3556 { | |
| 3557 // warning ("axis: logscale with no positive values to plot"); | |
| 3558 return retval; | |
| 3559 } | |
| 3560 | |
| 3561 if (min_val <= 0) | |
| 3562 { | |
| 3563 warning ("axis: omitting nonpositive data in log plot"); | |
| 3564 min_val = min_pos; | |
| 3565 } | |
| 3566 // FIXME -- maybe this test should also be relative? | |
| 3567 if (std::abs (min_val - max_val) < sqrt (DBL_EPSILON)) | |
| 3568 { | |
| 3569 min_val *= 0.9; | |
| 3570 max_val *= 1.1; | |
| 3571 } | |
| 3572 min_val = pow (10, floor (log10 (min_val))); | |
| 3573 max_val = pow (10, ceil (log10 (max_val))); | |
| 3574 } | |
| 3575 else | |
| 3576 { | |
| 3577 if (min_val == 0 && max_val == 0) | |
| 3578 { | |
| 3579 min_val = -1; | |
| 3580 max_val = 1; | |
| 3581 } | |
| 3582 // FIXME -- maybe this test should also be relative? | |
| 3583 else if (std::abs (min_val - max_val) < sqrt (DBL_EPSILON)) | |
| 3584 { | |
| 3585 min_val -= 0.1 * std::abs (min_val); | |
| 3586 max_val += 0.1 * std::abs (max_val); | |
| 3587 } | |
|
7827
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3588 |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3589 double tick_sep = calc_tick_sep (min_val , max_val); |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3590 min_val = tick_sep * std::floor (min_val / tick_sep); |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3591 max_val = tick_sep * ceil (max_val / tick_sep); |
| 7222 | 3592 } |
| 3593 } | |
| 3594 | |
| 3595 retval.resize (1, 2); | |
| 3596 | |
| 3597 retval(0) = min_val; | |
| 3598 retval(1) = max_val; | |
| 3599 | |
| 3600 return retval; | |
| 3601 } | |
| 3602 | |
| 7446 | 3603 void |
| 7869 | 3604 axes::properties::calc_ticks_and_lims (array_property& lims, |
| 3605 array_property& ticks, | |
| 3606 bool limmode_is_auto, bool is_logscale) | |
| 7446 | 3607 { |
|
7827
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3608 // FIXME -- add log ticks and lims |
| 7446 | 3609 |
| 3610 if (lims.get ().is_empty ()) | |
| 3611 return; | |
| 3612 | |
| 3613 double lo = (lims.get ().matrix_value ()) (0); | |
| 3614 double hi = (lims.get ().matrix_value ()) (1); | |
|
7843
d3dcfdfdc434
handle unsorted limits when calculatin gticks and limits
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7836
diff
changeset
|
3615 // FIXME should this be checked for somewhere else? (i.e. set{x,y,z}lim) |
|
d3dcfdfdc434
handle unsorted limits when calculatin gticks and limits
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7836
diff
changeset
|
3616 if (hi < lo) |
|
d3dcfdfdc434
handle unsorted limits when calculatin gticks and limits
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7836
diff
changeset
|
3617 { |
|
d3dcfdfdc434
handle unsorted limits when calculatin gticks and limits
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7836
diff
changeset
|
3618 double tmp = hi; |
|
d3dcfdfdc434
handle unsorted limits when calculatin gticks and limits
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7836
diff
changeset
|
3619 hi = lo; |
|
d3dcfdfdc434
handle unsorted limits when calculatin gticks and limits
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7836
diff
changeset
|
3620 lo = tmp; |
|
d3dcfdfdc434
handle unsorted limits when calculatin gticks and limits
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7836
diff
changeset
|
3621 } |
|
7857
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3622 |
|
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3623 if (is_logscale) |
|
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3624 { |
|
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3625 // FIXME we should check for negtives here |
|
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3626 hi = std::log10 (hi); |
|
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3627 lo = std::log10 (lo); |
|
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3628 } |
|
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3629 |
|
7827
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3630 double tick_sep = calc_tick_sep (lo , hi); |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3631 |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3632 int i1 = static_cast<int> (std::floor (lo / tick_sep)); |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3633 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
|
3634 |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3635 if (limmode_is_auto) |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3636 { |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3637 // 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
|
3638 Matrix tmp_lims (1,2); |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3639 tmp_lims(0) = tick_sep * i1; |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3640 tmp_lims(1) = tick_sep * i2; |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3641 |
|
7857
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3642 if (is_logscale) |
|
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3643 { |
|
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3644 tmp_lims(0) = std::pow (10.,tmp_lims(0)); |
|
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3645 tmp_lims(1) = std::pow (10.,tmp_lims(1)); |
|
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3646 } |
|
7827
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3647 lims = tmp_lims; |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3648 } |
| 7446 | 3649 else |
|
7827
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3650 { |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3651 // adjust min and max tics if they are out of limits |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3652 i1 = static_cast<int> (std::ceil (lo / tick_sep)); |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3653 i2 = static_cast<int> (std::floor (hi / tick_sep)); |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3654 } |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3655 |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3656 Matrix tmp_ticks (1, i2-i1+1); |
|
7857
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3657 for (int i = 0; i <= i2-i1; i++) |
|
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3658 { |
|
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3659 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
|
3660 if (is_logscale) |
|
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3661 tmp_ticks (i) = std::pow (10., tmp_ticks (i)); |
|
09b1a9c88128
added (far from perfect) support for logscale ticks
Shai Ayal <shaiay@users.sourceforge.net>
parents:
7855
diff
changeset
|
3662 } |
|
7827
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3663 |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3664 ticks = tmp_ticks; |
| 7446 | 3665 } |
| 3666 | |
|
9347
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3667 void |
|
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3668 axes::properties::calc_ticklabels (const array_property& ticks, |
| 9605 | 3669 any_property& labels, bool /*logscale*/) |
|
9347
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3670 { |
|
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3671 Matrix values = ticks.get ().matrix_value (); |
|
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3672 Cell c (values.dims ()); |
|
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3673 std::ostringstream os; |
|
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3674 |
|
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3675 for (int i = 0; i < values.numel (); i++) |
|
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3676 { |
|
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3677 os.str (std::string ()); |
|
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3678 os << values(i); |
|
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3679 c(i) = os.str (); |
|
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3680 } |
|
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3681 |
|
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3682 labels = c; |
|
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3683 } |
|
3da821b161e9
imported patch ticklabel
Michael Goffioul <michael.goffioul@gmail.com>
parents:
9316
diff
changeset
|
3684 |
| 9455 | 3685 void |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3686 get_children_limits (double& min_val, double& max_val, double& min_pos, |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3687 const Matrix& kids, char 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
|
3688 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3689 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
|
3690 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3691 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
|
3692 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3693 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
|
3694 for (octave_idx_type i = 0; i < n; i++) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3695 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3696 graphics_object obj = gh_manager::get_object (kids(i)); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3697 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3698 if (obj.is_xliminclude ()) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3699 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3700 octave_value lim = obj.get_xlim (); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3701 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3702 check_limit_vals (min_val, max_val, min_pos, lim); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3703 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3704 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3705 break; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3706 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3707 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
|
3708 for (octave_idx_type i = 0; i < n; i++) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3709 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3710 graphics_object obj = gh_manager::get_object (kids(i)); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3711 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3712 if (obj.is_yliminclude ()) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3713 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3714 octave_value lim = obj.get_ylim (); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3715 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3716 check_limit_vals (min_val, max_val, min_pos, lim); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3717 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3718 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3719 break; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3720 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3721 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
|
3722 for (octave_idx_type i = 0; i < n; i++) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3723 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3724 graphics_object obj = gh_manager::get_object (kids(i)); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3725 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3726 if (obj.is_zliminclude ()) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3727 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3728 octave_value lim = obj.get_zlim (); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3729 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3730 check_limit_vals (min_val, max_val, min_pos, lim); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3731 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3732 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3733 break; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3734 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3735 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
|
3736 for (octave_idx_type i = 0; i < n; i++) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3737 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3738 graphics_object obj = gh_manager::get_object (kids(i)); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3739 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3740 if (obj.is_climinclude ()) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3741 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3742 octave_value lim = obj.get_clim (); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3743 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3744 check_limit_vals (min_val, max_val, min_pos, lim); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3745 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3746 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3747 break; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3748 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3749 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
|
3750 for (octave_idx_type i = 0; i < n; i++) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3751 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3752 graphics_object obj = gh_manager::get_object (kids(i)); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3753 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3754 if (obj.is_aliminclude ()) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3755 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3756 octave_value lim = obj.get_alim (); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3757 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3758 check_limit_vals (min_val, max_val, min_pos, lim); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3759 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3760 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3761 break; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3762 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3763 default: |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3764 break; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3765 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3766 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3767 |
| 7222 | 3768 static bool updating_axis_limits = false; |
| 3769 | |
| 7214 | 3770 void |
| 7222 | 3771 axes::update_axis_limits (const std::string& axis_type) |
| 7214 | 3772 { |
| 7222 | 3773 if (updating_axis_limits) |
| 3774 return; | |
| 3775 | |
| 3776 Matrix kids = xproperties.get_children (); | |
| 3777 | |
| 3778 double min_val = octave_Inf; | |
| 3779 double max_val = -octave_Inf; | |
| 3780 double min_pos = octave_Inf; | |
| 3781 | |
| 3782 char update_type = 0; | |
| 3783 | |
| 3784 Matrix limits; | |
| 3785 | |
| 3786 if (axis_type == "xdata" || axis_type == "xscale" | |
| 3787 || axis_type == "xldata" || axis_type == "xudata" | |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3788 || 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
|
3789 || axis_type == "xlim") |
| 7222 | 3790 { |
| 7363 | 3791 if (xproperties.xlimmode_is ("auto")) |
| 7222 | 3792 { |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3793 get_children_limits (min_val, max_val, min_pos, kids, 'x'); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3794 |
|
7827
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3795 limits = xproperties.get_axis_limits (min_val, max_val, min_pos, |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3796 xproperties.xscale_is ("log")); |
| 7222 | 3797 |
| 3798 update_type = 'x'; | |
| 3799 } | |
| 3800 } | |
| 3801 else if (axis_type == "ydata" || axis_type == "yscale" | |
| 3802 || axis_type == "ldata" || axis_type == "udata" | |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3803 || axis_type == "ylimmode" || axis_type == "yliminclude" |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3804 || axis_type == "ylim") |
| 7222 | 3805 { |
| 7363 | 3806 if (xproperties.ylimmode_is ("auto")) |
| 7222 | 3807 { |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3808 get_children_limits (min_val, max_val, min_pos, kids, 'y'); |
| 7222 | 3809 |
|
7827
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3810 limits = xproperties.get_axis_limits (min_val, max_val, min_pos, |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3811 xproperties.yscale_is ("log")); |
| 7222 | 3812 |
| 3813 update_type = 'y'; | |
| 3814 } | |
| 3815 } | |
| 3816 else if (axis_type == "zdata" || axis_type == "zscale" | |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3817 || axis_type == "zlimmode" || axis_type == "zliminclude" |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3818 || axis_type == "zlim") |
| 7222 | 3819 { |
| 7363 | 3820 if (xproperties.zlimmode_is ("auto")) |
| 7222 | 3821 { |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3822 get_children_limits (min_val, max_val, min_pos, kids, 'z'); |
| 7222 | 3823 |
|
7827
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3824 limits = xproperties.get_axis_limits (min_val, max_val, min_pos, |
|
3584f37eac69
better tick and limit handling, still missing logscale support
Shai Ayal <shaiay@sourceforge.net>
parents:
7824
diff
changeset
|
3825 xproperties.zscale_is ("log")); |
| 7222 | 3826 |
| 3827 update_type = 'z'; | |
| 3828 } | |
| 3829 } | |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3830 else if (axis_type == "cdata" || axis_type == "climmode" |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3831 || axis_type == "cdatamapping" || axis_type == "climinclude" |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3832 || axis_type == "clim") |
| 7222 | 3833 { |
| 7363 | 3834 if (xproperties.climmode_is ("auto")) |
| 7222 | 3835 { |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3836 get_children_limits (min_val, max_val, min_pos, kids, 'c'); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3837 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3838 if (min_val > max_val) |
| 7222 | 3839 { |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3840 min_val = min_pos = 0; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3841 max_val = 1; |
| 7222 | 3842 } |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3843 else if (min_val == max_val) |
| 7222 | 3844 max_val = min_val + 1; |
| 3845 | |
| 3846 limits.resize (1, 2); | |
| 3847 | |
| 3848 limits(0) = min_val; | |
| 3849 limits(1) = max_val; | |
| 3850 | |
| 3851 update_type = 'c'; | |
| 3852 } | |
| 3853 | |
| 3854 } | |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3855 else if (axis_type == "alphadata" || axis_type == "alimmode" |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3856 || axis_type == "alphadatamapping" || axis_type == "aliminclude" |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3857 || axis_type == "alim") |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3858 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3859 if (xproperties.alimmode_is ("auto")) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3860 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3861 get_children_limits (min_val, max_val, min_pos, kids, 'a'); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3862 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3863 if (min_val > max_val) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3864 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3865 min_val = min_pos = 0; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3866 max_val = 1; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3867 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3868 else if (min_val == max_val) |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3869 max_val = min_val + 1; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3870 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3871 limits.resize (1, 2); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3872 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3873 limits(0) = min_val; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3874 limits(1) = max_val; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3875 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3876 update_type = 'a'; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3877 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3878 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3879 } |
| 7222 | 3880 |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
10056
diff
changeset
|
3881 unwind_protect frame; |
|
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
10056
diff
changeset
|
3882 frame.protect_var (updating_axis_limits); |
|
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
10056
diff
changeset
|
3883 |
| 7222 | 3884 updating_axis_limits = true; |
| 3885 | |
| 3886 switch (update_type) | |
| 3887 { | |
| 3888 case 'x': | |
| 3889 xproperties.set_xlim (limits); | |
| 3890 xproperties.set_xlimmode ("auto"); | |
| 7446 | 3891 xproperties.update_xlim (); |
| 7222 | 3892 break; |
| 3893 | |
| 3894 case 'y': | |
| 3895 xproperties.set_ylim (limits); | |
| 3896 xproperties.set_ylimmode ("auto"); | |
| 7446 | 3897 xproperties.update_ylim (); |
| 7222 | 3898 break; |
| 3899 | |
| 3900 case 'z': | |
| 3901 xproperties.set_zlim (limits); | |
| 3902 xproperties.set_zlimmode ("auto"); | |
| 7446 | 3903 xproperties.update_zlim (); |
| 7222 | 3904 break; |
| 3905 | |
| 3906 case 'c': | |
| 3907 xproperties.set_clim (limits); | |
| 3908 xproperties.set_climmode ("auto"); | |
| 3909 break; | |
| 3910 | |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3911 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
|
3912 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
|
3913 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
|
3914 break; |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
3915 |
| 7222 | 3916 default: |
| 3917 break; | |
| 3918 } | |
| 3919 | |
| 7427 | 3920 xproperties.update_transform (); |
| 7214 | 3921 } |
| 3922 | |
| 9455 | 3923 inline |
| 3924 double force_in_range (const double x, const double lower, const double upper) | |
| 3925 { | |
| 3926 if (x < lower) | |
| 3927 { return lower; } | |
| 3928 else if (x > upper) | |
| 3929 { return upper; } | |
| 3930 else | |
| 3931 { return x; } | |
| 3932 } | |
| 3933 | |
|
7855
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
3934 void |
| 9455 | 3935 axes::properties::zoom_about_point (double x, double y, double factor, |
| 3936 bool push_to_zoom_stack) | |
| 3937 { | |
| 3938 // FIXME: Do we need error checking here? | |
| 3939 Matrix xlims = get_xlim ().matrix_value (); | |
| 3940 Matrix ylims = get_ylim ().matrix_value (); | |
| 3941 | |
| 3942 // Get children axes limits | |
| 3943 Matrix kids = get_children (); | |
| 3944 double minx = octave_Inf; | |
| 3945 double maxx = -octave_Inf; | |
| 3946 double min_pos_x = octave_Inf; | |
| 3947 get_children_limits (minx, maxx, min_pos_x, kids, 'x'); | |
| 3948 | |
| 3949 double miny = octave_Inf; | |
| 3950 double maxy = -octave_Inf; | |
| 3951 double min_pos_y = octave_Inf; | |
| 3952 get_children_limits (miny, maxy, min_pos_y, kids, 'y'); | |
| 3953 | |
| 3954 // Perform the zooming | |
| 3955 xlims (0) = x + factor * (xlims (0) - x); | |
| 3956 xlims (1) = x + factor * (xlims (1) - x); | |
| 3957 ylims (0) = y + factor * (ylims (0) - y); | |
| 3958 ylims (1) = y + factor * (ylims (1) - y); | |
| 3959 | |
| 3960 // Make sure we stay within the range og the plot | |
| 3961 xlims (0) = force_in_range (xlims (0), minx, maxx); | |
| 3962 xlims (1) = force_in_range (xlims (1), minx, maxx); | |
| 3963 ylims (0) = force_in_range (ylims (0), miny, maxy); | |
| 3964 ylims (1) = force_in_range (ylims (1), miny, maxy); | |
| 3965 | |
| 3966 zoom (xlims, ylims, push_to_zoom_stack); | |
| 3967 } | |
| 3968 | |
| 3969 void | |
| 3970 axes::properties::zoom (const Matrix& xl, const Matrix& yl, bool push_to_zoom_stack) | |
| 3971 { | |
| 3972 if (push_to_zoom_stack) | |
| 3973 { | |
| 3974 zoom_stack.push_front (xlimmode.get ()); | |
| 3975 zoom_stack.push_front (xlim.get ()); | |
| 3976 zoom_stack.push_front (ylimmode.get ()); | |
| 3977 zoom_stack.push_front (ylim.get ()); | |
| 3978 } | |
| 3979 | |
|
7855
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
3980 xlim = xl; |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
3981 xlimmode = "manual"; |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
3982 ylim = yl; |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
3983 ylimmode = "manual"; |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
3984 |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
3985 update_transform (); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
3986 update_xlim (false); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
3987 update_ylim (false); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
3988 } |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
3989 |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
3990 void |
| 9455 | 3991 axes::properties::translate_view (double delta_x, double delta_y) |
| 3992 { | |
| 3993 // FIXME: Do we need error checking here? | |
| 3994 Matrix xlims = get_xlim ().matrix_value (); | |
| 3995 Matrix ylims = get_ylim ().matrix_value (); | |
| 3996 | |
| 3997 // Get children axes limits | |
| 3998 Matrix kids = get_children (); | |
| 3999 double minx = octave_Inf; | |
| 4000 double maxx = -octave_Inf; | |
| 4001 double min_pos_x = octave_Inf; | |
| 4002 get_children_limits (minx, maxx, min_pos_x, kids, 'x'); | |
| 4003 | |
| 4004 double miny = octave_Inf; | |
| 4005 double maxy = -octave_Inf; | |
| 4006 double min_pos_y = octave_Inf; | |
| 4007 get_children_limits (miny, maxy, min_pos_y, kids, 'y'); | |
| 4008 | |
| 4009 // Make sure we don't exceed the borders | |
| 4010 if (delta_x > 0) | |
| 4011 delta_x = std::min (xlims (1) + delta_x, maxx) - xlims (1); | |
| 4012 else | |
| 4013 delta_x = std::max (xlims (0) + delta_x, minx) - xlims (0); | |
| 4014 xlims (0) = xlims (0) + delta_x; | |
| 4015 xlims (1) = xlims (1) + delta_x; | |
| 4016 | |
| 4017 if (delta_y > 0) | |
| 4018 delta_y = std::min (ylims (1) + delta_y, maxy) - ylims (1); | |
| 4019 else | |
| 4020 delta_y = std::max (ylims (0) + delta_y, miny) - ylims (0); | |
| 4021 ylims (0) = ylims (0) + delta_y; | |
| 4022 ylims (1) = ylims (1) + delta_y; | |
| 4023 | |
| 4024 zoom (xlims, ylims, false); | |
| 4025 } | |
| 4026 | |
| 4027 void | |
|
7855
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4028 axes::properties::unzoom (void) |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4029 { |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4030 if (zoom_stack.size () >= 4) |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4031 { |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4032 ylim = zoom_stack.front (); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4033 zoom_stack.pop_front (); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4034 ylimmode = zoom_stack.front (); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4035 zoom_stack.pop_front (); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4036 xlim = zoom_stack.front (); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4037 zoom_stack.pop_front (); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4038 xlimmode = zoom_stack.front (); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4039 zoom_stack.pop_front (); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4040 |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4041 update_transform (); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4042 update_xlim (false); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4043 update_ylim (false); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4044 } |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4045 } |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4046 |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4047 void |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4048 axes::properties::clear_zoom_stack (void) |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4049 { |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4050 while (zoom_stack.size () > 4) |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4051 zoom_stack.pop_front (); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4052 |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4053 unzoom (); |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4054 } |
|
f317f14516cb
Add zoom stack facility in axes object.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7849
diff
changeset
|
4055 |
| 7363 | 4056 // --------------------------------------------------------------------- |
| 4057 | |
|
7862
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4058 Matrix |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4059 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
|
4060 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4061 Matrix m (1, 3); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4062 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4063 m(0) = xmin (xdata.min_val (), xmin (xldata.min_val (), xudata.min_val ())); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4064 m(1) = xmax (xdata.max_val (), xmax (xldata.max_val (), xudata.max_val ())); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4065 m(2) = xmin (xdata.min_pos (), xmin (xldata.min_pos (), xudata.min_pos ())); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4066 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4067 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
|
4068 } |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4069 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4070 Matrix |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4071 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
|
4072 { |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4073 Matrix m (1, 3); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4074 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4075 m(0) = xmin (ydata.min_val (), xmin (ldata.min_val (), udata.min_val ())); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4076 m(1) = xmax (ydata.max_val (), xmax (ldata.max_val (), udata.max_val ())); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4077 m(2) = xmin (ydata.min_pos (), xmin (ldata.min_pos (), udata.min_pos ())); |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4078 |
|
8f3459a90bf3
Redesign axis limit computation handling (using hidden limit properties in child objects)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7860
diff
changeset
|
4079 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
|
4080 } |
| 6406 | 4081 |
| 4082 // --------------------------------------------------------------------- | |
| 4083 | |
| 7363 | 4084 // Note: "text" code is entirely auto-generated |
| 6406 | 4085 |
| 4086 // --------------------------------------------------------------------- | |
| 4087 | |
|
9680
73153525df9a
initial implementation of OpenGL image rendering
Shai Ayal <shaiay@users.sourceforge.net>
parents:
9605
diff
changeset
|
4088 octave_value |
|
73153525df9a
initial implementation of OpenGL image rendering
Shai Ayal <shaiay@users.sourceforge.net>
parents:
9605
diff
changeset
|
4089 image::properties::get_color_data (void) const |
|
73153525df9a
initial implementation of OpenGL image rendering
Shai Ayal <shaiay@users.sourceforge.net>
parents:
9605
diff
changeset
|
4090 { |
|
73153525df9a
initial implementation of OpenGL image rendering
Shai Ayal <shaiay@users.sourceforge.net>
parents:
9605
diff
changeset
|
4091 return convert_cdata (*this, get_cdata (), |
|
73153525df9a
initial implementation of OpenGL image rendering
Shai Ayal <shaiay@users.sourceforge.net>
parents:
9605
diff
changeset
|
4092 cdatamapping_is ("scaled"), 3); |
|
73153525df9a
initial implementation of OpenGL image rendering
Shai Ayal <shaiay@users.sourceforge.net>
parents:
9605
diff
changeset
|
4093 } |
| 6406 | 4094 |
| 4095 // --------------------------------------------------------------------- | |
| 4096 | |
|
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
|
4097 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
|
4098 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
|
4099 { |
|
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
|
4100 return convert_cdata (*this, get_facevertexcdata (), |
|
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
|
4101 cdatamapping_is ("scaled"), 2); |
|
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
|
4102 } |
| 6807 | 4103 |
| 4104 // --------------------------------------------------------------------- | |
| 4105 | |
|
7829
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4106 octave_value |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4107 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
|
4108 { |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4109 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
|
4110 } |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4111 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4112 inline void |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4113 cross_product (double x1, double y1, double z1, |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4114 double x2, double y2, double z2, |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4115 double& x, double& y, double& z) |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4116 { |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4117 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
|
4118 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
|
4119 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
|
4120 } |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4121 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4122 void |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4123 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
|
4124 { |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4125 if (normalmode_is ("auto")) |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4126 { |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4127 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
|
4128 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
|
4129 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
|
4130 |
|
8449
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4131 |
|
7829
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4132 int p = z.columns (), q = z.rows (); |
|
8449
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4133 int i1 = 0, i2 = 0, i3 = 0; |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4134 int j1 = 0, j2 = 0, j3 = 0; |
|
7829
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4135 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4136 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
|
4137 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
|
4138 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4139 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
|
4140 |
|
8449
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4141 for (int i = 0; i < p; i++) |
|
7829
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4142 { |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4143 if (y_mat) |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4144 { |
|
8449
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4145 i1 = i - 1; |
|
7829
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4146 i2 = i; |
|
8449
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4147 i3 = i + 1; |
|
7829
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4148 } |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4149 |
|
8449
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4150 for (int j = 0; j < q; j++) |
|
7829
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4151 { |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4152 if (x_mat) |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4153 { |
|
8449
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4154 j1 = j - 1; |
|
7829
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4155 j2 = j; |
|
8449
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4156 j3 = j + 1; |
|
7829
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4157 } |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4158 |
|
8449
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4159 double& nx = n(j, i, 0); |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4160 double& ny = n(j, i, 1); |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4161 double& nz = n(j, i, 2); |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4162 |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4163 if ((j > 0) && (i > 0)) |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4164 // upper left quadrangle |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4165 cross_product (x(j1,i-1)-x(j2,i), y(j-1,i1)-y(j,i2), z(j-1,i-1)-z(j,i), |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4166 x(j2,i-1)-x(j1,i), y(j,i1)-y(j-1,i2), z(j,i-1)-z(j-1,i), |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4167 nx, ny, nz); |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4168 |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4169 if ((j > 0) && (i < (p -1))) |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4170 // upper right quadrangle |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4171 cross_product (x(j1,i+1)-x(j2,i), y(j-1,i3)-y(j,i2), z(j-1,i+1)-z(j,i), |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4172 x(j1,i)-x(j2,i+1), y(j-1,i2)-y(j,i3), z(j-1,i)-z(j,i+1), |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4173 nx, ny, nz); |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4174 |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4175 if ((j < (q - 1)) && (i > 0)) |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4176 // lower left quadrangle |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4177 cross_product (x(j2,i-1)-x(j3,i), y(j,i1)-y(j+1,i2), z(j,i-1)-z(j+1,i), |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4178 x(j3,i-1)-x(j2,i), y(j+1,i1)-y(j,i2), z(j+1,i-1)-z(j,i), |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4179 nx, ny, nz); |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4180 |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4181 if ((j < (q - 1)) && (i < (p -1))) |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4182 // lower right quadrangle |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4183 cross_product (x(j3,i)-x(j2,i+1), y(j+1,i2)-y(j,i3), z(j+1,i)-z(j,i+1), |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4184 x(j3,i+1)-x(j2,i), y(j+1,i3)-y(j,i2), z(j+1,i+1)-z(j,i), |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4185 nx, ny, nz); |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4186 |
|
448188853722
Calculate surface normals for boundaries, use more neighboring
Kai Habel
parents:
8341
diff
changeset
|
4187 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
|
4188 |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4189 nx /= d; |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4190 ny /= d; |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4191 nz /= d; |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4192 } |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4193 } |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4194 vertexnormals = n; |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4195 } |
|
8ca8e97e8c0a
Add rendering interface for surface object (no implementation yet).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7828
diff
changeset
|
4196 } |
| 6406 | 4197 |
| 4198 // --------------------------------------------------------------------- | |
| 4199 | |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4200 void |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4201 hggroup::update_axis_limits (const std::string& axis_type) |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4202 { |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4203 Matrix kids = xproperties.get_children (); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4204 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4205 double min_val = octave_Inf; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4206 double max_val = -octave_Inf; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4207 double min_pos = octave_Inf; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4208 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4209 char update_type = 0; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4210 |
|
8081
b1634dd9ebe7
Make hggroup to react on [xyzac]liminclude changes in its children.
Michael Goffioul
parents:
8075
diff
changeset
|
4211 if (axis_type == "xlim" || axis_type == "xliminclude") |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4212 { |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4213 get_children_limits (min_val, max_val, min_pos, kids, 'x'); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4214 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4215 update_type = 'x'; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4216 } |
|
8081
b1634dd9ebe7
Make hggroup to react on [xyzac]liminclude changes in its children.
Michael Goffioul
parents:
8075
diff
changeset
|
4217 else if (axis_type == "ylim" || axis_type == "yliminclude") |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4218 { |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4219 get_children_limits (min_val, max_val, min_pos, kids, 'y'); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4220 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4221 update_type = 'y'; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4222 } |
|
8081
b1634dd9ebe7
Make hggroup to react on [xyzac]liminclude changes in its children.
Michael Goffioul
parents:
8075
diff
changeset
|
4223 else if (axis_type == "zlim" || axis_type == "zliminclude") |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4224 { |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4225 get_children_limits (min_val, max_val, min_pos, kids, 'z'); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4226 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4227 update_type = 'z'; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4228 } |
|
8081
b1634dd9ebe7
Make hggroup to react on [xyzac]liminclude changes in its children.
Michael Goffioul
parents:
8075
diff
changeset
|
4229 else if (axis_type == "clim" || axis_type == "climinclude") |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4230 { |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4231 get_children_limits (min_val, max_val, min_pos, kids, 'c'); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4232 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4233 update_type = 'c'; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4234 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4235 } |
|
8081
b1634dd9ebe7
Make hggroup to react on [xyzac]liminclude changes in its children.
Michael Goffioul
parents:
8075
diff
changeset
|
4236 else if (axis_type == "alim" || axis_type == "aliminclude") |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4237 { |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4238 get_children_limits (min_val, max_val, min_pos, kids, 'a'); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4239 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4240 update_type = 'a'; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4241 } |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4242 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4243 Matrix limits (1, 3, 0.0); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4244 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4245 limits(0) = min_val; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4246 limits(1) = max_val; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4247 limits(2) = min_pos; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4248 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4249 switch (update_type) |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4250 { |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4251 case 'x': |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4252 xproperties.set_xlim (limits); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4253 break; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4254 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4255 case 'y': |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4256 xproperties.set_ylim (limits); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4257 break; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4258 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4259 case 'z': |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4260 xproperties.set_zlim (limits); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4261 break; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4262 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4263 case 'c': |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4264 xproperties.set_clim (limits); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4265 break; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4266 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4267 case 'a': |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4268 xproperties.set_alim (limits); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4269 break; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4270 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4271 default: |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4272 break; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4273 } |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4274 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4275 base_graphics_object::update_axis_limits (axis_type); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4276 } |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4277 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4278 // --------------------------------------------------------------------- |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4279 |
| 6406 | 4280 octave_value |
| 7189 | 4281 base_graphics_object::get_default (const caseless_str& name) const |
| 6406 | 4282 { |
| 4283 graphics_handle parent = get_parent (); | |
| 4284 graphics_object parent_obj = gh_manager::get_object (parent); | |
| 4285 | |
| 4286 return parent_obj.get_default (type () + name); | |
| 4287 } | |
| 4288 | |
| 4289 octave_value | |
| 7189 | 4290 base_graphics_object::get_factory_default (const caseless_str& name) const |
| 6406 | 4291 { |
| 4292 graphics_object parent_obj = gh_manager::get_object (0); | |
| 4293 | |
| 4294 return parent_obj.get_factory_default (type () + name); | |
| 4295 } | |
| 4296 | |
| 7286 | 4297 // We use a random value for the handle to avoid issues with plots and |
| 4298 // scalar values for the first argument. | |
| 6406 | 4299 gh_manager::gh_manager (void) |
| 7286 | 4300 : handle_map (), handle_free_list (), |
| 4301 next_handle (-1.0 - (rand () + 1.0) / (RAND_MAX + 2.0)) | |
| 6406 | 4302 { |
| 4303 handle_map[0] = graphics_object (new root_figure ()); | |
|
7847
40b16e04172a
Make backend switching work.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7844
diff
changeset
|
4304 |
|
40b16e04172a
Make backend switching work.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7844
diff
changeset
|
4305 // Make sure the default backend is registered. |
|
40b16e04172a
Make backend switching work.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7844
diff
changeset
|
4306 graphics_backend::default_backend (); |
| 6406 | 4307 } |
| 4308 | |
| 4309 graphics_handle | |
| 4310 gh_manager::do_make_graphics_handle (const std::string& go_name, | |
| 7370 | 4311 const graphics_handle& p, bool do_createfcn) |
| 6406 | 4312 { |
| 4313 graphics_handle h = get_handle (go_name); | |
| 4314 | |
| 4315 base_graphics_object *go = 0; | |
| 4316 | |
|
7864
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
4317 go = make_graphics_object_from_type (go_name, h, p); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
4318 |
| 6406 | 4319 if (go) |
| 7370 | 4320 { |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
4321 graphics_object obj (go); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
4322 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
4323 handle_map[h] = obj; |
| 7370 | 4324 if (do_createfcn) |
| 4325 go->get_properties ().execute_createfcn (); | |
|
8058
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
4326 |
|
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
4327 // notify backend |
|
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
4328 graphics_backend backend = go->get_backend (); |
|
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
4329 if (backend) |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
4330 backend.object_created (obj); |
| 7370 | 4331 } |
| 6406 | 4332 else |
| 4333 error ("gh_manager::do_make_graphics_handle: invalid object type `%s'", | |
| 4334 go_name.c_str ()); | |
| 4335 | |
| 4336 return h; | |
| 4337 } | |
| 4338 | |
| 4339 graphics_handle | |
| 4340 gh_manager::do_make_figure_handle (double val) | |
| 4341 { | |
| 4342 graphics_handle h = val; | |
| 4343 | |
|
8058
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
4344 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
|
4345 graphics_object obj (go); |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
4346 |
|
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
4347 handle_map[h] = obj; |
|
8058
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
4348 |
|
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
4349 // notify backend |
|
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
4350 graphics_backend backend = go->get_backend (); |
|
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
4351 if (backend) |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
4352 backend.object_created (obj); |
|
8058
ca39c21fa4b8
[mq]: generic_octave_to_backend_nofitication
John W. Eaton <jwe@octave.org>
parents:
8052
diff
changeset
|
4353 |
| 6406 | 4354 return h; |
| 4355 } | |
| 4356 | |
| 4357 void | |
| 4358 gh_manager::do_push_figure (const graphics_handle& h) | |
| 4359 { | |
| 4360 do_pop_figure (h); | |
| 4361 | |
| 4362 figure_list.push_front (h); | |
| 4363 } | |
| 4364 | |
| 4365 void | |
| 4366 gh_manager::do_pop_figure (const graphics_handle& h) | |
| 4367 { | |
| 4368 for (figure_list_iterator p = figure_list.begin (); | |
| 4369 p != figure_list.end (); | |
| 4370 p++) | |
| 4371 { | |
| 4372 if (*p == h) | |
| 4373 { | |
| 4374 figure_list.erase (p); | |
| 4375 break; | |
| 4376 } | |
| 4377 } | |
| 4378 } | |
| 4379 | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4380 class |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4381 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
|
4382 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4383 public: |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4384 callback_event (const graphics_handle& h, const std::string& name, |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4385 const octave_value& data = Matrix ()) |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4386 : base_graphics_event (), handle (h), callback_name (name), |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4387 callback_data (data) { } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4388 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4389 void execute (void) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4390 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4391 gh_manager::execute_callback (handle, callback_name, callback_data); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4392 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4393 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4394 private: |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4395 callback_event (void) |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4396 : base_graphics_event () { } |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4397 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4398 private: |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4399 graphics_handle handle; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4400 std::string callback_name; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4401 octave_value callback_data; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4402 }; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4403 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4404 class |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4405 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
|
4406 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4407 public: |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4408 function_event (graphics_event::event_fcn fcn, void* data = 0) |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4409 : base_graphics_event (), function (fcn), |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4410 function_data (data) { } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4411 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4412 void execute (void) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4413 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4414 function (function_data); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4415 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4416 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4417 private: |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4418 function_event (void) |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4419 : base_graphics_event () { } |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4420 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4421 private: |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4422 graphics_event::event_fcn function; |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4423 void* function_data; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4424 }; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4425 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4426 class |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4427 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
|
4428 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4429 public: |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4430 set_event (const graphics_handle& h, const std::string& name, |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4431 const octave_value& value) |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4432 : base_graphics_event (), handle (h), property_name (name), |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4433 property_value (value) { } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4434 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4435 void execute (void) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4436 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4437 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4438 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4439 xset (handle, property_name, property_value); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4440 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4441 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4442 private: |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4443 set_event (void) |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4444 : base_graphics_event () { } |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4445 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4446 private: |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4447 graphics_handle handle; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4448 std::string property_name; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4449 octave_value property_value; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4450 }; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4451 |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4452 graphics_event |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4453 graphics_event::create_callback_event (const graphics_handle& h, |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4454 const std::string& name, |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4455 const octave_value& data) |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4456 { |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4457 graphics_event e; |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4458 |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4459 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
|
4460 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4461 return e; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4462 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4463 |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4464 graphics_event |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4465 graphics_event::create_function_event (graphics_event::event_fcn fcn, |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4466 void *data) |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4467 { |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4468 graphics_event e; |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4469 |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4470 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
|
4471 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4472 return e; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4473 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4474 |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4475 graphics_event |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4476 graphics_event::create_set_event (const graphics_handle& h, |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4477 const std::string& name, |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4478 const octave_value& data) |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4479 { |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4480 graphics_event e; |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4481 |
|
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4482 e.rep = new set_event (h, name, data); |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4483 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4484 return e; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4485 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4486 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4487 static void |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4488 xset_gcbo (const graphics_handle& h) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4489 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4490 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
|
4491 root_figure::properties& props = |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4492 dynamic_cast<root_figure::properties&> (go.get_properties ()); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4493 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4494 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
|
4495 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4496 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4497 void |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4498 gh_manager::do_restore_gcbo (void) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4499 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4500 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4501 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4502 callback_objects.pop_front (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4503 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4504 xset_gcbo (callback_objects.empty () |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4505 ? graphics_handle () |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4506 : callback_objects.front ().get_handle ()); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4507 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4508 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4509 void |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4510 gh_manager::do_execute_callback (const graphics_handle& h, |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4511 const octave_value& cb_arg, |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4512 const octave_value& data) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4513 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4514 octave_value_list args; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4515 octave_function *fcn = 0; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4516 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4517 args(0) = h.as_octave_value (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4518 if (data.is_defined ()) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4519 args(1) = data; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4520 else |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4521 args(1) = Matrix (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4522 |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
10056
diff
changeset
|
4523 unwind_protect_safe frame; |
|
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
10056
diff
changeset
|
4524 frame.add_fcn (gh_manager::restore_gcbo); |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4525 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4526 if (true) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4527 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4528 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4529 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4530 callback_objects.push_front (get_object (h)); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4531 xset_gcbo (h); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4532 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4533 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4534 BEGIN_INTERRUPT_WITH_EXCEPTIONS; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4535 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4536 // Copy CB because "function_value" method is non-const. |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4537 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4538 octave_value cb = cb_arg; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4539 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4540 if (cb.is_function_handle ()) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4541 fcn = cb.function_value (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4542 else if (cb.is_string ()) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4543 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4544 int status; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4545 std::string s = cb.string_value (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4546 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4547 eval_string (s, false, status); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4548 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4549 else if (cb.is_cell () && cb.length () > 0 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4550 && (cb.rows () == 1 || cb.columns () == 1) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4551 && cb.cell_value ()(0).is_function_handle ()) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4552 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4553 Cell c = cb.cell_value (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4554 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4555 fcn = c(0).function_value (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4556 if (! error_state) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4557 { |
|
8052
961d4c52ffae
Convert stem and stem3 to use stem series objects
David Bateman <dbateman@free.fr>
parents:
8021
diff
changeset
|
4558 for (int i = 1; i < c.length () ; i++) |
|
961d4c52ffae
Convert stem and stem3 to use stem series objects
David Bateman <dbateman@free.fr>
parents:
8021
diff
changeset
|
4559 args(1+i) = c(i); |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4560 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4561 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4562 else |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4563 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4564 std::string nm = cb.class_name (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4565 error ("trying to execute non-executable object (class = %s)", |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4566 nm.c_str ()); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4567 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4568 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4569 if (fcn && ! error_state) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4570 feval (fcn, args); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4571 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4572 END_INTERRUPT_WITH_EXCEPTIONS; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4573 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4574 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4575 void |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4576 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
|
4577 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4578 event_queue.push_back (e); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4579 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4580 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
|
4581 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4582 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4583 void |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4584 gh_manager::do_post_callback (const graphics_handle& h, const std::string name, |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4585 const octave_value& data) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4586 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4587 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4588 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4589 graphics_object go = get_object (h); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4590 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4591 if (go.valid_object ()) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4592 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4593 if (callback_objects.empty ()) |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4594 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
|
4595 else |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4596 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4597 const graphics_object& current = callback_objects.front (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4598 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4599 if (current.get_properties ().is_interruptible ()) |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4600 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
|
4601 else |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4602 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4603 caseless_str busy_action (go.get_properties ().get_busyaction ()); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4604 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4605 if (busy_action.compare ("queue")) |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4606 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
|
4607 else |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4608 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4609 caseless_str cname (name); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4610 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4611 if (cname.compare ("deletefcn") |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4612 || cname.compare ("createfcn") |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4613 || (go.isa ("figure") |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4614 && (cname.compare ("closerequestfcn") |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4615 || cname.compare ("resizefcn")))) |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4616 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
|
4617 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4618 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4619 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4620 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4621 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4622 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4623 void |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4624 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
|
4625 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4626 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4627 |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4628 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
|
4629 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4630 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4631 void |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4632 gh_manager::do_post_set (const graphics_handle& h, const std::string name, |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4633 const octave_value& value) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4634 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4635 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4636 |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4637 do_post_event (graphics_event::create_set_event (h, name, value)); |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4638 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4639 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4640 int |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4641 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
|
4642 { |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4643 graphics_event e; |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4644 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4645 do |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4646 { |
|
7964
9cd3ee5298a0
Use common rep/class pattern for graphics events
John W. Eaton <jwe@octave.org>
parents:
7936
diff
changeset
|
4647 e = graphics_event (); |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4648 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4649 gh_manager::lock (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4650 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4651 if (! event_queue.empty ()) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4652 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4653 if (callback_objects.empty () || force) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4654 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4655 e = event_queue.front (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4656 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4657 event_queue.pop_front (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4658 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4659 else |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4660 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4661 const graphics_object& go = callback_objects.front (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4662 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4663 if (go.get_properties ().is_interruptible ()) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4664 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4665 e = event_queue.front (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4666 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4667 event_queue.pop_front (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4668 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4669 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4670 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4671 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4672 gh_manager::unlock (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4673 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4674 if (e.ok ()) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4675 e.execute (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4676 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4677 while (e.ok ()); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4678 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4679 gh_manager::lock (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4680 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4681 if (event_queue.empty ()) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4682 command_editor::remove_event_hook (gh_manager::process_events); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4683 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4684 gh_manager::unlock (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4685 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4686 return 0; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4687 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4688 |
| 6406 | 4689 property_list::plist_map_type |
| 4690 root_figure::init_factory_properties (void) | |
| 4691 { | |
| 4692 property_list::plist_map_type plist_map; | |
| 4693 | |
| 6844 | 4694 plist_map["figure"] = figure::properties::factory_defaults (); |
| 4695 plist_map["axes"] = axes::properties::factory_defaults (); | |
| 4696 plist_map["line"] = line::properties::factory_defaults (); | |
| 4697 plist_map["text"] = text::properties::factory_defaults (); | |
| 4698 plist_map["image"] = image::properties::factory_defaults (); | |
| 4699 plist_map["patch"] = patch::properties::factory_defaults (); | |
| 4700 plist_map["surface"] = surface::properties::factory_defaults (); | |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4701 plist_map["hggroup"] = hggroup::properties::factory_defaults (); |
| 6406 | 4702 |
| 4703 return plist_map; | |
| 4704 } | |
| 4705 | |
| 4706 // --------------------------------------------------------------------- | |
| 4707 | |
| 4708 DEFUN (ishandle, args, , | |
| 4709 "-*- texinfo -*-\n\ | |
| 6678 | 4710 @deftypefn {Built-in Function} {} ishandle (@var{h})\n\ |
| 6406 | 4711 Return true if @var{h} is a graphics handle and false otherwise.\n\ |
| 4712 @end deftypefn") | |
| 4713 { | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4714 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4715 |
| 6406 | 4716 octave_value retval; |
| 4717 | |
| 4718 if (args.length () == 1) | |
| 4719 retval = is_handle (args(0)); | |
| 4720 else | |
| 4721 print_usage (); | |
| 4722 | |
| 4723 return retval; | |
| 4724 } | |
| 4725 | |
| 4726 DEFUN (set, args, , | |
| 4727 "-*- texinfo -*-\n\ | |
|
10056
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4728 @deftypefn {Built-in Function} {} set (@var{h}, @var{property}, @var{value}, @dots{})\n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4729 @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
|
4730 @deftypefnx {Built-in Function} {} set (@var{h}, @var{pv})\n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4731 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
|
4732 handles) @var{h}.\n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4733 There are three ways how to give the property names and values:\n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4734 \n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4735 @itemize\n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4736 @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
|
4737 \n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4738 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
|
4739 @var{value} is a value of the appropriate type for the property.\n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4740 @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
|
4741 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
|
4742 \n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4743 In this case, the number of columns of @var{values} must match the number of\n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4744 elements in @var{properties}. The first column of @var{values} contains values\n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4745 for the first entry in @var{properties} etc.. The number of rows of @var{values}\n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4746 must be 1 or match the number of elements of @var{h}. In the first case, each\n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4747 handle in @var{h} will be assigned the same values. In the latter case, the\n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4748 first handle in @var{h} will be assigned the values from the first row of\n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4749 @var{values} and so on.\n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4750 @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
|
4751 \n\ |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4752 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
|
4753 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
|
4754 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
|
4755 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
|
4756 @end itemize\n\ |
| 6406 | 4757 @end deftypefn") |
| 4758 { | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4759 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4760 |
| 6406 | 4761 octave_value retval; |
| 4762 | |
| 4763 int nargin = args.length (); | |
| 4764 | |
| 4765 if (nargin > 0) | |
| 4766 { | |
|
10056
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4767 // get vector of graphics handles |
| 6732 | 4768 ColumnVector hcv (args(0).vector_value ()); |
| 6406 | 4769 |
| 4770 if (! error_state) | |
| 6732 | 4771 { |
| 6733 | 4772 bool request_drawnow = false; |
| 4773 | |
|
10056
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4774 // loop over graphics objects |
| 6732 | 4775 for (octave_idx_type n = 0; n < hcv.length (); n++) |
| 4776 { | |
| 4777 graphics_object obj = gh_manager::get_object (hcv(n)); | |
| 6406 | 4778 |
| 6732 | 4779 if (obj) |
| 4780 { | |
|
10056
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4781 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
|
4782 && args(2).is_cell ()) |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4783 { |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4784 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
|
4785 { |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4786 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
|
4787 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
|
4788 } |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4789 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
|
4790 { |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4791 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
|
4792 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
|
4793 } |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4794 else |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4795 { |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4796 error("set: number of graphics handles must match number of value rows (%d != %d)", |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4797 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
|
4798 break; |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4799 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4800 } |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4801 } |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4802 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
|
4803 { |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4804 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
|
4805 } |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4806 else |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4807 { |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4808 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
|
4809 request_drawnow = true; |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4810 } |
| 6732 | 4811 } |
| 4812 else | |
| 6733 | 4813 { |
| 4814 error ("set: invalid handle (= %g)", hcv(n)); | |
| 4815 break; | |
| 4816 } | |
|
10056
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4817 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4818 if (error_state) |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4819 break; |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4820 |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4821 request_drawnow = true; |
|
33ba83a06a42
Fix set function to allow cell and struct arguments.
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
9972
diff
changeset
|
4822 } |
| 6733 | 4823 |
| 4824 if (! error_state && request_drawnow) | |
| 7409 | 4825 Vdrawnow_requested = true; |
| 6732 | 4826 } |
| 6406 | 4827 else |
| 6732 | 4828 error ("set: expecting graphics handle as first argument"); |
| 6406 | 4829 } |
| 4830 else | |
| 4831 print_usage (); | |
| 4832 | |
| 4833 return retval; | |
| 4834 } | |
| 4835 | |
| 4836 DEFUN (get, args, , | |
| 4837 "-*- texinfo -*-\n\ | |
| 6678 | 4838 @deftypefn {Built-in Function} {} get (@var{h}, @var{p})\n\ |
| 6406 | 4839 Return the named property @var{p} from the graphics handle @var{h}.\n\ |
| 4840 If @var{p} is omitted, return the complete property list for @var{h}.\n\ | |
| 6732 | 4841 If @var{h} is a vector, return a cell array including the property\n\ |
| 4842 values or lists respectively.\n\ | |
| 6406 | 4843 @end deftypefn") |
| 4844 { | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4845 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4846 |
| 6406 | 4847 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
|
4848 |
|
f155e9d1f086
graphics.cc (Fget, F__get__): return column vector, not row vector
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
4849 Cell vals; |
| 6406 | 4850 |
| 4851 int nargin = args.length (); | |
| 4852 | |
| 4853 if (nargin == 1 || nargin == 2) | |
| 4854 { | |
| 6732 | 4855 ColumnVector hcv (args(0).vector_value ()); |
| 6406 | 4856 |
| 4857 if (! error_state) | |
| 6732 | 4858 { |
| 6733 | 4859 octave_idx_type len = hcv.length (); |
| 4860 | |
|
8896
f155e9d1f086
graphics.cc (Fget, F__get__): return column vector, not row vector
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
4861 vals.resize (dim_vector (len, 1)); |
| 6733 | 4862 |
| 4863 for (octave_idx_type n = 0; n < len; n++) | |
| 6732 | 4864 { |
| 4865 graphics_object obj = gh_manager::get_object (hcv(n)); | |
| 6406 | 4866 |
| 6732 | 4867 if (obj) |
| 4868 { | |
| 4869 if (nargin == 1) | |
|
8896
f155e9d1f086
graphics.cc (Fget, F__get__): return column vector, not row vector
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
4870 vals(n) = obj.get (); |
| 6732 | 4871 else |
| 4872 { | |
| 7189 | 4873 caseless_str property = args(1).string_value (); |
| 6406 | 4874 |
| 6732 | 4875 if (! error_state) |
|
8896
f155e9d1f086
graphics.cc (Fget, F__get__): return column vector, not row vector
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
4876 vals(n) = obj.get (property); |
| 6732 | 4877 else |
| 6733 | 4878 { |
| 4879 error ("get: expecting property name as second argument"); | |
| 4880 break; | |
| 4881 } | |
| 6732 | 4882 } |
| 4883 } | |
| 4884 else | |
| 6733 | 4885 { |
| 4886 error ("get: invalid handle (= %g)", hcv(n)); | |
| 4887 break; | |
| 4888 } | |
| 6732 | 4889 } |
| 4890 } | |
| 6406 | 4891 else |
| 6732 | 4892 error ("get: expecting graphics handle as first argument"); |
| 6406 | 4893 } |
| 4894 else | |
| 4895 print_usage (); | |
| 4896 | |
| 6733 | 4897 if (! error_state) |
| 6732 | 4898 { |
|
8896
f155e9d1f086
graphics.cc (Fget, F__get__): return column vector, not row vector
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
4899 octave_idx_type len = vals.numel (); |
| 6733 | 4900 |
| 4901 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
|
4902 retval = vals; |
| 6733 | 4903 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
|
4904 retval = vals(0); |
| 6732 | 4905 } |
| 4906 | |
| 6406 | 4907 return retval; |
| 4908 } | |
| 4909 | |
|
8812
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8740
diff
changeset
|
4910 // 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
|
4911 // 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
|
4912 // 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
|
4913 |
| 7379 | 4914 DEFUN (__get__, args, , |
| 4915 "-*- texinfo -*-\n\ | |
| 4916 @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
|
4917 Undocumented internal function.\n\ |
| 7379 | 4918 @end deftypefn") |
| 4919 { | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4920 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
4921 |
| 7379 | 4922 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
|
4923 |
|
f155e9d1f086
graphics.cc (Fget, F__get__): return column vector, not row vector
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
4924 Cell vals; |
| 7379 | 4925 |
| 4926 int nargin = args.length (); | |
| 4927 | |
| 4928 if (nargin == 1) | |
| 4929 { | |
| 4930 ColumnVector hcv (args(0).vector_value ()); | |
| 4931 | |
| 4932 if (! error_state) | |
| 4933 { | |
| 4934 octave_idx_type len = hcv.length (); | |
| 4935 | |
|
8896
f155e9d1f086
graphics.cc (Fget, F__get__): return column vector, not row vector
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
4936 vals.resize (dim_vector (len, 1)); |
| 7379 | 4937 |
| 4938 for (octave_idx_type n = 0; n < len; n++) | |
| 4939 { | |
| 4940 graphics_object obj = gh_manager::get_object (hcv(n)); | |
| 4941 | |
| 4942 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
|
4943 vals(n) = obj.get (true); |
| 7379 | 4944 else |
| 4945 { | |
| 4946 error ("get: invalid handle (= %g)", hcv(n)); | |
| 4947 break; | |
| 4948 } | |
| 4949 } | |
| 4950 } | |
| 4951 else | |
| 4952 error ("get: expecting graphics handle as first argument"); | |
| 4953 } | |
| 4954 else | |
| 4955 print_usage (); | |
| 4956 | |
| 4957 if (! error_state) | |
| 4958 { | |
|
8896
f155e9d1f086
graphics.cc (Fget, F__get__): return column vector, not row vector
John W. Eaton <jwe@octave.org>
parents:
8812
diff
changeset
|
4959 octave_idx_type len = vals.numel (); |
| 7379 | 4960 |
| 4961 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
|
4962 retval = vals; |
| 7379 | 4963 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
|
4964 retval = vals(0); |
| 7379 | 4965 } |
| 4966 | |
| 4967 return retval; | |
| 4968 } | |
| 4969 | |
| 6406 | 4970 static octave_value |
| 4971 make_graphics_object (const std::string& go_name, | |
| 6874 | 4972 const octave_value_list& args) |
| 6406 | 4973 { |
| 4974 octave_value retval; | |
| 4975 | |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4976 double val = octave_NaN; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4977 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4978 octave_value_list xargs = args.splice (0, 1); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4979 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4980 caseless_str p ("parent"); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4981 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4982 for (int i = 0; i < xargs.length (); i++) |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4983 if (xargs(i).is_string () |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4984 && p.compare (xargs(i).string_value ())) |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4985 { |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4986 if (i < (xargs.length () - 1)) |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4987 { |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4988 val = xargs(i+1).double_value (); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4989 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4990 if (! error_state) |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4991 { |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4992 xargs = xargs.splice (i, 2); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4993 break; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4994 } |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4995 } |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4996 else |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4997 error ("__go_%s__: missing value for parent property", |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4998 go_name.c_str ()); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
4999 } |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
5000 |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
5001 if (! error_state && xisnan (val)) |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
5002 val = args(0).double_value (); |
| 6406 | 5003 |
| 5004 if (! error_state) | |
| 5005 { | |
| 5006 graphics_handle parent = gh_manager::lookup (val); | |
| 5007 | |
| 7056 | 5008 if (parent.ok ()) |
| 6406 | 5009 { |
| 5010 graphics_handle h | |
| 7370 | 5011 = gh_manager::make_graphics_handle (go_name, parent, false); |
| 6406 | 5012 |
| 5013 if (! error_state) | |
| 5014 { | |
| 5015 adopt (parent, h); | |
| 5016 | |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
5017 xset (h, xargs); |
| 7370 | 5018 xcreatefcn (h); |
| 6406 | 5019 |
| 6874 | 5020 retval = h.value (); |
| 7296 | 5021 |
| 5022 if (! error_state) | |
| 7409 | 5023 Vdrawnow_requested = true; |
| 6406 | 5024 } |
| 5025 else | |
| 5026 error ("__go%s__: unable to create graphics handle", | |
| 5027 go_name.c_str ()); | |
| 5028 } | |
| 5029 else | |
| 5030 error ("__go_%s__: invalid parent", go_name.c_str ()); | |
| 5031 } | |
| 5032 else | |
| 5033 error ("__go_%s__: invalid parent", go_name.c_str ()); | |
| 5034 | |
| 5035 return retval; | |
| 5036 } | |
| 5037 | |
| 5038 DEFUN (__go_figure__, args, , | |
| 5039 "-*- texinfo -*-\n\ | |
| 5040 @deftypefn {Built-in Function} {} __go_figure__ (@var{fignum})\n\ | |
| 6945 | 5041 Undocumented internal function.\n\ |
| 6406 | 5042 @end deftypefn") |
| 5043 { | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5044 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5045 |
| 6406 | 5046 octave_value retval; |
| 5047 | |
| 5048 if (args.length () > 0) | |
| 5049 { | |
| 5050 double val = args(0).double_value (); | |
| 5051 | |
| 5052 if (! error_state) | |
| 5053 { | |
| 5054 if (is_figure (val)) | |
| 5055 { | |
| 5056 graphics_handle h = gh_manager::lookup (val); | |
| 5057 | |
| 5058 xset (h, args.splice (0, 1)); | |
| 5059 | |
| 6874 | 5060 retval = h.value (); |
| 6406 | 5061 } |
| 5062 else | |
| 5063 { | |
| 5064 graphics_handle h = octave_NaN; | |
| 5065 | |
| 5066 if (xisnan (val)) | |
| 7370 | 5067 h = gh_manager::make_graphics_handle ("figure", 0, false); |
| 6406 | 5068 else if (val > 0 && D_NINT (val) == val) |
| 5069 h = gh_manager::make_figure_handle (val); | |
| 5070 else | |
| 5071 error ("__go_figure__: invalid figure number"); | |
| 5072 | |
| 7056 | 5073 if (! error_state && h.ok ()) |
| 6406 | 5074 { |
| 5075 adopt (0, h); | |
| 5076 | |
| 5077 xset (h, args.splice (0, 1)); | |
| 7370 | 5078 xcreatefcn (h); |
| 6406 | 5079 |
| 6874 | 5080 retval = h.value (); |
| 6406 | 5081 } |
| 5082 else | |
| 5083 error ("__go_figure__: failed to create figure handle"); | |
| 5084 } | |
| 5085 } | |
| 5086 else | |
| 5087 error ("__go_figure__: expecting figure number to be double value"); | |
| 5088 } | |
| 5089 else | |
| 5090 print_usage (); | |
| 5091 | |
| 5092 return retval; | |
| 5093 } | |
| 5094 | |
| 5095 #define GO_BODY(TYPE) \ | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5096 gh_manager::autolock guard; \ |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5097 \ |
| 6406 | 5098 octave_value retval; \ |
| 5099 \ | |
| 5100 if (args.length () > 0) \ | |
| 5101 retval = make_graphics_object (#TYPE, args); \ | |
| 5102 else \ | |
| 5103 print_usage (); \ | |
| 5104 \ | |
| 5105 return retval | |
| 5106 | |
| 5107 DEFUN (__go_axes__, args, , | |
| 5108 "-*- texinfo -*-\n\ | |
| 5109 @deftypefn {Built-in Function} {} __go_axes__ (@var{parent})\n\ | |
| 6945 | 5110 Undocumented internal function.\n\ |
| 6406 | 5111 @end deftypefn") |
| 5112 { | |
| 5113 GO_BODY (axes); | |
| 5114 } | |
| 5115 | |
| 5116 DEFUN (__go_line__, args, , | |
| 5117 "-*- texinfo -*-\n\ | |
| 5118 @deftypefn {Built-in Function} {} __go_line__ (@var{parent})\n\ | |
| 6945 | 5119 Undocumented internal function.\n\ |
| 6406 | 5120 @end deftypefn") |
| 5121 { | |
| 5122 GO_BODY (line); | |
| 5123 } | |
| 5124 | |
| 5125 DEFUN (__go_text__, args, , | |
| 5126 "-*- texinfo -*-\n\ | |
| 5127 @deftypefn {Built-in Function} {} __go_text__ (@var{parent})\n\ | |
| 6945 | 5128 Undocumented internal function.\n\ |
| 6406 | 5129 @end deftypefn") |
| 5130 { | |
| 5131 GO_BODY (text); | |
| 5132 } | |
| 5133 | |
| 5134 DEFUN (__go_image__, args, , | |
| 5135 "-*- texinfo -*-\n\ | |
| 5136 @deftypefn {Built-in Function} {} __go_image__ (@var{parent})\n\ | |
| 6945 | 5137 Undocumented internal function.\n\ |
| 6406 | 5138 @end deftypefn") |
| 5139 { | |
| 5140 GO_BODY (image); | |
| 5141 } | |
| 5142 | |
| 5143 DEFUN (__go_surface__, args, , | |
| 5144 "-*- texinfo -*-\n\ | |
| 5145 @deftypefn {Built-in Function} {} __go_surface__ (@var{parent})\n\ | |
| 6945 | 5146 Undocumented internal function.\n\ |
| 6406 | 5147 @end deftypefn") |
| 5148 { | |
| 5149 GO_BODY (surface); | |
| 5150 } | |
| 5151 | |
| 6807 | 5152 DEFUN (__go_patch__, args, , |
| 5153 "-*- texinfo -*-\n\ | |
| 5154 @deftypefn {Built-in Function} {} __go_patch__ (@var{parent})\n\ | |
| 6945 | 5155 Undocumented internal function.\n\ |
| 6807 | 5156 @end deftypefn") |
| 5157 { | |
| 5158 GO_BODY (patch); | |
| 5159 } | |
| 5160 | |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
5161 DEFUN (__go_hggroup__, args, , |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
5162 "-*- texinfo -*-\n\ |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
5163 @deftypefn {Built-in Function} {} __go_hggroup__ (@var{parent})\n\ |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
5164 Undocumented internal function.\n\ |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
5165 @end deftypefn") |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
5166 { |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
5167 GO_BODY (hggroup); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
5168 } |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7864
diff
changeset
|
5169 |
| 6406 | 5170 DEFUN (__go_delete__, args, , |
| 5171 "-*- texinfo -*-\n\ | |
| 5172 @deftypefn {Built-in Function} {} __go_delete__ (@var{h})\n\ | |
| 6945 | 5173 Undocumented internal function.\n\ |
| 6406 | 5174 @end deftypefn") |
| 5175 { | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5176 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5177 |
| 6406 | 5178 octave_value_list retval; |
| 5179 | |
| 5180 if (args.length () == 1) | |
| 5181 { | |
| 5182 graphics_handle h = octave_NaN; | |
| 5183 | |
|
8196
32e9e8103390
Allow arrays of graphic handles to F__go_delete__
David Bateman <dbateman@free.fr>
parents:
8183
diff
changeset
|
5184 const NDArray vals = args (0).array_value (); |
| 6406 | 5185 |
| 5186 if (! error_state) | |
| 5187 { | |
|
8341
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5188 // Check is all the handles to delete are valid first |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5189 // as callbacks might delete one of the handles we |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5190 // later want to delete |
|
8196
32e9e8103390
Allow arrays of graphic handles to F__go_delete__
David Bateman <dbateman@free.fr>
parents:
8183
diff
changeset
|
5191 for (octave_idx_type i = 0; i < vals.numel (); i++) |
| 6406 | 5192 { |
|
8196
32e9e8103390
Allow arrays of graphic handles to F__go_delete__
David Bateman <dbateman@free.fr>
parents:
8183
diff
changeset
|
5193 h = gh_manager::lookup (vals.elem (i)); |
|
32e9e8103390
Allow arrays of graphic handles to F__go_delete__
David Bateman <dbateman@free.fr>
parents:
8183
diff
changeset
|
5194 |
|
8341
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5195 if (! h.ok ()) |
|
8196
32e9e8103390
Allow arrays of graphic handles to F__go_delete__
David Bateman <dbateman@free.fr>
parents:
8183
diff
changeset
|
5196 { |
|
32e9e8103390
Allow arrays of graphic handles to F__go_delete__
David Bateman <dbateman@free.fr>
parents:
8183
diff
changeset
|
5197 error ("delete: invalid graphics object (= %g)", |
|
32e9e8103390
Allow arrays of graphic handles to F__go_delete__
David Bateman <dbateman@free.fr>
parents:
8183
diff
changeset
|
5198 vals.elem (i)); |
|
32e9e8103390
Allow arrays of graphic handles to F__go_delete__
David Bateman <dbateman@free.fr>
parents:
8183
diff
changeset
|
5199 break; |
|
32e9e8103390
Allow arrays of graphic handles to F__go_delete__
David Bateman <dbateman@free.fr>
parents:
8183
diff
changeset
|
5200 } |
| 6406 | 5201 } |
|
8341
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5202 |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5203 if (! error_state) |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5204 { |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5205 for (octave_idx_type i = 0; i < vals.numel (); i++) |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5206 { |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5207 h = gh_manager::lookup (vals.elem (i)); |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5208 |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5209 if (h.ok ()) |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5210 { |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5211 graphics_object obj = gh_manager::get_object (h); |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5212 |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5213 // Don't do recursive deleting, due to callbacks |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5214 if (! obj.get_properties ().is_beingdeleted ()) |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5215 { |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5216 graphics_handle parent_h = obj.get_parent (); |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5217 |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5218 graphics_object parent_obj = |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5219 gh_manager::get_object (parent_h); |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5220 |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5221 // NOTE: free the handle before removing it from its |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5222 // parent's children, such that the object's |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5223 // state is correct when the deletefcn callback |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5224 // is executed |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5225 |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5226 gh_manager::free (h); |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5227 |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5228 // A callback function might have already deleted |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5229 // the parent |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5230 if (parent_obj.valid_object ()) |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5231 parent_obj.remove_child (h); |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5232 |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5233 Vdrawnow_requested = true; |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5234 } |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5235 } |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5236 } |
|
b6c3b16d4cfa
Check validitity of handles to delete before deleting them to avoid issues with callbacks deleting the handles as well
David Bateman <dbateman@free.fr>
parents:
8333
diff
changeset
|
5237 } |
| 6406 | 5238 } |
| 5239 else | |
| 5240 error ("delete: invalid graphics object"); | |
| 5241 } | |
| 5242 else | |
| 5243 print_usage (); | |
| 5244 | |
| 5245 return retval; | |
| 5246 } | |
| 5247 | |
| 5248 DEFUN (__go_axes_init__, args, , | |
| 5249 "-*- texinfo -*-\n\ | |
| 5250 @deftypefn {Built-in Function} {} __go_axes_init__ (@var{h}, @var{mode})\n\ | |
| 6945 | 5251 Undocumented internal function.\n\ |
| 6406 | 5252 @end deftypefn") |
| 5253 { | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5254 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5255 |
| 6406 | 5256 octave_value retval; |
| 5257 | |
| 5258 int nargin = args.length (); | |
| 5259 | |
| 5260 std::string mode = ""; | |
| 5261 | |
| 5262 if (nargin == 2) | |
| 5263 { | |
| 5264 mode = args(1).string_value (); | |
| 5265 | |
| 5266 if (error_state) | |
| 5267 return retval; | |
| 5268 } | |
| 5269 | |
| 5270 if (nargin == 1 || nargin == 2) | |
| 5271 { | |
| 5272 graphics_handle h = octave_NaN; | |
| 5273 | |
| 5274 double val = args(0).double_value (); | |
| 5275 | |
| 5276 if (! error_state) | |
| 5277 { | |
| 5278 h = gh_manager::lookup (val); | |
| 5279 | |
| 7056 | 5280 if (h.ok ()) |
| 6406 | 5281 { |
| 5282 graphics_object obj = gh_manager::get_object (h); | |
| 5283 | |
| 5284 obj.set_defaults (mode); | |
| 8208 | 5285 |
| 5286 h = gh_manager::lookup (val); | |
| 5287 if (! h.ok ()) | |
| 5288 error ("__go_axes_init__: axis deleted during initialization (= %g)", val); | |
| 6406 | 5289 } |
| 5290 else | |
| 5291 error ("__go_axes_init__: invalid graphics object (= %g)", val); | |
| 5292 } | |
| 5293 else | |
| 5294 error ("__go_axes_init__: invalid graphics object"); | |
| 5295 } | |
| 5296 else | |
| 5297 print_usage (); | |
| 5298 | |
| 5299 return retval; | |
| 5300 } | |
| 5301 | |
| 5302 DEFUN (__go_handles__, , , | |
| 5303 "-*- texinfo -*-\n\ | |
| 5304 @deftypefn {Built-in Function} {} __go_handles__ ()\n\ | |
| 6945 | 5305 Undocumented internal function.\n\ |
| 6406 | 5306 @end deftypefn") |
| 5307 { | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5308 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5309 |
| 6425 | 5310 return octave_value (gh_manager::handle_list ()); |
| 5311 } | |
| 5312 | |
| 5313 DEFUN (__go_figure_handles__, , , | |
| 5314 "-*- texinfo -*-\n\ | |
| 5315 @deftypefn {Built-in Function} {} __go_figure_handles__ ()\n\ | |
| 6945 | 5316 Undocumented internal function.\n\ |
| 6425 | 5317 @end deftypefn") |
| 5318 { | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5319 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5320 |
| 6425 | 5321 return octave_value (gh_manager::figure_handle_list ()); |
| 6406 | 5322 } |
| 5323 | |
|
7967
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5324 DEFUN (__go_execute_callback__, args, , |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5325 "-*- texinfo -*-\n\ |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5326 @deftypefn {Built-in Function} {} __go_execute_callback__ (@var{h}, @var{name})\n\ |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5327 @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
|
5328 Undocumented internal function.\n\ |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5329 @end deftypefn") |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5330 { |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5331 octave_value retval; |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5332 |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5333 int nargin = args.length (); |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5334 |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5335 if (nargin == 2 || nargin == 3) |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5336 { |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5337 double val = args(0).double_value (); |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5338 |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5339 if (! error_state) |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5340 { |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5341 graphics_handle h = gh_manager::lookup (val); |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5342 |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5343 if (h.ok ()) |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5344 { |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5345 std::string name = args(1).string_value (); |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5346 |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5347 if (! error_state) |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5348 { |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5349 if (nargin == 2) |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5350 gh_manager::execute_callback (h, name); |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5351 else |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5352 gh_manager::execute_callback (h, name, args(2)); |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5353 } |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5354 else |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5355 error ("__go_execute_callback__: invalid callback name"); |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5356 } |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5357 else |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5358 error ("__go_execute_callback__: invalid graphics object (= %g)", |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5359 val); |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5360 } |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5361 else |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5362 error ("__go_execute_callback__: invalid graphics object"); |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5363 } |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5364 else |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5365 print_usage (); |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5366 |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5367 return retval; |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5368 } |
|
6add0f974aee
Add __go_execute_callback__
John W. Eaton <jwe@octave.org>
parents:
7964
diff
changeset
|
5369 |
| 7924 | 5370 DEFUN (available_backends, , , |
|
7835
ca8b97bb952c
added the function available_backends
Shai Ayal <shaiay@sourceforge.net>
parents:
7833
diff
changeset
|
5371 "-*- texinfo -*-\n\ |
|
ca8b97bb952c
added the function available_backends
Shai Ayal <shaiay@sourceforge.net>
parents:
7833
diff
changeset
|
5372 @deftypefn {Built-in Function} {} available_backends ()\n\ |
|
9316
c539ec5726e7
Update some of Advanced Plotting documentation.
Rik <rdrider0-list@yahoo.com>
parents:
9311
diff
changeset
|
5373 Return a cell array of registered graphics backends.\n\ |
|
7835
ca8b97bb952c
added the function available_backends
Shai Ayal <shaiay@sourceforge.net>
parents:
7833
diff
changeset
|
5374 @end deftypefn") |
|
ca8b97bb952c
added the function available_backends
Shai Ayal <shaiay@sourceforge.net>
parents:
7833
diff
changeset
|
5375 { |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5376 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5377 |
|
7835
ca8b97bb952c
added the function available_backends
Shai Ayal <shaiay@sourceforge.net>
parents:
7833
diff
changeset
|
5378 return octave_value (graphics_backend::available_backends_list ()); |
|
ca8b97bb952c
added the function available_backends
Shai Ayal <shaiay@sourceforge.net>
parents:
7833
diff
changeset
|
5379 } |
|
ca8b97bb952c
added the function available_backends
Shai Ayal <shaiay@sourceforge.net>
parents:
7833
diff
changeset
|
5380 |
| 7408 | 5381 DEFUN (drawnow, args, , |
| 5382 "-*- texinfo -*-\n\ | |
|
9316
c539ec5726e7
Update some of Advanced Plotting documentation.
Rik <rdrider0-list@yahoo.com>
parents:
9311
diff
changeset
|
5383 @deftypefn {Built-in Function} {} drawnow ()\n\ |
|
c539ec5726e7
Update some of Advanced Plotting documentation.
Rik <rdrider0-list@yahoo.com>
parents:
9311
diff
changeset
|
5384 @deftypefnx {Built-in Function} {} drawnow (\"expose\")\n\ |
|
c539ec5726e7
Update some of Advanced Plotting documentation.
Rik <rdrider0-list@yahoo.com>
parents:
9311
diff
changeset
|
5385 @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
|
5386 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
|
5387 any callbacks generated are executed. With the optional argument\n\ |
|
c539ec5726e7
Update some of Advanced Plotting documentation.
Rik <rdrider0-list@yahoo.com>
parents:
9311
diff
changeset
|
5388 @code{\"expose\"}, only graphic objects are updated and no other events or\n\ |
|
c539ec5726e7
Update some of Advanced Plotting documentation.
Rik <rdrider0-list@yahoo.com>
parents:
9311
diff
changeset
|
5389 callbacks are processed.\n\ |
|
c539ec5726e7
Update some of Advanced Plotting documentation.
Rik <rdrider0-list@yahoo.com>
parents:
9311
diff
changeset
|
5390 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
|
5391 undocumented.\n\ |
| 7408 | 5392 @end deftypefn") |
| 5393 { | |
| 5394 static int drawnow_executing = 0; | |
| 5395 static bool __go_close_all_registered__ = false; | |
| 5396 | |
| 5397 octave_value retval; | |
| 5398 | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5399 gh_manager::lock (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5400 |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
10056
diff
changeset
|
5401 unwind_protect frame; |
|
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
10056
diff
changeset
|
5402 frame.protect_var (Vdrawnow_requested, false); |
|
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
10056
diff
changeset
|
5403 |
|
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
10056
diff
changeset
|
5404 frame.protect_var (drawnow_executing); |
| 7409 | 5405 |
| 5406 if (++drawnow_executing <= 1) | |
| 7408 | 5407 { |
| 7409 | 5408 if (! __go_close_all_registered__) |
| 5409 { | |
| 5410 octave_add_atexit_function ("__go_close_all__"); | |
| 5411 | |
| 5412 __go_close_all_registered__ = true; | |
| 5413 } | |
| 5414 | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5415 if (args.length () == 0 || args.length () == 1) |
| 7408 | 5416 { |
| 7409 | 5417 Matrix hlist = gh_manager::figure_handle_list (); |
| 5418 | |
| 5419 for (int i = 0; ! error_state && i < hlist.length (); i++) | |
| 7408 | 5420 { |
| 7409 | 5421 graphics_handle h = gh_manager::lookup (hlist(i)); |
| 5422 | |
| 5423 if (h.ok () && h != 0) | |
| 7408 | 5424 { |
| 7409 | 5425 graphics_object go = gh_manager::get_object (h); |
| 5426 figure::properties& fprops = dynamic_cast <figure::properties&> (go.get_properties ()); | |
| 5427 | |
| 5428 if (fprops.is_modified ()) | |
| 7408 | 5429 { |
| 7409 | 5430 if (fprops.is_visible ()) |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5431 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5432 gh_manager::unlock (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5433 |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
5434 fprops.get_backend ().redraw_figure (go); |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5435 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5436 gh_manager::lock (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5437 } |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
5438 |
| 7409 | 5439 fprops.set_modified (false); |
| 7408 | 5440 } |
| 5441 } | |
| 5442 } | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5443 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5444 bool do_events = true; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5445 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5446 if (args.length () == 1) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5447 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5448 caseless_str val (args(0).string_value ()); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5449 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5450 if (! error_state && val.compare ("expose")) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5451 do_events = false; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5452 else |
|
8687
f3579c1d6be9
Fdrawnow: don't strip dirsep; return after errors
John W. Eaton <jwe@octave.org>
parents:
8636
diff
changeset
|
5453 { |
|
f3579c1d6be9
Fdrawnow: don't strip dirsep; return after errors
John W. Eaton <jwe@octave.org>
parents:
8636
diff
changeset
|
5454 error ("drawnow: invalid argument, expected `expose' as argument"); |
|
f3579c1d6be9
Fdrawnow: don't strip dirsep; return after errors
John W. Eaton <jwe@octave.org>
parents:
8636
diff
changeset
|
5455 return retval; |
|
f3579c1d6be9
Fdrawnow: don't strip dirsep; return after errors
John W. Eaton <jwe@octave.org>
parents:
8636
diff
changeset
|
5456 } |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5457 } |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5458 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5459 if (do_events) |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5460 { |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5461 gh_manager::unlock (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5462 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5463 gh_manager::process_events (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5464 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5465 gh_manager::lock (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5466 } |
| 7408 | 5467 } |
| 7409 | 5468 else if (args.length () >= 2 && args.length () <= 4) |
| 7408 | 5469 { |
| 7409 | 5470 std::string term, file, debug_file; |
| 5471 bool mono; | |
| 5472 | |
| 5473 term = args(0).string_value (); | |
| 7408 | 5474 |
| 5475 if (! error_state) | |
| 5476 { | |
| 7409 | 5477 file = args(1).string_value (); |
| 7408 | 5478 |
| 5479 if (! error_state) | |
| 5480 { | |
|
8007
a2ab20ba78f7
make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents:
7967
diff
changeset
|
5481 size_t pos = file.find_last_of (file_ops::dir_sep_chars ()); |
| 7409 | 5482 |
| 8021 | 5483 if (pos != std::string::npos) |
| 7409 | 5484 { |
|
8687
f3579c1d6be9
Fdrawnow: don't strip dirsep; return after errors
John W. Eaton <jwe@octave.org>
parents:
8636
diff
changeset
|
5485 std::string dirname = file.substr (0, pos+1); |
|
f3579c1d6be9
Fdrawnow: don't strip dirsep; return after errors
John W. Eaton <jwe@octave.org>
parents:
8636
diff
changeset
|
5486 |
|
f3579c1d6be9
Fdrawnow: don't strip dirsep; return after errors
John W. Eaton <jwe@octave.org>
parents:
8636
diff
changeset
|
5487 file_stat fs (dirname); |
| 7409 | 5488 |
| 5489 if (! (fs && fs.is_dir ())) | |
|
8687
f3579c1d6be9
Fdrawnow: don't strip dirsep; return after errors
John W. Eaton <jwe@octave.org>
parents:
8636
diff
changeset
|
5490 { |
|
f3579c1d6be9
Fdrawnow: don't strip dirsep; return after errors
John W. Eaton <jwe@octave.org>
parents:
8636
diff
changeset
|
5491 error ("drawnow: nonexistent directory `%s'", |
|
f3579c1d6be9
Fdrawnow: don't strip dirsep; return after errors
John W. Eaton <jwe@octave.org>
parents:
8636
diff
changeset
|
5492 dirname.c_str ()); |
|
f3579c1d6be9
Fdrawnow: don't strip dirsep; return after errors
John W. Eaton <jwe@octave.org>
parents:
8636
diff
changeset
|
5493 |
|
f3579c1d6be9
Fdrawnow: don't strip dirsep; return after errors
John W. Eaton <jwe@octave.org>
parents:
8636
diff
changeset
|
5494 return retval; |
|
f3579c1d6be9
Fdrawnow: don't strip dirsep; return after errors
John W. Eaton <jwe@octave.org>
parents:
8636
diff
changeset
|
5495 } |
| 7409 | 5496 } |
| 5497 | |
| 5498 mono = (args.length () >= 3 ? args(2).bool_value () : false); | |
| 7408 | 5499 |
| 5500 if (! error_state) | |
| 5501 { | |
| 7409 | 5502 debug_file = (args.length () > 3 ? args(3).string_value () |
| 5503 : ""); | |
| 5504 | |
| 5505 if (! error_state) | |
| 7408 | 5506 { |
| 7409 | 5507 graphics_handle h = gcf (); |
| 5508 | |
| 5509 if (h.ok ()) | |
| 5510 { | |
| 5511 graphics_object go = gh_manager::get_object (h); | |
| 5512 | |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5513 gh_manager::unlock (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5514 |
| 7419 | 5515 go.get_backend () |
|
8059
75c99d3f97d7
Octave to backend notification scheme
John W. Eaton <jwe@octave.org>
parents:
8058
diff
changeset
|
5516 .print_figure (go, term, file, mono, debug_file); |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5517 |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5518 gh_manager::lock (); |
| 7409 | 5519 } |
| 5520 else | |
| 5521 error ("drawnow: nothing to draw"); | |
| 7408 | 5522 } |
| 5523 else | |
| 7409 | 5524 error ("drawnow: invalid debug_file, expected a string value"); |
| 7408 | 5525 } |
| 5526 else | |
| 7409 | 5527 error ("drawnow: invalid colormode, expected a boolean value"); |
| 7408 | 5528 } |
| 5529 else | |
| 7409 | 5530 error ("drawnow: invalid file, expected a string value"); |
| 7408 | 5531 } |
| 5532 else | |
| 7409 | 5533 error ("drawnow: invalid terminal, expected a string value"); |
| 7408 | 5534 } |
| 5535 else | |
| 7409 | 5536 print_usage (); |
| 7408 | 5537 } |
| 7409 | 5538 |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5539 gh_manager::unlock (); |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5540 |
| 7408 | 5541 return retval; |
| 5542 } | |
| 5543 | |
|
7859
fdd465b00ec0
Rename add_listener to addlistener.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7857
diff
changeset
|
5544 DEFUN (addlistener, args, , |
|
7849
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5545 "-*- texinfo -*-\n\ |
|
7859
fdd465b00ec0
Rename add_listener to addlistener.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7857
diff
changeset
|
5546 @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
|
5547 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
|
5548 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
|
5549 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
|
5550 listeners are executed.\n\ |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5551 \n\ |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5552 @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
|
5553 \n\ |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5554 @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
|
5555 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
|
5556 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
|
5557 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
|
5558 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
|
5559 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
|
5560 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
|
5561 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
|
5562 \n\ |
|
7864
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5563 Example:\n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5564 \n\ |
|
7849
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5565 @example\n\ |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
9040
diff
changeset
|
5566 @group\n\ |
|
7849
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5567 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
|
5568 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
|
5569 endfunction\n\ |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5570 \n\ |
|
7859
fdd465b00ec0
Rename add_listener to addlistener.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7857
diff
changeset
|
5571 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
|
5572 @end group\n\ |
|
7849
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5573 @end example\n\ |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5574 \n\ |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5575 @end deftypefn") |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5576 { |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5577 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5578 |
|
7849
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5579 octave_value retval; |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5580 |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5581 if (args.length () == 3) |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5582 { |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5583 double h = args(0).double_value (); |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5584 |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5585 if (! error_state) |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5586 { |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5587 std::string pname = args(1).string_value (); |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5588 |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5589 if (! error_state) |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5590 { |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5591 graphics_handle gh = gh_manager::lookup (h); |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5592 |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5593 if (gh.ok ()) |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5594 { |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5595 graphics_object go = gh_manager::get_object (gh); |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5596 |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5597 go.add_property_listener (pname, args(2), POSTSET); |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5598 } |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5599 else |
|
7859
fdd465b00ec0
Rename add_listener to addlistener.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7857
diff
changeset
|
5600 error ("addlistener: invalid graphics object (= %g)", |
|
7849
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5601 h); |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5602 } |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5603 else |
|
7859
fdd465b00ec0
Rename add_listener to addlistener.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7857
diff
changeset
|
5604 error ("addlistener: invalid property name, expected a string value"); |
|
7849
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5605 } |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5606 else |
|
7859
fdd465b00ec0
Rename add_listener to addlistener.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7857
diff
changeset
|
5607 error ("addlistener: invalid handle"); |
|
7849
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5608 } |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5609 else |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5610 print_usage (); |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5611 |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5612 return retval; |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5613 } |
|
3249f64f69b2
Initial low-level support for property listeners.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7848
diff
changeset
|
5614 |
|
8299
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5615 DEFUN (dellistener, args, , |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5616 "-*- texinfo -*-\n\ |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5617 @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
|
5618 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
|
5619 @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
|
5620 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
|
5621 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
|
5622 \n\ |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5623 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
|
5624 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
|
5625 \n\ |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5626 Example:\n\ |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5627 \n\ |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5628 @example\n\ |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
9040
diff
changeset
|
5629 @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
|
5630 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
|
5631 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
|
5632 endfunction\n\ |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5633 \n\ |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5634 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
|
5635 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
|
5636 dellistener (gcf, \"position\", c);\n\ |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
9040
diff
changeset
|
5637 @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
|
5638 @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
|
5639 \n\ |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5640 @end deftypefn") |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5641 { |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5642 gh_manager::autolock guard; |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5643 |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5644 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
|
5645 |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5646 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
|
5647 { |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5648 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
|
5649 |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5650 if (! error_state) |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5651 { |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5652 std::string pname = args(1).string_value (); |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5653 |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5654 if (! error_state) |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5655 { |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5656 graphics_handle gh = gh_manager::lookup (h); |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5657 |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5658 if (gh.ok ()) |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5659 { |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5660 graphics_object go = gh_manager::get_object (gh); |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5661 |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5662 if (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
|
5663 go.delete_property_listener (pname, octave_value (), POSTSET); |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5664 else |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5665 go.delete_property_listener (pname, args(2), POSTSET); |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5666 } |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5667 else |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5668 error ("dellistener: invalid graphics object (= %g)", |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5669 h); |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5670 } |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5671 else |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5672 error ("dellistener: invalid property name, expected a string value"); |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5673 } |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5674 else |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5675 error ("dellistener: invalid handle"); |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5676 } |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5677 else |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5678 print_usage (); |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5679 |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5680 return retval; |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5681 } |
|
be9b14945774
Add code to remove listeners from properties and use it with newplot
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
5682 |
|
7864
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5683 DEFUN (addproperty, args, , |
| 7869 | 5684 "-*- texinfo -*-\n\ |
| 5685 @deftypefn {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
|
5686 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
|
5687 @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
|
5688 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
|
5689 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
|
5690 \n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5691 The supported property types are:\n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5692 \n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5693 @table @code\n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5694 @item string\n\ |
|
9040
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
8961
diff
changeset
|
5695 A string property. @var{arg} contains the default string value.\n\ |
|
7864
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5696 @item any\n\ |
|
9040
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
8961
diff
changeset
|
5697 An un-typed property. This kind of property can hold any octave\n\ |
|
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
8961
diff
changeset
|
5698 value. @var{args} contains the default value.\n\ |
|
7864
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5699 @item radio\n\ |
|
9040
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
8961
diff
changeset
|
5700 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
|
5701 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
|
5702 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
|
5703 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
|
5704 an optional second string argument.\n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5705 @item boolean\n\ |
|
9040
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
8961
diff
changeset
|
5706 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
|
5707 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
|
5708 the default property value.\n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5709 @item double\n\ |
|
9040
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
8961
diff
changeset
|
5710 A scalar double property. @var{arg} contains the default value.\n\ |
|
7864
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5711 @item handle\n\ |
|
9040
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
8961
diff
changeset
|
5712 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
|
5713 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
|
5714 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
|
5715 the empty matrix.\n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5716 @item data\n\ |
|
9040
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
8961
diff
changeset
|
5717 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
|
5718 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
|
5719 the empty matrix.\n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5720 @item color\n\ |
|
9040
dbd0c77e575e
Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents:
8961
diff
changeset
|
5721 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
|
5722 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
|
5723 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
|
5724 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
|
5725 @end table\n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5726 \n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5727 @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
|
5728 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
|
5729 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
|
5730 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
|
5731 property into the graphics object @var{h}.\n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5732 \n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5733 Examples:\n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5734 \n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5735 @example\n\ |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
9040
diff
changeset
|
5736 @group\n\ |
|
7864
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5737 addproperty (\"my_property\", gcf, \"string\", \"a string value\");\n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5738 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
|
5739 addproperty (\"my_style\", gcf, \"linelinestyle\", \"--\");\n\ |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
9040
diff
changeset
|
5740 @end group\n\ |
|
7864
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5741 @end example\n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5742 \n\ |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5743 @end deftypefn") |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5744 { |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5745 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5746 |
|
7864
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5747 octave_value retval; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5748 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5749 if (args.length () >= 3) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5750 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5751 std::string name = args(0).string_value (); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5752 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5753 if (! error_state) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5754 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5755 double h = args(1).double_value (); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5756 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5757 if (! error_state) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5758 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5759 graphics_handle gh = gh_manager::lookup (h); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5760 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5761 if (gh.ok ()) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5762 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5763 graphics_object go = gh_manager::get_object (gh); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5764 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5765 std::string type = args(2).string_value (); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5766 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5767 if (! error_state) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5768 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5769 if (! go.get_properties ().has_property (name)) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5770 { |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5771 property p = property::create (name, gh, type, |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5772 args.splice (0, 3)); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5773 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5774 if (! error_state) |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5775 go.get_properties ().insert_property (name, p); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5776 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5777 else |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5778 error ("addproperty: a `%s' property already exists in the graphics object", |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5779 name.c_str ()); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5780 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5781 else |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5782 error ("addproperty: invalid property type, expected a string value"); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5783 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5784 else |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5785 error ("addproperty: invalid graphics object (= %g)", h); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5786 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5787 else |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5788 error ("addproperty: invalid handle value"); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5789 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5790 else |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5791 error ("addproperty: invalid property name, expected a string value"); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5792 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5793 else |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5794 print_usage (); |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5795 |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5796 return retval; |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5797 } |
|
56f781f38f0b
Add dynamic property creation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7862
diff
changeset
|
5798 |
| 6595 | 5799 octave_value |
| 7447 | 5800 get_property_from_handle (double handle, const std::string& property, |
| 5801 const std::string& func) | |
| 6595 | 5802 { |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5803 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5804 |
| 6595 | 5805 graphics_object obj = gh_manager::get_object (handle); |
| 5806 octave_value retval; | |
| 5807 | |
| 5808 if (obj) | |
|
9582
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
5809 retval = obj.get (caseless_str (property)); |
| 6595 | 5810 else |
| 5811 error ("%s: invalid handle (= %g)", func.c_str(), handle); | |
| 5812 | |
| 5813 return retval; | |
| 5814 } | |
| 5815 | |
| 5816 bool | |
| 7447 | 5817 set_property_in_handle (double handle, const std::string& property, |
| 5818 const octave_value& arg, const std::string& func) | |
| 6595 | 5819 { |
|
7936
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5820 gh_manager::autolock guard; |
|
78400fde223e
Support for backend-to-octave event management
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
5821 |
| 6595 | 5822 graphics_object obj = gh_manager::get_object (handle); |
| 5823 int ret = false; | |
| 5824 | |
| 5825 if (obj) | |
| 5826 { | |
|
9582
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
5827 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
|
5828 |
|
bdcfb756d721
improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents:
9561
diff
changeset
|
5829 if (! error_state) |
| 6595 | 5830 ret = true; |
| 5831 } | |
| 5832 else | |
| 5833 error ("%s: invalid handle (= %g)", func.c_str(), handle); | |
| 5834 | |
| 5835 return ret; | |
| 5836 } |