Mercurial > octave
changeset 29889:3ab696e02f55
use m_ prefix for data members in graphics objects and properties classes
* graphics.in.h, graphics.cc: Use m_ prefix for class data members.
* genprops.awk: Use m_ prefix in generated code.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 16 Jul 2021 16:20:23 -0400 |
| parents | f2c6ea6c4abc |
| children | bc19d9360bac |
| files | libinterp/corefcn/genprops.awk libinterp/corefcn/graphics.cc libinterp/corefcn/graphics.in.h |
| diffstat | 3 files changed, 2270 insertions(+), 2257 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/genprops.awk Fri Jul 16 16:30:53 2021 +0200 +++ b/libinterp/corefcn/genprops.awk Fri Jul 16 16:20:23 2021 -0400 @@ -154,9 +154,9 @@ printf (" %s get_%s (void) const", rtype, name[i]); if (emit_get[i] == "definition" && deprecated[i]) - printf ("\n {\n warning_with_id (\"Octave:deprecated-property\",\"'%s' is deprecated and will be removed from a future version of Octave\");\n return %s.%s ();\n }\n", name[i], name[i], faccess); + printf ("\n {\n warning_with_id (\"Octave:deprecated-property\",\"'%s' is deprecated and will be removed from a future version of Octave\");\n return m_%s.%s ();\n }\n", name[i], name[i], faccess); else if (emit_get[i] == "definition") - printf (" { return %s.%s (); }\n", name[i], faccess); + printf (" { return m_%s.%s (); }\n", name[i], faccess); else printf (";\n"); } @@ -168,7 +168,7 @@ printf (" bool is_%s (void) const", name[i]); if (emit_get[i] == "definition") - printf (" { return %s.is_on (); }\n", name[i]); + printf (" { return m_%s.is_on (); }\n", name[i]); else printf (";\n"); @@ -182,7 +182,7 @@ printf (" bool %s_is (const std::string& v) const", name[i]); if (emit_get[i] == "definition") - printf (" { return %s.is (v); }\n", name[i]); + printf (" { return m_%s.is (v); }\n", name[i]); else printf (";\n"); @@ -193,19 +193,19 @@ function emit_get_color (i) { - printf (" bool %s_is_rgb (void) const { return %s.is_rgb (); }\n", name[i], name[i]); + printf (" bool %s_is_rgb (void) const { return m_%s.is_rgb (); }\n", name[i], name[i]); printf (" bool %s_is (const std::string& v) const", name[i]); if (emit_get[i] == "definition") - printf (" { return %s.is (v); }\n", name[i]); + printf (" { return m_%s.is (v); }\n", name[i]); else printf (";\n"); printf (" Matrix get_%s_rgb (void) const", name[i]); if (emit_get[i] == "definition") - printf (" { return (%s.is_rgb () ? %s.rgb () : Matrix ()); }\n", name[i], name[i]); + printf (" { return (m_%s.is_rgb () ? m_%s.rgb () : Matrix ()); }\n", name[i], name[i]); else printf (";\n"); @@ -216,19 +216,19 @@ function emit_get_double_radio (i) { - printf (" bool %s_is_double (void) const { return %s.is_double (); }\n", name[i], name[i]); + printf (" bool %s_is_double (void) const { return m_%s.is_double (); }\n", name[i], name[i]); printf (" bool %s_is (const std::string& v) const", name[i]); if (emit_get[i] == "definition") - printf (" { return %s.is (v); }\n", name[i]); + printf (" { return m_%s.is (v); }\n", name[i]); else printf (";\n"); printf (" double get_%s_double (void) const", name[i]); if (emit_get[i] == "definition") - printf (" { return (%s.is_double () ? %s.double_value () : 0); }\n", name[i], name[i]); + printf (" { return (m_%s.is_double () ? m_%s.double_value () : 0); }\n", name[i], name[i]); else printf (";\n"); @@ -242,7 +242,7 @@ printf (" void execute_%s (const octave_value& new_data = octave_value ()) const", name[i]); if (emit_get[i] == "definition") - printf (" { %s.execute (new_data); }\n", name[i]); + printf (" { m_%s.execute (new_data); }\n", name[i]); else printf (";\n"); @@ -263,14 +263,14 @@ printf (" std::string get_%s_string (void) const", name[i]); if (emit_get[i] == "definition") - printf (" { return %s.string_value (); }\n", name[i]); + printf (" { return m_%s.string_value (); }\n", name[i]); else printf (";\n"); printf (" string_vector get_%s_vector (void) const", name[i]); if (emit_get[i] == "definition") - printf (" { return %s.string_vector_value (); }\n", name[i]); + printf (" { return m_%s.string_vector_value (); }\n", name[i]); else printf (";\n"); @@ -309,7 +309,7 @@ print (base ? "protected:\n" : "private:\n"); for (i = 1; i <= idx; i++) - printf (" %s%s %s;\n", mutable[i] ? "mutable " : "", type[i], name[i]); + printf (" %s%s m_%s;\n", mutable[i] ? "mutable " : "", type[i], name[i]); if (idx > 0) print "\npublic:\n"; @@ -360,7 +360,7 @@ printf (" %s get_%s (void) const", type[i], name[i]); if (emit_get[i] == "definition") - printf (" { return %s; }\n", name[i]); + printf (" { return m_%s; }\n", name[i]); else printf (";\n"); } @@ -393,7 +393,7 @@ else has_builtin_listeners = 0; - printf ("\n {\n if (%s.set (val, %s))\n {\n", + printf ("\n {\n if (m_%s.set (val, %s))\n {\n", name[i], (has_builtin_listeners ? "false" : "true")); if (mode[i]) printf (" set_%smode (\"manual\");\n", name[i]); @@ -404,7 +404,7 @@ if (limits[i]) printf (" update_axis_limits (\"%s\");\n", name[i]); if (has_builtin_listeners) - printf (" %s.run_listeners (GCB_POSTSET);\n", name[i]); + printf (" m_%s.run_listeners (GCB_POSTSET);\n", name[i]); if (! mutable[i]) printf (" mark_modified ();\n"); printf (" }\n"); @@ -460,9 +460,9 @@ for (i = 1; i <= idx; i++) { if (ptype[i]) - printf (" %s (\"%s\", mh, %s)", name[i], name[i], defval[i]); + printf (" m_%s (\"%s\", mh, %s)", name[i], name[i], defval[i]); else - printf (" %s (%s)", name[i], defval[i]); + printf (" m_%s (%s)", name[i], defval[i]); if (i < idx) printf (","); printf ("\n"); @@ -474,9 +474,9 @@ { if (ptype[i]) { - printf (" %s.set_id (ID_%s);\n", name[i], toupper(name[i])); + printf (" m_%s.set_id (ID_%s);\n", name[i], toupper(name[i])); if (hidden[i]) - printf (" %s.set_hidden (true);\n", name[i]); + printf (" m_%s.set_hidden (true);\n", name[i]); } } @@ -578,7 +578,7 @@ { printf (" %sif (pname.compare (\"%s\"))\n", (i > 1 ? "else " : ""), name[i]); - printf (" return property (&%s, true);\n", name[i]); + printf (" return property (&m_%s, true);\n", name[i]); } } @@ -683,7 +683,7 @@ printf ("%s::properties", class_name); printf ("::all_property_names (void) const\n{\n static std::set<std::string> all_pnames = core_property_names ();\n\n"); if (base) - printf (" std::set<std::string> retval = all_pnames;\n std::set<std::string> dyn_props = dynamic_property_names ();\n retval.insert (dyn_props.begin (), dyn_props.end ());\n for (std::map<caseless_str, property, cmp_caseless_str>::const_iterator p = all_props.begin ();\n p != all_props.end (); p++)\n retval.insert (p->first);\n\n return retval;\n}\n\n"); + printf (" std::set<std::string> retval = all_pnames;\n std::set<std::string> dyn_props = dynamic_property_names ();\n retval.insert (dyn_props.begin (), dyn_props.end ());\n for (std::map<caseless_str, property, cmp_caseless_str>::const_iterator p = m_all_props.begin ();\n p != m_all_props.end (); p++)\n retval.insert (p->first);\n\n return retval;\n}\n\n"); else printf (" std::set<std::string> retval = all_pnames;\n std::set<std::string> base_props = base_properties::all_property_names ();\n retval.insert (base_props.begin (), base_props.end ());\n\n return retval;\n}\n\n");
--- a/libinterp/corefcn/graphics.cc Fri Jul 16 16:30:53 2021 +0200 +++ b/libinterp/corefcn/graphics.cc Fri Jul 16 16:20:23 2021 -0400 @@ -1262,14 +1262,14 @@ if (do_set (v)) { // Notify graphics toolkit. - if (id >= 0 && do_notify_toolkit) + if (m_id >= 0 && do_notify_toolkit) { gh_manager& gh_mgr = octave::__get_gh_manager__ ("base_property::set"); - graphics_object go = gh_mgr.get_object (parent); + graphics_object go = gh_mgr.get_object (m_parent); if (go) - go.update (id); + go.update (m_id); } // run listeners @@ -1285,17 +1285,17 @@ void base_property::run_listeners (listener_mode mode) { - const octave_value_list& l = listeners[mode]; + const octave_value_list& l = m_listeners[mode]; gh_manager& gh_mgr = octave::__get_gh_manager__ ("base_property::run_listeners"); for (int i = 0; i < l.length (); i++) - gh_mgr.execute_listener (parent, l(i)); + gh_mgr.execute_listener (m_parent, l(i)); } radio_values::radio_values (const std::string& opt_string) - : default_val (), possible_vals () + : m_default_val (), m_possible_vals () { std::size_t beg = 0; std::size_t len = opt_string.length (); @@ -1317,12 +1317,12 @@ if (t[0] == '{') { t = t.substr (1, t.length () - 2); - default_val = t; + m_default_val = t; } else if (beg == 0) // ensure default value - default_val = t; - - possible_vals.insert (t); + m_default_val = t; + + m_possible_vals.insert (t); beg = end + 1; } @@ -1333,7 +1333,7 @@ { std::string retval; - for (const auto& val : possible_vals) + for (const auto& val : m_possible_vals) { if (retval.empty ()) { @@ -1363,7 +1363,7 @@ octave_idx_type i = 0; Cell retval (nelem (), 1); - for (const auto& val : possible_vals) + for (const auto& val : m_possible_vals) retval(i++) = std::string (val); return retval; @@ -1438,7 +1438,7 @@ if (retval) { for (int i = 0; i < 3; i++) - xrgb(i) = tmp_rgb[i]; + m_rgb(i) = tmp_rgb[i]; } return retval; @@ -1457,17 +1457,17 @@ std::string match; - if (radio_val.contains (s, match)) - { - if (current_type != radio_t || match != current_val) + if (m_radio_val.contains (s, match)) + { + if (m_current_type != radio_t || match != m_current_val) { if (s.length () != match.length ()) warning_with_id ("Octave:abbreviated-property-match", "%s: allowing %s to match %s value %s", "set", s.c_str (), get_name ().c_str (), match.c_str ()); - current_val = match; - current_type = radio_t; + m_current_val = match; + m_current_type = radio_t; return true; } } @@ -1477,10 +1477,10 @@ { color_values col (s); - if (current_type != color_t || col != color_val) + if (m_current_type != color_t || col != m_color_val) { - color_val = col; - current_type = color_t; + m_color_val = col; + m_current_type = color_t; return true; } } @@ -1501,10 +1501,10 @@ color_values col (m(0), m(1), m(2)); - if (current_type != color_t || col != color_val) - { - color_val = col; - current_type = color_t; + if (m_current_type != color_t || col != m_color_val) + { + m_color_val = col; + m_current_type = color_t; return true; } } @@ -1523,19 +1523,19 @@ std::string s = val.string_value (); std::string match; - if (s.empty () || ! radio_val.contains (s, match)) + if (s.empty () || ! m_radio_val.contains (s, match)) error (R"(invalid value for double_radio property "%s")", get_name ().c_str ()); - if (current_type != radio_t || match != current_val) + if (m_current_type != radio_t || match != m_current_val) { if (s.length () != match.length ()) warning_with_id ("Octave:abbreviated-property-match", "%s: allowing %s to match %s value %s", "set", s.c_str (), get_name ().c_str (), match.c_str ()); - current_val = match; - current_type = radio_t; + m_current_val = match; + m_current_type = radio_t; return true; } } @@ -1543,10 +1543,10 @@ { double new_dval = val.double_value (); - if (current_type != double_t || new_dval != dval) - { - dval = new_dval; - current_type = double_t; + if (m_current_type != double_t || new_dval != m_dval) + { + m_dval = new_dval; + m_current_type = double_t; return true; } } @@ -1563,21 +1563,21 @@ bool xok = false; // check value type - if (type_constraints.size () > 0) - { - if (type_constraints.find (v.class_name ()) != type_constraints.end ()) + if (m_type_constraints.size () > 0) + { + if (m_type_constraints.find (v.class_name ()) != m_type_constraints.end ()) xok = true; // check if complex is allowed (it's also of class "double", so // checking that alone is not enough to ensure real type) - if (type_constraints.find ("real") != type_constraints.end () + if (m_type_constraints.find ("real") != m_type_constraints.end () && v.iscomplex ()) xok = false; } else xok = v.isnumeric () || v.is_bool_scalar (); - if (xok && size_constraints.size () > 0) + if (xok && m_size_constraints.size () > 0) { dim_vector vdims = v.dims (); int vlen = vdims.ndims (); @@ -1585,8 +1585,8 @@ xok = false; // check dimensional size constraints until a match is found - for (auto it = size_constraints.cbegin (); - ! xok && it != size_constraints.cend (); + for (auto it = m_size_constraints.cbegin (); + ! xok && it != m_size_constraints.cend (); ++it) { dim_vector itdims = (*it); @@ -1617,42 +1617,42 @@ { NDArray v_mat = v.array_value (); // Check min and max - if (! octave::math::isnan (minval.first)) + if (! octave::math::isnan (m_minval.first)) { for (octave_idx_type i = 0; i < v_mat.numel (); i++) - if (minval.second && minval.first > v_mat(i)) + if (m_minval.second && m_minval.first > v_mat(i)) error (R"(set: "%s" must be greater than or equal to %g)", - get_name ().c_str (), minval.first); - else if (! minval.second && minval.first >= v_mat(i)) + get_name ().c_str (), m_minval.first); + else if (! m_minval.second && m_minval.first >= v_mat(i)) error (R"(set: "%s" must be greater than %g)", - get_name ().c_str (), minval.first); - } - - if (! octave::math::isnan (maxval.first)) + get_name ().c_str (), m_minval.first); + } + + if (! octave::math::isnan (m_maxval.first)) { for (octave_idx_type i = 0; i < v_mat.numel (); i++) - if (maxval.second && maxval.first < v_mat(i)) + if (m_maxval.second && m_maxval.first < v_mat(i)) error (R"(set: "%s" must be less than or equal to %g)", - get_name ().c_str (), maxval.first); - else if (! maxval.second && maxval.first <= v_mat(i)) + get_name ().c_str (), m_maxval.first); + else if (! m_maxval.second && m_maxval.first <= v_mat(i)) error (R"(set: "%s" must be less than %g)", - get_name ().c_str (), maxval.first); - } - - if (finite_constraint == NO_CHECK) { /* do nothing */ } - else if (finite_constraint == FINITE) + get_name ().c_str (), m_maxval.first); + } + + if (m_finite_constraint == NO_CHECK) { /* do nothing */ } + else if (m_finite_constraint == FINITE) { for (octave_idx_type i = 0; i < v_mat.numel (); i++) if (! octave::math::isfinite (v_mat(i))) error (R"(set: "%s" must be finite)", get_name ().c_str ()); } - else if (finite_constraint == NOT_NAN) + else if (m_finite_constraint == NOT_NAN) { for (octave_idx_type i = 0; i < v_mat.numel (); i++) if (octave::math::isnan (v_mat(i))) error (R"(set: "%s" must not be nan)", get_name ().c_str ()); } - else if (finite_constraint == NOT_INF) + else if (m_finite_constraint == NOT_INF) { for (octave_idx_type i = 0; i < v_mat.numel (); i++) if (octave::math::isinf (v_mat(i))) @@ -1667,29 +1667,29 @@ bool array_property::is_equal (const octave_value& v) const { - if (data.type_name () == v.type_name ()) - { - if (data.dims () == v.dims ()) + if (m_data.type_name () == v.type_name ()) + { + if (m_data.dims () == v.dims ()) { #define CHECK_ARRAY_EQUAL(T, F, A) \ { \ - if (data.numel () == 1) \ - return data.F ## scalar_value () == \ + if (m_data.numel () == 1) \ + return m_data.F ## scalar_value () == \ v.F ## scalar_value (); \ else \ { \ /* Keep copy of array_value to allow */ \ /* sparse/bool arrays that are converted, to */ \ /* not be deallocated early */ \ - const A m1 = data.F ## array_value (); \ + const A m1 = m_data.F ## array_value (); \ const T *d1 = m1.data (); \ const A m2 = v.F ## array_value (); \ const T *d2 = m2.data (); \ \ bool flag = true; \ \ - for (int i = 0; flag && i < data.numel (); i++) \ + for (int i = 0; flag && i < m_data.numel (); i++) \ if (d1[i] != d2[i]) \ flag = false; \ \ @@ -1697,25 +1697,25 @@ } \ } - if (data.is_double_type () || data.islogical ()) + if (m_data.is_double_type () || m_data.islogical ()) CHECK_ARRAY_EQUAL (double, , NDArray) - else if (data.is_single_type ()) + else if (m_data.is_single_type ()) CHECK_ARRAY_EQUAL (float, float_, FloatNDArray) - else if (data.is_int8_type ()) + else if (m_data.is_int8_type ()) CHECK_ARRAY_EQUAL (octave_int8, int8_, int8NDArray) - else if (data.is_int16_type ()) + else if (m_data.is_int16_type ()) CHECK_ARRAY_EQUAL (octave_int16, int16_, int16NDArray) - else if (data.is_int32_type ()) + else if (m_data.is_int32_type ()) CHECK_ARRAY_EQUAL (octave_int32, int32_, int32NDArray) - else if (data.is_int64_type ()) + else if (m_data.is_int64_type ()) CHECK_ARRAY_EQUAL (octave_int64, int64_, int64NDArray) - else if (data.is_uint8_type ()) + else if (m_data.is_uint8_type ()) CHECK_ARRAY_EQUAL (octave_uint8, uint8_, uint8NDArray) - else if (data.is_uint16_type ()) + else if (m_data.is_uint16_type ()) CHECK_ARRAY_EQUAL (octave_uint16, uint16_, uint16NDArray) - else if (data.is_uint32_type ()) + else if (m_data.is_uint32_type ()) CHECK_ARRAY_EQUAL (octave_uint32, uint32_, uint32NDArray) - else if (data.is_uint64_type ()) + else if (m_data.is_uint64_type ()) CHECK_ARRAY_EQUAL (octave_uint64, uint64_, uint64NDArray) } } @@ -1726,40 +1726,41 @@ void array_property::get_data_limits (void) { - xmin = xminp = octave::numeric_limits<double>::Inf (); - xmax = xmaxp = -octave::numeric_limits<double>::Inf (); - - if (! data.isempty ()) - { - if (data.isinteger ()) - { - if (data.is_int8_type ()) - get_array_limits (data.int8_array_value (), - xmin, xmax, xminp, xmaxp); - else if (data.is_uint8_type ()) - get_array_limits (data.uint8_array_value (), - xmin, xmax, xminp, xmaxp); - else if (data.is_int16_type ()) - get_array_limits (data.int16_array_value (), - xmin, xmax, xminp, xmaxp); - else if (data.is_uint16_type ()) - get_array_limits (data.uint16_array_value (), - xmin, xmax, xminp, xmaxp); - else if (data.is_int32_type ()) - get_array_limits (data.int32_array_value (), - xmin, xmax, xminp, xmaxp); - else if (data.is_uint32_type ()) - get_array_limits (data.uint32_array_value (), - xmin, xmax, xminp, xmaxp); - else if (data.is_int64_type ()) - get_array_limits (data.int64_array_value (), - xmin, xmax, xminp, xmaxp); - else if (data.is_uint64_type ()) - get_array_limits (data.uint64_array_value (), - xmin, xmax, xminp, xmaxp); + m_min_val = m_min_pos = octave::numeric_limits<double>::Inf (); + m_max_val = m_max_neg = -octave::numeric_limits<double>::Inf (); + + if (! m_data.isempty ()) + { + if (m_data.isinteger ()) + { + if (m_data.is_int8_type ()) + get_array_limits (m_data.int8_array_value (), + m_min_val, m_max_val, m_min_pos, m_max_neg); + else if (m_data.is_uint8_type ()) + get_array_limits (m_data.uint8_array_value (), + m_min_val, m_max_val, m_min_pos, m_max_neg); + else if (m_data.is_int16_type ()) + get_array_limits (m_data.int16_array_value (), + m_min_val, m_max_val, m_min_pos, m_max_neg); + else if (m_data.is_uint16_type ()) + get_array_limits (m_data.uint16_array_value (), + m_min_val, m_max_val, m_min_pos, m_max_neg); + else if (m_data.is_int32_type ()) + get_array_limits (m_data.int32_array_value (), + m_min_val, m_max_val, m_min_pos, m_max_neg); + else if (m_data.is_uint32_type ()) + get_array_limits (m_data.uint32_array_value (), + m_min_val, m_max_val, m_min_pos, m_max_neg); + else if (m_data.is_int64_type ()) + get_array_limits (m_data.int64_array_value (), + m_min_val, m_max_val, m_min_pos, m_max_neg); + else if (m_data.is_uint64_type ()) + get_array_limits (m_data.uint64_array_value (), + m_min_val, m_max_val, m_min_pos, m_max_neg); } else - get_array_limits (data.array_value (), xmin, xmax, xminp, xmaxp); + get_array_limits (m_data.array_value (), + m_min_val, m_max_val, m_min_pos, m_max_neg); } } @@ -1771,7 +1772,7 @@ { if (! get ().isempty ()) { - current_val = graphics_handle (); + m_current_val = graphics_handle (); return true; } else @@ -1787,12 +1788,12 @@ // Check the object type if necessary bool type_ok = true; - if (gh.ok () && ! type_constraints.empty ()) + if (gh.ok () && ! m_type_constraints.empty ()) { type_ok = false; graphics_object obj = gh_mgr.get_object (gh); - for (const auto& type : type_constraints) + for (const auto& type : m_type_constraints) if (obj.isa (type)) { type_ok = true; @@ -1810,9 +1811,9 @@ get_name ().c_str ()); } - if (current_val != gh) - { - current_val = gh; + if (m_current_val != gh) + { + m_current_val = gh; return true; } @@ -1840,7 +1841,7 @@ Matrix children_property::do_get_children (bool return_hidden) const { - Matrix retval (children_list.size (), 1); + Matrix retval (m_children_list.size (), 1); octave_idx_type k = 0; gh_manager& gh_mgr @@ -1853,7 +1854,7 @@ if (! props.is_showhiddenhandles ()) { - for (const auto& hchild : children_list) + for (const auto& hchild : m_children_list) { graphics_handle kid = hchild; @@ -1870,7 +1871,7 @@ } else { - for (const auto& hchild : children_list) + for (const auto& hchild : m_children_list) retval(k++) = hchild; } @@ -1885,20 +1886,20 @@ if (from_root) { - for (graphics_handle hchild : children_list) + for (graphics_handle hchild : m_children_list) { graphics_object go = gh_mgr.get_object (hchild); if (go.valid_object () && ! go.get_properties ().is_beingdeleted ()) gh_mgr.free (hchild, from_root); } - children_list.clear (); - } - else - while (! children_list.empty ()) + m_children_list.clear (); + } + else + while (! m_children_list.empty ()) { // gh_mgr.free removes hchild from children_list - graphics_handle hchild = children_list.front (); + graphics_handle hchild = m_children_list.front (); graphics_object go = gh_mgr.get_object (hchild); if (go.valid_object () && ! go.get_properties ().is_beingdeleted ()) @@ -1907,7 +1908,7 @@ // FIXME: children_list should be clear anyway at this point. if (clear) - children_list.clear (); + m_children_list.clear (); } bool @@ -1986,12 +1987,12 @@ { executing_callbacks.insert (this); - if (callback.is_defined () && ! callback.isempty ()) + if (m_callback.is_defined () && ! m_callback.isempty ()) { gh_manager& gh_mgr = octave::__get_gh_manager__ ("callback_property::execute"); - gh_mgr.execute_callback (get_parent (), callback, data); + gh_mgr.execute_callback (get_parent (), m_callback, data); } } } @@ -2163,14 +2164,14 @@ void figure::properties::set_toolkit (const octave::graphics_toolkit& b) { - if (toolkit) + if (m_toolkit) finalize_r (get___myhandle__ ()); - toolkit = b; - __graphics_toolkit__ = b.get_name (); - __plot_stream__ = Matrix (); - - if (toolkit) + m_toolkit = b; + m___graphics_toolkit__ = b.get_name (); + m___plot_stream__ = Matrix (); + + if (m_toolkit) initialize_r (get___myhandle__ ()); mark_modified (); @@ -2198,9 +2199,9 @@ direction = "out"; } - if (__mouse_mode__.set (val, true)) - { - std::string mode = __mouse_mode__.current_value (); + if (m___mouse_mode__.set (val, true)) + { + std::string mode = m___mouse_mode__.current_value (); octave_scalar_map pm = get___pan_mode__ ().scalar_map_value (); pm.setfield ("Enable", mode == "pan" ? "on" : "off"); @@ -2244,7 +2245,7 @@ octave_value cf = gh_mgr.get_object (0).get ("currentfigure"); - if (! cf.isempty () && cf.double_value () == __myhandle__) + if (! cf.isempty () && cf.double_value () == m___myhandle__) { octave::autolock guard (gh_mgr.graphics_lock ()); @@ -2427,7 +2428,7 @@ remove = (sval == "remove"); } - pval_map_type& pval_map = plist_map[pfx]; + pval_map_type& pval_map = m_plist_map[pfx]; if (remove) { @@ -2778,27 +2779,27 @@ { default_val = get_default (pname); - rep->set (pname, default_val); + m_rep->set (pname, default_val); } else if (sval == "factory") { default_val = get_factory_default (pname); - rep->set (pname, default_val); + m_rep->set (pname, default_val); } else { // Matlab specifically uses "\default" to escape string setting if (sval == R"(\default)") - rep->set (pname, "default"); + m_rep->set (pname, "default"); else if (sval == R"(\factory)") - rep->set (pname, "factory"); + m_rep->set (pname, "factory"); else - rep->set (pname, val); - } - } - else - rep->set (pname, val); + m_rep->set (pname, val); + } + } + else + m_rep->set (pname, val); } /* @@ -3350,9 +3351,9 @@ base_properties::get_dynamic (const caseless_str& pname) const { std::map<caseless_str, property, cmp_caseless_str>::const_iterator it - = all_props.find (pname); - - if (it == all_props.end ()) + = m_all_props.find (pname); + + if (it == m_all_props.end ()) error (R"(get: unknown property "%s")", pname.c_str ()); return it->second.get (); @@ -3364,7 +3365,7 @@ octave_scalar_map m; for (std::map<caseless_str, property, cmp_caseless_str>::const_iterator - it = all_props.begin (); it != all_props.end (); ++it) + it = m_all_props.begin (); it != m_all_props.end (); ++it) if (all || ! it->second.is_hidden ()) m.assign (it->second.get_name (), it->second.get ()); @@ -3374,7 +3375,7 @@ std::set<std::string> base_properties::dynamic_property_names (void) const { - return dynamic_properties; + return m_dynamic_properties; } bool @@ -3385,21 +3386,21 @@ if (dynprops.find (pname) != dynprops.end ()) return true; else - return all_props.find (pname) != all_props.end (); + return m_all_props.find (pname) != m_all_props.end (); } void base_properties::set_dynamic (const caseless_str& pname, const octave_value& val) { - auto it = all_props.find (pname); - - if (it == all_props.end ()) + auto it = m_all_props.find (pname); + + if (it == m_all_props.end ()) error (R"(set: unknown property "%s")", pname.c_str ()); it->second.set (val); - dynamic_properties.insert (pname); + m_dynamic_properties.insert (pname); mark_modified (); } @@ -3408,9 +3409,9 @@ base_properties::get_property_dynamic (const caseless_str& pname) const { std::map<caseless_str, property, cmp_caseless_str>::const_iterator it - = all_props.find (pname); - - if (it == all_props.end ()) + = m_all_props.find (pname); + + if (it == m_all_props.end ()) error (R"(get_property: unknown property "%s")", pname.c_str ()); return it->second; @@ -3420,7 +3421,7 @@ base_properties::set_parent (const octave_value& val) { double hp = val.xdouble_value ("set: parent must be a graphics handle"); - if (hp == __myhandle__) + if (hp == m___myhandle__) error ("set: can not set object parent to be object itself"); gh_manager& gh_mgr @@ -3435,22 +3436,22 @@ old_parent_go = gh_mgr.get_object (get_parent ()); if (old_parent_go.get_handle () != hp) - old_parent_go.remove_child (__myhandle__); + old_parent_go.remove_child (m___myhandle__); else return; // Do nothing more // Check new parent's parent is not this child to avoid recursion graphics_object new_parent_go; new_parent_go = gh_mgr.get_object (new_parent); - if (new_parent_go.get_parent () == __myhandle__) + if (new_parent_go.get_parent () == m___myhandle__) { // new parent's parent gets child's original parent new_parent_go.get_properties ().set_parent (get_parent ().as_octave_value ()); } // Set parent property to new_parent and do adoption - parent = new_parent.as_octave_value (); - ::adopt (parent.handle_value (), __myhandle__); + m_parent = new_parent.as_octave_value (); + ::adopt (m_parent.handle_value (), m___myhandle__); } /* @@ -3469,7 +3470,7 @@ base_properties::mark_modified (void) { // Mark existing object as modified - __modified__ = "on"; + m___modified__ = "on"; // Attempt to mark parent object as modified if it exists @@ -3500,7 +3501,7 @@ gh_manager& gh_mgr = octave::__get_gh_manager__ ("base_properties::update_axis_limits"); - graphics_object go = gh_mgr.get_object (__myhandle__); + graphics_object go = gh_mgr.get_object (m___myhandle__); if (go) go.update_axis_limits (axis_type); @@ -3513,7 +3514,7 @@ gh_manager& gh_mgr = octave::__get_gh_manager__ ("base_properties::update_axis_limits"); - graphics_object go = gh_mgr.get_object (__myhandle__); + graphics_object go = gh_mgr.get_object (m___myhandle__); if (go) go.update_axis_limits (axis_type, h); @@ -3522,27 +3523,27 @@ void base_properties::update_contextmenu (void) const { - if (contextmenu.get ().isempty ()) + if (m_contextmenu.get ().isempty ()) return; gh_manager& gh_mgr = octave::__get_gh_manager__ ("base_properties::update_contextmenu"); - graphics_object go = gh_mgr.get_object (contextmenu.get ()); + graphics_object go = gh_mgr.get_object (m_contextmenu.get ()); if (go && go.isa ("uicontextmenu")) { uicontextmenu::properties& props = reinterpret_cast<uicontextmenu::properties&> (go.get_properties ()); - props.add_dependent_obj (__myhandle__); + props.add_dependent_obj (m___myhandle__); } } bool base_properties::is_handle_visible (void) const { - return (handlevisibility.is ("on") - || (! executing_callbacks.empty () && ! handlevisibility.is ("off"))); + return (m_handlevisibility.is ("on") + || (! executing_callbacks.empty () && ! m_handlevisibility.is ("off"))); } octave::graphics_toolkit @@ -3606,7 +3607,7 @@ if (fig.valid_object ()) { octave_value co = fig.get ("currentobject"); - if (! co.isempty () && co.double_value () == __myhandle__) + if (! co.isempty () && co.double_value () == m___myhandle__) { octave::autolock guard (gh_mgr.graphics_lock ()); @@ -3969,9 +3970,9 @@ graphics_handle val (v); if (octave::math::isnan (val.value ())) - callbackobject = graphics_handle (); + m_callbackobject = graphics_handle (); else if (ishghandle (val)) - callbackobject = val; + m_callbackobject = val; else err_set_invalid ("callbackobject"); } @@ -3983,7 +3984,7 @@ if (octave::math::isnan (val.value ()) || ishghandle (val)) { - currentfigure = val; + m_currentfigure = val; if (val.ok ()) { @@ -4000,26 +4001,26 @@ void figure::properties::set_integerhandle (const octave_value& val) { - if (integerhandle.set (val, true)) - { - bool int_fig_handle = integerhandle.is_on (); + if (m_integerhandle.set (val, true)) + { + bool int_fig_handle = m_integerhandle.is_on (); gh_manager& gh_mgr = octave::__get_gh_manager__ ("figure::properties::set_integerhandle"); - graphics_object this_go = gh_mgr.get_object (__myhandle__); - - graphics_handle old_myhandle = __myhandle__; - - __myhandle__ = gh_mgr.get_handle (int_fig_handle); - - gh_mgr.renumber_figure (old_myhandle, __myhandle__); + graphics_object this_go = gh_mgr.get_object (m___myhandle__); + + graphics_handle old_myhandle = m___myhandle__; + + m___myhandle__ = gh_mgr.get_handle (int_fig_handle); + + gh_mgr.renumber_figure (old_myhandle, m___myhandle__); graphics_object parent_go = gh_mgr.get_object (get_parent ()); base_properties& props = parent_go.get_properties (); - props.renumber_child (old_myhandle, __myhandle__); + props.renumber_child (old_myhandle, m___myhandle__); Matrix kids = get_children (); @@ -4027,15 +4028,15 @@ { graphics_object kid = gh_mgr.get_object (kids(i)); - kid.get_properties ().renumber_parent (__myhandle__); + kid.get_properties ().renumber_parent (m___myhandle__); } graphics_handle cf = gh_mgr.current_figure (); - if (__myhandle__ == cf) - xset (0, "currentfigure", __myhandle__.value ()); - - this_go.update (integerhandle.get_id ()); + if (m___myhandle__ == cf) + xset (0, "currentfigure", m___myhandle__.value ()); + + this_go.update (m_integerhandle.get_id ()); mark_modified (); } @@ -4152,11 +4153,11 @@ root_figure::reset_default_properties (void) { // empty list of local defaults - default_properties = property_list (); + m_default_properties = property_list (); remove_all_listeners (); xreset_default_properties (get_handle (), - xproperties.factory_defaults ()); + m_properties.factory_defaults ()); } // --------------------------------------------------------------------- @@ -4167,7 +4168,7 @@ graphics_handle hax (val); if (octave::math::isnan (hax.value ()) || ishghandle (hax)) - currentaxes = hax; + m_currentaxes = hax; else err_set_invalid ("currentaxes"); } @@ -4177,7 +4178,7 @@ { base_properties::remove_child (h, from_root); - if (h == currentaxes.handle_value ()) + if (h == m_currentaxes.handle_value ()) { graphics_handle new_currentaxes; @@ -4199,15 +4200,15 @@ } } - currentaxes = new_currentaxes; + m_currentaxes = new_currentaxes; } } octave_value figure::properties::get_number (void) const { - if (integerhandle.is_on ()) - return __myhandle__.value (); + if (m_integerhandle.is_on ()) + return m___myhandle__.value (); else return Matrix (); } @@ -4215,7 +4216,7 @@ octave::graphics_toolkit figure::properties::get_toolkit (void) const { - return toolkit; + return m_toolkit; } void @@ -4282,9 +4283,9 @@ std::string sval = val.string_value (); if (sval == "on") - xset (0, "currentfigure", __myhandle__.value ()); - - visible = val; + xset (0, "currentfigure", m___myhandle__.value ()); + + m_visible = val; } Matrix @@ -4372,7 +4373,7 @@ bool modified = false; old_bb = get_boundingbox (true); - modified = position.set (v, false, do_notify_toolkit); + modified = m_position.set (v, false, do_notify_toolkit); new_bb = get_boundingbox (true); if (old_bb != new_bb) @@ -4383,10 +4384,10 @@ = octave::__get_gh_manager__ ("figure::properties::set_position"); if (! get_resizefcn ().isempty ()) - gh_mgr.post_callback (__myhandle__, "resizefcn"); + gh_mgr.post_callback (m___myhandle__, "resizefcn"); if (! get_sizechangedfcn ().isempty ()) - gh_mgr.post_callback (__myhandle__, "sizechangedfcn"); + gh_mgr.post_callback (m___myhandle__, "sizechangedfcn"); update_boundingbox (); } @@ -4394,19 +4395,19 @@ if (modified) { - position.run_listeners (GCB_POSTSET); + m_position.run_listeners (GCB_POSTSET); mark_modified (); } - if (paperpositionmode.is ("auto")) - paperposition.set (get_auto_paperposition ()); + if (m_paperpositionmode.is ("auto")) + m_paperposition.set (get_auto_paperposition ()); } void figure::properties::set_outerposition (const octave_value& v, bool do_notify_toolkit) { - if (outerposition.set (v, true, do_notify_toolkit)) + if (m_outerposition.set (v, true, do_notify_toolkit)) mark_modified (); } @@ -4420,7 +4421,7 @@ error ("set: can't set paperunits to normalized when papertype is custom"); caseless_str old_paperunits = get_paperunits (); - if (paperunits.set (val, true)) + if (m_paperunits.set (val, true)) { update_paperunits (old_paperunits); mark_modified (); @@ -4436,7 +4437,7 @@ if (punits.compare ("normalized") && ptype.compare ("<custom>")) error ("set: can't set paperunits to normalized when papertype is custom"); - if (papertype.set (val, true)) + if (m_papertype.set (val, true)) { update_papertype (); mark_modified (); @@ -4765,8 +4766,8 @@ pos(2) *= sz(0); pos(3) *= sz(1); - papersize.set (octave_value (sz)); - paperposition.set (octave_value (pos)); + m_papersize.set (octave_value (sz)); + m_paperposition.set (octave_value (pos)); } void @@ -4780,11 +4781,11 @@ std::swap (sz(0), sz(1)); // Call papersize.set rather than set_papersize to avoid loops // between update_papersize and update_papertype. - papersize.set (octave_value (sz)); - } - - if (paperpositionmode.is ("auto")) - paperposition.set (get_auto_paperposition ()); + m_papersize.set (octave_value (sz)); + } + + if (m_paperpositionmode.is ("auto")) + m_paperposition.set (get_auto_paperposition ()); } void @@ -4794,12 +4795,12 @@ if (sz(0) > sz(1)) { std::swap (sz(0), sz(1)); - papersize.set (octave_value (sz)); - paperorientation.set (octave_value ("landscape")); - } - else - { - paperorientation.set ("portrait"); + m_papersize.set (octave_value (sz)); + m_paperorientation.set (octave_value ("landscape")); + } + else + { + m_paperorientation.set ("portrait"); } std::string punits = get_paperunits (); @@ -4901,7 +4902,7 @@ ptype = "e"; // Call papertype.set rather than set_papertype to avoid loops between // update_papersize and update_papertype - papertype.set (ptype); + m_papertype.set (ptype); } if (punits == "centimeters") { @@ -4916,11 +4917,11 @@ if (get_paperorientation () == "landscape") { std::swap (sz(0), sz(1)); - papersize.set (octave_value (sz)); - } - - if (paperpositionmode.is ("auto")) - paperposition.set (get_auto_paperposition ()); + m_papersize.set (octave_value (sz)); + } + + if (m_paperpositionmode.is ("auto")) + m_paperposition.set (get_auto_paperposition ()); } /* @@ -4966,11 +4967,11 @@ std::swap (sz(0), sz(1)); // Call papertype.set rather than set_papertype to avoid loops // between update_papersize and update_papertype - papersize.set (octave_value (sz)); - } - - if (paperpositionmode.is ("auto")) - paperposition.set (get_auto_paperposition ()); + m_papersize.set (octave_value (sz)); + } + + if (m_paperpositionmode.is ("auto")) + m_paperposition.set (get_auto_paperposition ()); } /* @@ -5005,7 +5006,7 @@ { caseless_str old_units = get_units (); - if (units.set (val, true)) + if (m_units.set (val, true)) { update_units (old_units); mark_modified (); @@ -5015,8 +5016,9 @@ void figure::properties::update_units (const caseless_str& old_units) { - position.set (convert_position (get_position ().matrix_value (), old_units, - get_units (), screen_size_pixels ()), false); + m_position.set (convert_position (get_position ().matrix_value (), + old_units, get_units (), + screen_size_pixels ()), false); } /* @@ -5046,7 +5048,7 @@ std::ostringstream os; std::string nm = get_name (); - os << "Figure " << __myhandle__.value (); + os << "Figure " << m___myhandle__.value (); if (! nm.empty ()) os << ": " << get_name (); @@ -5066,7 +5068,7 @@ octave_value figure::get_default (const caseless_str& name) const { - octave_value retval = default_properties.lookup (name); + octave_value retval = m_default_properties.lookup (name); if (retval.is_undefined ()) { @@ -5086,8 +5088,8 @@ figure::reset_default_properties (void) { // empty list of local defaults - default_properties = property_list (); - property_list::pval_map_type plist = xproperties.factory_defaults (); + m_default_properties = property_list (); + property_list::pval_map_type plist = m_properties.factory_defaults (); plist.erase ("units"); plist.erase ("position"); @@ -5105,135 +5107,135 @@ void axes::properties::init (void) { - position.add_constraint (dim_vector (1, 4)); - outerposition.add_constraint (dim_vector (1, 4)); - tightinset.add_constraint (dim_vector (1, 4)); - looseinset.add_constraint (dim_vector (1, 4)); - colororder.add_constraint (dim_vector (-1, 3)); - dataaspectratio.add_constraint (3); - dataaspectratio.add_constraint ("min", 0, false); - dataaspectratio.add_constraint (FINITE); - plotboxaspectratio.add_constraint (3); - plotboxaspectratio.add_constraint ("min", 0, false); - plotboxaspectratio.add_constraint (FINITE); + m_position.add_constraint (dim_vector (1, 4)); + m_outerposition.add_constraint (dim_vector (1, 4)); + m_tightinset.add_constraint (dim_vector (1, 4)); + m_looseinset.add_constraint (dim_vector (1, 4)); + m_colororder.add_constraint (dim_vector (-1, 3)); + m_dataaspectratio.add_constraint (3); + m_dataaspectratio.add_constraint ("min", 0, false); + m_dataaspectratio.add_constraint (FINITE); + m_plotboxaspectratio.add_constraint (3); + m_plotboxaspectratio.add_constraint ("min", 0, false); + m_plotboxaspectratio.add_constraint (FINITE); // FIXME: Should these use dimension vectors? Currently can set 'xlim' to // any matrix size, but only first two elements are used. - alim.add_constraint (2); - alim.add_constraint (NOT_NAN); - clim.add_constraint (2); - clim.add_constraint (NOT_NAN); - xlim.add_constraint (2); - xlim.add_constraint (NOT_NAN); - ylim.add_constraint (2); - ylim.add_constraint (NOT_NAN); - zlim.add_constraint (2); - zlim.add_constraint (NOT_NAN); - xtick.add_constraint (dim_vector (1, -1)); - xtick.add_constraint (FINITE); - ytick.add_constraint (dim_vector (1, -1)); - ytick.add_constraint (FINITE); - ztick.add_constraint (dim_vector (1, -1)); - ztick.add_constraint (FINITE); - ticklength.add_constraint (dim_vector (1, 2)); + m_alim.add_constraint (2); + m_alim.add_constraint (NOT_NAN); + m_clim.add_constraint (2); + m_clim.add_constraint (NOT_NAN); + m_xlim.add_constraint (2); + m_xlim.add_constraint (NOT_NAN); + m_ylim.add_constraint (2); + m_ylim.add_constraint (NOT_NAN); + m_zlim.add_constraint (2); + m_zlim.add_constraint (NOT_NAN); + m_xtick.add_constraint (dim_vector (1, -1)); + m_xtick.add_constraint (FINITE); + m_ytick.add_constraint (dim_vector (1, -1)); + m_ytick.add_constraint (FINITE); + m_ztick.add_constraint (dim_vector (1, -1)); + m_ztick.add_constraint (FINITE); + m_ticklength.add_constraint (dim_vector (1, 2)); Matrix vw (1, 2, 0); vw(1) = 90; - view = vw; - view.add_constraint (dim_vector (1, 2)); - cameraposition.add_constraint (3); - cameraposition.add_constraint (FINITE); - cameratarget.add_constraint (3); - cameratarget.add_constraint (FINITE); + m_view = vw; + m_view.add_constraint (dim_vector (1, 2)); + m_cameraposition.add_constraint (3); + m_cameraposition.add_constraint (FINITE); + m_cameratarget.add_constraint (3); + m_cameratarget.add_constraint (FINITE); Matrix upv (1, 3, 0.0); upv(2) = 1.0; - cameraupvector = upv; - cameraupvector.add_constraint (3); - cameraupvector.add_constraint (FINITE); - cameraviewangle.add_constraint (FINITE); - currentpoint.add_constraint (dim_vector (2, 3)); + m_cameraupvector = upv; + m_cameraupvector.add_constraint (3); + m_cameraupvector.add_constraint (FINITE); + m_cameraviewangle.add_constraint (FINITE); + m_currentpoint.add_constraint (dim_vector (2, 3)); // Range constraints for double properties - fontsize.add_constraint ("min", 0.0, false); - gridalpha.add_constraint ("min", 0.0, true); - gridalpha.add_constraint ("max", 1.0, true); - labelfontsizemultiplier.add_constraint ("min", 0.0, false); - linewidth.add_constraint ("min", 0.0, false); - minorgridalpha.add_constraint ("min", 0.0, true); - minorgridalpha.add_constraint ("max", 1.0, true); - titlefontsizemultiplier.add_constraint ("min", 0.0, false); + m_fontsize.add_constraint ("min", 0.0, false); + m_gridalpha.add_constraint ("min", 0.0, true); + m_gridalpha.add_constraint ("max", 1.0, true); + m_labelfontsizemultiplier.add_constraint ("min", 0.0, false); + m_linewidth.add_constraint ("min", 0.0, false); + m_minorgridalpha.add_constraint ("min", 0.0, true); + m_minorgridalpha.add_constraint ("max", 1.0, true); + m_titlefontsizemultiplier.add_constraint ("min", 0.0, false); // No constraints for hidden transform properties update_font (); - x_zlim.resize (1, 2); - - sx = "linear"; - sy = "linear"; - sz = "linear"; - - calc_ticklabels (xtick, xticklabel, xscale.is ("log"), + m_x_zlim.resize (1, 2); + + m_sx = "linear"; + m_sy = "linear"; + m_sz = "linear"; + + calc_ticklabels (m_xtick, m_xticklabel, m_xscale.is ("log"), xaxislocation_is ("origin"), - yscale.is ("log") ? 2 : (yaxislocation_is ("origin") ? 0 : - (yaxislocation_is ("left") ? -1 : 1)), xlim); - calc_ticklabels (ytick, yticklabel, yscale.is ("log"), + m_yscale.is ("log") ? 2 : (yaxislocation_is ("origin") ? 0 : + (yaxislocation_is ("left") ? -1 : 1)), m_xlim); + calc_ticklabels (m_ytick, m_yticklabel, m_yscale.is ("log"), yaxislocation_is ("origin"), - xscale.is ("log") ? 2 : (xaxislocation_is ("origin") ? 0 : - (xaxislocation_is ("bottom") ? -1 : 1)), ylim); - calc_ticklabels (ztick, zticklabel, zscale.is ("log"), false, 2, zlim); - - xset (xlabel.handle_value (), "handlevisibility", "off"); - xset (ylabel.handle_value (), "handlevisibility", "off"); - xset (zlabel.handle_value (), "handlevisibility", "off"); - xset (title.handle_value (), "handlevisibility", "off"); - - xset (xlabel.handle_value (), "horizontalalignment", "center"); - xset (xlabel.handle_value (), "horizontalalignmentmode", "auto"); - xset (ylabel.handle_value (), "horizontalalignment", "center"); - xset (ylabel.handle_value (), "horizontalalignmentmode", "auto"); - xset (zlabel.handle_value (), "horizontalalignment", "right"); - xset (zlabel.handle_value (), "horizontalalignmentmode", "auto"); - xset (title.handle_value (), "horizontalalignment", "center"); - xset (title.handle_value (), "horizontalalignmentmode", "auto"); - - xset (xlabel.handle_value (), "verticalalignment", "top"); - xset (xlabel.handle_value (), "verticalalignmentmode", "auto"); - xset (ylabel.handle_value (), "verticalalignment", "bottom"); - xset (ylabel.handle_value (), "verticalalignmentmode", "auto"); - xset (title.handle_value (), "verticalalignment", "bottom"); - xset (title.handle_value (), "verticalalignmentmode", "auto"); - - xset (ylabel.handle_value (), "rotation", 90.0); - xset (ylabel.handle_value (), "rotationmode", "auto"); - - xset (zlabel.handle_value (), "visible", "off"); - - xset (xlabel.handle_value (), "clipping", "off"); - xset (ylabel.handle_value (), "clipping", "off"); - xset (zlabel.handle_value (), "clipping", "off"); - xset (title.handle_value (), "clipping", "off"); - - xset (xlabel.handle_value (), "__autopos_tag__", "xlabel"); - xset (ylabel.handle_value (), "__autopos_tag__", "ylabel"); - xset (zlabel.handle_value (), "__autopos_tag__", "zlabel"); - xset (title.handle_value (), "__autopos_tag__", "title"); - - double fs = labelfontsizemultiplier.double_value () * - fontsize.double_value (); - xset (xlabel.handle_value (), "fontsize", octave_value (fs)); - xset (ylabel.handle_value (), "fontsize", octave_value (fs)); - xset (zlabel.handle_value (), "fontsize", octave_value (fs)); - fs = titlefontsizemultiplier.double_value () * fontsize.double_value (); - xset (title.handle_value (), "fontsize", octave_value (fs)); - xset (title.handle_value (), "fontweight", titlefontweight.get ()); - - adopt (xlabel.handle_value ()); - adopt (ylabel.handle_value ()); - adopt (zlabel.handle_value ()); - adopt (title.handle_value ()); + m_xscale.is ("log") ? 2 : (xaxislocation_is ("origin") ? 0 : + (xaxislocation_is ("bottom") ? -1 : 1)), m_ylim); + calc_ticklabels (m_ztick, m_zticklabel, m_zscale.is ("log"), false, 2, m_zlim); + + xset (m_xlabel.handle_value (), "handlevisibility", "off"); + xset (m_ylabel.handle_value (), "handlevisibility", "off"); + xset (m_zlabel.handle_value (), "handlevisibility", "off"); + xset (m_title.handle_value (), "handlevisibility", "off"); + + xset (m_xlabel.handle_value (), "horizontalalignment", "center"); + xset (m_xlabel.handle_value (), "horizontalalignmentmode", "auto"); + xset (m_ylabel.handle_value (), "horizontalalignment", "center"); + xset (m_ylabel.handle_value (), "horizontalalignmentmode", "auto"); + xset (m_zlabel.handle_value (), "horizontalalignment", "right"); + xset (m_zlabel.handle_value (), "horizontalalignmentmode", "auto"); + xset (m_title.handle_value (), "horizontalalignment", "center"); + xset (m_title.handle_value (), "horizontalalignmentmode", "auto"); + + xset (m_xlabel.handle_value (), "verticalalignment", "top"); + xset (m_xlabel.handle_value (), "verticalalignmentmode", "auto"); + xset (m_ylabel.handle_value (), "verticalalignment", "bottom"); + xset (m_ylabel.handle_value (), "verticalalignmentmode", "auto"); + xset (m_title.handle_value (), "verticalalignment", "bottom"); + xset (m_title.handle_value (), "verticalalignmentmode", "auto"); + + xset (m_ylabel.handle_value (), "rotation", 90.0); + xset (m_ylabel.handle_value (), "rotationmode", "auto"); + + xset (m_zlabel.handle_value (), "visible", "off"); + + xset (m_xlabel.handle_value (), "clipping", "off"); + xset (m_ylabel.handle_value (), "clipping", "off"); + xset (m_zlabel.handle_value (), "clipping", "off"); + xset (m_title.handle_value (), "clipping", "off"); + + xset (m_xlabel.handle_value (), "__autopos_tag__", "xlabel"); + xset (m_ylabel.handle_value (), "__autopos_tag__", "ylabel"); + xset (m_zlabel.handle_value (), "__autopos_tag__", "zlabel"); + xset (m_title.handle_value (), "__autopos_tag__", "title"); + + double fs = m_labelfontsizemultiplier.double_value () * + m_fontsize.double_value (); + xset (m_xlabel.handle_value (), "fontsize", octave_value (fs)); + xset (m_ylabel.handle_value (), "fontsize", octave_value (fs)); + xset (m_zlabel.handle_value (), "fontsize", octave_value (fs)); + fs = m_titlefontsizemultiplier.double_value () * m_fontsize.double_value (); + xset (m_title.handle_value (), "fontsize", octave_value (fs)); + xset (m_title.handle_value (), "fontweight", m_titlefontweight.get ()); + + adopt (m_xlabel.handle_value ()); + adopt (m_ylabel.handle_value ()); + adopt (m_zlabel.handle_value ()); + adopt (m_title.handle_value ()); Matrix tlooseinset = default_axes_position (); tlooseinset(2) = 1-tlooseinset(0)-tlooseinset(2); tlooseinset(3) = 1-tlooseinset(1)-tlooseinset(3); - looseinset = tlooseinset; + m_looseinset = tlooseinset; } /* @@ -5304,24 +5306,24 @@ axes::properties::sync_positions (void) { // First part is equivalent to 'update_tightinset ()' - if (positionconstraint.is ("innerposition")) + if (m_positionconstraint.is ("innerposition")) update_position (); else update_outerposition (); caseless_str old_units = get_units (); set_units ("normalized"); - Matrix pos = position.get ().matrix_value (); - Matrix outpos = outerposition.get ().matrix_value (); + Matrix pos = m_position.get ().matrix_value (); + Matrix outpos = m_outerposition.get ().matrix_value (); Matrix tightpos = calc_tightbox (pos); Matrix tinset (1, 4, 1.0); tinset(0) = pos(0)-tightpos(0); tinset(1) = pos(1)-tightpos(1); tinset(2) = tightpos(0)+tightpos(2)-pos(0)-pos(2); tinset(3) = tightpos(1)+tightpos(3)-pos(1)-pos(3); - tightinset = tinset; + m_tightinset = tinset; set_units (old_units); update_transform (); - if (positionconstraint.is ("innerposition")) + if (m_positionconstraint.is ("innerposition")) update_position (); else update_outerposition (); @@ -5409,7 +5411,7 @@ graphics_object go = gh_mgr.get_object (gh_mgr.lookup (v)); if (go.isa ("text")) - val = ::reparent (v, "set", who, __myhandle__, false); + val = ::reparent (v, "set", who, m___myhandle__, false); else { std::string cname = v.class_name (); @@ -5430,56 +5432,56 @@ void axes::properties::set_xlabel (const octave_value& v) { - set_text_child (xlabel, "xlabel", v); - xset (xlabel.handle_value (), "positionmode", "auto"); - xset (xlabel.handle_value (), "rotationmode", "auto"); - xset (xlabel.handle_value (), "horizontalalignmentmode", "auto"); - xset (xlabel.handle_value (), "verticalalignmentmode", "auto"); - xset (xlabel.handle_value (), "clipping", "off"); - xset (xlabel.handle_value (), "color", get_xcolor ()); - xset (xlabel.handle_value (), "__autopos_tag__", "xlabel"); + set_text_child (m_xlabel, "xlabel", v); + xset (m_xlabel.handle_value (), "positionmode", "auto"); + xset (m_xlabel.handle_value (), "rotationmode", "auto"); + xset (m_xlabel.handle_value (), "horizontalalignmentmode", "auto"); + xset (m_xlabel.handle_value (), "verticalalignmentmode", "auto"); + xset (m_xlabel.handle_value (), "clipping", "off"); + xset (m_xlabel.handle_value (), "color", get_xcolor ()); + xset (m_xlabel.handle_value (), "__autopos_tag__", "xlabel"); update_xlabel_position (); } void axes::properties::set_ylabel (const octave_value& v) { - set_text_child (ylabel, "ylabel", v); - xset (ylabel.handle_value (), "positionmode", "auto"); - xset (ylabel.handle_value (), "rotationmode", "auto"); - xset (ylabel.handle_value (), "horizontalalignmentmode", "auto"); - xset (ylabel.handle_value (), "verticalalignmentmode", "auto"); - xset (ylabel.handle_value (), "clipping", "off"); - xset (ylabel.handle_value (), "color", get_ycolor ()); - xset (ylabel.handle_value (), "__autopos_tag__", "ylabel"); + set_text_child (m_ylabel, "ylabel", v); + xset (m_ylabel.handle_value (), "positionmode", "auto"); + xset (m_ylabel.handle_value (), "rotationmode", "auto"); + xset (m_ylabel.handle_value (), "horizontalalignmentmode", "auto"); + xset (m_ylabel.handle_value (), "verticalalignmentmode", "auto"); + xset (m_ylabel.handle_value (), "clipping", "off"); + xset (m_ylabel.handle_value (), "color", get_ycolor ()); + xset (m_ylabel.handle_value (), "__autopos_tag__", "ylabel"); update_ylabel_position (); } void axes::properties::set_zlabel (const octave_value& v) { - set_text_child (zlabel, "zlabel", v); - xset (zlabel.handle_value (), "positionmode", "auto"); - xset (zlabel.handle_value (), "rotationmode", "auto"); - xset (zlabel.handle_value (), "horizontalalignmentmode", "auto"); - xset (zlabel.handle_value (), "verticalalignmentmode", "auto"); - xset (zlabel.handle_value (), "clipping", "off"); - xset (zlabel.handle_value (), "color", get_zcolor ()); - xset (zlabel.handle_value (), "__autopos_tag__", "zlabel"); + set_text_child (m_zlabel, "zlabel", v); + xset (m_zlabel.handle_value (), "positionmode", "auto"); + xset (m_zlabel.handle_value (), "rotationmode", "auto"); + xset (m_zlabel.handle_value (), "horizontalalignmentmode", "auto"); + xset (m_zlabel.handle_value (), "verticalalignmentmode", "auto"); + xset (m_zlabel.handle_value (), "clipping", "off"); + xset (m_zlabel.handle_value (), "color", get_zcolor ()); + xset (m_zlabel.handle_value (), "__autopos_tag__", "zlabel"); update_zlabel_position (); } void axes::properties::set_title (const octave_value& v) { - set_text_child (title, "title", v); - xset (title.handle_value (), "positionmode", "auto"); - xset (title.handle_value (), "horizontalalignment", "center"); - xset (title.handle_value (), "horizontalalignmentmode", "auto"); - xset (title.handle_value (), "verticalalignment", "bottom"); - xset (title.handle_value (), "verticalalignmentmode", "auto"); - xset (title.handle_value (), "clipping", "off"); - xset (title.handle_value (), "__autopos_tag__", "title"); + set_text_child (m_title, "title", v); + xset (m_title.handle_value (), "positionmode", "auto"); + xset (m_title.handle_value (), "horizontalalignment", "center"); + xset (m_title.handle_value (), "horizontalalignmentmode", "auto"); + xset (m_title.handle_value (), "verticalalignment", "bottom"); + xset (m_title.handle_value (), "verticalalignmentmode", "auto"); + xset (m_title.handle_value (), "clipping", "off"); + xset (m_title.handle_value (), "__autopos_tag__", "title"); update_title_position (); } @@ -5498,196 +5500,196 @@ Matrix tlim (1, 2, 0.0); tlim(1) = 1; - alim = tlim; - xlim = tlim; - ylim = tlim; - zlim = tlim; - - alimmode = "auto"; - climmode = "auto"; - xlimmode = "auto"; - ylimmode = "auto"; - zlimmode = "auto"; - - ambientlightcolor = Matrix (1, 3, 1.0); - - box = "off"; - boxstyle = "back"; + m_alim = tlim; + m_xlim = tlim; + m_ylim = tlim; + m_zlim = tlim; + + m_alimmode = "auto"; + m_climmode = "auto"; + m_xlimmode = "auto"; + m_ylimmode = "auto"; + m_zlimmode = "auto"; + + m_ambientlightcolor = Matrix (1, 3, 1.0); + + m_box = "off"; + m_boxstyle = "back"; // Note: camera properties (not mode) will be set in update_transform - camerapositionmode = "auto"; - cameratargetmode = "auto"; - cameraupvectormode = "auto"; - cameraviewanglemode = "auto"; + m_camerapositionmode = "auto"; + m_cameratargetmode = "auto"; + m_cameraupvectormode = "auto"; + m_cameraviewanglemode = "auto"; Matrix cl (1, 2, 0.0); cl(1) = 1; - clim = cl; - - clippingstyle = "3dbox"; - - color = color_values ("white"); - colororder = default_colororder (); - colororderindex = 1.0; + m_clim = cl; + + m_clippingstyle = "3dbox"; + + m_color = color_values ("white"); + m_colororder = default_colororder (); + m_colororderindex = 1.0; // Note: dataspectratio (not mode) will be set through update_aspectratios - dataaspectratiomode = "auto"; - - fontangle = "normal"; - fontname = OCTAVE_DEFAULT_FONTNAME; - fontsize = 10; - fontunits = "points"; - fontsmoothing = "on"; - fontweight = "normal"; - - gridalpha = 0.15; - gridalphamode = "auto"; - gridcolor = color_values (0.15, 0.15, 0.15); - gridcolormode = "auto"; - gridlinestyle = "-"; - - labelfontsizemultiplier = 1.1; - - layer = "bottom"; - - linestyleorder = "-"; - linestyleorderindex = 1.0; - - linewidth = 0.5; - - minorgridalpha = 0.25; - minorgridalphamode = "auto"; - minorgridcolor = color_values (0.1, 0.1, 0.1); - minorgridcolormode = "auto"; - minorgridlinestyle = ":"; - - nextplot = "replace"; + m_dataaspectratiomode = "auto"; + + m_fontangle = "normal"; + m_fontname = OCTAVE_DEFAULT_FONTNAME; + m_fontsize = 10; + m_fontunits = "points"; + m_fontsmoothing = "on"; + m_fontweight = "normal"; + + m_gridalpha = 0.15; + m_gridalphamode = "auto"; + m_gridcolor = color_values (0.15, 0.15, 0.15); + m_gridcolormode = "auto"; + m_gridlinestyle = "-"; + + m_labelfontsizemultiplier = 1.1; + + m_layer = "bottom"; + + m_linestyleorder = "-"; + m_linestyleorderindex = 1.0; + + m_linewidth = 0.5; + + m_minorgridalpha = 0.25; + m_minorgridalphamode = "auto"; + m_minorgridcolor = color_values (0.1, 0.1, 0.1); + m_minorgridcolormode = "auto"; + m_minorgridlinestyle = ":"; + + m_nextplot = "replace"; // Note: plotboxaspectratio will be set through update_aspectratios - plotboxaspectratiomode = "auto"; - projection = "orthographic"; - - sortmethod = "depth"; - - tickdir = "in"; - tickdirmode = "auto"; - ticklabelinterpreter = "tex"; - ticklength = default_axes_ticklength (); - - tightinset = Matrix (1, 4, 0.0); - - titlefontsizemultiplier = 1.1; - titlefontweight = "bold"; + m_plotboxaspectratiomode = "auto"; + m_projection = "orthographic"; + + m_sortmethod = "depth"; + + m_tickdir = "in"; + m_tickdirmode = "auto"; + m_ticklabelinterpreter = "tex"; + m_ticklength = default_axes_ticklength (); + + m_tightinset = Matrix (1, 4, 0.0); + + m_titlefontsizemultiplier = 1.1; + m_titlefontweight = "bold"; Matrix tview (1, 2, 0.0); tview(1) = 90; - view = tview; - - xaxislocation = "bottom"; - - xcolor = color_values (0.15, 0.15, 0.15); - xcolormode = "auto"; - xdir = "normal"; - xgrid = "off"; - xminorgrid = "off"; - xminortick = "off"; - xscale = "linear"; - xtick = Matrix (); - xticklabel = ""; - xticklabelmode = "auto"; - xticklabelrotation = 0.0; - xtickmode = "auto"; - - yaxislocation = "left"; - - ycolor = color_values (0.15, 0.15, 0.15); - ycolormode = "auto"; - ydir = "normal"; - ygrid = "off"; - yminorgrid = "off"; - yminortick = "off"; - yscale = "linear"; - ytick = Matrix (); - yticklabel = ""; - yticklabelmode = "auto"; - yticklabelrotation = 0.0; - ytickmode = "auto"; - - zcolor = color_values (0.15, 0.15, 0.15); - zcolormode = "auto"; - zdir = "normal"; - zgrid = "off"; - zminorgrid = "off"; - zminortick = "off"; - zscale = "linear"; - ztick = Matrix (); - zticklabel = ""; - zticklabelmode = "auto"; - zticklabelrotation = 0.0; - ztickmode = "auto"; - - sx = "linear"; - sy = "linear"; - sz = "linear"; - - visible = "on"; + m_view = tview; + + m_xaxislocation = "bottom"; + + m_xcolor = color_values (0.15, 0.15, 0.15); + m_xcolormode = "auto"; + m_xdir = "normal"; + m_xgrid = "off"; + m_xminorgrid = "off"; + m_xminortick = "off"; + m_xscale = "linear"; + m_xtick = Matrix (); + m_xticklabel = ""; + m_xticklabelmode = "auto"; + m_xticklabelrotation = 0.0; + m_xtickmode = "auto"; + + m_yaxislocation = "left"; + + m_ycolor = color_values (0.15, 0.15, 0.15); + m_ycolormode = "auto"; + m_ydir = "normal"; + m_ygrid = "off"; + m_yminorgrid = "off"; + m_yminortick = "off"; + m_yscale = "linear"; + m_ytick = Matrix (); + m_yticklabel = ""; + m_yticklabelmode = "auto"; + m_yticklabelrotation = 0.0; + m_ytickmode = "auto"; + + m_zcolor = color_values (0.15, 0.15, 0.15); + m_zcolormode = "auto"; + m_zdir = "normal"; + m_zgrid = "off"; + m_zminorgrid = "off"; + m_zminortick = "off"; + m_zscale = "linear"; + m_ztick = Matrix (); + m_zticklabel = ""; + m_zticklabelmode = "auto"; + m_zticklabelrotation = 0.0; + m_ztickmode = "auto"; + + m_sx = "linear"; + m_sy = "linear"; + m_sz = "linear"; + + m_visible = "on"; gh_manager& gh_mgr = octave::__get_gh_manager__ ("axes::properties::set_defaults"); - graphics_object go = gh_mgr.get_object (xlabel.handle_value ()); + graphics_object go = gh_mgr.get_object (m_xlabel.handle_value ()); go.reset_default_properties (); - go = gh_mgr.get_object (ylabel.handle_value ()); + go = gh_mgr.get_object (m_ylabel.handle_value ()); go.reset_default_properties (); - go = gh_mgr.get_object (zlabel.handle_value ()); + go = gh_mgr.get_object (m_zlabel.handle_value ()); go.reset_default_properties (); - go = gh_mgr.get_object (title.handle_value ()); + go = gh_mgr.get_object (m_title.handle_value ()); go.reset_default_properties (); - xset (xlabel.handle_value (), "handlevisibility", "off"); - xset (ylabel.handle_value (), "handlevisibility", "off"); - xset (zlabel.handle_value (), "handlevisibility", "off"); - xset (title.handle_value (), "handlevisibility", "off"); - - xset (xlabel.handle_value (), "horizontalalignment", "center"); - xset (xlabel.handle_value (), "horizontalalignmentmode", "auto"); - xset (ylabel.handle_value (), "horizontalalignment", "center"); - xset (ylabel.handle_value (), "horizontalalignmentmode", "auto"); - xset (zlabel.handle_value (), "horizontalalignment", "right"); - xset (zlabel.handle_value (), "horizontalalignmentmode", "auto"); - xset (title.handle_value (), "horizontalalignment", "center"); - xset (title.handle_value (), "horizontalalignmentmode", "auto"); - - xset (xlabel.handle_value (), "verticalalignment", "top"); - xset (xlabel.handle_value (), "verticalalignmentmode", "auto"); - xset (ylabel.handle_value (), "verticalalignment", "bottom"); - xset (ylabel.handle_value (), "verticalalignmentmode", "auto"); - xset (title.handle_value (), "verticalalignment", "bottom"); - xset (title.handle_value (), "verticalalignmentmode", "auto"); - - xset (ylabel.handle_value (), "rotation", 90.0); - xset (ylabel.handle_value (), "rotationmode", "auto"); - - xset (zlabel.handle_value (), "visible", "off"); - - xset (xlabel.handle_value (), "clipping", "off"); - xset (ylabel.handle_value (), "clipping", "off"); - xset (zlabel.handle_value (), "clipping", "off"); - xset (title.handle_value (), "clipping", "off"); - - xset (xlabel.handle_value (), "__autopos_tag__", "xlabel"); - xset (ylabel.handle_value (), "__autopos_tag__", "ylabel"); - xset (zlabel.handle_value (), "__autopos_tag__", "zlabel"); - xset (title.handle_value (), "__autopos_tag__", "title"); + xset (m_xlabel.handle_value (), "handlevisibility", "off"); + xset (m_ylabel.handle_value (), "handlevisibility", "off"); + xset (m_zlabel.handle_value (), "handlevisibility", "off"); + xset (m_title.handle_value (), "handlevisibility", "off"); + + xset (m_xlabel.handle_value (), "horizontalalignment", "center"); + xset (m_xlabel.handle_value (), "horizontalalignmentmode", "auto"); + xset (m_ylabel.handle_value (), "horizontalalignment", "center"); + xset (m_ylabel.handle_value (), "horizontalalignmentmode", "auto"); + xset (m_zlabel.handle_value (), "horizontalalignment", "right"); + xset (m_zlabel.handle_value (), "horizontalalignmentmode", "auto"); + xset (m_title.handle_value (), "horizontalalignment", "center"); + xset (m_title.handle_value (), "horizontalalignmentmode", "auto"); + + xset (m_xlabel.handle_value (), "verticalalignment", "top"); + xset (m_xlabel.handle_value (), "verticalalignmentmode", "auto"); + xset (m_ylabel.handle_value (), "verticalalignment", "bottom"); + xset (m_ylabel.handle_value (), "verticalalignmentmode", "auto"); + xset (m_title.handle_value (), "verticalalignment", "bottom"); + xset (m_title.handle_value (), "verticalalignmentmode", "auto"); + + xset (m_ylabel.handle_value (), "rotation", 90.0); + xset (m_ylabel.handle_value (), "rotationmode", "auto"); + + xset (m_zlabel.handle_value (), "visible", "off"); + + xset (m_xlabel.handle_value (), "clipping", "off"); + xset (m_ylabel.handle_value (), "clipping", "off"); + xset (m_zlabel.handle_value (), "clipping", "off"); + xset (m_title.handle_value (), "clipping", "off"); + + xset (m_xlabel.handle_value (), "__autopos_tag__", "xlabel"); + xset (m_ylabel.handle_value (), "__autopos_tag__", "ylabel"); + xset (m_zlabel.handle_value (), "__autopos_tag__", "zlabel"); + xset (m_title.handle_value (), "__autopos_tag__", "title"); double fs; - fs = labelfontsizemultiplier.double_value () * fontsize.double_value (); - xset (xlabel.handle_value (), "fontsize", octave_value (fs)); - xset (ylabel.handle_value (), "fontsize", octave_value (fs)); - xset (zlabel.handle_value (), "fontsize", octave_value (fs)); - fs = titlefontsizemultiplier.double_value () * fontsize.double_value (); - xset (title.handle_value (), "fontsize", octave_value (fs)); - xset (title.handle_value (), "fontweight", titlefontweight.get ()); + fs = m_labelfontsizemultiplier.double_value () * m_fontsize.double_value (); + xset (m_xlabel.handle_value (), "fontsize", octave_value (fs)); + xset (m_ylabel.handle_value (), "fontsize", octave_value (fs)); + xset (m_zlabel.handle_value (), "fontsize", octave_value (fs)); + fs = m_titlefontsizemultiplier.double_value () * m_fontsize.double_value (); + xset (m_title.handle_value (), "fontsize", octave_value (fs)); + xset (m_title.handle_value (), "fontweight", m_titlefontweight.get ()); update_transform (); sync_positions (); @@ -5697,7 +5699,7 @@ octave_value axes::properties::get_colormap (void) const { - if (__colormap__.get ().isempty ()) + if (m___colormap__.get ().isempty ()) { gh_manager& gh_mgr = octave::__get_gh_manager__ ("axes::properties::get_colormap"); @@ -5735,7 +5737,7 @@ if (! is_beingdeleted ()) { - hp = gh_mgr.make_graphics_handle ("text", __myhandle__, false, false); + hp = gh_mgr.make_graphics_handle ("text", m___myhandle__, false, false); xset (hp.handle_value (), "handlevisibility", "off"); @@ -5751,24 +5753,24 @@ graphics_object go = gh_mgr.get_object (h); - if (xlabel.handle_value ().ok () && h == xlabel.handle_value ()) - { - delete_text_child (xlabel, from_root); + if (m_xlabel.handle_value ().ok () && h == m_xlabel.handle_value ()) + { + delete_text_child (m_xlabel, from_root); update_xlabel_position (); } - else if (ylabel.handle_value ().ok () && h == ylabel.handle_value ()) - { - delete_text_child (ylabel, from_root); + else if (m_ylabel.handle_value ().ok () && h == m_ylabel.handle_value ()) + { + delete_text_child (m_ylabel, from_root); update_ylabel_position (); } - else if (zlabel.handle_value ().ok () && h == zlabel.handle_value ()) - { - delete_text_child (zlabel, from_root); + else if (m_zlabel.handle_value ().ok () && h == m_zlabel.handle_value ()) + { + delete_text_child (m_zlabel, from_root); update_zlabel_position (); } - else if (title.handle_value ().ok () && h == title.handle_value ()) - { - delete_text_child (title, from_root); + else if (m_title.handle_value ().ok () && h == m_title.handle_value ()) + { + delete_text_child (m_title, from_root); update_title_position (); } else if (get_num_lights () > 0 && go.isa ("light") @@ -5988,9 +5990,9 @@ double yd = (ydir_is ("normal") ? 1 : -1); double zd = (zdir_is ("normal") ? 1 : -1); - Matrix xlimits = sx.scale (get_xlim ().matrix_value ()); - Matrix ylimits = sy.scale (get_ylim ().matrix_value ()); - Matrix zlimits = sz.scale (get_zlim ().matrix_value ()); + Matrix xlimits = m_sx.scale (get_xlim ().matrix_value ()); + Matrix ylimits = m_sy.scale (get_ylim ().matrix_value ()); + Matrix zlimits = m_sz.scale (get_zlim ().matrix_value ()); double xo = xlimits(xd > 0 ? 0 : 1); double yo = ylimits(yd > 0 ? 0 : 1); @@ -6015,7 +6017,7 @@ c_center(1) = (ylimits(0) + ylimits(1)) / 2; c_center(2) = (zlimits(0) + zlimits(1)) / 2; - cameratarget = xform2cam (c_center); + m_cameratarget = xform2cam (c_center); } else c_center = cam2xform (get_cameratarget ().matrix_value ()); @@ -6041,7 +6043,7 @@ c_eye(1) = c_eye(1)*(ylimits(1)-ylimits(0))/(yd*pb(1))+c_center(1); c_eye(2) = c_eye(2)*(zlimits(1)-zlimits(0))/(zd*pb(2))+c_center(2); - cameraposition = xform2cam (c_eye); + m_cameraposition = xform2cam (c_eye); } else c_eye = cam2xform (get_cameraposition ().matrix_value ()); @@ -6062,7 +6064,7 @@ else c_upv(2) = 1; - cameraupvector = xform2cam (c_upv); + m_cameraupvector = xform2cam (c_upv); } else c_upv = cam2xform (get_cameraupvector ().matrix_value ()); @@ -6073,8 +6075,8 @@ Matrix x_normrender; Matrix x_pre = xform_matrix (); - x_render = xform_matrix (); - x_render_inv = xform_matrix (); + m_x_render = xform_matrix (); + m_x_render_inv = xform_matrix (); scale (x_pre, pb(0), pb(1), pb(2)); translate (x_pre, -0.5, -0.5, -0.5); @@ -6139,7 +6141,7 @@ } v_angle = 2 * (180.0 / M_PI) * atan (1 / (2 * af * norm (F))); - cameraviewangle = v_angle; + m_cameraviewangle = v_angle; } else v_angle = get_cameraviewangle (); @@ -6175,24 +6177,24 @@ x_cube = x_normrender * unit_cube (); cmin = x_cube.row_min (); cmax = x_cube.row_max (); - x_zlim.resize (1, 2); - x_zlim(0) = cmin(2); - x_zlim(1) = cmax(2); - - x_render = x_normrender; - scale (x_render, xd/(xlimits(1)-xlimits(0)), yd/(ylimits(1)-ylimits(0)), + m_x_zlim.resize (1, 2); + m_x_zlim(0) = cmin(2); + m_x_zlim(1) = cmax(2); + + m_x_render = x_normrender; + scale (m_x_render, xd/(xlimits(1)-xlimits(0)), yd/(ylimits(1)-ylimits(0)), zd/(zlimits(1)-zlimits(0))); - translate (x_render, -xo, -yo, -zo); - - x_render_inv = x_render.inverse (); + translate (m_x_render, -xo, -yo, -zo); + + m_x_render_inv = m_x_render.inverse (); // Note: these matrices are a slight modified version of the regular matrices, - // more suited for OpenGL rendering (x_gl_mat1 => light => x_gl_mat2) - x_gl_mat1 = x_view; - scale (x_gl_mat1, xd/(xlimits(1)-xlimits(0)), yd/(ylimits(1)-ylimits(0)), + // more suited for OpenGL rendering (m_x_gl_mat1 => light => m_x_gl_mat2) + m_x_gl_mat1 = x_view; + scale (m_x_gl_mat1, xd/(xlimits(1)-xlimits(0)), yd/(ylimits(1)-ylimits(0)), zd/(zlimits(1)-zlimits(0))); - translate (x_gl_mat1, -xo, -yo, -zo); - x_gl_mat2 = x_viewport * x_projection; + translate (m_x_gl_mat1, -xo, -yo, -zo); + m_x_gl_mat2 = x_viewport * x_projection; } static bool updating_axes_layout = false; @@ -6220,7 +6222,7 @@ ColumnVector p1, p2, dir (3); - xstate = ystate = zstate = AXE_ANY_DIR; + m_xstate = m_ystate = m_zstate = AXE_ANY_DIR; p1 = xform.transform (x_min, (y_min+y_max)/2, (z_min+z_max)/2, false); p2 = xform.transform (x_max, (y_min+y_max)/2, (z_min+z_max)/2, false); @@ -6228,27 +6230,27 @@ dir(1) = octave::math::round (p2(1) - p1(1)); dir(2) = (p2(2) - p1(2)); if (dir(0) == 0 && dir(1) == 0) - xstate = AXE_DEPTH_DIR; + m_xstate = AXE_DEPTH_DIR; else if (dir(2) == 0) { if (dir(0) == 0) - xstate = AXE_VERT_DIR; + m_xstate = AXE_VERT_DIR; else if (dir(1) == 0) - xstate = AXE_HORZ_DIR; + m_xstate = AXE_HORZ_DIR; } if (dir(2) == 0) { if (dir(1) == 0) - xPlane = (dir(0) > 0 ? x_max : x_min); + m_xPlane = (dir(0) > 0 ? x_max : x_min); else - xPlane = (dir(1) < 0 ? x_max : x_min); - } - else - xPlane = (dir(2) < 0 ? x_min : x_max); - - xPlaneN = (xPlane == x_min ? x_max : x_min); - fx = (x_max - x_min) / sqrt (dir(0)*dir(0) + dir(1)*dir(1)); + m_xPlane = (dir(1) < 0 ? x_max : x_min); + } + else + m_xPlane = (dir(2) < 0 ? x_min : x_max); + + m_xPlaneN = (m_xPlane == x_min ? x_max : x_min); + m_fx = (x_max - x_min) / sqrt (dir(0)*dir(0) + dir(1)*dir(1)); p1 = xform.transform ((x_min + x_max)/2, y_min, (z_min + z_max)/2, false); p2 = xform.transform ((x_min + x_max)/2, y_max, (z_min + z_max)/2, false); @@ -6256,27 +6258,27 @@ dir(1) = octave::math::round (p2(1) - p1(1)); dir(2) = (p2(2) - p1(2)); if (dir(0) == 0 && dir(1) == 0) - ystate = AXE_DEPTH_DIR; + m_ystate = AXE_DEPTH_DIR; else if (dir(2) == 0) { if (dir(0) == 0) - ystate = AXE_VERT_DIR; + m_ystate = AXE_VERT_DIR; else if (dir(1) == 0) - ystate = AXE_HORZ_DIR; + m_ystate = AXE_HORZ_DIR; } if (dir(2) == 0) { if (dir(1) == 0) - yPlane = (dir(0) > 0 ? y_max : y_min); + m_yPlane = (dir(0) > 0 ? y_max : y_min); else - yPlane = (dir(1) < 0 ? y_max : y_min); - } - else - yPlane = (dir(2) < 0 ? y_min : y_max); - - yPlaneN = (yPlane == y_min ? y_max : y_min); - fy = (y_max - y_min) / sqrt (dir(0)*dir(0) + dir(1)*dir(1)); + m_yPlane = (dir(1) < 0 ? y_max : y_min); + } + else + m_yPlane = (dir(2) < 0 ? y_min : y_max); + + m_yPlaneN = (m_yPlane == y_min ? y_max : y_min); + m_fy = (y_max - y_min) / sqrt (dir(0)*dir(0) + dir(1)*dir(1)); p1 = xform.transform ((x_min + x_max)/2, (y_min + y_max)/2, z_min, false); p2 = xform.transform ((x_min + x_max)/2, (y_min + y_max)/2, z_max, false); @@ -6284,78 +6286,78 @@ dir(1) = octave::math::round (p2(1) - p1(1)); dir(2) = (p2(2) - p1(2)); if (dir(0) == 0 && dir(1) == 0) - zstate = AXE_DEPTH_DIR; + m_zstate = AXE_DEPTH_DIR; else if (dir(2) == 0) { if (dir(0) == 0) - zstate = AXE_VERT_DIR; + m_zstate = AXE_VERT_DIR; else if (dir(1) == 0) - zstate = AXE_HORZ_DIR; + m_zstate = AXE_HORZ_DIR; } if (dir(2) == 0) { if (dir(1) == 0) - zPlane = (dir(0) > 0 ? z_min : z_max); + m_zPlane = (dir(0) > 0 ? z_min : z_max); else - zPlane = (dir(1) < 0 ? z_min : z_max); - } - else - zPlane = (dir(2) < 0 ? z_min : z_max); - - zPlaneN = (zPlane == z_min ? z_max : z_min); - fz = (z_max - z_min) / sqrt (dir(0)*dir(0) + dir(1)*dir(1)); + m_zPlane = (dir(1) < 0 ? z_min : z_max); + } + else + m_zPlane = (dir(2) < 0 ? z_min : z_max); + + m_zPlaneN = (m_zPlane == z_min ? z_max : z_min); + m_fz = (z_max - z_min) / sqrt (dir(0)*dir(0) + dir(1)*dir(1)); octave::unwind_protect_var<bool> restore_var (updating_axes_layout, true); - xySym = (xd*yd*(xPlane-xPlaneN)*(yPlane-yPlaneN) > 0); - zSign = (zd*(zPlane-zPlaneN) <= 0); - xyzSym = (zSign ? xySym : ! xySym); - xpTick = (zSign ? xPlaneN : xPlane); - ypTick = (zSign ? yPlaneN : yPlane); - zpTick = (zSign ? zPlane : zPlaneN); - xpTickN = (zSign ? xPlane : xPlaneN); - ypTickN = (zSign ? yPlane : yPlaneN); - zpTickN = (zSign ? zPlaneN : zPlane); + m_xySym = (xd*yd*(m_xPlane-m_xPlaneN)*(m_yPlane-m_yPlaneN) > 0); + m_zSign = (zd*(m_zPlane-m_zPlaneN) <= 0); + m_xyzSym = (m_zSign ? m_xySym : ! m_xySym); + m_xpTick = (m_zSign ? m_xPlaneN : m_xPlane); + m_ypTick = (m_zSign ? m_yPlaneN : m_yPlane); + m_zpTick = (m_zSign ? m_zPlane : m_zPlaneN); + m_xpTickN = (m_zSign ? m_xPlane : m_xPlaneN); + m_ypTickN = (m_zSign ? m_yPlane : m_yPlaneN); + m_zpTickN = (m_zSign ? m_zPlaneN : m_zPlane); // 2D mode - x2Dtop = false; - y2Dright = false; - layer2Dtop = false; - if (xstate == AXE_HORZ_DIR && ystate == AXE_VERT_DIR) + m_x2Dtop = false; + m_y2Dright = false; + m_layer2Dtop = false; + if (m_xstate == AXE_HORZ_DIR && m_ystate == AXE_VERT_DIR) { Matrix ylimits = get_ylim ().matrix_value (); if (xaxislocation_is ("top") || (yscale_is ("log") && xaxislocation_is ("origin") && (ylimits(1) < 0.))) { - std::swap (yPlane, yPlaneN); - x2Dtop = true; - } - ypTick = yPlaneN; - ypTickN = yPlane; + std::swap (m_yPlane, m_yPlaneN); + m_x2Dtop = true; + } + m_ypTick = m_yPlaneN; + m_ypTickN = m_yPlane; Matrix xlimits = get_xlim ().matrix_value (); if (yaxislocation_is ("right") || (xscale_is ("log") && yaxislocation_is ("origin") && (xlimits(1) < 0.))) { - std::swap (xPlane, xPlaneN); - y2Dright = true; - } - xpTick = xPlaneN; - xpTickN = xPlane; + std::swap (m_xPlane, m_xPlaneN); + m_y2Dright = true; + } + m_xpTick = m_xPlaneN; + m_xpTickN = m_xPlane; if (layer_is ("top")) { - zpTick = zPlaneN; - layer2Dtop = true; + m_zpTick = m_zPlaneN; + m_layer2Dtop = true; } else - zpTick = zPlane; + m_zpTick = m_zPlane; } Matrix viewmat = get_view ().matrix_value (); - nearhoriz = std::abs (viewmat(1)) <= 5; - is2D = viewmat(1) == 90; + m_nearhoriz = std::abs (viewmat(1)) <= 5; + m_is2D = viewmat(1) == 90; update_ticklength (); } @@ -6363,12 +6365,12 @@ void axes::properties::update_ticklength (void) { - bool mode2D = (((xstate > AXE_DEPTH_DIR ? 1 : 0) + - (ystate > AXE_DEPTH_DIR ? 1 : 0) + - (zstate > AXE_DEPTH_DIR ? 1 : 0)) == 2); + bool mode2D = (((m_xstate > AXE_DEPTH_DIR ? 1 : 0) + + (m_ystate > AXE_DEPTH_DIR ? 1 : 0) + + (m_zstate > AXE_DEPTH_DIR ? 1 : 0)) == 2); if (tickdirmode_is ("auto")) - tickdir.set (mode2D ? "in" : "out", true); + m_tickdir.set (mode2D ? "in" : "out", true); double ticksign = (tickdir_is ("in") ? -1 : 1); @@ -6379,18 +6381,18 @@ // Scale the results of Octave's algorithm for better visuals. ticklen(1) *= (0.76 * std::max (bbox(2), bbox(3))); - xticklen = ticksign * (mode2D ? ticklen(0) : ticklen(1)); - yticklen = ticksign * (mode2D ? ticklen(0) : ticklen(1)); - zticklen = ticksign * (mode2D ? ticklen(0) : ticklen(1)); + m_xticklen = ticksign * (mode2D ? ticklen(0) : ticklen(1)); + m_yticklen = ticksign * (mode2D ? ticklen(0) : ticklen(1)); + m_zticklen = ticksign * (mode2D ? ticklen(0) : ticklen(1)); double offset = get___fontsize_points__ () / 2; - xtickoffset = (mode2D ? std::max (0., xticklen) : std::abs (xticklen)) + - (xstate == AXE_HORZ_DIR ? offset*1.5 : offset); - ytickoffset = (mode2D ? std::max (0., yticklen) : std::abs (yticklen)) + - (ystate == AXE_HORZ_DIR ? offset*1.5 : offset); - ztickoffset = (mode2D ? std::max (0., zticklen) : std::abs (zticklen)) + - (zstate == AXE_HORZ_DIR ? offset*1.5 : offset); + m_xtickoffset = (mode2D ? std::max (0., m_xticklen) : std::abs (m_xticklen)) + + (m_xstate == AXE_HORZ_DIR ? offset*1.5 : offset); + m_ytickoffset = (mode2D ? std::max (0., m_yticklen) : std::abs (m_yticklen)) + + (m_ystate == AXE_HORZ_DIR ? offset*1.5 : offset); + m_ztickoffset = (mode2D ? std::max (0., m_zticklen) : std::abs (m_zticklen)) + + (m_zstate == AXE_HORZ_DIR ? offset*1.5 : offset); update_xlabel_position (); update_ylabel_position (); @@ -6474,7 +6476,7 @@ if (xlabel_props.horizontalalignmentmode_is ("auto")) { xlabel_props.set_horizontalalignment - (xstate > AXE_DEPTH_DIR ? "center" : (xyzSym ? "left" : "right")); + (m_xstate > AXE_DEPTH_DIR ? "center" : (m_xyzSym ? "left" : "right")); xlabel_props.set_horizontalalignmentmode ("auto"); } @@ -6482,7 +6484,7 @@ if (xlabel_props.verticalalignmentmode_is ("auto")) { xlabel_props.set_verticalalignment - (xstate == AXE_VERT_DIR || x2Dtop ? "bottom" : "top"); + (m_xstate == AXE_VERT_DIR || m_x2Dtop ? "bottom" : "top"); xlabel_props.set_verticalalignmentmode ("auto"); } @@ -6503,20 +6505,20 @@ double hmax = ext(1) + margin; double angle = 0.0; ColumnVector p - = graphics_xform::xform_vector ((xpTickN + xpTick)/2, ypTick, zpTick); - - bool tick_along_z = nearhoriz || octave::math::isinf (fy); + = graphics_xform::xform_vector ((m_xpTickN + m_xpTick)/2, m_ypTick, m_zpTick); + + bool tick_along_z = m_nearhoriz || octave::math::isinf (m_fy); if (tick_along_z) - p(2) += (octave::math::signum (zpTick - zpTickN) * fz * xtickoffset); + p(2) += (octave::math::signum (m_zpTick - m_zpTickN) * m_fz * m_xtickoffset); else - p(1) += (octave::math::signum (ypTick - ypTickN) * fy * xtickoffset); + p(1) += (octave::math::signum (m_ypTick - m_ypTickN) * m_fy * m_xtickoffset); p = xform.transform (p(0), p(1), p(2), false); - switch (xstate) + switch (m_xstate) { case AXE_ANY_DIR: - p(0) += (xyzSym ? wmax : -wmax); + p(0) += (m_xyzSym ? wmax : -wmax); p(1) += hmax; break; @@ -6526,7 +6528,7 @@ break; case AXE_HORZ_DIR: - p(1) += (x2Dtop ? -hmax : hmax); + p(1) += (m_x2Dtop ? -hmax : hmax); break; } @@ -6578,7 +6580,7 @@ if (ylabel_props.horizontalalignmentmode_is ("auto")) { ylabel_props.set_horizontalalignment - (ystate > AXE_DEPTH_DIR ? "center" : (! xyzSym ? "left" : "right")); + (m_ystate > AXE_DEPTH_DIR ? "center" : (! m_xyzSym ? "left" : "right")); ylabel_props.set_horizontalalignmentmode ("auto"); } @@ -6586,7 +6588,7 @@ if (ylabel_props.verticalalignmentmode_is ("auto")) { ylabel_props.set_verticalalignment - (ystate == AXE_VERT_DIR && ! y2Dright ? "bottom" : "top"); + (m_ystate == AXE_VERT_DIR && ! m_y2Dright ? "bottom" : "top"); ylabel_props.set_verticalalignmentmode ("auto"); } @@ -6607,25 +6609,25 @@ double hmax = ext(1) + margin; double angle = 0.0; ColumnVector p - = graphics_xform::xform_vector (xpTick, (ypTickN + ypTick)/2, zpTick); - - bool tick_along_z = nearhoriz || octave::math::isinf (fx); + = graphics_xform::xform_vector (m_xpTick, (m_ypTickN + m_ypTick)/2, m_zpTick); + + bool tick_along_z = m_nearhoriz || octave::math::isinf (m_fx); if (tick_along_z) - p(2) += (octave::math::signum (zpTick - zpTickN) * fz * ytickoffset); + p(2) += (octave::math::signum (m_zpTick - m_zpTickN) * m_fz * m_ytickoffset); else - p(0) += (octave::math::signum (xpTick - xpTickN) * fx * ytickoffset); + p(0) += (octave::math::signum (m_xpTick - m_xpTickN) * m_fx * m_ytickoffset); p = xform.transform (p(0), p(1), p(2), false); - switch (ystate) + switch (m_ystate) { case AXE_ANY_DIR: - p(0) += (! xyzSym ? wmax : -wmax); + p(0) += (! m_xyzSym ? wmax : -wmax); p(1) += hmax; break; case AXE_VERT_DIR: - p(0) += (y2Dright ? wmax : -wmax); + p(0) += (m_y2Dright ? wmax : -wmax); angle = 90; break; @@ -6683,7 +6685,7 @@ if (zlabel_props.horizontalalignmentmode_is ("auto")) { zlabel_props.set_horizontalalignment - ((zstate > AXE_DEPTH_DIR || camAuto) ? "center" : "right"); + ((m_zstate > AXE_DEPTH_DIR || camAuto) ? "center" : "right"); zlabel_props.set_horizontalalignmentmode ("auto"); } @@ -6691,8 +6693,8 @@ if (zlabel_props.verticalalignmentmode_is ("auto")) { zlabel_props.set_verticalalignment - (zstate == AXE_VERT_DIR - ? "bottom" : ((zSign || camAuto) ? "bottom" : "top")); + (m_zstate == AXE_VERT_DIR + ? "bottom" : ((m_zSign || camAuto) ? "bottom" : "top")); zlabel_props.set_verticalalignmentmode ("auto"); } @@ -6714,28 +6716,28 @@ double angle = 0.0; ColumnVector p; - if (xySym) - { - p = graphics_xform::xform_vector (xPlaneN, yPlane, - (zpTickN + zpTick)/2); - if (octave::math::isinf (fy)) - p(0) += octave::math::signum (xPlaneN - xPlane) * fx * ztickoffset; + if (m_xySym) + { + p = graphics_xform::xform_vector (m_xPlaneN, m_yPlane, + (m_zpTickN + m_zpTick)/2); + if (octave::math::isinf (m_fy)) + p(0) += octave::math::signum (m_xPlaneN - m_xPlane) * m_fx * m_ztickoffset; else - p(1) += octave::math::signum (yPlane - yPlaneN) * fy * ztickoffset; + p(1) += octave::math::signum (m_yPlane - m_yPlaneN) * m_fy * m_ztickoffset; } else { - p = graphics_xform::xform_vector (xPlane, yPlaneN, - (zpTickN + zpTick)/2); - if (octave::math::isinf (fx)) - p(1) += octave::math::signum (yPlaneN - yPlane) * fy * ztickoffset; + p = graphics_xform::xform_vector (m_xPlane, m_yPlaneN, + (m_zpTickN + m_zpTick)/2); + if (octave::math::isinf (m_fx)) + p(1) += octave::math::signum (m_yPlaneN - m_yPlane) * m_fy * m_ztickoffset; else - p(0) += octave::math::signum (xPlane - xPlaneN) * fx * ztickoffset; + p(0) += octave::math::signum (m_xPlane - m_xPlaneN) * m_fx * m_ztickoffset; } p = xform.transform (p(0), p(1), p(2), false); - switch (zstate) + switch (m_zstate) { case AXE_ANY_DIR: if (camAuto) @@ -6746,8 +6748,8 @@ // FIXME: what's the correct offset? // - // p[0] += (! xySym ? wmax : -wmax); - // p[1] += (zSign ? hmax : -hmax); + // p[0] += (! m_xySym ? wmax : -wmax); + // p[1] += (m_zSign ? hmax : -hmax); break; @@ -6810,9 +6812,9 @@ ColumnVector p = graphics_xform::xform_vector (bbox(0) + bbox(2)/2, bbox(1) - 10, - (x_zlim(0) + x_zlim(1))/2); - - if (x2Dtop) + (m_x_zlim(0) + m_x_zlim(1))/2); + + if (m_x2Dtop) { Matrix ext (1, 2, 0.0); ext = get_ticklabel_extents (get_xtick ().matrix_value (), @@ -6907,16 +6909,16 @@ if (plotboxaspectratiomode_is ("auto")) { pba = Matrix (1, 3, 1.0); - plotboxaspectratio.set (pba, false); + m_plotboxaspectratio.set (pba, false); } normalized_aspectratios (da, pba, dx, dy, dz); - dataaspectratio.set (da, false); + m_dataaspectratio.set (da, false); } else if (plotboxaspectratiomode_is ("auto")) { normalized_aspectratios (pba, da, dx, dy, dz); - plotboxaspectratio.set (pba, false); + m_plotboxaspectratio.set (pba, false); } else { @@ -6991,7 +6993,7 @@ else { normalized_aspectratios (pba, da, dx, dy, dz); - plotboxaspectratio.set (pba, false); + m_plotboxaspectratio.set (pba, false); } } } @@ -7036,10 +7038,10 @@ octave::autolock guard (gh_mgr.graphics_lock ()); - txt_renderer.set_font (get ("fontname").string_value (), - get ("fontweight").string_value (), - get ("fontangle").string_value (), - get ("__fontsize_points__").double_value () * dpr); + m_txt_renderer.set_font (get ("fontname").string_value (), + get ("fontweight").string_value (), + get ("fontangle").string_value (), + get ("__fontsize_points__").double_value () * dpr); } // The INTERNAL flag defines whether position or outerposition is used. @@ -7087,9 +7089,9 @@ for (int j = 0; j <= 1; j++) for (int k = 0; k <= 1; k++) { - ColumnVector p = xform.transform (i ? xPlaneN : xPlane, - j ? yPlaneN : yPlane, - k ? zPlaneN : zPlane, false); + ColumnVector p = xform.transform (i ? m_xPlaneN : m_xPlane, + j ? m_yPlaneN : m_yPlane, + k ? m_zPlaneN : m_zPlane, false); ext(0) = std::min (ext(0), p(0)); ext(1) = std::min (ext(1), p(1)); ext(2) = std::max (ext(2), p(0)); @@ -7225,10 +7227,10 @@ void axes::properties::set_xticklabel (const octave_value& val) { - if (xticklabel.set (convert_ticklabel_string (val), false)) + if (m_xticklabel.set (convert_ticklabel_string (val), false)) { set_xticklabelmode ("manual"); - xticklabel.run_listeners (GCB_POSTSET); + m_xticklabel.run_listeners (GCB_POSTSET); mark_modified (); } else @@ -7240,10 +7242,10 @@ void axes::properties::set_yticklabel (const octave_value& val) { - if (yticklabel.set (convert_ticklabel_string (val), false)) + if (m_yticklabel.set (convert_ticklabel_string (val), false)) { set_yticklabelmode ("manual"); - yticklabel.run_listeners (GCB_POSTSET); + m_yticklabel.run_listeners (GCB_POSTSET); mark_modified (); } else @@ -7255,10 +7257,10 @@ void axes::properties::set_zticklabel (const octave_value& val) { - if (zticklabel.set (convert_ticklabel_string (val), false)) + if (m_zticklabel.set (convert_ticklabel_string (val), false)) { set_zticklabelmode ("manual"); - zticklabel.run_listeners (GCB_POSTSET); + m_zticklabel.run_listeners (GCB_POSTSET); mark_modified (); } else @@ -7311,7 +7313,7 @@ void axes::properties::set_linestyleorder (const octave_value& val) { - linestyleorder.set (convert_linestyleorder_string (val), false); + m_linestyleorder.set (convert_linestyleorder_string (val), false); } void @@ -7319,7 +7321,7 @@ { caseless_str old_units = get_units (); - if (units.set (val, true)) + if (m_units.set (val, true)) { update_units (old_units); mark_modified (); @@ -7338,22 +7340,22 @@ = parent_go.get_properties ().get_boundingbox (true).extract_n (0, 2, 1, 2); caseless_str new_units = get_units (); - position.set (octave_value (convert_position (get_position ().matrix_value (), - old_units, new_units, - parent_bb)), - false); - outerposition.set (octave_value (convert_position (get_outerposition ().matrix_value (), - old_units, new_units, - parent_bb)), - false); - tightinset.set (octave_value (convert_position (get_tightinset ().matrix_value (), - old_units, new_units, - parent_bb)), - false); - looseinset.set (octave_value (convert_position (get_looseinset ().matrix_value (), - old_units, new_units, - parent_bb)), - false); + m_position.set (octave_value + (convert_position (get_position ().matrix_value (), + old_units, new_units, parent_bb)), + false); + m_outerposition.set (octave_value + (convert_position (get_outerposition ().matrix_value (), + old_units, new_units, parent_bb)), + false); + m_tightinset.set (octave_value + (convert_position (get_tightinset ().matrix_value (), + old_units, new_units, parent_bb)), + false); + m_looseinset.set (octave_value + (convert_position (get_looseinset ().matrix_value (), + old_units, new_units, parent_bb)), + false); } void @@ -7361,7 +7363,7 @@ { caseless_str old_fontunits = get_fontunits (); - if (fontunits.set (val, true)) + if (m_fontunits.set (val, true)) { update_fontunits (old_fontunits); mark_modified (); @@ -7409,25 +7411,25 @@ { if (use_scale) { - x = sx.scale (x); - y = sy.scale (y); - z = sz.scale (z); - } - - return ::transform (xform, x, y, z); + x = m_sx.scale (x); + y = m_sy.scale (y); + z = m_sz.scale (z); + } + + return ::transform (m_xform, x, y, z); } ColumnVector graphics_xform::untransform (double x, double y, double z, bool use_scale) const { - ColumnVector v = ::transform (xform_inv, x, y, z); + ColumnVector v = ::transform (m_xform_inv, x, y, z); if (use_scale) { - v(0) = sx.unscale (v(0)); - v(1) = sy.unscale (v(1)); - v(2) = sz.unscale (v(2)); + v(0) = m_sx.unscale (v(0)); + v(1) = m_sy.unscale (v(1)); + v(2) = m_sz.unscale (v(2)); } return v; @@ -7436,7 +7438,7 @@ octave_value axes::get_default (const caseless_str& pname) const { - octave_value retval = default_properties.lookup (pname); + octave_value retval = m_default_properties.lookup (pname); if (retval.is_undefined ()) { @@ -7537,7 +7539,7 @@ caseless_str old_units = get_units (); set_units ("normalized"); - Matrix outerbox = outerposition.get ().matrix_value (); + Matrix outerbox = m_outerposition.get ().matrix_value (); double outer_left = outerbox(0); double outer_bottom = outerbox(1); @@ -7547,8 +7549,8 @@ double outer_right = outer_width + outer_left; double outer_top = outer_height + outer_bottom; - Matrix linset = looseinset.get ().matrix_value (); - Matrix tinset = tightinset.get ().matrix_value (); + Matrix linset = m_looseinset.get ().matrix_value (); + Matrix tinset = m_tightinset.get ().matrix_value (); double left_margin = std::max (linset(0), tinset(0)); double bottom_margin = std::max (linset(1), tinset(1)); @@ -7583,7 +7585,7 @@ innerbox(2) = inner_width; innerbox(3) = inner_height; - position = innerbox; + m_position = innerbox; set_units (old_units); update_transform (); @@ -7596,7 +7598,7 @@ caseless_str old_units = get_units (); set_units ("normalized"); - Matrix innerbox = position.get ().matrix_value (); + Matrix innerbox = m_position.get ().matrix_value (); double inner_left = innerbox(0); double inner_bottom = innerbox(1); @@ -7606,8 +7608,8 @@ double inner_right = inner_width + inner_left; double inner_top = inner_height + inner_bottom; - Matrix linset = looseinset.get ().matrix_value (); - Matrix tinset = tightinset.get ().matrix_value (); + Matrix linset = m_looseinset.get ().matrix_value (); + Matrix tinset = m_tightinset.get ().matrix_value (); double left_margin = std::max (linset(0), tinset(0)); double bottom_margin = std::max (linset(1), tinset(1)); @@ -7631,7 +7633,7 @@ outerbox(2) = outer_width; outerbox(3) = outer_height; - outerposition = outerbox; + m_outerposition = outerbox; set_units (old_units); update_transform (); @@ -7643,17 +7645,17 @@ caseless_str old_units = get_units (); set_units ("normalized"); - Matrix linset = looseinset.get ().matrix_value (); - Matrix tinset = tightinset.get ().matrix_value (); + Matrix linset = m_looseinset.get ().matrix_value (); + Matrix tinset = m_tightinset.get ().matrix_value (); double left_margin = std::max (linset(0), tinset(0)); double bottom_margin = std::max (linset(1), tinset(1)); double right_margin = std::max (linset(2), tinset(2)); double top_margin = std::max (linset(3), tinset(3)); - if (positionconstraint.is ("innerposition")) - { - Matrix innerbox = position.get ().matrix_value (); + if (m_positionconstraint.is ("innerposition")) + { + Matrix innerbox = m_position.get ().matrix_value (); double inner_left = innerbox(0); double inner_bottom = innerbox(1); @@ -7680,11 +7682,11 @@ outerbox(2) = outer_width; outerbox(3) = outer_height; - outerposition = outerbox; - } - else - { - Matrix outerbox = outerposition.get ().matrix_value (); + m_outerposition = outerbox; + } + else + { + Matrix outerbox = m_outerposition.get ().matrix_value (); double outer_left = outerbox(0); double outer_bottom = outerbox(1); @@ -7722,7 +7724,7 @@ innerbox(2) = inner_width; innerbox(3) = inner_height; - position = innerbox; + m_position = innerbox; } set_units (old_units); @@ -8301,7 +8303,7 @@ os << '0'; os << exponent << '}'; - if (ticklabelinterpreter.is ("latex")) + if (m_ticklabelinterpreter.is ("latex")) c(i) = "$" + os.str () + "$"; else c(i) = os.str (); @@ -8348,15 +8350,15 @@ label.erase (0, label.find_first_not_of (' ')); label = label.substr (0, label.find_last_not_of (' ')+1); - if (txt_renderer.ok ()) + if (m_txt_renderer.ok ()) { gh_manager& gh_mgr = octave::__get_gh_manager__ ("axes::properties::get_ticklabel_extents"); octave::autolock guard (gh_mgr.graphics_lock ()); - ext = txt_renderer.get_extent (label, 0.0, - get_ticklabelinterpreter ()); + ext = m_txt_renderer.get_extent (label, 0.0, + get_ticklabelinterpreter ()); wmax = std::max (wmax, ext(0) / dpr); hmax = std::max (hmax, ext(1) / dpr); @@ -8498,62 +8500,62 @@ || axis_type == "xlimmode" || axis_type == "xliminclude" || axis_type == "xlim") { - limits = xproperties.get_xlim ().matrix_value (); + limits = m_properties.get_xlim ().matrix_value (); FIX_LIMITS; update_type = 'x'; - if (xproperties.xlimmode_is ("auto")) + if (m_properties.xlimmode_is ("auto")) { get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'x'); - limits = xproperties.get_axis_limits (min_val, max_val, - min_pos, max_neg, - xproperties.xscale_is ("log")); + limits = m_properties.get_axis_limits (min_val, max_val, + min_pos, max_neg, + m_properties.xscale_is ("log")); } else - xproperties.check_axis_limits (limits, kids, - xproperties.xscale_is ("log"), - update_type); + m_properties.check_axis_limits (limits, kids, + m_properties.xscale_is ("log"), + update_type); } else if (axis_type == "ydata" || axis_type == "yscale" || axis_type == "ylimmode" || axis_type == "yliminclude" || axis_type == "ylim") { - limits = xproperties.get_ylim ().matrix_value (); + limits = m_properties.get_ylim ().matrix_value (); FIX_LIMITS; update_type = 'y'; - if (xproperties.ylimmode_is ("auto")) + if (m_properties.ylimmode_is ("auto")) { get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'y'); - limits = xproperties.get_axis_limits (min_val, max_val, - min_pos, max_neg, - xproperties.yscale_is ("log")); + limits = m_properties.get_axis_limits (min_val, max_val, + min_pos, max_neg, + m_properties.yscale_is ("log")); } else - xproperties.check_axis_limits (limits, kids, - xproperties.yscale_is ("log"), - update_type); + m_properties.check_axis_limits (limits, kids, + m_properties.yscale_is ("log"), + update_type); } else if (axis_type == "zdata" || axis_type == "zscale" || axis_type == "zlimmode" || axis_type == "zliminclude" || axis_type == "zlim") { - limits = xproperties.get_zlim ().matrix_value (); + limits = m_properties.get_zlim ().matrix_value (); FIX_LIMITS; update_type = 'z'; - if (xproperties.zlimmode_is ("auto")) + if (m_properties.zlimmode_is ("auto")) { get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'z'); - xproperties.set_has3Dkids ((max_val - min_val) > + m_properties.set_has3Dkids ((max_val - min_val) > std::numeric_limits<double>::epsilon ()); - limits = xproperties.get_axis_limits (min_val, max_val, - min_pos, max_neg, - xproperties.zscale_is ("log")); + limits = m_properties.get_axis_limits (min_val, max_val, + min_pos, max_neg, + m_properties.zscale_is ("log")); } else { @@ -8561,21 +8563,21 @@ // if there are 3D children. Is there a way to avoid this call? get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'z'); - xproperties.set_has3Dkids ((max_val - min_val) > + m_properties.set_has3Dkids ((max_val - min_val) > std::numeric_limits<double>::epsilon ()); - xproperties.check_axis_limits (limits, kids, - xproperties.zscale_is ("log"), - update_type); + m_properties.check_axis_limits (limits, kids, + m_properties.zscale_is ("log"), + update_type); } } else if (axis_type == "cdata" || axis_type == "climmode" || axis_type == "cdatamapping" || axis_type == "climinclude" || axis_type == "clim") { - if (xproperties.climmode_is ("auto")) - { - limits = xproperties.get_clim ().matrix_value (); + if (m_properties.climmode_is ("auto")) + { + limits = m_properties.get_clim ().matrix_value (); FIX_LIMITS; get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'c'); @@ -8601,9 +8603,9 @@ || axis_type == "alphadatamapping" || axis_type == "aliminclude" || axis_type == "alim") { - if (xproperties.alimmode_is ("auto")) - { - limits = xproperties.get_alim ().matrix_value (); + if (m_properties.alimmode_is ("auto")) + { + limits = m_properties.get_alim ().matrix_value (); FIX_LIMITS; get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'a'); @@ -8634,44 +8636,44 @@ switch (update_type) { case 'x': - is_auto = xproperties.xlimmode_is ("auto"); - xproperties.set_xlim (limits); + is_auto = m_properties.xlimmode_is ("auto"); + m_properties.set_xlim (limits); if (is_auto) - xproperties.set_xlimmode ("auto"); - xproperties.update_xlim (); + m_properties.set_xlimmode ("auto"); + m_properties.update_xlim (); break; case 'y': - is_auto = xproperties.ylimmode_is ("auto"); - xproperties.set_ylim (limits); + is_auto = m_properties.ylimmode_is ("auto"); + m_properties.set_ylim (limits); if (is_auto) - xproperties.set_ylimmode ("auto"); - xproperties.update_ylim (); + m_properties.set_ylimmode ("auto"); + m_properties.update_ylim (); break; case 'z': - is_auto = xproperties.zlimmode_is ("auto"); - xproperties.set_zlim (limits); + is_auto = m_properties.zlimmode_is ("auto"); + m_properties.set_zlim (limits); if (is_auto) - xproperties.set_zlimmode ("auto"); - xproperties.update_zlim (); + m_properties.set_zlimmode ("auto"); + m_properties.update_zlim (); break; case 'c': - xproperties.set_clim (limits); - xproperties.set_climmode ("auto"); + m_properties.set_clim (limits); + m_properties.set_climmode ("auto"); break; case 'a': - xproperties.set_alim (limits); - xproperties.set_alimmode ("auto"); + m_properties.set_alim (limits); + m_properties.set_alimmode ("auto"); break; default: break; } - xproperties.update_transform (); + m_properties.update_transform (); } // FIXME: This function is called repeatedly while the axes are being set up. @@ -8686,7 +8688,7 @@ != updating_aspectratios.end ())) return; - Matrix kids = xproperties.get_children (); + Matrix kids = m_properties.get_children (); double min_val = octave::numeric_limits<double>::Inf (); double max_val = -octave::numeric_limits<double>::Inf (); @@ -8702,20 +8704,20 @@ || axis_type == "xlim") { update_type = 'x'; - if (xproperties.xlimmode_is ("auto")) + if (m_properties.xlimmode_is ("auto")) { get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'x'); - limits = xproperties.get_axis_limits (min_val, max_val, - min_pos, max_neg, - xproperties.xscale_is ("log")); + limits = m_properties.get_axis_limits (min_val, max_val, + min_pos, max_neg, + m_properties.xscale_is ("log")); } else { - limits = xproperties.get_xlim ().matrix_value (); - xproperties.check_axis_limits (limits, kids, - xproperties.xscale_is ("log"), - update_type); + limits = m_properties.get_xlim ().matrix_value (); + m_properties.check_axis_limits (limits, kids, + m_properties.xscale_is ("log"), + update_type); if (axis_type == "xscale") update_type = 'x'; } @@ -8725,20 +8727,20 @@ || axis_type == "ylim") { update_type = 'y'; - if (xproperties.ylimmode_is ("auto")) + if (m_properties.ylimmode_is ("auto")) { get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'y'); - limits = xproperties.get_axis_limits (min_val, max_val, - min_pos, max_neg, - xproperties.yscale_is ("log")); + limits = m_properties.get_axis_limits (min_val, max_val, + min_pos, max_neg, + m_properties.yscale_is ("log")); } else { - limits = xproperties.get_ylim ().matrix_value (); - xproperties.check_axis_limits (limits, kids, - xproperties.yscale_is ("log"), - update_type); + limits = m_properties.get_ylim ().matrix_value (); + m_properties.check_axis_limits (limits, kids, + m_properties.yscale_is ("log"), + update_type); if (axis_type == "yscale") update_type = 'y'; } @@ -8748,22 +8750,22 @@ || axis_type == "zlim") { update_type = 'z'; - if (xproperties.zlimmode_is ("auto")) + if (m_properties.zlimmode_is ("auto")) { get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'z'); - xproperties.set_has3Dkids ((max_val - min_val) > + m_properties.set_has3Dkids ((max_val - min_val) > std::numeric_limits<double>::epsilon ()); // FIXME: How to correctly handle (positive or negative) log scale? if ((! octave::math::isfinite (min_val) || ! octave::math::isfinite (max_val)) - && ! xproperties.zscale_is ("log")) + && ! m_properties.zscale_is ("log")) min_val = max_val = 0.; - limits = xproperties.get_axis_limits (min_val, max_val, - min_pos, max_neg, - xproperties.zscale_is ("log")); + limits = m_properties.get_axis_limits (min_val, max_val, + min_pos, max_neg, + m_properties.zscale_is ("log")); } else { @@ -8771,13 +8773,13 @@ // if there are 3D children. Is there a way to avoid this call? get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'z'); - xproperties.set_has3Dkids ((max_val - min_val) > + m_properties.set_has3Dkids ((max_val - min_val) > std::numeric_limits<double>::epsilon ()); - limits = xproperties.get_zlim ().matrix_value (); - xproperties.check_axis_limits (limits, kids, - xproperties.zscale_is ("log"), - update_type); + limits = m_properties.get_zlim ().matrix_value (); + m_properties.check_axis_limits (limits, kids, + m_properties.zscale_is ("log"), + update_type); if (axis_type == "zscale") update_type = 'z'; } @@ -8786,7 +8788,7 @@ || axis_type == "cdatamapping" || axis_type == "climinclude" || axis_type == "clim") { - if (xproperties.climmode_is ("auto")) + if (m_properties.climmode_is ("auto")) { get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'c'); @@ -8814,7 +8816,7 @@ || axis_type == "alphadatamapping" || axis_type == "aliminclude" || axis_type == "alim") { - if (xproperties.alimmode_is ("auto")) + if (m_properties.alimmode_is ("auto")) { get_children_limits (min_val, max_val, min_pos, max_neg, kids, 'a'); @@ -8845,44 +8847,44 @@ switch (update_type) { case 'x': - is_auto = xproperties.xlimmode_is ("auto"); - xproperties.set_xlim (limits); + is_auto = m_properties.xlimmode_is ("auto"); + m_properties.set_xlim (limits); if (is_auto) - xproperties.set_xlimmode ("auto"); - xproperties.update_xlim (); + m_properties.set_xlimmode ("auto"); + m_properties.update_xlim (); break; case 'y': - is_auto = xproperties.ylimmode_is ("auto"); - xproperties.set_ylim (limits); + is_auto = m_properties.ylimmode_is ("auto"); + m_properties.set_ylim (limits); if (is_auto) - xproperties.set_ylimmode ("auto"); - xproperties.update_ylim (); + m_properties.set_ylimmode ("auto"); + m_properties.update_ylim (); break; case 'z': - is_auto = xproperties.zlimmode_is ("auto"); - xproperties.set_zlim (limits); + is_auto = m_properties.zlimmode_is ("auto"); + m_properties.set_zlim (limits); if (is_auto) - xproperties.set_zlimmode ("auto"); - xproperties.update_zlim (); + m_properties.set_zlimmode ("auto"); + m_properties.update_zlim (); break; case 'c': - xproperties.set_clim (limits); - xproperties.set_climmode ("auto"); + m_properties.set_clim (limits); + m_properties.set_climmode ("auto"); break; case 'a': - xproperties.set_alim (limits); - xproperties.set_alimmode ("auto"); + m_properties.set_alim (limits); + m_properties.set_alimmode ("auto"); break; default: break; } - xproperties.update_transform (); + m_properties.update_transform (); } inline @@ -8994,15 +8996,15 @@ void axes::properties::push_zoom_stack (void) { - if (zoom_stack.empty ()) - { - zoom_stack.push_front (xlimmode.get ()); - zoom_stack.push_front (xlim.get ()); - zoom_stack.push_front (ylimmode.get ()); - zoom_stack.push_front (ylim.get ()); - zoom_stack.push_front (zlimmode.get ()); - zoom_stack.push_front (zlim.get ()); - zoom_stack.push_front (view.get ()); + if (m_zoom_stack.empty ()) + { + m_zoom_stack.push_front (m_xlimmode.get ()); + m_zoom_stack.push_front (m_xlim.get ()); + m_zoom_stack.push_front (m_ylimmode.get ()); + m_zoom_stack.push_front (m_ylim.get ()); + m_zoom_stack.push_front (m_zlimmode.get ()); + m_zoom_stack.push_front (m_zlim.get ()); + m_zoom_stack.push_front (m_view.get ()); } } @@ -9022,14 +9024,14 @@ if (mode == "horizontal" || mode == "both") { - xlim = xl; - xlimmode = "manual"; + m_xlim = xl; + m_xlimmode = "manual"; } if (mode == "vertical" || mode == "both") { - ylim = yl; - ylimmode = "manual"; + m_ylim = yl; + m_ylimmode = "manual"; } update_transform (); @@ -9220,28 +9222,28 @@ void axes::properties::unzoom (void) { - if (zoom_stack.size () >= 7) - { - view = zoom_stack.front (); - zoom_stack.pop_front (); - - zlim = zoom_stack.front (); - zoom_stack.pop_front (); - - zlimmode = zoom_stack.front (); - zoom_stack.pop_front (); - - ylim = zoom_stack.front (); - zoom_stack.pop_front (); - - ylimmode = zoom_stack.front (); - zoom_stack.pop_front (); - - xlim = zoom_stack.front (); - zoom_stack.pop_front (); - - xlimmode = zoom_stack.front (); - zoom_stack.pop_front (); + if (m_zoom_stack.size () >= 7) + { + m_view = m_zoom_stack.front (); + m_zoom_stack.pop_front (); + + m_zlim = m_zoom_stack.front (); + m_zoom_stack.pop_front (); + + m_zlimmode = m_zoom_stack.front (); + m_zoom_stack.pop_front (); + + m_ylim = m_zoom_stack.front (); + m_zoom_stack.pop_front (); + + m_ylimmode = m_zoom_stack.front (); + m_zoom_stack.pop_front (); + + m_xlim = m_zoom_stack.front (); + m_zoom_stack.pop_front (); + + m_xlimmode = m_zoom_stack.front (); + m_zoom_stack.pop_front (); update_transform (); @@ -9265,7 +9267,7 @@ graphics_object fig (go.get_ancestor ("figure")); octave_value ca = fig.get ("currentaxes"); - if (! ca.isempty () && ca.double_value () == __myhandle__) + if (! ca.isempty () && ca.double_value () == m___myhandle__) { octave::autolock guard (gh_mgr.graphics_lock ()); @@ -9289,7 +9291,7 @@ octave::gtk_manager& gtk_mgr = octave::__get_gtk_manager__ ("figure::properties::init_toolkit"); - toolkit = gtk_mgr.get_toolkit (); + m_toolkit = gtk_mgr.get_toolkit (); } void @@ -9297,8 +9299,8 @@ { std::size_t items_to_leave_on_stack = (do_unzoom ? 7 : 0); - while (zoom_stack.size () > items_to_leave_on_stack) - zoom_stack.pop_front (); + while (m_zoom_stack.size () > items_to_leave_on_stack) + m_zoom_stack.pop_front (); if (do_unzoom) unzoom (); @@ -9337,7 +9339,7 @@ axes::reset_default_properties (void) { // empty list of local defaults - default_properties = property_list (); + m_default_properties = property_list (); // Save warning state of "Octave:deprecated-property" int state = toggle_warn ("Octave:deprecated-property", false); @@ -9354,12 +9356,12 @@ { base_graphics_object::initialize (go); - xinitialize (xproperties.get_title ()); - xinitialize (xproperties.get_xlabel ()); - xinitialize (xproperties.get_ylabel ()); - xinitialize (xproperties.get_zlabel ()); - - xproperties.sync_positions (); + xinitialize (m_properties.get_title ()); + xinitialize (m_properties.get_xlabel ()); + xinitialize (m_properties.get_ylabel ()); + xinitialize (m_properties.get_zlabel ()); + + m_properties.sync_positions (); } // --------------------------------------------------------------------- @@ -9369,10 +9371,10 @@ { Matrix m (1, 4); - m(0) = xdata.min_val (); - m(1) = xdata.max_val (); - m(2) = xdata.min_pos (); - m(3) = xdata.max_neg (); + m(0) = m_xdata.min_val (); + m(1) = m_xdata.max_val (); + m(2) = m_xdata.min_pos (); + m(3) = m_xdata.max_neg (); return m; } @@ -9382,10 +9384,10 @@ { Matrix m (1, 4); - m(0) = ydata.min_val (); - m(1) = ydata.max_val (); - m(2) = ydata.min_pos (); - m(3) = ydata.max_neg (); + m(0) = m_ydata.min_val (); + m(1) = m_ydata.max_val (); + m(2) = m_ydata.min_pos (); + m(3) = m_ydata.max_neg (); return m; } @@ -9407,7 +9409,7 @@ text::properties::get_extent_matrix (bool rotated) const { // FIXME: Should this function also add the (x,y) base position? - Matrix ext = extent.get ().matrix_value (); + Matrix ext = m_extent.get ().matrix_value (); if (rotated && get_rotation () != 0) { @@ -9474,7 +9476,7 @@ { caseless_str old_fontunits = get_fontunits (); - if (fontunits.set (val, true)) + if (m_fontunits.set (val, true)) { update_fontunits (old_fontunits); mark_modified (); @@ -9515,16 +9517,16 @@ octave::autolock guard (gh_mgr.graphics_lock ()); - txt_renderer.set_font (get ("fontname").string_value (), - get ("fontweight").string_value (), - get ("fontangle").string_value (), - get ("__fontsize_points__").double_value () * dpr); - - txt_renderer.set_anti_aliasing (is_fontsmoothing ()); + m_txt_renderer.set_font (get ("fontname").string_value (), + get ("fontweight").string_value (), + get ("fontangle").string_value (), + get ("__fontsize_points__").double_value () * dpr); + + m_txt_renderer.set_anti_aliasing (is_fontsmoothing ()); Matrix c = get_color_rgb (); if (! c.isempty ()) - txt_renderer.set_color (c); + m_txt_renderer.set_color (c); } @@ -9561,9 +9563,8 @@ octave::autolock guard (gh_mgr.graphics_lock ()); - txt_renderer.text_to_pixels (sv.join ("\n"), pixels, bbox, - halign, valign, 0.0, - get_interpreter ()); + m_txt_renderer.text_to_pixels (sv.join ("\n"), m_pixels, bbox, + halign, valign, 0.0, get_interpreter ()); // The bbox is relative to the text's position. We'll leave it that // way, because get_position does not return valid results when the // text is first constructed. Conversion to proper coordinates is @@ -9595,7 +9596,7 @@ Matrix pos = get_position ().matrix_value (); - pos = convert_text_position (pos, *this, cached_units, get_units ()); + pos = convert_text_position (pos, *this, m_cached_units, get_units ()); // FIXME: if the current axes view is 2D, then one should probably drop // the z-component of "pos" and leave "zliminclude" to "off". @@ -9615,7 +9616,7 @@ set_zliminclude ("off"); } - cached_units = get_units (); + m_cached_units = get_units (); } double @@ -9780,9 +9781,9 @@ octave::unwind_protect_var<bool> restore_var (updating_patch_data, true); - faces.set (idx); - vertices.set (vert); - facevertexcdata.set (fvc); + m_faces.set (idx); + m_vertices.set (vert); + m_facevertexcdata.set (fvc); } // core coplanar tester @@ -10146,10 +10147,10 @@ Matrix fn (num_f, 3, 0.0); calc_face_normals (fn); - facenormals = fn; + m_facenormals = fn; } else if (reset) - facenormals = Matrix (); + m_facenormals = Matrix (); } void @@ -10246,10 +10247,10 @@ } } - vertexnormals = vn; + m_vertexnormals = vn; } else if (reset) - vertexnormals = Matrix (); + m_vertexnormals = Matrix (); } void @@ -10260,7 +10261,7 @@ // calculate normals for default data // This is done because the normals for the default data do not match // get(0, "DefaultPatchVertexNormals") in Matlab. - xproperties.update_normals (true); + m_properties.update_normals (true); } @@ -10268,13 +10269,13 @@ patch::reset_default_properties (void) { // empty list of local defaults - default_properties = property_list (); - xreset_default_properties (get_handle (), xproperties.factory_defaults ()); + m_default_properties = property_list (); + xreset_default_properties (get_handle (), m_properties.factory_defaults ()); // calculate normals for default data // This is done because the normals for the default data do not match // get(0, "DefaultPatchVertexNormals") in Matlab. - xproperties.update_normals (true); + m_properties.update_normals (true); } // --------------------------------------------------------------------- @@ -10368,7 +10369,7 @@ { base_graphics_object::initialize (go); - Matrix series_idx = xproperties.get_seriesindex ().matrix_value (); + Matrix series_idx = m_properties.get_seriesindex ().matrix_value (); if (series_idx.isempty ()) { // Increment series index counter in parent axes @@ -10381,14 +10382,14 @@ series_idx.resize (1, 1); series_idx(0) = parent_axes_prop.get_nextseriesindex (); - xproperties.set_seriesindex (series_idx); + m_properties.set_seriesindex (series_idx); parent_axes_prop.set_nextseriesindex (parent_axes_prop.get_nextseriesindex () + 1); } - if (xproperties.cdatamode_is ("auto")) - xproperties.update_color (); + if (m_properties.cdatamode_is ("auto")) + m_properties.update_color (); } // --------------------------------------------------------------------- @@ -10519,10 +10520,10 @@ nz /= d; } } - facenormals = n; + m_facenormals = n; } else if (reset) - facenormals = Matrix (); + m_facenormals = Matrix (); } void @@ -10617,10 +10618,10 @@ nz /= d; } } - vertexnormals = n; + m_vertexnormals = n; } else if (reset) - vertexnormals = Matrix (); + m_vertexnormals = Matrix (); } DEFMETHOD (__update_normals__, interp, args, , @@ -10734,7 +10735,7 @@ gh_manager& gh_mgr = octave::__get_gh_manager__ ("hggroup::properties::update_limits"); - graphics_object go = gh_mgr.get_object (__myhandle__); + graphics_object go = gh_mgr.get_object (m___myhandle__); if (go) { @@ -10752,7 +10753,7 @@ gh_manager& gh_mgr = octave::__get_gh_manager__ ("hggroup::properties::update_limits"); - graphics_object go = gh_mgr.get_object (__myhandle__); + graphics_object go = gh_mgr.get_object (m___myhandle__); if (go) { @@ -10787,27 +10788,27 @@ if (axis_type == "xlim" || axis_type == "xliminclude") { - limits = xproperties.get_xlim ().matrix_value (); + limits = m_properties.get_xlim ().matrix_value (); update_type = 'x'; } else if (axis_type == "ylim" || axis_type == "yliminclude") { - limits = xproperties.get_ylim ().matrix_value (); + limits = m_properties.get_ylim ().matrix_value (); update_type = 'y'; } else if (axis_type == "zlim" || axis_type == "zliminclude") { - limits = xproperties.get_zlim ().matrix_value (); + limits = m_properties.get_zlim ().matrix_value (); update_type = 'z'; } else if (axis_type == "clim" || axis_type == "climinclude") { - limits = xproperties.get_clim ().matrix_value (); + limits = m_properties.get_clim ().matrix_value (); update_type = 'c'; } else if (axis_type == "alim" || axis_type == "aliminclude") { - limits = xproperties.get_alim ().matrix_value (); + limits = m_properties.get_alim ().matrix_value (); update_type = 'a'; } @@ -10850,30 +10851,30 @@ switch (update_type) { case 'x': - xproperties.set_xlim (limits); + m_properties.set_xlim (limits); break; case 'y': - xproperties.set_ylim (limits); + m_properties.set_ylim (limits); break; case 'z': - xproperties.set_zlim (limits); + m_properties.set_zlim (limits); break; case 'c': - xproperties.set_clim (limits); + m_properties.set_clim (limits); break; case 'a': - xproperties.set_alim (limits); + m_properties.set_alim (limits); break; default: break; } - graphics_handle hg = xproperties.get___myhandle__ (); + graphics_handle hg = m_properties.get___myhandle__ (); base_graphics_object::update_axis_limits (axis_type, hg); } } @@ -10884,7 +10885,7 @@ if (updating_hggroup_limits) return; - Matrix kids = xproperties.get_children (); + Matrix kids = m_properties.get_children (); double min_val = octave::numeric_limits<double>::Inf (); double max_val = -octave::numeric_limits<double>::Inf (); @@ -10936,23 +10937,23 @@ switch (update_type) { case 'x': - xproperties.set_xlim (limits); + m_properties.set_xlim (limits); break; case 'y': - xproperties.set_ylim (limits); + m_properties.set_ylim (limits); break; case 'z': - xproperties.set_zlim (limits); + m_properties.set_zlim (limits); break; case 'c': - xproperties.set_clim (limits); + m_properties.set_clim (limits); break; case 'a': - xproperties.set_alim (limits); + m_properties.set_alim (limits); break; default: @@ -10968,7 +10969,7 @@ uicontextmenu::properties::update_beingdeleted (void) { // Clear the uicontextmenu property of dependent objects - if (beingdeleted.is ("on")) + if (m_beingdeleted.is ("on")) { gh_manager& gh_mgr = octave::__get_gh_manager__ ("uicontextmenu::properties::update_beingdeleted"); @@ -11018,7 +11019,7 @@ octave_value uicontrol::properties::get_extent (void) const { - Matrix m = extent.get ().matrix_value (); + Matrix m = m_extent.get ().matrix_value (); gh_manager& gh_mgr = octave::__get_gh_manager__ ("uicontrol::properties::get_extent"); @@ -11057,10 +11058,10 @@ Matrix parent_bbox = parent_go.get_properties ().get_boundingbox (true); Matrix parent_size = parent_bbox.extract_n (0, 2, 1, 2); - pos = convert_position (pos, cached_units, get_units (), parent_size); + pos = convert_position (pos, m_cached_units, get_units (), parent_size); set_position (pos); - cached_units = get_units (); + m_cached_units = get_units (); } void @@ -11073,7 +11074,7 @@ if (go_parent.valid_object () && go_parent.isa ("uibuttongroup")) { bool was_button = style_is ("radiobutton") || style_is ("togglebutton"); - style = st; + m_style = st; bool now_button = style_is ("radiobutton") || style_is ("togglebutton"); uibuttongroup::properties& props = dynamic_cast<uibuttongroup::properties&> (go_parent.get_properties ()); @@ -11081,7 +11082,7 @@ if (! was_button && now_button && ! props.get_selectedobject ().ok ()) { props.set_selectedobject (get___myhandle__ ().value ()); - value.set (octave_value (1)); + m_value.set (octave_value (1)); } else if (was_button && ! now_button && (props.get_selectedobject ().value () @@ -11090,16 +11091,16 @@ } // Don't notify the style change until the "value" property is fixed - bool modified = style.set (st, true, false); + bool modified = m_style.set (st, true, false); // Override "value" property for listbox and popupmenu. if (modified) { if (style_is ("listbox") || style_is ("popupmenu")) { - Matrix v = value.get ().matrix_value (); + Matrix v = m_value.get ().matrix_value (); if (v.numel () == 1 && v(0) == 0) - value.set (octave_value (1), true, false); + m_value.set (octave_value (1), true, false); } // Notify toolkit @@ -11107,7 +11108,7 @@ graphics_object go = gh_mgr.get_object (get___myhandle__ ()); if (go) - go.update (style.get_id ()); + go.update (m_style.get_id ()); } } @@ -11145,7 +11146,7 @@ { caseless_str old_fontunits = get_fontunits (); - if (fontunits.set (val, true)) + if (m_fontunits.set (val, true)) { update_fontunits (old_fontunits); mark_modified (); @@ -11161,7 +11162,7 @@ fontsz = convert_font_size (fontsz, old_units, new_units, parent_height); - fontsize.set (octave_value (fontsz), true); + m_fontsize.set (octave_value (fontsz), true); } double @@ -11256,7 +11257,7 @@ bool modified = false; old_bb = get_boundingbox (true); - modified = position.set (v, false); + modified = m_position.set (v, false); new_bb = get_boundingbox (true); if (old_bb != new_bb) @@ -11267,10 +11268,10 @@ = octave::__get_gh_manager__ ("uibuttongroup::properties::set_position"); if (! get_resizefcn ().isempty ()) - gh_mgr.post_callback (__myhandle__, "resizefcn"); + gh_mgr.post_callback (m___myhandle__, "resizefcn"); if (! get_sizechangedfcn ().isempty ()) - gh_mgr.post_callback (__myhandle__, "sizechangedfcn"); + gh_mgr.post_callback (m___myhandle__, "sizechangedfcn"); update_boundingbox (); } @@ -11278,7 +11279,7 @@ if (modified) { - position.run_listeners (GCB_POSTSET); + m_position.run_listeners (GCB_POSTSET); mark_modified (); } } @@ -11288,7 +11289,7 @@ { caseless_str old_units = get_units (); - if (units.set (val, true)) + if (m_units.set (val, true)) { update_units (old_units); mark_modified (); @@ -11317,7 +11318,7 @@ { caseless_str old_fontunits = get_fontunits (); - if (fontunits.set (val, true)) + if (m_fontunits.set (val, true)) { update_fontunits (old_fontunits); mark_modified (); @@ -11352,12 +11353,12 @@ uibuttongroup::properties::set_selectedobject (const octave_value& v) { graphics_handle current_selectedobject = get_selectedobject(); - selectedobject = current_selectedobject; + m_selectedobject = current_selectedobject; if (v.isempty ()) { if (current_selectedobject.ok ()) { - selectedobject = graphics_handle (); + m_selectedobject = graphics_handle (); mark_modified (); } return; @@ -11382,7 +11383,7 @@ const caseless_str& style = cop.get_style (); if (style.compare ("radiobutton") || style.compare ("togglebutton")) { - selectedobject = val; + m_selectedobject = val; mark_modified (); return; } @@ -11504,7 +11505,7 @@ bool modified = false; old_bb = get_boundingbox (true); - modified = position.set (v, false); + modified = m_position.set (v, false); new_bb = get_boundingbox (true); if (old_bb != new_bb) @@ -11515,10 +11516,10 @@ = octave::__get_gh_manager__ ("uipanel::properties::set_position"); if (! get_resizefcn ().isempty ()) - gh_mgr.post_callback (__myhandle__, "resizefcn"); + gh_mgr.post_callback (m___myhandle__, "resizefcn"); if (! get_sizechangedfcn ().isempty ()) - gh_mgr.post_callback (__myhandle__, "sizechangedfcn"); + gh_mgr.post_callback (m___myhandle__, "sizechangedfcn"); update_boundingbox (); } @@ -11526,7 +11527,7 @@ if (modified) { - position.run_listeners (GCB_POSTSET); + m_position.run_listeners (GCB_POSTSET); mark_modified (); } } @@ -11537,7 +11538,7 @@ { caseless_str old_units = get_units (); - if (units.set (val, true)) + if (m_units.set (val, true)) { update_units (old_units); mark_modified (); @@ -11566,7 +11567,7 @@ { caseless_str old_fontunits = get_fontunits (); - if (fontunits.set (val, true)) + if (m_fontunits.set (val, true)) { update_fontunits (old_fontunits); mark_modified (); @@ -11633,7 +11634,7 @@ if (val.iscellstr ()) { - if (columnformat.set (val, true)) + if (m_columnformat.set (val, true)) mark_modified (); } else if (val.iscell ()) @@ -11664,12 +11665,12 @@ } } - if (columnformat.set (val, true)) + if (m_columnformat.set (val, true)) mark_modified (); } else if (val.isempty ()) { - if (columnformat.set (Cell (), true)) + if (m_columnformat.set (Cell (), true)) mark_modified (); } else @@ -11713,7 +11714,7 @@ error ("set: expecting either 'auto' or a cell of pixel values or auto"); else { - if (columnwidth.set (val, true)) + if (m_columnwidth.set (val, true)) mark_modified (); } } @@ -11723,7 +11724,7 @@ { caseless_str old_units = get_units (); - if (units.set (val, true)) + if (m_units.set (val, true)) { update_units (old_units); mark_modified (); @@ -11752,7 +11753,7 @@ { caseless_str old_fontunits = get_fontunits (); - if (fontunits.set (val, true)) + if (m_fontunits.set (val, true)) { update_fontunits (old_fontunits); mark_modified (); @@ -11798,7 +11799,7 @@ Matrix uitable::properties::get_backgroundcolor_rgb (void) { - Matrix bg = backgroundcolor.get ().matrix_value (); + Matrix bg = m_backgroundcolor.get ().matrix_value (); return bg.row (0); } @@ -11806,7 +11807,7 @@ uitable::properties::get_alternatebackgroundcolor_rgb (void) { int i = 0; - Matrix bg = backgroundcolor.get ().matrix_value (); + Matrix bg = m_backgroundcolor.get ().matrix_value (); if (bg.rows () > 1) i = 1; @@ -11816,14 +11817,14 @@ Matrix uitable::properties::get_extent_matrix (void) const { - return extent.get ().matrix_value (); + return m_extent.get ().matrix_value (); } octave_value uitable::properties::get_extent (void) const { // FIXME: Is it really acceptable to just let the toolkit update the extent? - Matrix m = extent.get ().matrix_value (); + Matrix m = m_extent.get ().matrix_value (); gh_manager& gh_mgr = octave::__get_gh_manager__ ("uitable::properties::get_extent"); @@ -11846,7 +11847,7 @@ octave_value uitoolbar::get_default (const caseless_str& pname) const { - octave_value retval = default_properties.lookup (pname); + octave_value retval = m_default_properties.lookup (pname); if (retval.is_undefined ()) { @@ -11867,10 +11868,10 @@ uitoolbar::reset_default_properties (void) { // empty list of local defaults - default_properties = property_list (); + m_default_properties = property_list (); remove_all_listeners (); - xreset_default_properties (get_handle (), xproperties.factory_defaults ()); + xreset_default_properties (get_handle (), m_properties.factory_defaults ()); } // --------------------------------------------------------------------- @@ -12018,36 +12019,37 @@ callback_event (const graphics_handle& h, const std::string& name, const octave_value& data = Matrix (), int busyaction = base_graphics_event::QUEUE) - : base_graphics_event (busyaction), handle (h), callback_name (name), - callback (), callback_data (data) { } + : base_graphics_event (busyaction), m_handle (h), m_callback_name (name), + m_callback (), m_callback_data (data) { } callback_event (const graphics_handle& h, const octave_value& cb, const octave_value& data = Matrix (), int busyaction = base_graphics_event::QUEUE) - : base_graphics_event (busyaction), handle (h), callback_name (), - callback (cb), callback_data (data) { } + : base_graphics_event (busyaction), m_handle (h), m_callback_name (), + m_callback (cb), m_callback_data (data) { } void execute (void) { gh_manager& gh_mgr = octave::__get_gh_manager__ ("callback_event::execute"); - if (callback.is_defined ()) - gh_mgr.execute_callback (handle, callback, callback_data); + if (m_callback.is_defined ()) + gh_mgr.execute_callback (m_handle, m_callback, m_callback_data); else - gh_mgr.execute_callback (handle, callback_name, callback_data); + gh_mgr.execute_callback (m_handle, m_callback_name, m_callback_data); } private: callback_event (void) - : base_graphics_event (), handle (), callback_name (), callback_data () + : base_graphics_event (), m_handle (), m_callback_name (), + m_callback_data () { } private: - graphics_handle handle; - std::string callback_name; - octave_value callback; - octave_value callback_data; + graphics_handle m_handle; + std::string m_callback_name; + octave_value m_callback; + octave_value m_callback_data; }; class @@ -12056,34 +12058,34 @@ public: mcode_event (const graphics_handle& h, const std::string& cmd, int busyaction = base_graphics_event::QUEUE) - : base_graphics_event (busyaction), handle (h), mcode (cmd) + : base_graphics_event (busyaction), m_handle (h), m_mcode (cmd) { } void execute (void) { - if (! mcode.empty ()) + if (! m_mcode.empty ()) { gh_manager& gh_mgr = octave::__get_gh_manager__ ("mcode_event::execute"); - graphics_object go = gh_mgr.get_object (handle); + graphics_object go = gh_mgr.get_object (m_handle); if (go.valid_object ()) { - octave_value cb (mcode); - gh_mgr.execute_callback (handle, cb); + octave_value cb (m_mcode); + gh_mgr.execute_callback (m_handle, cb); } } } private: mcode_event (void) - : base_graphics_event (), handle (), mcode () + : base_graphics_event (), m_handle (), m_mcode () { } private: - graphics_handle handle; - std::string mcode; + graphics_handle m_handle; + std::string m_mcode; }; class @@ -12096,7 +12098,7 @@ function_event (void) = delete; function_event (graphics_event::event_fcn fcn, void *data = nullptr) - : base_graphics_event (), function (fcn), function_data (data) + : base_graphics_event (), m_function (fcn), m_function_data (data) { } // No copying! @@ -12107,14 +12109,14 @@ void execute (void) { - function (function_data); + m_function (m_function_data); } private: - graphics_event::event_fcn function; - - void *function_data; + graphics_event::event_fcn m_function; + + void *m_function_data; }; class @@ -12124,8 +12126,8 @@ set_event (const graphics_handle& h, const std::string& name, const octave_value& value, bool do_notify_toolkit = true, bool redraw_figure = false) - : base_graphics_event (), handle (h), property_name (name), - property_value (value), notify_toolkit (do_notify_toolkit), + : base_graphics_event (), m_handle (h), m_property_name (name), + m_property_value (value), m_notify_toolkit (do_notify_toolkit), m_redraw_figure (redraw_figure) { } @@ -12135,11 +12137,11 @@ octave::autolock guard (gh_mgr.graphics_lock ()); - graphics_object go = gh_mgr.get_object (handle); + graphics_object go = gh_mgr.get_object (m_handle); if (go) { - property p = go.get_properties ().get_property (property_name); + property p = go.get_properties ().get_property (m_property_name); if (p.ok ()) { @@ -12149,20 +12151,20 @@ // base_properties::set to accept this also? This would allow for // the use of high level set_xxx instead of directly changing the // property value. - if (go.isa ("figure") && property_name == "position") + if (go.isa ("figure") && m_property_name == "position") { figure::properties& fprops = dynamic_cast<figure::properties&> (go.get_properties ()); - fprops.set_position (property_value, notify_toolkit); + fprops.set_position (m_property_value, m_notify_toolkit); } - else if (go.isa ("figure") && property_name == "outerposition") + else if (go.isa ("figure") && m_property_name == "outerposition") { figure::properties& fprops = dynamic_cast<figure::properties&> (go.get_properties ()); - fprops.set_outerposition (property_value, notify_toolkit); + fprops.set_outerposition (m_property_value, m_notify_toolkit); } else - p.set (property_value, true, notify_toolkit); + p.set (m_property_value, true, m_notify_toolkit); if (m_redraw_figure) { @@ -12182,14 +12184,14 @@ private: set_event (void) - : base_graphics_event (), handle (), property_name (), property_value () + : base_graphics_event (), m_handle (), m_property_name (), m_property_value () { } private: - graphics_handle handle; - std::string property_name; - octave_value property_value; - bool notify_toolkit; + graphics_handle m_handle; + std::string m_property_name; + octave_value m_property_value; + bool m_notify_toolkit; bool m_redraw_figure; };
--- a/libinterp/corefcn/graphics.in.h Fri Jul 16 16:30:53 2021 +0200 +++ b/libinterp/corefcn/graphics.in.h Fri Jul 16 16:20:23 2021 -0400 @@ -195,48 +195,48 @@ class OCTINTERP_API scaler { public: - scaler (void) : rep (new base_scaler ()) { } - - scaler (const scaler& s) : rep (s.rep->clone ()) { } + scaler (void) : m_rep (new base_scaler ()) { } + + scaler (const scaler& s) : m_rep (s.m_rep->clone ()) { } scaler (const std::string& s) - : rep (s == "log" - ? new log_scaler () - : (s == "neglog" - ? new neg_log_scaler () - : (s == "linear" - ? new lin_scaler () - : new base_scaler ()))) + : m_rep (s == "log" + ? new log_scaler () + : (s == "neglog" + ? new neg_log_scaler () + : (s == "linear" + ? new lin_scaler () + : new base_scaler ()))) { } - ~scaler (void) { delete rep; } + ~scaler (void) { delete m_rep; } Matrix scale (const Matrix& m) const - { return rep->scale (m); } + { return m_rep->scale (m); } NDArray scale (const NDArray& m) const - { return rep->scale (m); } + { return m_rep->scale (m); } double scale (double d) const - { return rep->scale (d); } + { return m_rep->scale (d); } double unscale (double d) const - { return rep->unscale (d); } + { return m_rep->unscale (d); } bool is_linear (void) const - { return rep->is_linear (); } + { return m_rep->is_linear (); } scaler& operator = (const scaler& s) { if (&s != this) { - if (rep) + if (m_rep) { - delete rep; - rep = nullptr; + delete m_rep; + m_rep = nullptr; } - rep = s.rep->clone (); + m_rep = s.m_rep->clone (); } return *this; @@ -244,26 +244,26 @@ scaler& operator = (const std::string& s) { - if (rep) + if (m_rep) { - delete rep; - rep = nullptr; + delete m_rep; + m_rep = nullptr; } if (s == "log") - rep = new log_scaler (); + m_rep = new log_scaler (); else if (s == "neglog") - rep = new neg_log_scaler (); + m_rep = new neg_log_scaler (); else if (s == "linear") - rep = new lin_scaler (); + m_rep = new lin_scaler (); else - rep = new base_scaler (); + m_rep = new base_scaler (); return *this; } private: - base_scaler *rep; + base_scaler *m_rep; }; // --------------------------------------------------------------------- @@ -284,39 +284,41 @@ public: base_property (void) - : id (-1), count (1), name (), parent (), hidden (), listeners () + : m_id (-1), m_count (1), m_name (), m_parent (), m_hidden (), + m_listeners () { } base_property (const std::string& s, const graphics_handle& h) - : id (-1), count (1), name (s), parent (h), hidden (false), listeners () + : m_id (-1), m_count (1), m_name (s), m_parent (h), m_hidden (false), + m_listeners () { } base_property (const base_property& p) - : id (-1), count (1), name (p.name), parent (p.parent), - hidden (p.hidden), listeners () + : m_id (-1), m_count (1), m_name (p.m_name), m_parent (p.m_parent), + m_hidden (p.m_hidden), m_listeners () { } virtual ~base_property (void) = default; - bool ok (void) const { return parent.ok (); } - - std::string get_name (void) const { return name; } - - void set_name (const std::string& s) { name = s; } - - graphics_handle get_parent (void) const { return parent; } - - void set_parent (const graphics_handle& h) { parent = h; } - - bool is_hidden (void) const { return hidden; } - - void set_hidden (bool flag) { hidden = flag; } + bool ok (void) const { return m_parent.ok (); } + + std::string get_name (void) const { return m_name; } + + void set_name (const std::string& s) { m_name = s; } + + graphics_handle get_parent (void) const { return m_parent; } + + void set_parent (const graphics_handle& h) { m_parent = h; } + + bool is_hidden (void) const { return m_hidden; } + + void set_hidden (bool flag) { m_hidden = flag; } virtual bool is_radio (void) const { return false; } - int get_id (void) const { return id; } - - void set_id (int d) { id = d; } + int get_id (void) const { return m_id; } + + void set_id (int d) { m_id = d; } // Sets property value, notifies graphics toolkit. // If do_run is true, runs associated listeners. @@ -325,17 +327,17 @@ virtual octave_value get (void) const { - error (R"(get: invalid property "%s")", name.c_str ()); + error (R"(get: invalid property "%s")", m_name.c_str ()); } virtual std::string values_as_string (void) const { - error (R"(values_as_string: invalid property "%s")", name.c_str ()); + error (R"(values_as_string: invalid property "%s")", m_name.c_str ()); } virtual Cell values_as_cell (void) const { - error (R"(values_as_cell: invalid property "%s")", name.c_str ()); + error (R"(values_as_cell: invalid property "%s")", m_name.c_str ()); } base_property& operator = (const octave_value& val) @@ -346,14 +348,14 @@ void add_listener (const octave_value& v, listener_mode mode = GCB_POSTSET) { - octave_value_list& l = listeners[mode]; + octave_value_list& l = m_listeners[mode]; l.resize (l.length () + 1, v); } void delete_listener (const octave_value& v = octave_value (), listener_mode mode = GCB_POSTSET) { - octave_value_list& l = listeners[mode]; + octave_value_list& l = m_listeners[mode]; if (v.is_defined ()) { @@ -383,7 +385,7 @@ else { octave_value_list lnew (0); - octave_value_list& lp = listeners[GCB_PERSISTENT]; + octave_value_list& lp = m_listeners[GCB_PERSISTENT]; for (int i = l.length () - 1; i >= 0 ; i--) { for (int j = 0; j < lp.length (); j++) @@ -409,7 +411,7 @@ protected: virtual bool do_set (const octave_value&) { - error (R"(set: invalid property "%s")", name.c_str ()); + error (R"(set: invalid property "%s")", m_name.c_str ()); } private: @@ -420,12 +422,12 @@ listener_map_const_iterator; private: - int id; - octave::refcount<octave_idx_type> count; - std::string name; - graphics_handle parent; - bool hidden; - listener_map listeners; + int m_id; + octave::refcount<octave_idx_type> m_count; + std::string m_name; + graphics_handle m_parent; + bool m_hidden; + listener_map m_listeners; }; // --------------------------------------------------------------------- @@ -435,15 +437,15 @@ public: string_property (const std::string& s, const graphics_handle& h, const std::string& val = "") - : base_property (s, h), str (val) { } + : base_property (s, h), m_str (val) { } string_property (const string_property& p) - : base_property (p), str (p.str) { } + : base_property (p), m_str (p.m_str) { } octave_value get (void) const - { return octave_value (str); } - - std::string string_value (void) const { return str; } + { return octave_value (m_str); } + + std::string string_value (void) const { return m_str; } string_property& operator = (const octave_value& val) { @@ -462,16 +464,16 @@ std::string new_str = val.string_value (); - if (new_str != str) + if (new_str != m_str) { - str = new_str; + m_str = new_str; return true; } return false; } private: - std::string str; + std::string m_str; }; // --------------------------------------------------------------------- @@ -484,21 +486,21 @@ string_array_property (const std::string& s, const graphics_handle& h, const std::string& val = "", const char& sep = '|', const desired_enum& typ = string_t) - : base_property (s, h), desired_type (typ), separator (sep), str () + : base_property (s, h), m_desired_type (typ), m_separator (sep), m_str () { std::size_t pos = 0; while (true) { - std::size_t new_pos = val.find_first_of (separator, pos); + std::size_t new_pos = val.find_first_of (m_separator, pos); if (new_pos == std::string::npos) { - str.append (val.substr (pos)); + m_str.append (val.substr (pos)); break; } else - str.append (val.substr (pos, new_pos - pos)); + m_str.append (val.substr (pos, new_pos - pos)); pos = new_pos + 1; } @@ -507,7 +509,7 @@ string_array_property (const std::string& s, const graphics_handle& h, const Cell& c, const char& sep = '|', const desired_enum& typ = string_t) - : base_property (s, h), desired_type (typ), separator (sep), str () + : base_property (s, h), m_desired_type (typ), m_separator (sep), m_str () { if (! c.iscellstr ()) error (R"(set: invalid order property value for "%s")", @@ -518,16 +520,16 @@ for (octave_idx_type i = 0; i < c.numel (); i++) strings[i] = c(i).string_value (); - str = strings; + m_str = strings; } string_array_property (const string_array_property& p) - : base_property (p), desired_type (p.desired_type), - separator (p.separator), str (p.str) { } + : base_property (p), m_desired_type (p.m_desired_type), + m_separator (p.m_separator), m_str (p.m_str) { } octave_value get (void) const { - if (desired_type == string_t) + if (m_desired_type == string_t) return octave_value (string_value ()); else return octave_value (cell_value ()); @@ -537,19 +539,19 @@ { std::string s; - for (octave_idx_type i = 0; i < str.numel (); i++) + for (octave_idx_type i = 0; i < m_str.numel (); i++) { - s += str[i]; - if (i != str.numel () - 1) - s += separator; + s += m_str[i]; + if (i != m_str.numel () - 1) + s += m_separator; } return s; } - Cell cell_value (void) const {return Cell (str);} - - string_vector string_vector_value (void) const { return str; } + Cell cell_value (void) const {return Cell (m_str);} + + string_vector string_vector_value (void) const { return m_str; } string_array_property& operator = (const octave_value& val) { @@ -573,7 +575,7 @@ // Split single string on delimiter (usually '|') while (pos != std::string::npos) { - std::size_t new_pos = new_str.find_first_of (separator, pos); + std::size_t new_pos = new_str.find_first_of (m_separator, pos); if (new_pos == std::string::npos) { @@ -586,10 +588,10 @@ pos = new_pos + 1; } - if (str.numel () == strings.numel ()) + if (m_str.numel () == strings.numel ()) { - for (octave_idx_type i = 0; i < str.numel (); i++) - if (strings[i] != str[i]) + for (octave_idx_type i = 0; i < m_str.numel (); i++) + if (strings[i] != m_str[i]) { replace = true; break; @@ -598,11 +600,11 @@ else replace = true; - desired_type = string_t; + m_desired_type = string_t; if (replace) { - str = strings; + m_str = strings; return true; } } @@ -613,20 +615,20 @@ octave_idx_type nel = chm.rows (); string_vector strings (nel); - if (nel != str.numel ()) + if (nel != m_str.numel ()) replace = true; for (octave_idx_type i = 0; i < nel; i++) { strings[i] = chm.row_as_string (i); - if (! replace && strings[i] != str[i]) + if (! replace && strings[i] != m_str[i]) replace = true; } - desired_type = string_t; + m_desired_type = string_t; if (replace) { - str = strings; + m_str = strings; return true; } } @@ -639,13 +641,13 @@ octave_idx_type nel = strings.numel (); - if (nel != str.numel ()) + if (nel != m_str.numel ()) replace = true; else { for (octave_idx_type i = 0; i < nel; i++) { - if (strings[i] != str[i]) + if (strings[i] != m_str[i]) { replace = true; break; @@ -653,11 +655,11 @@ } } - desired_type = cell_t; + m_desired_type = cell_t; if (replace) { - str = strings; + m_str = strings; return true; } } @@ -669,9 +671,9 @@ } private: - desired_enum desired_type; - char separator; - string_vector str; + desired_enum m_desired_type; + char m_separator; + string_vector m_str; }; // --------------------------------------------------------------------- @@ -683,52 +685,52 @@ text_label_property (const std::string& s, const graphics_handle& h, const std::string& val = "") - : base_property (s, h), value (val), stored_type (char_t) + : base_property (s, h), m_value (val), m_stored_type (char_t) { } text_label_property (const std::string& s, const graphics_handle& h, const NDArray& nda) - : base_property (s, h), stored_type (char_t) + : base_property (s, h), m_stored_type (char_t) { octave_idx_type nel = nda.numel (); - value.resize (nel); + m_value.resize (nel); for (octave_idx_type i = 0; i < nel; i++) { std::ostringstream buf; buf << nda(i); - value[i] = buf.str (); + m_value[i] = buf.str (); } } text_label_property (const std::string& s, const graphics_handle& h, const Cell& c) - : base_property (s, h), stored_type (cellstr_t) + : base_property (s, h), m_stored_type (cellstr_t) { octave_idx_type nel = c.numel (); - value.resize (nel); + m_value.resize (nel); for (octave_idx_type i = 0; i < nel; i++) { octave_value tmp = c(i); if (tmp.is_string ()) - value[i] = c(i).string_value (); + m_value[i] = c(i).string_value (); else { double d = c(i).double_value (); std::ostringstream buf; buf << d; - value[i] = buf.str (); + m_value[i] = buf.str (); } } } text_label_property (const text_label_property& p) - : base_property (p), value (p.value), stored_type (p.stored_type) + : base_property (p), m_value (p.m_value), m_stored_type (p.m_stored_type) { } bool empty (void) const @@ -739,7 +741,7 @@ octave_value get (void) const { - if (stored_type == char_t) + if (m_stored_type == char_t) return octave_value (char_value ()); else return octave_value (cell_value ()); @@ -747,14 +749,14 @@ std::string string_value (void) const { - return value.empty () ? "" : value[0]; - } - - string_vector string_vector_value (void) const { return value; } - - charMatrix char_value (void) const { return charMatrix (value, ' '); } - - Cell cell_value (void) const {return Cell (value); } + return m_value.empty () ? "" : m_value[0]; + } + + string_vector string_vector_value (void) const { return m_value; } + + charMatrix char_value (void) const { return charMatrix (m_value, ' '); } + + Cell cell_value (void) const {return Cell (m_value); } text_label_property& operator = (const octave_value& val) { @@ -770,9 +772,9 @@ { if (val.is_string ()) { - value = val.string_vector_value (); - - stored_type = char_t; + m_value = val.string_vector_value (); + + m_stored_type = char_t; } else if (val.iscell ()) { @@ -780,25 +782,25 @@ octave_idx_type nel = c.numel (); - value.resize (nel); + m_value.resize (nel); for (octave_idx_type i = 0; i < nel; i++) { octave_value tmp = c(i); if (tmp.is_string ()) - value[i] = c(i).string_value (); + m_value[i] = c(i).string_value (); else { double d = c(i).double_value (); std::ostringstream buf; buf << d; - value[i] = buf.str (); + m_value[i] = buf.str (); } } - stored_type = cellstr_t; + m_stored_type = cellstr_t; } else { @@ -816,24 +818,24 @@ octave_idx_type nel = nda.numel (); - value.resize (nel); + m_value.resize (nel); for (octave_idx_type i = 0; i < nel; i++) { std::ostringstream buf; buf << nda(i); - value[i] = buf.str (); + m_value[i] = buf.str (); } - stored_type = char_t; + m_stored_type = char_t; } return true; } private: - string_vector value; - type stored_type; + string_vector m_value; + type m_stored_type; }; // --------------------------------------------------------------------- @@ -844,20 +846,20 @@ OCTINTERP_API radio_values (const std::string& opt_string = ""); radio_values (const radio_values& a) - : default_val (a.default_val), possible_vals (a.possible_vals) { } + : m_default_val (a.m_default_val), m_possible_vals (a.m_possible_vals) { } radio_values& operator = (const radio_values& a) { if (&a != this) { - default_val = a.default_val; - possible_vals = a.possible_vals; + m_default_val = a.m_default_val; + m_possible_vals = a.m_possible_vals; } return *this; } - std::string default_value (void) const { return default_val; } + std::string default_value (void) const { return m_default_val; } bool validate (const std::string& val, std::string& match) { @@ -877,7 +879,7 @@ std::string first_match; - for (const auto& possible_val : possible_vals) + for (const auto& possible_val : m_possible_vals) { if (possible_val.compare (val, len)) { @@ -912,12 +914,12 @@ OCTINTERP_API Cell values_as_cell (void) const; - octave_idx_type nelem (void) const { return possible_vals.size (); } + octave_idx_type nelem (void) const { return m_possible_vals.size (); } private: // Might also want to cache - std::string default_val; - std::set<caseless_str> possible_vals; + std::string m_default_val; + std::set<caseless_str> m_possible_vals; }; class OCTINTERP_API radio_property : public base_property @@ -926,31 +928,31 @@ radio_property (const std::string& nm, const graphics_handle& h, const radio_values& v = radio_values ()) : base_property (nm, h), - vals (v), current_val (v.default_value ()) { } + m_vals (v), m_current_val (v.default_value ()) { } radio_property (const std::string& nm, const graphics_handle& h, const std::string& v) : base_property (nm, h), - vals (v), current_val (vals.default_value ()) { } + m_vals (v), m_current_val (m_vals.default_value ()) { } radio_property (const std::string& nm, const graphics_handle& h, const radio_values& v, const std::string& def) : base_property (nm, h), - vals (v), current_val (def) { } + m_vals (v), m_current_val (def) { } radio_property (const radio_property& p) - : base_property (p), vals (p.vals), current_val (p.current_val) { } - - octave_value get (void) const { return octave_value (current_val); } - - const std::string& current_value (void) const { return current_val; } - - std::string values_as_string (void) const { return vals.values_as_string (); } - - Cell values_as_cell (void) const { return vals.values_as_cell (); } + : base_property (p), m_vals (p.m_vals), m_current_val (p.m_current_val) { } + + octave_value get (void) const { return octave_value (m_current_val); } + + const std::string& current_value (void) const { return m_current_val; } + + std::string values_as_string (void) const { return m_vals.values_as_string (); } + + Cell values_as_cell (void) const { return m_vals.values_as_cell (); } bool is (const caseless_str& v) const - { return v.compare (current_val); } + { return v.compare (m_current_val); } bool is_radio (void) const { return true; } @@ -973,26 +975,26 @@ std::string match; - if (! vals.validate (s, match)) + if (! m_vals.validate (s, match)) error (R"(set: invalid value for radio property "%s" (value = %s))", get_name ().c_str (), s.c_str ()); - if (match != current_val) + if (match != m_current_val) { if (s.length () != match.length ()) warning_with_id ("Octave:abbreviated-property-match", "%s: allowing %s to match %s value %s", "set", s.c_str (), get_name ().c_str (), match.c_str ()); - current_val = match; + m_current_val = match; return true; } return false; } private: - radio_values vals; - std::string current_val; + radio_values m_vals; + std::string m_current_val; }; // --------------------------------------------------------------------- @@ -1001,59 +1003,59 @@ { public: color_values (double r = 0, double g = 0, double b = 1) - : xrgb (1, 3) - { - xrgb(0) = r; - xrgb(1) = g; - xrgb(2) = b; + : m_rgb (1, 3) + { + m_rgb(0) = r; + m_rgb(1) = g; + m_rgb(2) = b; validate (); } color_values (const std::string& str) - : xrgb (1, 3) + : m_rgb (1, 3) { if (! str2rgb (str)) error ("invalid color specification: %s", str.c_str ()); } color_values (const color_values& c) - : xrgb (c.xrgb) + : m_rgb (c.m_rgb) { } color_values& operator = (const color_values& c) { if (&c != this) - xrgb = c.xrgb; + m_rgb = c.m_rgb; return *this; } bool operator == (const color_values& c) const { - return (xrgb(0) == c.xrgb(0) - && xrgb(1) == c.xrgb(1) - && xrgb(2) == c.xrgb(2)); + return (m_rgb(0) == c.m_rgb(0) + && m_rgb(1) == c.m_rgb(1) + && m_rgb(2) == c.m_rgb(2)); } bool operator != (const color_values& c) const { return ! (*this == c); } - Matrix rgb (void) const { return xrgb; } - - operator octave_value (void) const { return xrgb; } + Matrix rgb (void) const { return m_rgb; } + + operator octave_value (void) const { return m_rgb; } void validate (void) const { for (int i = 0; i < 3; i++) { - if (xrgb(i) < 0 || xrgb(i) > 1) + if (m_rgb(i) < 0 || m_rgb(i) > 1) error ("invalid RGB color specification"); } } private: - Matrix xrgb; + Matrix m_rgb; OCTINTERP_API bool str2rgb (const std::string& str); }; @@ -1063,79 +1065,79 @@ public: color_property (const color_values& c, const radio_values& v) : base_property ("", graphics_handle ()), - current_type (color_t), color_val (c), radio_val (v), - current_val (v.default_value ()) + m_current_type (color_t), m_color_val (c), m_radio_val (v), + m_current_val (v.default_value ()) { } color_property (const radio_values& v, const color_values& c) : base_property ("", graphics_handle ()), - current_type (radio_t), color_val (c), radio_val (v), - current_val (v.default_value ()) + m_current_type (radio_t), m_color_val (c), m_radio_val (v), + m_current_val (v.default_value ()) { } color_property (const std::string& nm, const graphics_handle& h, const color_values& c = color_values (), const radio_values& v = radio_values ()) : base_property (nm, h), - current_type (color_t), color_val (c), radio_val (v), - current_val (v.default_value ()) + m_current_type (color_t), m_color_val (c), m_radio_val (v), + m_current_val (v.default_value ()) { } color_property (const std::string& nm, const graphics_handle& h, const radio_values& v) : base_property (nm, h), - current_type (radio_t), color_val (color_values ()), radio_val (v), - current_val (v.default_value ()) + m_current_type (radio_t), m_color_val (color_values ()), m_radio_val (v), + m_current_val (v.default_value ()) { } color_property (const std::string& nm, const graphics_handle& h, const std::string& v) : base_property (nm, h), - current_type (radio_t), color_val (color_values ()), radio_val (v), - current_val (radio_val.default_value ()) + m_current_type (radio_t), m_color_val (color_values ()), m_radio_val (v), + m_current_val (m_radio_val.default_value ()) { } color_property (const std::string& nm, const graphics_handle& h, const color_property& v) : base_property (nm, h), - current_type (v.current_type), color_val (v.color_val), - radio_val (v.radio_val), current_val (v.current_val) + m_current_type (v.m_current_type), m_color_val (v.m_color_val), + m_radio_val (v.m_radio_val), m_current_val (v.m_current_val) { } color_property (const color_property& p) - : base_property (p), current_type (p.current_type), - color_val (p.color_val), radio_val (p.radio_val), - current_val (p.current_val) { } + : base_property (p), m_current_type (p.m_current_type), + m_color_val (p.m_color_val), m_radio_val (p.m_radio_val), + m_current_val (p.m_current_val) { } octave_value get (void) const { - if (current_type == color_t) - return color_val.rgb (); - - return current_val; - } - - bool is_rgb (void) const { return (current_type == color_t); } - - bool is_radio (void) const { return (current_type == radio_t); } + if (m_current_type == color_t) + return m_color_val.rgb (); + + return m_current_val; + } + + bool is_rgb (void) const { return (m_current_type == color_t); } + + bool is_radio (void) const { return (m_current_type == radio_t); } bool is (const std::string& v) const - { return (is_radio () && current_val == v); } + { return (is_radio () && m_current_val == v); } Matrix rgb (void) const { - if (current_type != color_t) + if (m_current_type != color_t) error ("color has no RGB value"); - return color_val.rgb (); + return m_color_val.rgb (); } const std::string& current_value (void) const { - if (current_type != radio_t) + if (m_current_type != radio_t) error ("color has no radio value"); - return current_val; + return m_current_val; } color_property& operator = (const octave_value& val) @@ -1149,18 +1151,18 @@ base_property * clone (void) const { return new color_property (*this); } std::string values_as_string (void) const - { return radio_val.values_as_string (); } - - Cell values_as_cell (void) const { return radio_val.values_as_cell (); } + { return m_radio_val.values_as_string (); } + + Cell values_as_cell (void) const { return m_radio_val.values_as_cell (); } protected: OCTINTERP_API bool do_set (const octave_value& newval); private: - enum current_enum { color_t, radio_t } current_type; - color_values color_val; - radio_values radio_val; - std::string current_val; + enum current_enum { color_t, radio_t } m_current_type; + color_values m_color_val; + radio_values m_radio_val; + std::string m_current_val; }; // --------------------------------------------------------------------- @@ -1172,25 +1174,26 @@ NOT_NAN, NOT_INF }; + class OCTINTERP_API double_property : public base_property { public: double_property (const std::string& nm, const graphics_handle& h, double d = 0) : base_property (nm, h), - current_val (d), finite_constraint (NO_CHECK), - minval (std::pair<double, bool> (octave_NaN, true)), - maxval (std::pair<double, bool> (octave_NaN, true)) { } + m_current_val (d), m_finite_constraint (NO_CHECK), + m_minval (std::pair<double, bool> (octave_NaN, true)), + m_maxval (std::pair<double, bool> (octave_NaN, true)) { } double_property (const double_property& p) - : base_property (p), current_val (p.current_val), - finite_constraint (NO_CHECK), - minval (std::pair<double, bool> (octave_NaN, true)), - maxval (std::pair<double, bool> (octave_NaN, true)) { } - - octave_value get (void) const { return octave_value (current_val); } - - double double_value (void) const { return current_val; } + : base_property (p), m_current_val (p.m_current_val), + m_finite_constraint (NO_CHECK), + m_minval (std::pair<double, bool> (octave_NaN, true)), + m_maxval (std::pair<double, bool> (octave_NaN, true)) { } + + octave_value get (void) const { return octave_value (m_current_val); } + + double double_value (void) const { return m_current_val; } double_property& operator = (const octave_value& val) { @@ -1202,9 +1205,9 @@ { double_property *p = new double_property (*this); - p->finite_constraint = finite_constraint; - p->minval = minval; - p->maxval = maxval; + p->m_finite_constraint = m_finite_constraint; + p->m_minval = m_minval; + p->m_maxval = m_maxval; return p; } @@ -1212,13 +1215,13 @@ void add_constraint (const std::string& type, double val, bool inclusive) { if (type == "min") - minval = std::pair<double, bool> (val, inclusive); + m_minval = std::pair<double, bool> (val, inclusive); else if (type == "max") - maxval = std::pair<double, bool> (val, inclusive); + m_maxval = std::pair<double, bool> (val, inclusive); } void add_constraint (const finite_type finite) - { finite_constraint = finite; } + { m_finite_constraint = finite; } protected: bool do_set (const octave_value& v) @@ -1230,46 +1233,46 @@ double new_val = v.double_value (); // Check min and max - if (! octave::math::isnan (minval.first)) + if (! octave::math::isnan (m_minval.first)) { - if (minval.second && minval.first > new_val) + if (m_minval.second && m_minval.first > new_val) error (R"(set: "%s" must be greater than or equal to %g)", - get_name ().c_str (), minval.first); - else if (! minval.second && minval.first >= new_val) + get_name ().c_str (), m_minval.first); + else if (! m_minval.second && m_minval.first >= new_val) error (R"(set: "%s" must be greater than %g)", - get_name ().c_str (), minval.first); + get_name ().c_str (), m_minval.first); } - if (! octave::math::isnan (maxval.first)) + if (! octave::math::isnan (m_maxval.first)) { - if (maxval.second && maxval.first < new_val) + if (m_maxval.second && m_maxval.first < new_val) error (R"(set: "%s" must be less than or equal to %g)", - get_name ().c_str (), maxval.first); - else if (! maxval.second && maxval.first <= new_val) + get_name ().c_str (), m_maxval.first); + else if (! m_maxval.second && m_maxval.first <= new_val) error (R"(set: "%s" must be less than %g)", - get_name ().c_str (), maxval.first); + get_name ().c_str (), m_maxval.first); } - if (finite_constraint == NO_CHECK) { /* do nothing */ } - else if (finite_constraint == FINITE) + if (m_finite_constraint == NO_CHECK) { /* do nothing */ } + else if (m_finite_constraint == FINITE) { if (! octave::math::isfinite (new_val)) error (R"(set: "%s" must be finite)", get_name ().c_str ()); } - else if (finite_constraint == NOT_NAN) + else if (m_finite_constraint == NOT_NAN) { if (octave::math::isnan (new_val)) error (R"(set: "%s" must not be nan)", get_name ().c_str ()); } - else if (finite_constraint == NOT_INF) + else if (m_finite_constraint == NOT_INF) { if (octave::math::isinf (new_val)) error (R"(set: "%s" must not be infinite)", get_name ().c_str ()); } - if (new_val != current_val) + if (new_val != m_current_val) { - current_val = new_val; + m_current_val = new_val; return true; } @@ -1277,9 +1280,9 @@ } private: - double current_val; - finite_type finite_constraint; - std::pair<double, bool> minval, maxval; + double m_current_val; + finite_type m_finite_constraint; + std::pair<double, bool> m_minval, m_maxval; }; // --------------------------------------------------------------------- @@ -1289,58 +1292,58 @@ public: double_radio_property (double d, const radio_values& v) : base_property ("", graphics_handle ()), - current_type (double_t), dval (d), radio_val (v), - current_val (v.default_value ()) + m_current_type (double_t), m_dval (d), m_radio_val (v), + m_current_val (v.default_value ()) { } double_radio_property (const std::string& nm, const graphics_handle& h, const std::string& v) : base_property (nm, h), - current_type (radio_t), dval (0), radio_val (v), - current_val (radio_val.default_value ()) + m_current_type (radio_t), m_dval (0), m_radio_val (v), + m_current_val (m_radio_val.default_value ()) { } double_radio_property (const std::string& nm, const graphics_handle& h, const double_radio_property& v) : base_property (nm, h), - current_type (v.current_type), dval (v.dval), - radio_val (v.radio_val), current_val (v.current_val) + m_current_type (v.m_current_type), m_dval (v.m_dval), + m_radio_val (v.m_radio_val), m_current_val (v.m_current_val) { } double_radio_property (const double_radio_property& p) - : base_property (p), current_type (p.current_type), - dval (p.dval), radio_val (p.radio_val), - current_val (p.current_val) { } + : base_property (p), m_current_type (p.m_current_type), + m_dval (p.m_dval), m_radio_val (p.m_radio_val), + m_current_val (p.m_current_val) { } octave_value get (void) const { - if (current_type == double_t) - return dval; - - return current_val; - } - - bool is_double (void) const { return (current_type == double_t); } - - bool is_radio (void) const { return (current_type == radio_t); } + if (m_current_type == double_t) + return m_dval; + + return m_current_val; + } + + bool is_double (void) const { return (m_current_type == double_t); } + + bool is_radio (void) const { return (m_current_type == radio_t); } bool is (const std::string& v) const - { return (is_radio () && current_val == v); } + { return (is_radio () && m_current_val == v); } double double_value (void) const { - if (current_type != double_t) + if (m_current_type != double_t) error ("%s: property has no double", get_name ().c_str ()); - return dval; + return m_dval; } const std::string& current_value (void) const { - if (current_type != radio_t) + if (m_current_type != radio_t) error ("%s: property has no radio value", get_name ().c_str ()); - return current_val; + return m_current_val; } double_radio_property& operator = (const octave_value& val) @@ -1358,10 +1361,10 @@ OCTINTERP_API bool do_set (const octave_value& v); private: - enum current_enum { double_t, radio_t } current_type; - double dval; - radio_values radio_val; - std::string current_val; + enum current_enum { double_t, radio_t } m_current_type; + double m_dval; + radio_values m_radio_val; + std::string m_current_val; }; // --------------------------------------------------------------------- @@ -1370,22 +1373,22 @@ { public: array_property (void) - : base_property ("", graphics_handle ()), data (Matrix ()), - xmin (), xmax (), xminp (), xmaxp (), - type_constraints (), size_constraints (), finite_constraint (NO_CHECK), - minval (std::pair<double, bool> (octave_NaN, true)), - maxval (std::pair<double, bool> (octave_NaN, true)) + : base_property ("", graphics_handle ()), m_data (Matrix ()), + m_min_val (), m_max_val (), m_min_pos (), m_max_neg (), + m_type_constraints (), m_size_constraints (), m_finite_constraint (NO_CHECK), + m_minval (std::pair<double, bool> (octave_NaN, true)), + m_maxval (std::pair<double, bool> (octave_NaN, true)) { get_data_limits (); } array_property (const std::string& nm, const graphics_handle& h, const octave_value& m) - : base_property (nm, h), data (m.issparse () ? m.full_value () : m), - xmin (), xmax (), xminp (), xmaxp (), - type_constraints (), size_constraints (), finite_constraint (NO_CHECK), - minval (std::pair<double, bool> (octave_NaN, true)), - maxval (std::pair<double, bool> (octave_NaN, true)) + : base_property (nm, h), m_data (m.issparse () ? m.full_value () : m), + m_min_val (), m_max_val (), m_min_pos (), m_max_neg (), + m_type_constraints (), m_size_constraints (), m_finite_constraint (NO_CHECK), + m_minval (std::pair<double, bool> (octave_NaN, true)), + m_maxval (std::pair<double, bool> (octave_NaN, true)) { get_data_limits (); } @@ -1394,36 +1397,36 @@ // internally to access min/max values; no need to // copy constraints. array_property (const array_property& p) - : base_property (p), data (p.data), - xmin (p.xmin), xmax (p.xmax), xminp (p.xminp), xmaxp (p.xmaxp), - type_constraints (), size_constraints (), finite_constraint (NO_CHECK), - minval (std::pair<double, bool> (octave_NaN, true)), - maxval (std::pair<double, bool> (octave_NaN, true)) + : base_property (p), m_data (p.m_data), + m_min_val (p.m_min_val), m_max_val (p.m_max_val), m_min_pos (p.m_min_pos), m_max_neg (p.m_max_neg), + m_type_constraints (), m_size_constraints (), m_finite_constraint (NO_CHECK), + m_minval (std::pair<double, bool> (octave_NaN, true)), + m_maxval (std::pair<double, bool> (octave_NaN, true)) { } - octave_value get (void) const { return data; } + octave_value get (void) const { return m_data; } void add_constraint (const std::string& type) - { type_constraints.insert (type); } + { m_type_constraints.insert (type); } void add_constraint (const dim_vector& dims) - { size_constraints.push_back (dims); } + { m_size_constraints.push_back (dims); } void add_constraint (const finite_type finite) - { finite_constraint = finite; } + { m_finite_constraint = finite; } void add_constraint (const std::string& type, double val, bool inclusive) { if (type == "min") - minval = std::pair<double, bool> (val, inclusive); + m_minval = std::pair<double, bool> (val, inclusive); else if (type == "max") - maxval = std::pair<double, bool> (val, inclusive); - } - - double min_val (void) const { return xmin; } - double max_val (void) const { return xmax; } - double min_pos (void) const { return xminp; } - double max_neg (void) const { return xmaxp; } + m_maxval = std::pair<double, bool> (val, inclusive); + } + + double min_val (void) const { return m_min_val; } + double max_val (void) const { return m_max_val; } + double min_pos (void) const { return m_min_pos; } + double max_neg (void) const { return m_max_neg; } Matrix get_limits (void) const { @@ -1447,11 +1450,11 @@ { array_property *p = new array_property (*this); - p->type_constraints = type_constraints; - p->size_constraints = size_constraints; - p->finite_constraint = finite_constraint; - p->minval = minval; - p->maxval = maxval; + p->m_type_constraints = m_type_constraints; + p->m_size_constraints = m_size_constraints; + p->m_finite_constraint = m_finite_constraint; + p->m_minval = m_minval; + p->m_maxval = m_maxval; return p; } @@ -1468,7 +1471,7 @@ // FIXME: should we check for actual data change? if (! is_equal (tmp)) { - data = tmp; + m_data = tmp; get_data_limits (); @@ -1486,15 +1489,15 @@ OCTINTERP_API void get_data_limits (void); protected: - octave_value data; - double xmin; - double xmax; - double xminp; - double xmaxp; - std::set<std::string> type_constraints; - std::list<dim_vector> size_constraints; - finite_type finite_constraint; - std::pair<double, bool> minval, maxval; + octave_value m_data; + double m_min_val; + double m_max_val; + double m_min_pos; + double m_max_neg; + std::set<std::string> m_type_constraints; + std::list<dim_vector> m_size_constraints; + finite_type m_finite_constraint; + std::pair<double, bool> m_minval, m_maxval; }; class OCTINTERP_API row_vector_property : public array_property @@ -1539,9 +1542,9 @@ void add_constraint (octave_idx_type len) { - size_constraints.remove (dim_vector (1, -1)); - size_constraints.remove (dim_vector (-1, 1)); - size_constraints.remove (dim_vector (0, 0)); + m_size_constraints.remove (dim_vector (1, -1)); + m_size_constraints.remove (dim_vector (-1, 1)); + m_size_constraints.remove (dim_vector (0, 0)); add_constraint (dim_vector (1, len)); add_constraint (dim_vector (len, 1)); @@ -1557,11 +1560,11 @@ { row_vector_property *p = new row_vector_property (*this); - p->type_constraints = type_constraints; - p->size_constraints = size_constraints; - p->finite_constraint = finite_constraint; - p->minval = minval; - p->maxval = maxval; + p->m_type_constraints = m_type_constraints; + p->m_size_constraints = m_size_constraints; + p->m_finite_constraint = m_finite_constraint; + p->m_minval = m_minval; + p->m_maxval = m_maxval; return p; } @@ -1571,7 +1574,7 @@ { bool retval = array_property::do_set (v); - dim_vector dv = data.dims (); + dim_vector dv = m_data.dims (); if (dv(0) > 1 && dv(1) == 1) { @@ -1579,7 +1582,7 @@ dv(0) = dv(1); dv(1) = tmp; - data = data.reshape (dv); + m_data = m_data.reshape (dv); } return retval; @@ -1636,14 +1639,14 @@ handle_property (const std::string& nm, const graphics_handle& h, const graphics_handle& val = graphics_handle ()) : base_property (nm, h), - current_val (val) { } + m_current_val (val) { } handle_property (const handle_property& p) - : base_property (p), current_val (p.current_val) { } - - octave_value get (void) const { return current_val.as_octave_value (); } - - graphics_handle handle_value (void) const { return current_val; } + : base_property (p), m_current_val (p.m_current_val) { } + + octave_value get (void) const { return m_current_val.as_octave_value (); } + + graphics_handle handle_value (void) const { return m_current_val; } handle_property& operator = (const octave_value& val) { @@ -1658,19 +1661,19 @@ } void invalidate (void) - { current_val = octave::numeric_limits<double>::NaN (); } + { m_current_val = octave::numeric_limits<double>::NaN (); } base_property * clone (void) const { return new handle_property (*this); } void add_constraint (const std::string& type) - { type_constraints.insert (type); } + { m_type_constraints.insert (type); } protected: OCTINTERP_API bool do_set (const octave_value& v); - std::set<std::string> type_constraints; + std::set<std::string> m_type_constraints; private: - graphics_handle current_val; + graphics_handle m_current_val; }; // --------------------------------------------------------------------- @@ -1680,12 +1683,12 @@ public: any_property (const std::string& nm, const graphics_handle& h, const octave_value& m = Matrix ()) - : base_property (nm, h), data (m) { } + : base_property (nm, h), m_data (m) { } any_property (const any_property& p) - : base_property (p), data (p.data) { } - - octave_value get (void) const { return data; } + : base_property (p), m_data (p.m_data) { } + + octave_value get (void) const { return m_data; } any_property& operator = (const octave_value& val) { @@ -1698,12 +1701,12 @@ protected: bool do_set (const octave_value& v) { - data = v; + m_data = v; return true; } private: - octave_value data; + octave_value m_data; }; // --------------------------------------------------------------------- @@ -1712,22 +1715,22 @@ { public: children_property (void) - : base_property ("", graphics_handle ()), children_list () + : base_property ("", graphics_handle ()), m_children_list () { do_init_children (Matrix ()); } children_property (const std::string& nm, const graphics_handle& h, const Matrix& val) - : base_property (nm, h), children_list () + : base_property (nm, h), m_children_list () { do_init_children (val); } children_property (const children_property& p) - : base_property (p), children_list () - { - do_init_children (p.children_list); + : base_property (p), m_children_list () + { + do_init_children (p.m_children_list); } children_property& operator = (const octave_value& val) @@ -1775,7 +1778,7 @@ void renumber (graphics_handle old_gh, graphics_handle new_gh) { - for (auto& hchild : children_list) + for (auto& hchild : m_children_list) { if (hchild == old_gh) { @@ -1790,7 +1793,7 @@ private: typedef std::list<double>::iterator children_list_iterator; typedef std::list<double>::const_iterator const_children_list_iterator; - std::list<double> children_list; + std::list<double> m_children_list; protected: bool do_set (const octave_value& val) @@ -1838,13 +1841,13 @@ if (add_hidden) tmp.stack (get_hidden ()); - children_list.clear (); + m_children_list.clear (); // Don't use do_init_children here, as that reverses the // order of the list, and we don't want to do that if setting // the child list directly. for (octave_idx_type i = 0; i < tmp.numel (); i++) - children_list.push_back (tmp.xelem (i)); + m_children_list.push_back (tmp.xelem (i)); return is_ok; } @@ -1852,25 +1855,25 @@ private: void do_init_children (const Matrix& val) { - children_list.clear (); + m_children_list.clear (); for (octave_idx_type i = 0; i < val.numel (); i++) - children_list.push_front (val.xelem (i)); + m_children_list.push_front (val.xelem (i)); } void do_init_children (const std::list<double>& val) { - children_list.clear (); - children_list = val; + m_children_list.clear (); + m_children_list = val; } OCTINTERP_API Matrix do_get_children (bool return_hidden) const; Matrix do_get_all_children (void) const { - Matrix retval (children_list.size (), 1); + Matrix retval (m_children_list.size (), 1); octave_idx_type i = 0; - for (const auto& hchild : children_list) + for (const auto& hchild : m_children_list) retval(i++) = hchild; return retval; @@ -1878,11 +1881,11 @@ bool do_remove_child (double child) { - for (auto it = children_list.begin (); it != children_list.end (); it++) + for (auto it = m_children_list.begin (); it != m_children_list.end (); it++) { if (*it == child) { - children_list.erase (it); + m_children_list.erase (it); return true; } } @@ -1891,7 +1894,7 @@ void do_adopt_child (double val) { - children_list.push_front (val); + m_children_list.push_front (val); } void do_delete_children (bool clear, bool from_root); @@ -1904,18 +1907,18 @@ public: callback_property (const std::string& nm, const graphics_handle& h, const octave_value& m) - : base_property (nm, h), callback (m) { } + : base_property (nm, h), m_callback (m) { } callback_property (const callback_property& p) - : base_property (p), callback (p.callback) { } - - octave_value get (void) const { return callback; } + : base_property (p), m_callback (p.m_callback) { } + + octave_value get (void) const { return m_callback; } OCTINTERP_API void execute (const octave_value& data = octave_value ()) const; bool is_defined (void) const { - return (callback.is_defined () && ! callback.isempty ()); + return (m_callback.is_defined () && ! m_callback.isempty ()); } callback_property& operator = (const octave_value& val) @@ -1933,7 +1936,7 @@ error (R"(invalid value for callback property "%s")", get_name ().c_str ()); - callback = v; + m_callback = v; return true; return false; } @@ -1942,7 +1945,7 @@ OCTINTERP_API bool validate (const octave_value& v) const; private: - octave_value callback; + octave_value m_callback; }; // --------------------------------------------------------------------- @@ -1950,122 +1953,122 @@ class OCTINTERP_API property { public: - property (void) : rep (new base_property ("", graphics_handle ())) + property (void) : m_rep (new base_property ("", graphics_handle ())) { } - property (base_property *bp, bool persist = false) : rep (bp) - { if (persist) rep->count++; } - - property (const property& p) : rep (p.rep) - { - rep->count++; + property (base_property *bp, bool persist = false) : m_rep (bp) + { if (persist) m_rep->m_count++; } + + property (const property& p) : m_rep (p.m_rep) + { + m_rep->m_count++; } ~property (void) { - if (--rep->count == 0) - delete rep; + if (--m_rep->m_count == 0) + delete m_rep; } bool ok (void) const - { return rep->ok (); } + { return m_rep->ok (); } std::string get_name (void) const - { return rep->get_name (); } + { return m_rep->get_name (); } void set_name (const std::string& name) - { rep->set_name (name); } + { m_rep->set_name (name); } graphics_handle get_parent (void) const - { return rep->get_parent (); } + { return m_rep->get_parent (); } void set_parent (const graphics_handle& h) - { rep->set_parent (h); } + { m_rep->set_parent (h); } bool is_hidden (void) const - { return rep->is_hidden (); } + { return m_rep->is_hidden (); } void set_hidden (bool flag) - { rep->set_hidden (flag); } + { m_rep->set_hidden (flag); } bool is_radio (void) const - { return rep->is_radio (); } + { return m_rep->is_radio (); } int get_id (void) const - { return rep->get_id (); } + { return m_rep->get_id (); } void set_id (int d) - { rep->set_id (d); } + { m_rep->set_id (d); } octave_value get (void) const - { return rep->get (); } + { return m_rep->get (); } bool set (const octave_value& val, bool do_run = true, bool do_notify_toolkit = true) - { return rep->set (val, do_run, do_notify_toolkit); } + { return m_rep->set (val, do_run, do_notify_toolkit); } std::string values_as_string (void) const - { return rep->values_as_string (); } + { return m_rep->values_as_string (); } Cell values_as_cell (void) const - { return rep->values_as_cell (); } + { return m_rep->values_as_cell (); } property& operator = (const octave_value& val) { - *rep = val; + *m_rep = val; return *this; } property& operator = (const property& p) { - if (rep && --rep->count == 0) - delete rep; - - rep = p.rep; - rep->count++; + if (m_rep && --m_rep->m_count == 0) + delete m_rep; + + m_rep = p.m_rep; + m_rep->m_count++; return *this; } void add_listener (const octave_value& v, listener_mode mode = GCB_POSTSET) - { rep->add_listener (v, mode); } + { m_rep->add_listener (v, mode); } void delete_listener (const octave_value& v = octave_value (), listener_mode mode = GCB_POSTSET) - { rep->delete_listener (v, mode); } + { m_rep->delete_listener (v, mode); } void run_listeners (listener_mode mode = GCB_POSTSET) - { rep->run_listeners (mode); } + { m_rep->run_listeners (mode); } static OCTINTERP_API property create (const std::string& name, const graphics_handle& parent, const caseless_str& type, const octave_value_list& args); property clone (void) const - { return property (rep->clone ()); } + { return property (m_rep->clone ()); } #if 0 const string_property& as_string_property (void) const - { return *(dynamic_cast<string_property *> (rep)); } + { return *(dynamic_cast<string_property *> (m_rep)); } const radio_property& as_radio_property (void) const - { return *(dynamic_cast<radio_property *> (rep)); } + { return *(dynamic_cast<radio_property *> (m_rep)); } const color_property& as_color_property (void) const - { return *(dynamic_cast<color_property *> (rep)); } + { return *(dynamic_cast<color_property *> (m_rep)); } const double_property& as_double_property (void) const - { return *(dynamic_cast<double_property *> (rep)); } + { return *(dynamic_cast<double_property *> (m_rep)); } const bool_property& as_bool_property (void) const - { return *(dynamic_cast<bool_property *> (rep)); } + { return *(dynamic_cast<bool_property *> (m_rep)); } const handle_property& as_handle_property (void) const - { return *(dynamic_cast<handle_property *> (rep)); } + { return *(dynamic_cast<handle_property *> (m_rep)); } #endif private: - base_property *rep; + base_property *m_rep; }; // --------------------------------------------------------------------- @@ -2149,7 +2152,7 @@ typedef plist_map_type::const_iterator plist_map_const_iterator; property_list (const plist_map_type& m = plist_map_type ()) - : plist_map (m) { } + : m_plist_map (m) { } ~property_list (void) = default; @@ -2157,27 +2160,27 @@ OCTINTERP_API octave_value lookup (const caseless_str& name) const; - plist_map_iterator begin (void) { return plist_map.begin (); } - plist_map_const_iterator begin (void) const { return plist_map.begin (); } - - plist_map_iterator end (void) { return plist_map.end (); } - plist_map_const_iterator end (void) const { return plist_map.end (); } + plist_map_iterator begin (void) { return m_plist_map.begin (); } + plist_map_const_iterator begin (void) const { return m_plist_map.begin (); } + + plist_map_iterator end (void) { return m_plist_map.end (); } + plist_map_const_iterator end (void) const { return m_plist_map.end (); } plist_map_iterator find (const std::string& go_name) { - return plist_map.find (go_name); + return m_plist_map.find (go_name); } plist_map_const_iterator find (const std::string& go_name) const { - return plist_map.find (go_name); + return m_plist_map.find (go_name); } OCTINTERP_API octave_scalar_map as_struct (const std::string& prefix_arg) const; private: - plist_map_type plist_map; + plist_map_type m_plist_map; }; // --------------------------------------------------------------------- @@ -2214,8 +2217,8 @@ void insert_property (const std::string& name, property p) { p.set_name (name); - p.set_parent (__myhandle__); - all_props[name] = p; + p.set_parent (m___myhandle__); + m_all_props[name] = p; } virtual void set (const caseless_str&, const octave_value&); @@ -2249,17 +2252,17 @@ virtual void remove_child (const graphics_handle& h, bool = false) { - if (children.remove_child (h.value ())) + if (m_children.remove_child (h.value ())) { - children.run_listeners (); + m_children.run_listeners (); mark_modified (); } } virtual void adopt (const graphics_handle& h) { - children.adopt (h.value ()); - children.run_listeners (); + m_children.adopt (h.value ()); + m_children.run_listeners (); mark_modified (); } @@ -2282,27 +2285,27 @@ void set_beingdeleted (const octave_value& val) { - beingdeleted.set (val, true, false); + m_beingdeleted.set (val, true, false); update_beingdeleted (); } - void set_tag (const octave_value& val) { tag = val; } + void set_tag (const octave_value& val) { m_tag = val; } OCTINTERP_API void set_parent (const octave_value& val); Matrix get_children (void) const { - return children.get_children (); + return m_children.get_children (); } Matrix get_all_children (void) const { - return children.get_all (); + return m_children.get_all (); } Matrix get_hidden_children (void) const { - return children.get_hidden (); + return m_children.get_hidden (); } OCTINTERP_API void @@ -2312,7 +2315,7 @@ void set_modified (const octave_value& val) { set___modified__ (val); } - void set___modified__ (const octave_value& val) { __modified__ = val; } + void set___modified__ (const octave_value& val) { m___modified__ = val; } // Redirect calls to "uicontextmenu" to "contextmenu". @@ -2326,7 +2329,7 @@ set_contextmenu (val); } - void reparent (const graphics_handle& new_parent) { parent = new_parent; } + void reparent (const graphics_handle& new_parent) { m_parent = new_parent; } // Update data limits for AXIS_TYPE (xdata, ydata, etc.) in the parent // axes object. @@ -2340,17 +2343,17 @@ virtual void delete_children (bool clear = false, bool from_root = false) { - children.delete_children (clear, from_root); + m_children.delete_children (clear, from_root); } void renumber_child (graphics_handle old_gh, graphics_handle new_gh) { - children.renumber (old_gh, new_gh); + m_children.renumber (old_gh, new_gh); } void renumber_parent (graphics_handle new_gh) { - parent = new_gh; + m_parent = new_gh; } static OCTINTERP_API property_list::pval_map_type factory_defaults (void); @@ -2379,7 +2382,7 @@ OCTINTERP_API bool has_dynamic_property (const std::string& pname) const; protected: - std::set<std::string> dynamic_properties; + std::set<std::string> m_dynamic_properties; OCTINTERP_API void set_dynamic (const caseless_str& pname, const octave_value& val); @@ -2439,13 +2442,13 @@ } }; - std::map<caseless_str, property, cmp_caseless_str> all_props; + std::map<caseless_str, property, cmp_caseless_str> m_all_props; protected: virtual void init (void) { - contextmenu.add_constraint ("uicontextmenu"); + m_contextmenu.add_constraint ("uicontextmenu"); } }; @@ -2454,7 +2457,7 @@ public: friend class graphics_object; - base_graphics_object (void) : toolkit_flag (false) { } + base_graphics_object (void) : m_toolkit_flag (false) { } // No copying! @@ -2636,7 +2639,7 @@ virtual bool valid_object (void) const { return false; } - bool valid_toolkit_object (void) const { return toolkit_flag; } + bool valid_toolkit_object (void) const { return m_toolkit_flag; } virtual std::string type (void) const { @@ -2680,22 +2683,22 @@ protected: virtual void initialize (const graphics_object& go) { - if (! toolkit_flag) - toolkit_flag = get_toolkit ().initialize (go); + if (! m_toolkit_flag) + m_toolkit_flag = get_toolkit ().initialize (go); } virtual void finalize (const graphics_object& go) { - if (toolkit_flag) + if (m_toolkit_flag) { get_toolkit ().finalize (go); - toolkit_flag = false; + m_toolkit_flag = false; } } virtual void update (const graphics_object& go, int id) { - if (toolkit_flag) + if (m_toolkit_flag) get_toolkit ().update (go, id); } @@ -2703,16 +2706,16 @@ // A flag telling whether this object is a valid object // in the backend context. - bool toolkit_flag; + bool m_toolkit_flag; }; class OCTINTERP_API graphics_object { public: - graphics_object (void) : rep (new base_graphics_object ()) { } - - graphics_object (base_graphics_object *new_rep) : rep (new_rep) { } + graphics_object (void) : m_rep (new base_graphics_object ()) { } + + graphics_object (base_graphics_object *new_rep) : m_rep (new_rep) { } graphics_object (const graphics_object&) = default; @@ -2720,29 +2723,29 @@ ~graphics_object (void) = default; - void mark_modified (void) { rep->mark_modified (); } + void mark_modified (void) { m_rep->mark_modified (); } void override_defaults (base_graphics_object& obj) { - rep->override_defaults (obj); + m_rep->override_defaults (obj); } void override_defaults (void) { - rep->override_defaults (*rep); + m_rep->override_defaults (*m_rep); } void build_user_defaults_map (property_list::pval_map_type& def, const std::string go_name) const { - rep->build_user_defaults_map (def, go_name); - } - - void set_from_list (property_list& plist) { rep->set_from_list (plist); } + m_rep->build_user_defaults_map (def, go_name); + } + + void set_from_list (property_list& plist) { m_rep->set_from_list (plist); } void set (const caseless_str& name, const octave_value& val) { - rep->set (name, val); + m_rep->set (name, val); } OCTINTERP_API void set (const octave_value_list& args); @@ -2755,16 +2758,16 @@ OCTINTERP_API void set_value_or_default (const caseless_str& name, const octave_value& val); - void set_defaults (const std::string& mode) { rep->set_defaults (mode); } - - octave_value get (bool all = false) const { return rep->get (all); } + void set_defaults (const std::string& mode) { m_rep->set_defaults (mode); } + + octave_value get (bool all = false) const { return m_rep->get (all); } octave_value get (const caseless_str& name) const { return name.compare ("default") ? get_defaults () : (name.compare ("factory") - ? get_factory_defaults () : rep->get (name)); + ? get_factory_defaults () : m_rep->get (name)); } octave_value get (const std::string& name) const @@ -2779,90 +2782,90 @@ octave_value get_default (const caseless_str& name) const { - return rep->get_default (name); + return m_rep->get_default (name); } octave_value get_factory_default (const caseless_str& name) const { - return rep->get_factory_default (name); - } - - octave_value get_defaults (void) const { return rep->get_defaults (); } + return m_rep->get_factory_default (name); + } + + octave_value get_defaults (void) const { return m_rep->get_defaults (); } property_list get_defaults_list (void) const { - return rep->get_defaults_list (); + return m_rep->get_defaults_list (); } octave_value get_factory_defaults (void) const { - return rep->get_factory_defaults (); + return m_rep->get_factory_defaults (); } property_list get_factory_defaults_list (void) const { - return rep->get_factory_defaults_list (); + return m_rep->get_factory_defaults_list (); } bool has_readonly_property (const caseless_str& pname) const { - return rep->has_readonly_property (pname); + return m_rep->has_readonly_property (pname); } // FIXME: It seems like this function should be const, but that is // currently not possible. - std::string values_as_string (void) { return rep->values_as_string (); } + std::string values_as_string (void) { return m_rep->values_as_string (); } // FIXME: It seems like this function should be const, but that is // currently not possible. std::string value_as_string (const std::string& prop) { - return rep->value_as_string (prop); + return m_rep->value_as_string (prop); } // FIXME: It seems like this function should be const, but that is // currently not possible. - octave_map values_as_struct (void) { return rep->values_as_struct (); } - - graphics_handle get_parent (void) const { return rep->get_parent (); } - - graphics_handle get_handle (void) const { return rep->get_handle (); } + octave_map values_as_struct (void) { return m_rep->values_as_struct (); } + + graphics_handle get_parent (void) const { return m_rep->get_parent (); } + + graphics_handle get_handle (void) const { return m_rep->get_handle (); } OCTINTERP_API graphics_object get_ancestor (const std::string& type) const; - void remove_child (const graphics_handle& h) { rep->remove_child (h); } - - void adopt (const graphics_handle& h) { rep->adopt (h); } - - void reparent (const graphics_handle& h) { rep->reparent (h); } - - void defaults (void) const { rep->defaults (); } - - bool isa (const std::string& go_name) const { return rep->isa (go_name); } - - base_properties& get_properties (void) { return rep->get_properties (); } + void remove_child (const graphics_handle& h) { m_rep->remove_child (h); } + + void adopt (const graphics_handle& h) { m_rep->adopt (h); } + + void reparent (const graphics_handle& h) { m_rep->reparent (h); } + + void defaults (void) const { m_rep->defaults (); } + + bool isa (const std::string& go_name) const { return m_rep->isa (go_name); } + + base_properties& get_properties (void) { return m_rep->get_properties (); } const base_properties& get_properties (void) const { - return rep->get_properties (); + return m_rep->get_properties (); } void update_axis_limits (const std::string& axis_type) { - rep->update_axis_limits (axis_type); + m_rep->update_axis_limits (axis_type); } void update_axis_limits (const std::string& axis_type, const graphics_handle& h) { - rep->update_axis_limits (axis_type, h); - } - - bool valid_object (void) const { return rep->valid_object (); } - - std::string type (void) const { return rep->type (); } - - operator bool (void) const { return rep->valid_object (); } + m_rep->update_axis_limits (axis_type, h); + } + + bool valid_object (void) const { return m_rep->valid_object (); } + + std::string type (void) const { return m_rep->type (); } + + operator bool (void) const { return m_rep->valid_object (); } // FIXME: These functions should be generated automatically by the // genprops.awk script. @@ -2903,30 +2906,30 @@ { return get_properties ().is_handle_visible (); } octave::graphics_toolkit get_toolkit (void) const - { return rep->get_toolkit (); } + { return m_rep->get_toolkit (); } void add_property_listener (const std::string& nm, const octave_value& v, listener_mode mode = GCB_POSTSET) - { rep->add_property_listener (nm, v, mode); } + { m_rep->add_property_listener (nm, v, mode); } void delete_property_listener (const std::string& nm, const octave_value& v, listener_mode mode = GCB_POSTSET) - { rep->delete_property_listener (nm, v, mode); } - - void remove_all_listeners (void) { rep->remove_all_listeners (); } - - void initialize (void) { rep->initialize (*this); } - - void finalize (void) { rep->finalize (*this); } - - void update (int id) { rep->update (*this, id); } + { m_rep->delete_property_listener (nm, v, mode); } + + void remove_all_listeners (void) { m_rep->remove_all_listeners (); } + + void initialize (void) { m_rep->initialize (*this); } + + void finalize (void) { m_rep->finalize (*this); } + + void update (int id) { m_rep->update (*this, id); } void reset_default_properties (void) - { rep->reset_default_properties (); } + { m_rep->reset_default_properties (); } private: - std::shared_ptr<base_graphics_object> rep; + std::shared_ptr<base_graphics_object> m_rep; }; // --------------------------------------------------------------------- @@ -2984,13 +2987,13 @@ private: - properties xproperties; + properties m_properties; protected: root_figure (void) - : xproperties (0, graphics_handle ()), default_properties (), - factory_properties (init_factory_properties ()) + : m_properties (0, graphics_handle ()), m_default_properties (), + m_factory_properties (init_factory_properties ()) { } public: @@ -3010,7 +3013,7 @@ // surface, etc.) then we don't have to know the type of OBJ // here, we just call its set function and let it decide which // properties from the list to use. - obj.set_from_list (default_properties); + obj.set_from_list (m_default_properties); } void set (const caseless_str& name, const octave_value& value) @@ -3019,9 +3022,9 @@ // strip "default", pass rest to function that will // parse the remainder and add the element to the // default_properties map. - default_properties.set (name.substr (7), value); + m_default_properties.set (name.substr (7), value); else - xproperties.set (name, value); + m_properties.set (name, value); } octave_value get (const caseless_str& name) const @@ -3033,19 +3036,19 @@ else if (name.compare ("factory", 7)) return get_factory_default (name.substr (7)); else - retval = xproperties.get (name); + retval = m_properties.get (name); return retval; } octave_value get_default (const caseless_str& name) const { - octave_value retval = default_properties.lookup (name); + octave_value retval = m_default_properties.lookup (name); if (retval.is_undefined ()) { // no default property found, use factory default - retval = factory_properties.lookup (name); + retval = m_factory_properties.lookup (name); if (retval.is_undefined ()) error ("get: invalid default property '%s'", name.c_str ()); @@ -3056,7 +3059,7 @@ octave_value get_factory_default (const caseless_str& name) const { - octave_value retval = factory_properties.lookup (name); + octave_value retval = m_factory_properties.lookup (name); if (retval.is_undefined ()) error ("get: invalid factory default property '%s'", name.c_str ()); @@ -3066,27 +3069,27 @@ octave_value get_defaults (void) const { - return default_properties.as_struct ("default"); + return m_default_properties.as_struct ("default"); } property_list get_defaults_list (void) const { - return default_properties; + return m_default_properties; } octave_value get_factory_defaults (void) const { - return factory_properties.as_struct ("factory"); + return m_factory_properties.as_struct ("factory"); } property_list get_factory_defaults_list (void) const { - return factory_properties; - } - - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + return m_factory_properties; + } + + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } @@ -3094,7 +3097,7 @@ bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -3102,9 +3105,9 @@ private: - property_list default_properties; - - property_list factory_properties; + property_list m_default_properties; + + property_list m_factory_properties; static OCTINTERP_API property_list::plist_map_type init_factory_properties (void); @@ -3121,7 +3124,7 @@ public: void init_integerhandle (const octave_value& val) { - integerhandle = val; + m_integerhandle = val; } OCTINTERP_API void @@ -3246,20 +3249,20 @@ protected: void init (void) { - alphamap.add_constraint (dim_vector (-1, 1)); - colormap.add_constraint (dim_vector (-1, 3)); - colormap.add_constraint (dim_vector (0, 0)); - outerposition.add_constraint (dim_vector (1, 4)); - outerposition.add_constraint (FINITE); - paperposition.add_constraint (dim_vector (1, 4)); - paperposition.add_constraint (FINITE); - papersize.add_constraint (dim_vector (1, 2)); - papersize.add_constraint (FINITE); - pointershapecdata.add_constraint (dim_vector (16, 16)); - pointershapecdata.add_constraint (dim_vector (32, 32)); - pointershapehotspot.add_constraint (dim_vector (1, 2)); - position.add_constraint (dim_vector (1, 4)); - position.add_constraint (FINITE); + m_alphamap.add_constraint (dim_vector (-1, 1)); + m_colormap.add_constraint (dim_vector (-1, 3)); + m_colormap.add_constraint (dim_vector (0, 0)); + m_outerposition.add_constraint (dim_vector (1, 4)); + m_outerposition.add_constraint (FINITE); + m_paperposition.add_constraint (dim_vector (1, 4)); + m_paperposition.add_constraint (FINITE); + m_papersize.add_constraint (dim_vector (1, 2)); + m_papersize.add_constraint (FINITE); + m_pointershapecdata.add_constraint (dim_vector (16, 16)); + m_pointershapecdata.add_constraint (dim_vector (32, 32)); + m_pointershapehotspot.add_constraint (dim_vector (1, 2)); + m_position.add_constraint (dim_vector (1, 4)); + m_position.add_constraint (FINITE); init_toolkit (); } @@ -3269,23 +3272,23 @@ void update_paperpositionmode (void) { - if (paperpositionmode.is ("auto")) - paperposition.set (get_auto_paperposition ()); + if (m_paperpositionmode.is ("auto")) + m_paperposition.set (get_auto_paperposition ()); } OCTINTERP_API void update_handlevisibility (void); OCTINTERP_API void init_toolkit (void); - octave::graphics_toolkit toolkit; + octave::graphics_toolkit m_toolkit; }; private: - properties xproperties; + properties m_properties; public: figure (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p), default_properties () + : base_graphics_object (), m_properties (mh, p), m_default_properties () { } ~figure (void) = default; @@ -3294,14 +3297,14 @@ { // Allow parent (root object) to override first (properties knows how // to find the parent object). - xproperties.override_defaults (obj); + m_properties.override_defaults (obj); // Now override with our defaults. If the default_properties // list includes the properties for all defaults (line, // surface, etc.) then we don't have to know the type of OBJ // here, we just call its set function and let it decide which // properties from the list to use. - obj.set_from_list (default_properties); + obj.set_from_list (m_default_properties); } void set (const caseless_str& name, const octave_value& value) @@ -3310,9 +3313,9 @@ // strip "default", pass rest to function that will // parse the remainder and add the element to the // default_properties map. - default_properties.set (name.substr (7), value); + m_default_properties.set (name.substr (7), value); else - xproperties.set (name, value); + m_properties.set (name, value); } octave_value get (const caseless_str& name) const @@ -3322,7 +3325,7 @@ if (name.compare ("default", 7)) retval = get_default (name.substr (7)); else - retval = xproperties.get (name); + retval = m_properties.get (name); return retval; } @@ -3331,17 +3334,17 @@ octave_value get_defaults (void) const { - return default_properties.as_struct ("default"); + return m_default_properties.as_struct ("default"); } property_list get_defaults_list (void) const { - return default_properties; - } - - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + return m_default_properties; + } + + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } @@ -3349,14 +3352,14 @@ bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; } private: - property_list default_properties; + property_list m_default_properties; }; // --------------------------------------------------------------------- @@ -3366,31 +3369,31 @@ public: graphics_xform (void) - : xform (xform_eye ()), xform_inv (xform_eye ()), - sx ("linear"), sy ("linear"), sz ("linear"), zlim (1, 2, 0.0) - { - zlim(1) = 1.0; + : m_xform (xform_eye ()), m_xform_inv (xform_eye ()), + m_sx ("linear"), m_sy ("linear"), m_sz ("linear"), m_zlim (1, 2, 0.0) + { + m_zlim(1) = 1.0; } graphics_xform (const Matrix& xm, const Matrix& xim, const scaler& x, const scaler& y, const scaler& z, const Matrix& zl) - : xform (xm), xform_inv (xim), sx (x), sy (y), sz (z), zlim (zl) { } + : m_xform (xm), m_xform_inv (xim), m_sx (x), m_sy (y), m_sz (z), m_zlim (zl) { } graphics_xform (const graphics_xform& g) - : xform (g.xform), xform_inv (g.xform_inv), sx (g.sx), - sy (g.sy), sz (g.sz), zlim (g.zlim) { } + : m_xform (g.m_xform), m_xform_inv (g.m_xform_inv), m_sx (g.m_sx), + m_sy (g.m_sy), m_sz (g.m_sz), m_zlim (g.m_zlim) { } ~graphics_xform (void) = default; graphics_xform& operator = (const graphics_xform& g) { - xform = g.xform; - xform_inv = g.xform_inv; - sx = g.sx; - sy = g.sy; - sz = g.sz; - zlim = g.zlim; + m_xform = g.m_xform; + m_xform_inv = g.m_xform_inv; + m_sx = g.m_sx; + m_sy = g.m_sy; + m_sz = g.m_sz; + m_zlim = g.m_zlim; return *this; } @@ -3406,18 +3409,18 @@ untransform (double x, double y, double z, bool use_scale = true) const; ColumnVector untransform (double x, double y, bool use_scale = true) const - { return untransform (x, y, (zlim(0)+zlim(1))/2, use_scale); } - - Matrix xscale (const Matrix& m) const { return sx.scale (m); } - Matrix yscale (const Matrix& m) const { return sy.scale (m); } - Matrix zscale (const Matrix& m) const { return sz.scale (m); } + { return untransform (x, y, (m_zlim(0)+m_zlim(1))/2, use_scale); } + + Matrix xscale (const Matrix& m) const { return m_sx.scale (m); } + Matrix yscale (const Matrix& m) const { return m_sy.scale (m); } + Matrix zscale (const Matrix& m) const { return m_sz.scale (m); } Matrix scale (const Matrix& m) const { bool has_z = (m.columns () > 2); - if (sx.is_linear () && sy.is_linear () - && (! has_z || sz.is_linear ())) + if (m_sx.is_linear () && m_sy.is_linear () + && (! has_z || m_sz.is_linear ())) return m; Matrix retval (m.dims ()); @@ -3426,20 +3429,20 @@ for (int i = 0; i < r; i++) { - retval(i,0) = sx.scale (m(i,0)); - retval(i,1) = sy.scale (m(i,1)); + retval(i,0) = m_sx.scale (m(i,0)); + retval(i,1) = m_sy.scale (m(i,1)); if (has_z) - retval(i,2) = sz.scale (m(i,2)); + retval(i,2) = m_sz.scale (m(i,2)); } return retval; } private: - Matrix xform; - Matrix xform_inv; - scaler sx, sy, sz; - Matrix zlim; + Matrix m_xform; + Matrix m_xform_inv; + scaler m_sx, m_sy, m_sz; + Matrix m_zlim; }; enum @@ -3466,9 +3469,9 @@ OCTINTERP_API void adopt (const graphics_handle& h); - const scaler& get_x_scaler (void) const { return sx; } - const scaler& get_y_scaler (void) const { return sy; } - const scaler& get_z_scaler (void) const { return sz; } + const scaler& get_x_scaler (void) const { return m_sx; } + const scaler& get_y_scaler (void) const { return m_sy; } + const scaler& get_z_scaler (void) const { return m_sz; } OCTINTERP_API Matrix get_boundingbox (bool internal = false, @@ -3507,7 +3510,7 @@ { std::string cur_val; - if (positionconstraint.is ("innerposition")) + if (m_positionconstraint.is ("innerposition")) cur_val = "position"; else cur_val = "outerposition"; @@ -3518,7 +3521,7 @@ void set_activepositionproperty (const octave_value& val) { // call set method to validate the input - activepositionproperty.set (val); + m_activepositionproperty.set (val); if (val.char_matrix_value ().row_as_string (0) == "position") set_positionconstraint ("innerposition"); @@ -3545,57 +3548,57 @@ OCTINTERP_API void update_title_position (void); graphics_xform get_transform (void) const - { return graphics_xform (x_render, x_render_inv, sx, sy, sz, x_zlim); } - - Matrix get_transform_matrix (void) const { return x_render; } - Matrix get_inverse_transform_matrix (void) const { return x_render_inv; } - Matrix get_opengl_matrix_1 (void) const { return x_gl_mat1; } - Matrix get_opengl_matrix_2 (void) const { return x_gl_mat2; } - Matrix get_transform_zlim (void) const { return x_zlim; } - - int get_xstate (void) const { return xstate; } - int get_ystate (void) const { return ystate; } - int get_zstate (void) const { return zstate; } - double get_xPlane (void) const { return xPlane; } - double get_xPlaneN (void) const { return xPlaneN; } - double get_yPlane (void) const { return yPlane; } - double get_yPlaneN (void) const { return yPlaneN; } - double get_zPlane (void) const { return zPlane; } - double get_zPlaneN (void) const { return zPlaneN; } - double get_xpTick (void) const { return xpTick; } - double get_xpTickN (void) const { return xpTickN; } - double get_ypTick (void) const { return ypTick; } - double get_ypTickN (void) const { return ypTickN; } - double get_zpTick (void) const { return zpTick; } - double get_zpTickN (void) const { return zpTickN; } - double get_x_min (void) const { return std::min (xPlane, xPlaneN); } - double get_x_max (void) const { return std::max (xPlane, xPlaneN); } - double get_y_min (void) const { return std::min (yPlane, yPlaneN); } - double get_y_max (void) const { return std::max (yPlane, yPlaneN); } - double get_z_min (void) const { return std::min (zPlane, zPlaneN); } - double get_z_max (void) const { return std::max (zPlane, zPlaneN); } - double get_fx (void) const { return fx; } - double get_fy (void) const { return fy; } - double get_fz (void) const { return fz; } - double get_xticklen (void) const { return xticklen; } - double get_yticklen (void) const { return yticklen; } - double get_zticklen (void) const { return zticklen; } - double get_xtickoffset (void) const { return xtickoffset; } - double get_ytickoffset (void) const { return ytickoffset; } - double get_ztickoffset (void) const { return ztickoffset; } - bool get_x2Dtop (void) const { return x2Dtop; } - bool get_y2Dright (void) const { return y2Dright; } - bool get_layer2Dtop (void) const { return layer2Dtop; } + { return graphics_xform (m_x_render, m_x_render_inv, m_sx, m_sy, m_sz, m_x_zlim); } + + Matrix get_transform_matrix (void) const { return m_x_render; } + Matrix get_inverse_transform_matrix (void) const { return m_x_render_inv; } + Matrix get_opengl_matrix_1 (void) const { return m_x_gl_mat1; } + Matrix get_opengl_matrix_2 (void) const { return m_x_gl_mat2; } + Matrix get_transform_zlim (void) const { return m_x_zlim; } + + int get_xstate (void) const { return m_xstate; } + int get_ystate (void) const { return m_ystate; } + int get_zstate (void) const { return m_zstate; } + double get_xPlane (void) const { return m_xPlane; } + double get_xPlaneN (void) const { return m_xPlaneN; } + double get_yPlane (void) const { return m_yPlane; } + double get_yPlaneN (void) const { return m_yPlaneN; } + double get_zPlane (void) const { return m_zPlane; } + double get_zPlaneN (void) const { return m_zPlaneN; } + double get_xpTick (void) const { return m_xpTick; } + double get_xpTickN (void) const { return m_xpTickN; } + double get_ypTick (void) const { return m_ypTick; } + double get_ypTickN (void) const { return m_ypTickN; } + double get_zpTick (void) const { return m_zpTick; } + double get_zpTickN (void) const { return m_zpTickN; } + double get_x_min (void) const { return std::min (m_xPlane, m_xPlaneN); } + double get_x_max (void) const { return std::max (m_xPlane, m_xPlaneN); } + double get_y_min (void) const { return std::min (m_yPlane, m_yPlaneN); } + double get_y_max (void) const { return std::max (m_yPlane, m_yPlaneN); } + double get_z_min (void) const { return std::min (m_zPlane, m_zPlaneN); } + double get_z_max (void) const { return std::max (m_zPlane, m_zPlaneN); } + double get_fx (void) const { return m_fx; } + double get_fy (void) const { return m_fy; } + double get_fz (void) const { return m_fz; } + double get_xticklen (void) const { return m_xticklen; } + double get_yticklen (void) const { return m_yticklen; } + double get_zticklen (void) const { return m_zticklen; } + double get_xtickoffset (void) const { return m_xtickoffset; } + double get_ytickoffset (void) const { return m_ytickoffset; } + double get_ztickoffset (void) const { return m_ztickoffset; } + bool get_x2Dtop (void) const { return m_x2Dtop; } + bool get_y2Dright (void) const { return m_y2Dright; } + bool get_layer2Dtop (void) const { return m_layer2Dtop; } bool get_is2D (bool include_kids = false) const - { return (include_kids ? (is2D && ! has3Dkids) : is2D); } - void set_has3Dkids (bool val) { has3Dkids = val; } - bool get_xySym (void) const { return xySym; } - bool get_xyzSym (void) const { return xyzSym; } - bool get_zSign (void) const { return zSign; } - bool get_nearhoriz (void) const { return nearhoriz; } + { return (include_kids ? (m_is2D && ! m_has3Dkids) : m_is2D); } + void set_has3Dkids (bool val) { m_has3Dkids = val; } + bool get_xySym (void) const { return m_xySym; } + bool get_xyzSym (void) const { return m_xyzSym; } + bool get_zSign (void) const { return m_zSign; } + bool get_nearhoriz (void) const { return m_nearhoriz; } ColumnVector pixel2coord (double px, double py) const - { return get_transform ().untransform (px, py, (x_zlim(0)+x_zlim(1))/2); } + { return get_transform ().untransform (px, py, (m_x_zlim(0)+m_x_zlim(1))/2); } ColumnVector coord2pixel (double x, double y, double z) const { return get_transform ().transform (x, y, z); } @@ -3638,71 +3641,71 @@ OCTINTERP_API void update_fontunits (const caseless_str& old_fontunits); - void increase_num_lights (void) { num_lights++; } - void decrease_num_lights (void) { num_lights--; } - unsigned int get_num_lights (void) const { return num_lights; } + void increase_num_lights (void) { m_num_lights++; } + void decrease_num_lights (void) { m_num_lights--; } + unsigned int get_num_lights (void) const { return m_num_lights; } private: - scaler sx = scaler (); - scaler sy = scaler (); - scaler sz = scaler (); - - Matrix x_render = Matrix (); - Matrix x_render_inv = Matrix (); - Matrix x_gl_mat1 = Matrix (); - Matrix x_gl_mat2 = Matrix (); - Matrix x_zlim = Matrix (); - - std::list<octave_value> zoom_stack = std::list<octave_value> (); + scaler m_sx = scaler (); + scaler m_sy = scaler (); + scaler m_sz = scaler (); + + Matrix m_x_render = Matrix (); + Matrix m_x_render_inv = Matrix (); + Matrix m_x_gl_mat1 = Matrix (); + Matrix m_x_gl_mat2 = Matrix (); + Matrix m_x_zlim = Matrix (); + + std::list<octave_value> m_zoom_stack = std::list<octave_value> (); // Axes layout data - int xstate = 0; - int ystate = 0; - int zstate = 0; - - double xPlane = 0.0; - double yPlane = 0.0; - double zPlane = 0.0; - - double xPlaneN = 0.0; - double yPlaneN = 0.0; - double zPlaneN = 0.0; - - double xpTick = 0.0; - double ypTick = 0.0; - double zpTick = 0.0; - - double xpTickN = 0.0; - double ypTickN = 0.0; - double zpTickN = 0.0; - - double fx = 0.0; - double fy = 0.0; - double fz = 0.0; - - double xticklen = 0.0; - double yticklen = 0.0; - double zticklen = 0.0; - - double xtickoffset = 0.0; - double ytickoffset = 0.0; - double ztickoffset = 0.0; - - bool x2Dtop = false; - bool y2Dright = false; - bool layer2Dtop = false; - bool is2D = false; - bool has3Dkids = false; - bool xySym = false; - bool xyzSym = false; - bool zSign = false; - bool nearhoriz = false; - - unsigned int num_lights = 0; + int m_xstate = 0; + int m_ystate = 0; + int m_zstate = 0; + + double m_xPlane = 0.0; + double m_yPlane = 0.0; + double m_zPlane = 0.0; + + double m_xPlaneN = 0.0; + double m_yPlaneN = 0.0; + double m_zPlaneN = 0.0; + + double m_xpTick = 0.0; + double m_ypTick = 0.0; + double m_zpTick = 0.0; + + double m_xpTickN = 0.0; + double m_ypTickN = 0.0; + double m_zpTickN = 0.0; + + double m_fx = 0.0; + double m_fy = 0.0; + double m_fz = 0.0; + + double m_xticklen = 0.0; + double m_yticklen = 0.0; + double m_zticklen = 0.0; + + double m_xtickoffset = 0.0; + double m_ytickoffset = 0.0; + double m_ztickoffset = 0.0; + + bool m_x2Dtop = false; + bool m_y2Dright = false; + bool m_layer2Dtop = false; + bool m_is2D = false; + bool m_has3Dkids = false; + bool m_xySym = false; + bool m_xyzSym = false; + bool m_zSign = false; + bool m_nearhoriz = false; + + unsigned int m_num_lights = 0; // Text renderer, used for calculation of text (tick labels) size - octave::text_renderer txt_renderer; + octave::text_renderer m_txt_renderer; OCTINTERP_API void set_text_child (handle_property& h, const std::string& who, @@ -3790,7 +3793,7 @@ radio_property ticklabelinterpreter u , "{tex}|latex|none" array_property ticklength u , default_axes_ticklength () array_property tightinset r , Matrix (1, 4, 0.0) - handle_property title SOf , make_graphics_handle ("text", __myhandle__, false, false, false) + handle_property title SOf , make_graphics_handle ("text", m___myhandle__, false, false, false) double_property titlefontsizemultiplier u , 1.1 radio_property titlefontweight u , "{bold}|normal" // FIXME: Should be a "axestoolbar" object. Make it read-only for now. @@ -3804,7 +3807,7 @@ radio_property xcolormode , "{auto}|manual" radio_property xdir u , "{normal}|reverse" bool_property xgrid , "off" - handle_property xlabel SOf , make_graphics_handle ("text", __myhandle__, false, false, false) + handle_property xlabel SOf , make_graphics_handle ("text", m___myhandle__, false, false, false) row_vector_property xlim mu , default_lim () radio_property xlimmode al , "{auto}|manual" bool_property xminorgrid , "off" @@ -3823,7 +3826,7 @@ radio_property ycolormode , "{auto}|manual" radio_property ydir u , "{normal}|reverse" bool_property ygrid , "off" - handle_property ylabel SOf , make_graphics_handle ("text", __myhandle__, false, false, false) + handle_property ylabel SOf , make_graphics_handle ("text", m___myhandle__, false, false, false) row_vector_property ylim mu , default_lim () radio_property ylimmode al , "{auto}|manual" bool_property yminorgrid , "off" @@ -3840,7 +3843,7 @@ radio_property zcolormode , "{auto}|manual" radio_property zdir u , "{normal}|reverse" bool_property zgrid , "off" - handle_property zlabel SOf , make_graphics_handle ("text", __myhandle__, false, false, false) + handle_property zlabel SOf , make_graphics_handle ("text", m___myhandle__, false, false, false) row_vector_property zlim mu , default_lim () radio_property zlimmode al , "{auto}|manual" bool_property zminorgrid , "off" @@ -3886,29 +3889,29 @@ void update_xscale (void) { - sx = get_scale (get_xscale (), xlim.get ().matrix_value ()); + m_sx = get_scale (get_xscale (), m_xlim.get ().matrix_value ()); } void update_yscale (void) { - sy = get_scale (get_yscale (), ylim.get ().matrix_value ()); + m_sy = get_scale (get_yscale (), m_ylim.get ().matrix_value ()); } void update_zscale (void) { - sz = get_scale (get_zscale (), zlim.get ().matrix_value ()); + m_sz = get_scale (get_zscale (), m_zlim.get ().matrix_value ()); } OCTINTERP_API void update_label_color (handle_property label, color_property col); void update_xcolor (void) - { update_label_color (xlabel, xcolor); } + { update_label_color (m_xlabel, m_xcolor); } void update_ycolor (void) - { update_label_color (ylabel, ycolor); } + { update_label_color (m_ylabel, m_ycolor); } void update_zcolor (void) - { update_label_color (zlabel, zcolor); } + { update_label_color (m_zlabel, m_zcolor); } void update_view (void) { sync_positions (); } @@ -3946,59 +3949,59 @@ void update_layer (void) { update_axes_layout (); } void update_box (void) { - if (xticklabelmode.is ("auto")) - calc_ticklabels (xtick, xticklabel, xscale.is ("log"), + if (m_xticklabelmode.is ("auto")) + calc_ticklabels (m_xtick, m_xticklabel, m_xscale.is ("log"), xaxislocation_is ("origin"), - yscale.is ("log") ? 2 : + m_yscale.is ("log") ? 2 : (yaxislocation_is ("origin") ? 0 : (yaxislocation_is ("left") ? -1 : 1)), - xlim); - if (yticklabelmode.is ("auto")) - calc_ticklabels (ytick, yticklabel, yscale.is ("log"), + m_xlim); + if (m_yticklabelmode.is ("auto")) + calc_ticklabels (m_ytick, m_yticklabel, m_yscale.is ("log"), yaxislocation_is ("origin"), - xscale.is ("log") ? 2 : + m_xscale.is ("log") ? 2 : (xaxislocation_is ("origin") ? 0 : (xaxislocation_is ("bottom") ? -1 : 1)), - ylim); + m_ylim); } void update_yaxislocation (void) { sync_positions (); update_axes_layout (); - if (xticklabelmode.is ("auto")) - calc_ticklabels (xtick, xticklabel, xscale.is ("log"), + if (m_xticklabelmode.is ("auto")) + calc_ticklabels (m_xtick, m_xticklabel, m_xscale.is ("log"), xaxislocation_is ("origin"), - yscale.is ("log") ? 2 : + m_yscale.is ("log") ? 2 : (yaxislocation_is ("origin") ? 0 : (yaxislocation_is ("left") ? -1 : 1)), - xlim); - if (yticklabelmode.is ("auto")) - calc_ticklabels (ytick, yticklabel, yscale.is ("log"), + m_xlim); + if (m_yticklabelmode.is ("auto")) + calc_ticklabels (m_ytick, m_yticklabel, m_yscale.is ("log"), yaxislocation_is ("origin"), - xscale.is ("log") ? 2 : + m_xscale.is ("log") ? 2 : (xaxislocation_is ("origin") ? 0 : (xaxislocation_is ("bottom") ? -1 : 1)), - ylim); + m_ylim); update_ylabel_position (); } void update_xaxislocation (void) { sync_positions (); update_axes_layout (); - if (xticklabelmode.is ("auto")) - calc_ticklabels (xtick, xticklabel, xscale.is ("log"), + if (m_xticklabelmode.is ("auto")) + calc_ticklabels (m_xtick, m_xticklabel, m_xscale.is ("log"), xaxislocation_is ("origin"), - yscale.is ("log") ? 2 : + m_yscale.is ("log") ? 2 : (yaxislocation_is ("origin") ? 0 : (yaxislocation_is ("left") ? -1 : 1)), - xlim); - if (yticklabelmode.is ("auto")) - calc_ticklabels (ytick, yticklabel, yscale.is ("log"), + m_xlim); + if (m_yticklabelmode.is ("auto")) + calc_ticklabels (m_ytick, m_yticklabel, m_yscale.is ("log"), yaxislocation_is ("origin"), - xscale.is ("log") ? 2 : + m_xscale.is ("log") ? 2 : (xaxislocation_is ("origin") ? 0 : (xaxislocation_is ("bottom") ? -1 : 1)), - ylim); + m_ylim); update_xlabel_position (); } @@ -4019,40 +4022,44 @@ void update_xtick (bool sync_pos = true) { - calc_ticks_and_lims (xlim, xtick, xminortickvalues, xlimmode.is ("auto"), - xtickmode.is ("auto"), xscale.is ("log")); - if (xticklabelmode.is ("auto")) - calc_ticklabels (xtick, xticklabel, xscale.is ("log"), + calc_ticks_and_lims (m_xlim, m_xtick, m_xminortickvalues, + m_xlimmode.is ("auto"), m_xtickmode.is ("auto"), + m_xscale.is ("log")); + if (m_xticklabelmode.is ("auto")) + calc_ticklabels (m_xtick, m_xticklabel, m_xscale.is ("log"), xaxislocation_is ("origin"), - yscale.is ("log") ? 2 : + m_yscale.is ("log") ? 2 : (yaxislocation_is ("origin") ? 0 : (yaxislocation_is ("left") ? -1 : 1)), - xlim); + m_xlim); if (sync_pos) sync_positions (); } void update_ytick (bool sync_pos = true) { - calc_ticks_and_lims (ylim, ytick, yminortickvalues, ylimmode.is ("auto"), - ytickmode.is ("auto"), yscale.is ("log")); - if (yticklabelmode.is ("auto")) - calc_ticklabels (ytick, yticklabel, yscale.is ("log"), + calc_ticks_and_lims (m_ylim, m_ytick, m_yminortickvalues, + m_ylimmode.is ("auto"), m_ytickmode.is ("auto"), + m_yscale.is ("log")); + if (m_yticklabelmode.is ("auto")) + calc_ticklabels (m_ytick, m_yticklabel, m_yscale.is ("log"), yaxislocation_is ("origin"), - xscale.is ("log") ? 2 : + m_xscale.is ("log") ? 2 : (xaxislocation_is ("origin") ? 0 : (xaxislocation_is ("bottom") ? -1 : 1)), - ylim); + m_ylim); if (sync_pos) sync_positions (); } void update_ztick (bool sync_pos = true) { - calc_ticks_and_lims (zlim, ztick, zminortickvalues, zlimmode.is ("auto"), - ztickmode.is ("auto"), zscale.is ("log")); - if (zticklabelmode.is ("auto")) - calc_ticklabels (ztick, zticklabel, zscale.is ("log"), false, 2, zlim); + calc_ticks_and_lims (m_zlim, m_ztick, m_zminortickvalues, + m_zlimmode.is ("auto"), m_ztickmode.is ("auto"), + m_zscale.is ("log")); + if (m_zticklabelmode.is ("auto")) + calc_ticklabels (m_ztick, m_zticklabel, m_zscale.is ("log"), false, + 2, m_zlim); if (sync_pos) sync_positions (); @@ -4060,44 +4067,44 @@ void update_xtickmode (void) { - if (xtickmode.is ("auto")) + if (m_xtickmode.is ("auto")) update_xtick (); } void update_ytickmode (void) { - if (ytickmode.is ("auto")) + if (m_ytickmode.is ("auto")) update_ytick (); } void update_ztickmode (void) { - if (ztickmode.is ("auto")) + if (m_ztickmode.is ("auto")) update_ztick (); } void update_xticklabelmode (void) { - if (xticklabelmode.is ("auto")) - calc_ticklabels (xtick, xticklabel, xscale.is ("log"), + if (m_xticklabelmode.is ("auto")) + calc_ticklabels (m_xtick, m_xticklabel, m_xscale.is ("log"), xaxislocation_is ("origin"), - yscale.is ("log") ? 2 : + m_yscale.is ("log") ? 2 : (yaxislocation_is ("origin") ? 0 : (yaxislocation_is ("left") ? -1 : 1)), - xlim); + m_xlim); } void update_yticklabelmode (void) { - if (yticklabelmode.is ("auto")) - calc_ticklabels (ytick, yticklabel, yscale.is ("log"), + if (m_yticklabelmode.is ("auto")) + calc_ticklabels (m_ytick, m_yticklabel, m_yscale.is ("log"), yaxislocation_is ("origin"), - xscale.is ("log") ? 2 : + m_xscale.is ("log") ? 2 : (xaxislocation_is ("origin") ? 0 : (xaxislocation_is ("bottom") ? -1 : 1)), - ylim); + m_ylim); } void update_zticklabelmode (void) { - if (zticklabelmode.is ("auto")) - calc_ticklabels (ztick, zticklabel, zscale.is ("log"), false, 2, zlim); + if (m_zticklabelmode.is ("auto")) + calc_ticklabels (m_ztick, m_zticklabel, m_zscale.is ("log"), false, 2, m_zlim); } void update_fontname (void) @@ -4193,7 +4200,7 @@ void update___colormap__ (void) { - colormap.run_listeners (GCB_POSTSET); + m_colormap.run_listeners (GCB_POSTSET); } OCTINTERP_API octave_value get_colormap (void) const; @@ -4212,17 +4219,18 @@ { update_axis_limits ("xlim"); - calc_ticks_and_lims (xlim, xtick, xminortickvalues, xlimmode.is ("auto"), - xtickmode.is ("auto"), xscale.is ("log")); - if (xticklabelmode.is ("auto")) - calc_ticklabels (xtick, xticklabel, xscale.is ("log"), - xaxislocation.is ("origin"), - yscale.is ("log") ? 2 : + calc_ticks_and_lims (m_xlim, m_xtick, m_xminortickvalues, + m_xlimmode.is ("auto"), m_xtickmode.is ("auto"), + m_xscale.is ("log")); + if (m_xticklabelmode.is ("auto")) + calc_ticklabels (m_xtick, m_xticklabel, m_xscale.is ("log"), + m_xaxislocation.is ("origin"), + m_yscale.is ("log") ? 2 : (yaxislocation_is ("origin") ? 0 : (yaxislocation_is ("left") ? -1 : 1)), - xlim); - - fix_limits (xlim); + m_xlim); + + fix_limits (m_xlim); update_xscale (); @@ -4233,17 +4241,18 @@ { update_axis_limits ("ylim"); - calc_ticks_and_lims (ylim, ytick, yminortickvalues, ylimmode.is ("auto"), - ytickmode.is ("auto"), yscale.is ("log")); - if (yticklabelmode.is ("auto")) - calc_ticklabels (ytick, yticklabel, yscale.is ("log"), + calc_ticks_and_lims (m_ylim, m_ytick, m_yminortickvalues, + m_ylimmode.is ("auto"), m_ytickmode.is ("auto"), + m_yscale.is ("log")); + if (m_yticklabelmode.is ("auto")) + calc_ticklabels (m_ytick, m_yticklabel, m_yscale.is ("log"), yaxislocation_is ("origin"), - xscale.is ("log") ? 2 : + m_xscale.is ("log") ? 2 : (xaxislocation_is ("origin") ? 0 : (xaxislocation_is ("bottom") ? -1 : 1)), - ylim); - - fix_limits (ylim); + m_ylim); + + fix_limits (m_ylim); update_yscale (); @@ -4254,12 +4263,14 @@ { update_axis_limits ("zlim"); - calc_ticks_and_lims (zlim, ztick, zminortickvalues, zlimmode.is ("auto"), - ztickmode.is ("auto"), zscale.is ("log")); - if (zticklabelmode.is ("auto")) - calc_ticklabels (ztick, zticklabel, zscale.is ("log"), false, 2, zlim); - - fix_limits (zlim); + calc_ticks_and_lims (m_zlim, m_ztick, m_zminortickvalues, + m_zlimmode.is ("auto"), m_ztickmode.is ("auto"), + m_zscale.is ("log")); + if (m_zticklabelmode.is ("auto")) + calc_ticklabels (m_ztick, m_zticklabel, m_zscale.is ("log"), false, + 2, m_zlim); + + fix_limits (m_zlim); update_zscale (); @@ -4271,13 +4282,13 @@ }; private: - properties xproperties; + properties m_properties; public: axes (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p), default_properties () - { - xproperties.update_transform (); + : base_graphics_object (), m_properties (mh, p), m_default_properties () + { + m_properties.update_transform (); } ~axes (void) = default; @@ -4286,14 +4297,14 @@ { // Allow parent (figure) to override first (properties knows how // to find the parent object). - xproperties.override_defaults (obj); + m_properties.override_defaults (obj); // Now override with our defaults. If the default_properties // list includes the properties for all defaults (line, // surface, etc.) then we don't have to know the type of OBJ // here, we just call its set function and let it decide which // properties from the list to use. - obj.set_from_list (default_properties); + obj.set_from_list (m_default_properties); } void set (const caseless_str& name, const octave_value& value) @@ -4302,14 +4313,14 @@ // strip "default", pass rest to function that will // parse the remainder and add the element to the // default_properties map. - default_properties.set (name.substr (7), value); + m_default_properties.set (name.substr (7), value); else - xproperties.set (name, value); + m_properties.set (name, value); } void set_defaults (const std::string& mode) { - xproperties.set_defaults (*this, mode); + m_properties.set_defaults (*this, mode); } octave_value get (const caseless_str& name) const @@ -4320,7 +4331,7 @@ if (name.compare ("default", 7)) retval = get_default (name.substr (7)); else - retval = xproperties.get (name); + retval = m_properties.get (name); return retval; } @@ -4329,17 +4340,17 @@ octave_value get_defaults (void) const { - return default_properties.as_struct ("default"); + return m_default_properties.as_struct ("default"); } property_list get_defaults_list (void) const { - return default_properties; - } - - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + return m_default_properties; + } + + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } OCTINTERP_API void update_axis_limits (const std::string& axis_type); @@ -4352,7 +4363,7 @@ bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -4362,7 +4373,7 @@ OCTINTERP_API void initialize (const graphics_object& go); private: - property_list default_properties; + property_list m_default_properties; }; // --------------------------------------------------------------------- @@ -4408,8 +4419,8 @@ protected: void init (void) { - linewidth.add_constraint ("min", 0, false); - markersize.add_constraint ("min", 0, false); + m_linewidth.add_constraint ("min", 0, false); + m_markersize.add_constraint ("min", 0, false); } private: @@ -4420,28 +4431,28 @@ void update_ydata (void) { set_ylim (compute_ylim ()); } - void update_zdata (void) { set_zlim (zdata.get_limits ()); } + void update_zdata (void) { set_zlim (m_zdata.get_limits ()); } }; private: - properties xproperties; + properties m_properties; public: line (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) + : base_graphics_object (), m_properties (mh, p) { } ~line (void) = default; - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -4476,11 +4487,11 @@ new_val = new_val.resize (dv, true); } - if (position.set (new_val, false)) + if (m_position.set (new_val, false)) { set_positionmode ("manual"); update_position (); - position.run_listeners (GCB_POSTSET); + m_position.run_listeners (GCB_POSTSET); mark_modified (); } else @@ -4533,19 +4544,19 @@ OCTINTERP_API Matrix get_data_position (void) const; OCTINTERP_API Matrix get_extent_matrix (bool rotated = false) const; - const uint8NDArray& get_pixels (void) const { return pixels; } + const uint8NDArray& get_pixels (void) const { return m_pixels; } // Text renderer, used for calculation of text size - octave::text_renderer txt_renderer; + octave::text_renderer m_txt_renderer; protected: void init (void) { - position.add_constraint (dim_vector (1, 3)); - fontsize.add_constraint ("min", 0.0, false); - linewidth.add_constraint ("min", 0.0, false); - margin.add_constraint ("min", 0.0, false); - cached_units = get_units (); + m_position.add_constraint (dim_vector (1, 3)); + m_fontsize.add_constraint ("min", 0.0, false); + m_linewidth.add_constraint ("min", 0.0, false); + m_margin.add_constraint ("min", 0.0, false); + m_cached_units = get_units (); update_font (); } @@ -4593,7 +4604,7 @@ void update_color (void) { - if (! color.is ("none")) + if (! m_color.is ("none")) { update_font (); update_text_extent (); @@ -4615,31 +4626,31 @@ OCTINTERP_API void update_fontunits (const caseless_str& old_fontunits); private: - std::string cached_units; - uint8NDArray pixels; + std::string m_cached_units; + uint8NDArray m_pixels; }; private: - properties xproperties; + properties m_properties; public: text (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) - { - xproperties.set_clipping ("off"); + : base_graphics_object (), m_properties (mh, p) + { + m_properties.set_clipping ("off"); } ~text (void) = default; - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -4657,14 +4668,14 @@ public: bool is_aliminclude (void) const - { return (aliminclude.is_on () && alphadatamapping.is ("scaled")); } + { return (m_aliminclude.is_on () && m_alphadatamapping.is ("scaled")); } std::string get_aliminclude (void) const - { return aliminclude.current_value (); } + { return m_aliminclude.current_value (); } bool is_climinclude (void) const - { return (climinclude.is_on () && cdatamapping.is ("scaled")); } + { return (m_climinclude.is_on () && m_cdatamapping.is ("scaled")); } std::string get_climinclude (void) const - { return climinclude.current_value (); } + { return m_climinclude.current_value (); } OCTINTERP_API octave_value get_color_data (void) const; @@ -4697,64 +4708,64 @@ protected: void init (void) { - xdata.add_constraint (2); - xdata.add_constraint (dim_vector (0, 0)); - ydata.add_constraint (2); - ydata.add_constraint (dim_vector (0, 0)); - cdata.add_constraint ("double"); - cdata.add_constraint ("single"); - cdata.add_constraint ("logical"); - cdata.add_constraint ("int8"); - cdata.add_constraint ("int16"); - cdata.add_constraint ("int32"); - cdata.add_constraint ("int64"); - cdata.add_constraint ("uint8"); - cdata.add_constraint ("uint16"); - cdata.add_constraint ("uint32"); - cdata.add_constraint ("uint64"); - cdata.add_constraint ("real"); - cdata.add_constraint (dim_vector (-1, -1)); - cdata.add_constraint (dim_vector (-1, -1, 3)); - alphadata.add_constraint ("double"); - alphadata.add_constraint ("uint8"); - alphadata.add_constraint (dim_vector (-1, -1)); + m_xdata.add_constraint (2); + m_xdata.add_constraint (dim_vector (0, 0)); + m_ydata.add_constraint (2); + m_ydata.add_constraint (dim_vector (0, 0)); + m_cdata.add_constraint ("double"); + m_cdata.add_constraint ("single"); + m_cdata.add_constraint ("logical"); + m_cdata.add_constraint ("int8"); + m_cdata.add_constraint ("int16"); + m_cdata.add_constraint ("int32"); + m_cdata.add_constraint ("int64"); + m_cdata.add_constraint ("uint8"); + m_cdata.add_constraint ("uint16"); + m_cdata.add_constraint ("uint32"); + m_cdata.add_constraint ("uint64"); + m_cdata.add_constraint ("real"); + m_cdata.add_constraint (dim_vector (-1, -1)); + m_cdata.add_constraint (dim_vector (-1, -1, 3)); + m_alphadata.add_constraint ("double"); + m_alphadata.add_constraint ("uint8"); + m_alphadata.add_constraint (dim_vector (-1, -1)); } private: void update_alphadata (void) { if (alphadatamapping_is ("scaled")) - set_alim (alphadata.get_limits ()); + set_alim (m_alphadata.get_limits ()); else - alim = alphadata.get_limits (); + m_alim = m_alphadata.get_limits (); } void update_cdata (void) { if (cdatamapping_is ("scaled")) - set_clim (cdata.get_limits ()); + set_clim (m_cdata.get_limits ()); else - clim = cdata.get_limits (); - - if (xdatamode.is ("auto")) + m_clim = m_cdata.get_limits (); + + if (m_xdatamode.is ("auto")) update_xdata (); - if (ydatamode.is ("auto")) + if (m_ydatamode.is ("auto")) update_ydata (); } void update_xdata (void) { - if (xdata.get ().isempty ()) + if (m_xdata.get ().isempty ()) set_xdatamode ("auto"); - if (xdatamode.is ("auto")) + if (m_xdatamode.is ("auto")) { set_xdata (get_auto_xdata ()); set_xdatamode ("auto"); } - Matrix limits = xdata.get_limits (); + Matrix limits = m_xdata.get_limits (); float dp = pixel_xsize (); limits(0) = limits(0) - dp; @@ -4764,16 +4775,16 @@ void update_ydata (void) { - if (ydata.get ().isempty ()) + if (m_ydata.get ().isempty ()) set_ydatamode ("auto"); - if (ydatamode.is ("auto")) + if (m_ydatamode.is ("auto")) { set_ydata (get_auto_ydata ()); set_ydatamode ("auto"); } - Matrix limits = ydata.get_limits (); + Matrix limits = m_ydata.get_limits (); float dp = pixel_ysize (); limits(0) = limits(0) - dp; @@ -4825,36 +4836,36 @@ public: float pixel_xsize (void) { - return pixel_size ((get_cdata ().dims ())(1), xdata.get_limits ()); + return pixel_size ((get_cdata ().dims ())(1), m_xdata.get_limits ()); } float pixel_ysize (void) { - return pixel_size ((get_cdata ().dims ())(0), ydata.get_limits ()); + return pixel_size ((get_cdata ().dims ())(0), m_ydata.get_limits ()); } }; private: - properties xproperties; + properties m_properties; public: image (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) - { - xproperties.initialize_data (); + : base_graphics_object (), m_properties (mh, p) + { + m_properties.initialize_data (); } ~image (void) = default; - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -4882,7 +4893,7 @@ protected: void init (void) { - position.add_constraint (dim_vector (1, 3)); + m_position.add_constraint (dim_vector (1, 3)); } private: @@ -4890,24 +4901,24 @@ }; private: - properties xproperties; + properties m_properties; public: light (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) + : base_graphics_object (), m_properties (mh, p) { } ~light (void) = default; - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -4938,14 +4949,14 @@ } bool is_aliminclude (void) const - { return (aliminclude.is_on () && alphadatamapping.is ("scaled")); } + { return (m_aliminclude.is_on () && m_alphadatamapping.is ("scaled")); } std::string get_aliminclude (void) const - { return aliminclude.current_value (); } + { return m_aliminclude.current_value (); } bool is_climinclude (void) const - { return (climinclude.is_on () && cdatamapping.is ("scaled")); } + { return (m_climinclude.is_on () && m_cdatamapping.is ("scaled")); } std::string get_climinclude (void) const - { return climinclude.current_value (); } + { return m_climinclude.current_value (); } OCTINTERP_API bool get_do_lighting (void) const; @@ -5006,47 +5017,47 @@ protected: void init (void) { - xdata.add_constraint (dim_vector (-1, -1)); - ydata.add_constraint (dim_vector (-1, -1)); - zdata.add_constraint (dim_vector (-1, -1)); - faces.add_constraint (dim_vector (-1, -1)); - vertices.add_constraint (dim_vector (-1, 2)); - vertices.add_constraint (dim_vector (-1, 3)); - cdata.add_constraint ("double"); - cdata.add_constraint ("single"); - cdata.add_constraint ("logical"); - cdata.add_constraint ("int8"); - cdata.add_constraint ("int16"); - cdata.add_constraint ("int32"); - cdata.add_constraint ("int64"); - cdata.add_constraint ("uint8"); - cdata.add_constraint ("uint16"); - cdata.add_constraint ("uint32"); - cdata.add_constraint ("uint64"); - cdata.add_constraint ("real"); - cdata.add_constraint (dim_vector (-1, -1)); - cdata.add_constraint (dim_vector (-1, -1, 3)); - facevertexcdata.add_constraint (dim_vector (-1, 1)); - facevertexcdata.add_constraint (dim_vector (-1, 3)); - facevertexcdata.add_constraint (dim_vector (0, 0)); - facevertexalphadata.add_constraint (dim_vector (-1, 1)); - facevertexalphadata.add_constraint (dim_vector (0, 0)); - facenormals.add_constraint (dim_vector (-1, 3)); - facenormals.add_constraint (dim_vector (0, 0)); - vertexnormals.add_constraint (dim_vector (-1, 3)); - vertexnormals.add_constraint (dim_vector (0, 0)); - - ambientstrength.add_constraint ("min", 0.0, true); - ambientstrength.add_constraint ("max", 1.0, true); - diffusestrength.add_constraint ("min", 0.0, true); - diffusestrength.add_constraint ("max", 1.0, true); - linewidth.add_constraint ("min", 0.0, false); - markersize.add_constraint ("min", 0.0, false); - specularcolorreflectance.add_constraint ("min", 0.0, true); - specularcolorreflectance.add_constraint ("max", 1.0, true); - specularexponent.add_constraint ("min", 0.0, false); - specularstrength.add_constraint ("min", 0.0, true); - specularstrength.add_constraint ("max", 1.0, true); + m_xdata.add_constraint (dim_vector (-1, -1)); + m_ydata.add_constraint (dim_vector (-1, -1)); + m_zdata.add_constraint (dim_vector (-1, -1)); + m_faces.add_constraint (dim_vector (-1, -1)); + m_vertices.add_constraint (dim_vector (-1, 2)); + m_vertices.add_constraint (dim_vector (-1, 3)); + m_cdata.add_constraint ("double"); + m_cdata.add_constraint ("single"); + m_cdata.add_constraint ("logical"); + m_cdata.add_constraint ("int8"); + m_cdata.add_constraint ("int16"); + m_cdata.add_constraint ("int32"); + m_cdata.add_constraint ("int64"); + m_cdata.add_constraint ("uint8"); + m_cdata.add_constraint ("uint16"); + m_cdata.add_constraint ("uint32"); + m_cdata.add_constraint ("uint64"); + m_cdata.add_constraint ("real"); + m_cdata.add_constraint (dim_vector (-1, -1)); + m_cdata.add_constraint (dim_vector (-1, -1, 3)); + m_facevertexcdata.add_constraint (dim_vector (-1, 1)); + m_facevertexcdata.add_constraint (dim_vector (-1, 3)); + m_facevertexcdata.add_constraint (dim_vector (0, 0)); + m_facevertexalphadata.add_constraint (dim_vector (-1, 1)); + m_facevertexalphadata.add_constraint (dim_vector (0, 0)); + m_facenormals.add_constraint (dim_vector (-1, 3)); + m_facenormals.add_constraint (dim_vector (0, 0)); + m_vertexnormals.add_constraint (dim_vector (-1, 3)); + m_vertexnormals.add_constraint (dim_vector (0, 0)); + + m_ambientstrength.add_constraint ("min", 0.0, true); + m_ambientstrength.add_constraint ("max", 1.0, true); + m_diffusestrength.add_constraint ("min", 0.0, true); + m_diffusestrength.add_constraint ("max", 1.0, true); + m_linewidth.add_constraint ("min", 0.0, false); + m_markersize.add_constraint ("min", 0.0, false); + m_specularcolorreflectance.add_constraint ("min", 0.0, true); + m_specularcolorreflectance.add_constraint ("max", 1.0, true); + m_specularexponent.add_constraint ("min", 0.0, false); + m_specularstrength.add_constraint ("min", 0.0, true); + m_specularstrength.add_constraint ("max", 1.0, true); } public: @@ -5086,7 +5097,7 @@ update_normals (true); } - set_xlim (xdata.get_limits ()); + set_xlim (m_xdata.get_limits ()); } void update_ydata (void) @@ -5104,14 +5115,14 @@ update_normals (true); } - set_ylim (ydata.get_limits ()); + set_ylim (m_ydata.get_limits ()); } void update_zdata (void) { update_fvc (); update_normals (true); - set_zlim (zdata.get_limits ()); + set_zlim (m_zdata.get_limits ()); } void update_cdata (void) @@ -5120,9 +5131,9 @@ update_normals (false); if (cdatamapping_is ("scaled")) - set_clim (cdata.get_limits ()); + set_clim (m_cdata.get_limits ()); else - clim = cdata.get_limits (); + m_clim = m_cdata.get_limits (); } OCTINTERP_API void update_data (void); @@ -5159,25 +5170,25 @@ }; private: - properties xproperties; - property_list default_properties; + properties m_properties; + property_list m_default_properties; public: patch (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) + : base_graphics_object (), m_properties (mh, p) { } ~patch (void) = default; - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -5211,14 +5222,14 @@ } bool is_aliminclude (void) const - { return aliminclude.is_on (); } + { return m_aliminclude.is_on (); } std::string get_aliminclude (void) const - { return aliminclude.current_value (); } + { return m_aliminclude.current_value (); } bool is_climinclude (void) const - { return climinclude.is_on (); } + { return m_climinclude.is_on (); } std::string get_climinclude (void) const - { return climinclude.current_value (); } + { return m_climinclude.current_value (); } // See the genprops.awk script for an explanation of the // properties declarations. @@ -5271,44 +5282,44 @@ protected: void init (void) { - xdata.add_constraint (dim_vector (-1, 1)); - xdata.add_constraint (dim_vector (1, -1)); - xdata.add_constraint (dim_vector (-1, 0)); - xdata.add_constraint (dim_vector (0, -1)); - ydata.add_constraint (dim_vector (-1, 1)); - ydata.add_constraint (dim_vector (1, -1)); - ydata.add_constraint (dim_vector (-1, 0)); - ydata.add_constraint (dim_vector (0, -1)); - zdata.add_constraint (dim_vector (-1, 1)); - zdata.add_constraint (dim_vector (1, -1)); - zdata.add_constraint (dim_vector (-1, 0)); - zdata.add_constraint (dim_vector (0, -1)); - sizedata.add_constraint ("min", 0.0, false); - sizedata.add_constraint (dim_vector (-1, 1)); - sizedata.add_constraint (dim_vector (1, -1)); - sizedata.add_constraint (dim_vector (-1, 0)); - sizedata.add_constraint (dim_vector (0, -1)); - cdata.add_constraint ("double"); - cdata.add_constraint ("single"); - cdata.add_constraint ("logical"); - cdata.add_constraint ("int8"); - cdata.add_constraint ("int16"); - cdata.add_constraint ("int32"); - cdata.add_constraint ("int64"); - cdata.add_constraint ("uint8"); - cdata.add_constraint ("uint16"); - cdata.add_constraint ("uint32"); - cdata.add_constraint ("uint64"); - cdata.add_constraint ("real"); - cdata.add_constraint (dim_vector (-1, 1)); - cdata.add_constraint (dim_vector (-1, 3)); - cdata.add_constraint (dim_vector (-1, 0)); - cdata.add_constraint (dim_vector (0, -1)); - - linewidth.add_constraint ("min", 0.0, false); - seriesindex.add_constraint (dim_vector (1, 1)); - seriesindex.add_constraint (dim_vector (-1, 0)); - seriesindex.add_constraint (dim_vector (0, -1)); + m_xdata.add_constraint (dim_vector (-1, 1)); + m_xdata.add_constraint (dim_vector (1, -1)); + m_xdata.add_constraint (dim_vector (-1, 0)); + m_xdata.add_constraint (dim_vector (0, -1)); + m_ydata.add_constraint (dim_vector (-1, 1)); + m_ydata.add_constraint (dim_vector (1, -1)); + m_ydata.add_constraint (dim_vector (-1, 0)); + m_ydata.add_constraint (dim_vector (0, -1)); + m_zdata.add_constraint (dim_vector (-1, 1)); + m_zdata.add_constraint (dim_vector (1, -1)); + m_zdata.add_constraint (dim_vector (-1, 0)); + m_zdata.add_constraint (dim_vector (0, -1)); + m_sizedata.add_constraint ("min", 0.0, false); + m_sizedata.add_constraint (dim_vector (-1, 1)); + m_sizedata.add_constraint (dim_vector (1, -1)); + m_sizedata.add_constraint (dim_vector (-1, 0)); + m_sizedata.add_constraint (dim_vector (0, -1)); + m_cdata.add_constraint ("double"); + m_cdata.add_constraint ("single"); + m_cdata.add_constraint ("logical"); + m_cdata.add_constraint ("int8"); + m_cdata.add_constraint ("int16"); + m_cdata.add_constraint ("int32"); + m_cdata.add_constraint ("int64"); + m_cdata.add_constraint ("uint8"); + m_cdata.add_constraint ("uint16"); + m_cdata.add_constraint ("uint32"); + m_cdata.add_constraint ("uint64"); + m_cdata.add_constraint ("real"); + m_cdata.add_constraint (dim_vector (-1, 1)); + m_cdata.add_constraint (dim_vector (-1, 3)); + m_cdata.add_constraint (dim_vector (-1, 0)); + m_cdata.add_constraint (dim_vector (0, -1)); + + m_linewidth.add_constraint ("min", 0.0, false); + m_seriesindex.add_constraint (dim_vector (1, 1)); + m_seriesindex.add_constraint (dim_vector (-1, 0)); + m_seriesindex.add_constraint (dim_vector (0, -1)); } public: @@ -5325,13 +5336,13 @@ // if x/ydata are set empty, silently empty other *data properties. set_ydata (Matrix ()); set_zdata (Matrix ()); - bool cdatamode_auto = cdatamode.is ("auto"); + bool cdatamode_auto = m_cdatamode.is ("auto"); set_cdata (Matrix ()); if (cdatamode_auto) set_cdatamode ("auto"); } - set_xlim (xdata.get_limits ()); + set_xlim (m_xdata.get_limits ()); update_data (); } @@ -5342,20 +5353,20 @@ { set_xdata (Matrix ()); set_zdata (Matrix ()); - bool cdatamode_auto = cdatamode.is ("auto"); + bool cdatamode_auto = m_cdatamode.is ("auto"); set_cdata (Matrix ()); if (cdatamode_auto) set_cdatamode ("auto"); } - set_ylim (ydata.get_limits ()); + set_ylim (m_ydata.get_limits ()); update_data (); } void update_zdata (void) { - set_zlim (zdata.get_limits ()); + set_zlim (m_zdata.get_limits ()); update_data (); } @@ -5368,22 +5379,22 @@ void update_cdata (void) { if (get_cdata ().matrix_value ().rows () == 1) - set_clim (cdata.get_limits ()); + set_clim (m_cdata.get_limits ()); else - clim = cdata.get_limits (); + m_clim = m_cdata.get_limits (); update_data (); } void update_cdatamode (void) { - if (cdatamode.is ("auto")) + if (m_cdatamode.is ("auto")) update_color (); } void update_seriesindex (void) { - if (cdatamode.is ("auto")) + if (m_cdatamode.is ("auto")) update_color (); } @@ -5392,12 +5403,12 @@ }; private: - properties xproperties; - property_list default_properties; + properties m_properties; + property_list m_default_properties; public: scatter (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) + : base_graphics_object (), m_properties (mh, p) { // FIXME: seriesindex should increment by one each time a new scatter // object is added to the axes. @@ -5405,15 +5416,15 @@ ~scatter (void) = default; - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -5437,14 +5448,14 @@ octave_value get_color_data (void) const; bool is_aliminclude (void) const - { return (aliminclude.is_on () && alphadatamapping.is ("scaled")); } + { return (m_aliminclude.is_on () && m_alphadatamapping.is ("scaled")); } std::string get_aliminclude (void) const - { return aliminclude.current_value (); } + { return m_aliminclude.current_value (); } bool is_climinclude (void) const - { return (climinclude.is_on () && cdatamapping.is ("scaled")); } + { return (m_climinclude.is_on () && m_cdatamapping.is ("scaled")); } std::string get_climinclude (void) const - { return climinclude.current_value (); } + { return m_climinclude.current_value (); } OCTINTERP_API bool get_do_lighting (void) const; @@ -5505,42 +5516,42 @@ protected: void init (void) { - xdata.add_constraint (dim_vector (-1, -1)); - ydata.add_constraint (dim_vector (-1, -1)); - zdata.add_constraint (dim_vector (-1, -1)); - cdata.add_constraint ("double"); - cdata.add_constraint ("single"); - cdata.add_constraint ("logical"); - cdata.add_constraint ("int8"); - cdata.add_constraint ("int16"); - cdata.add_constraint ("int32"); - cdata.add_constraint ("int64"); - cdata.add_constraint ("uint8"); - cdata.add_constraint ("uint16"); - cdata.add_constraint ("uint32"); - cdata.add_constraint ("uint64"); - cdata.add_constraint ("real"); - cdata.add_constraint (dim_vector (-1, -1)); - cdata.add_constraint (dim_vector (-1, -1, 3)); - alphadata.add_constraint ("double"); - alphadata.add_constraint ("uint8"); - alphadata.add_constraint (dim_vector (-1, -1)); - facenormals.add_constraint (dim_vector (-1, -1, 3)); - facenormals.add_constraint (dim_vector (0, 0)); - vertexnormals.add_constraint (dim_vector (-1, -1, 3)); - vertexnormals.add_constraint (dim_vector (0, 0)); - - ambientstrength.add_constraint ("min", 0.0, true); - ambientstrength.add_constraint ("max", 1.0, true); - diffusestrength.add_constraint ("min", 0.0, true); - diffusestrength.add_constraint ("max", 1.0, true); - linewidth.add_constraint ("min", 0.0, false); - markersize.add_constraint ("min", 0.0, false); - specularcolorreflectance.add_constraint ("min", 0.0, true); - specularcolorreflectance.add_constraint ("max", 1.0, true); - specularexponent.add_constraint ("min", 0.0, false); - specularstrength.add_constraint ("min", 0.0, true); - specularstrength.add_constraint ("max", 1.0, true); + m_xdata.add_constraint (dim_vector (-1, -1)); + m_ydata.add_constraint (dim_vector (-1, -1)); + m_zdata.add_constraint (dim_vector (-1, -1)); + m_cdata.add_constraint ("double"); + m_cdata.add_constraint ("single"); + m_cdata.add_constraint ("logical"); + m_cdata.add_constraint ("int8"); + m_cdata.add_constraint ("int16"); + m_cdata.add_constraint ("int32"); + m_cdata.add_constraint ("int64"); + m_cdata.add_constraint ("uint8"); + m_cdata.add_constraint ("uint16"); + m_cdata.add_constraint ("uint32"); + m_cdata.add_constraint ("uint64"); + m_cdata.add_constraint ("real"); + m_cdata.add_constraint (dim_vector (-1, -1)); + m_cdata.add_constraint (dim_vector (-1, -1, 3)); + m_alphadata.add_constraint ("double"); + m_alphadata.add_constraint ("uint8"); + m_alphadata.add_constraint (dim_vector (-1, -1)); + m_facenormals.add_constraint (dim_vector (-1, -1, 3)); + m_facenormals.add_constraint (dim_vector (0, 0)); + m_vertexnormals.add_constraint (dim_vector (-1, -1, 3)); + m_vertexnormals.add_constraint (dim_vector (0, 0)); + + m_ambientstrength.add_constraint ("min", 0.0, true); + m_ambientstrength.add_constraint ("max", 1.0, true); + m_diffusestrength.add_constraint ("min", 0.0, true); + m_diffusestrength.add_constraint ("max", 1.0, true); + m_linewidth.add_constraint ("min", 0.0, false); + m_markersize.add_constraint ("min", 0.0, false); + m_specularcolorreflectance.add_constraint ("min", 0.0, true); + m_specularcolorreflectance.add_constraint ("max", 1.0, true); + m_specularexponent.add_constraint ("min", 0.0, false); + m_specularstrength.add_constraint ("min", 0.0, true); + m_specularstrength.add_constraint ("max", 1.0, true); } public: @@ -5555,35 +5566,35 @@ void update_alphadata (void) { if (alphadatamapping_is ("scaled")) - set_alim (alphadata.get_limits ()); + set_alim (m_alphadata.get_limits ()); else - alim = alphadata.get_limits (); + m_alim = m_alphadata.get_limits (); } void update_cdata (void) { if (cdatamapping_is ("scaled")) - set_clim (cdata.get_limits ()); + set_clim (m_cdata.get_limits ()); else - clim = cdata.get_limits (); + m_clim = m_cdata.get_limits (); } void update_xdata (void) { update_normals (true); - set_xlim (xdata.get_limits ()); + set_xlim (m_xdata.get_limits ()); } void update_ydata (void) { update_normals (true); - set_ylim (ydata.get_limits ()); + set_ylim (m_ydata.get_limits ()); } void update_zdata (void) { update_normals (true); - set_zlim (zdata.get_limits ()); + set_zlim (m_zdata.get_limits ()); } OCTINTERP_API void update_face_normals (bool reset, bool force = false); @@ -5610,24 +5621,24 @@ }; private: - properties xproperties; + properties m_properties; public: surface (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) + : base_graphics_object (), m_properties (mh, p) { } ~surface (void) = default; - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -5681,18 +5692,18 @@ }; private: - properties xproperties; + properties m_properties; public: hggroup (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) + : base_graphics_object (), m_properties (mh, p) { } ~hggroup (void) = default; - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } @@ -5703,7 +5714,7 @@ bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -5753,29 +5764,29 @@ protected: void init (void) { - position.add_constraint ("min", 0, false); + m_position.add_constraint ("min", 0, false); } }; private: - properties xproperties; + properties m_properties; public: uimenu (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) + : base_graphics_object (), m_properties (mh, p) { } ~uimenu (void) = default; - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -5817,9 +5828,9 @@ protected: void init (void) { - position.add_constraint (dim_vector (1, 2)); - position.add_constraint (dim_vector (2, 1)); - visible.set (octave_value (false)); + m_position.add_constraint (dim_vector (1, 2)); + m_position.add_constraint (dim_vector (2, 1)); + m_visible.set (octave_value (false)); } private: @@ -5831,24 +5842,24 @@ }; private: - properties xproperties; + properties m_properties; public: uicontextmenu (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) + : base_graphics_object (), m_properties (mh, p) { } ~uicontextmenu (void) = default; - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -5910,20 +5921,20 @@ END_PROPERTIES private: - std::string cached_units; + std::string m_cached_units; protected: void init (void) { - cdata.add_constraint ("double"); - cdata.add_constraint ("single"); - cdata.add_constraint ("uint8"); - cdata.add_constraint (dim_vector (-1, -1, 3)); - cdata.add_constraint (dim_vector (0, 0)); - position.add_constraint (dim_vector (1, 4)); - sliderstep.add_constraint (dim_vector (1, 2)); - fontsize.add_constraint ("min", 0.0, false); - cached_units = get_units (); + m_cdata.add_constraint ("double"); + m_cdata.add_constraint ("single"); + m_cdata.add_constraint ("uint8"); + m_cdata.add_constraint (dim_vector (-1, -1, 3)); + m_cdata.add_constraint (dim_vector (0, 0)); + m_position.add_constraint (dim_vector (1, 4)); + m_sliderstep.add_constraint (dim_vector (1, 2)); + m_fontsize.add_constraint ("min", 0.0, false); + m_cached_units = get_units (); } OCTINTERP_API void update_text_extent (void); @@ -5944,24 +5955,24 @@ }; private: - properties xproperties; + properties m_properties; public: uicontrol (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) + : base_graphics_object (), m_properties (mh, p) { } ~uicontrol (void) = default; - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -6026,9 +6037,9 @@ protected: void init (void) { - position.add_constraint (dim_vector (1, 4)); - borderwidth.add_constraint ("min", 0.0, true); - fontsize.add_constraint ("min", 0.0, false); + m_position.add_constraint (dim_vector (1, 4)); + m_borderwidth.add_constraint ("min", 0.0, true); + m_fontsize.add_constraint ("min", 0.0, false); } // void update_text_extent (void); @@ -6044,24 +6055,24 @@ }; private: - properties xproperties; + properties m_properties; public: uibuttongroup (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) + : base_graphics_object (), m_properties (mh, p) { } ~uibuttongroup (void) = default; - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -6118,9 +6129,9 @@ protected: void init (void) { - borderwidth.add_constraint ("min", 0.0, true); - fontsize.add_constraint ("min", 0.0, false); - position.add_constraint (dim_vector (1, 4)); + m_borderwidth.add_constraint ("min", 0.0, true); + m_fontsize.add_constraint ("min", 0.0, false); + m_position.add_constraint (dim_vector (1, 4)); } OCTINTERP_API void update_units (const caseless_str& old_units); @@ -6129,24 +6140,24 @@ }; private: - properties xproperties; + properties m_properties; public: uipanel (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) + : base_graphics_object (), m_properties (mh, p) { } ~uipanel (void) = default; - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -6217,11 +6228,11 @@ protected: void init (void) { - position.add_constraint (dim_vector (1, 4)); - extent.add_constraint (dim_vector (1, 4)); - backgroundcolor.add_constraint ("double"); - backgroundcolor.add_constraint (dim_vector (-1, 3)); - columneditable.add_constraint ("logical"); + m_position.add_constraint (dim_vector (1, 4)); + m_extent.add_constraint (dim_vector (1, 4)); + m_backgroundcolor.add_constraint ("double"); + m_backgroundcolor.add_constraint (dim_vector (-1, 3)); + m_columneditable.add_constraint ("logical"); } OCTINTERP_API void update_units (const caseless_str& old_units); @@ -6238,24 +6249,24 @@ }; private: - properties xproperties; + properties m_properties; public: uitable (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) + : base_graphics_object (), m_properties (mh, p) { } ~uitable (void) { } - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -6287,11 +6298,11 @@ }; private: - properties xproperties; + properties m_properties; public: uitoolbar (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p), default_properties () + : base_graphics_object (), m_properties (mh, p), m_default_properties () { } ~uitoolbar (void) = default; @@ -6300,14 +6311,14 @@ { // Allow parent (figure) to override first (properties knows how // to find the parent object). - xproperties.override_defaults (obj); + m_properties.override_defaults (obj); // Now override with our defaults. If the default_properties // list includes the properties for all defaults (line, // surface, etc.) then we don't have to know the type of OBJ // here, we just call its set function and let it decide which // properties from the list to use. - obj.set_from_list (default_properties); + obj.set_from_list (m_default_properties); } void set (const caseless_str& name, const octave_value& value) @@ -6316,9 +6327,9 @@ // strip "default", pass rest to function that will // parse the remainder and add the element to the // default_properties map. - default_properties.set (name.substr (7), value); + m_default_properties.set (name.substr (7), value); else - xproperties.set (name, value); + m_properties.set (name, value); } octave_value get (const caseless_str& name) const @@ -6328,7 +6339,7 @@ if (name.compare ("default", 7)) retval = get_default (name.substr (7)); else - retval = xproperties.get (name); + retval = m_properties.get (name); return retval; } @@ -6337,17 +6348,17 @@ octave_value get_defaults (void) const { - return default_properties.as_struct ("default"); + return m_default_properties.as_struct ("default"); } property_list get_defaults_list (void) const { - return default_properties; - } - - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + return m_default_properties; + } + + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } @@ -6355,14 +6366,14 @@ bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; } private: - property_list default_properties; + property_list m_default_properties; }; // --------------------------------------------------------------------- @@ -6394,33 +6405,33 @@ protected: void init (void) { - cdata.add_constraint ("double"); - cdata.add_constraint ("single"); - cdata.add_constraint ("uint8"); - cdata.add_constraint (dim_vector (-1, -1, 3)); - cdata.add_constraint (dim_vector (0, 0)); + m_cdata.add_constraint ("double"); + m_cdata.add_constraint ("single"); + m_cdata.add_constraint ("uint8"); + m_cdata.add_constraint (dim_vector (-1, -1, 3)); + m_cdata.add_constraint (dim_vector (0, 0)); } }; private: - properties xproperties; + properties m_properties; public: uipushtool (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) + : base_graphics_object (), m_properties (mh, p) { } ~uipushtool (void) = default; - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -6460,33 +6471,33 @@ protected: void init (void) { - cdata.add_constraint ("double"); - cdata.add_constraint ("single"); - cdata.add_constraint ("uint8"); - cdata.add_constraint (dim_vector (-1, -1, 3)); - cdata.add_constraint (dim_vector (0, 0)); + m_cdata.add_constraint ("double"); + m_cdata.add_constraint ("single"); + m_cdata.add_constraint ("uint8"); + m_cdata.add_constraint (dim_vector (-1, -1, 3)); + m_cdata.add_constraint (dim_vector (0, 0)); } }; private: - properties xproperties; + properties m_properties; public: uitoggletool (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), xproperties (mh, p) + : base_graphics_object (), m_properties (mh, p) { } ~uitoggletool (void) = default; - base_properties& get_properties (void) { return xproperties; } - - const base_properties& get_properties (void) const { return xproperties; } + base_properties& get_properties (void) { return m_properties; } + + const base_properties& get_properties (void) const { return m_properties; } bool valid_object (void) const { return true; } bool has_readonly_property (const caseless_str& pname) const { - bool retval = xproperties.has_readonly_property (pname); + bool retval = m_properties.has_readonly_property (pname); if (! retval) retval = base_properties::has_readonly_property (pname); return retval; @@ -6544,7 +6555,7 @@ graphics_event (void) = default; - graphics_event (base_graphics_event *new_rep) : rep (new_rep) { } + graphics_event (base_graphics_event *new_rep) : m_rep (new_rep) { } graphics_event (const graphics_event&) = default; @@ -6555,7 +6566,7 @@ int get_busyaction (void) { if (ok ()) - return rep->get_busyaction (); + return m_rep->get_busyaction (); else error ("graphics_event::busyaction: invalid graphics_event"); } @@ -6563,10 +6574,10 @@ void execute (void) { if (ok ()) - rep->execute (); - } - - bool ok (void) const { return (rep != nullptr); } + m_rep->execute (); + } + + bool ok (void) const { return (m_rep != nullptr); } static OCTINTERP_API graphics_event create_callback_event (const graphics_handle& h, @@ -6593,7 +6604,7 @@ bool redraw_figure = false); private: - std::shared_ptr <base_graphics_event> rep; + std::shared_ptr <base_graphics_event> m_rep; }; class OCTINTERP_API gh_manager