Mercurial > hg > octave-avbm
changeset 6844:9ac351b05b51
[project @ 2007-08-30 00:46:23 by jwe]
author | jwe |
---|---|
date | Thu, 30 Aug 2007 00:46:23 +0000 |
parents | 9adfed86501f |
children | 11dd2cb3825c |
files | src/ChangeLog src/graphics.cc src/graphics.h |
diffstat | 3 files changed, 231 insertions(+), 221 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,15 @@ 2007-08-29 John W. Eaton <jwe@octave.org> + * graphics.cc (class root_figure::properties): + Rename from root_figure::root_figure_properties. + (class figure::properties): Rename from figure::figure_properties. + (class axes::properties): Rename from axes::axes_properties. + (class line::properties): Rename from line::line_properties. + (class text::properties): Rename from text::text_properties. + (class image::properties): Rename from image::image_properties. + (class patch::properties): Rename from patch::patch_properties. + (class surface::properties): Rename from surface::surface_properties. + * base-list.h (octave_base_list::remove): Implement our own remove_if function here.
--- a/src/graphics.cc +++ b/src/graphics.cc @@ -740,8 +740,8 @@ } void -root_figure::root_figure_properties::set (const property_name& name, - const octave_value& val) +root_figure::properties::set (const property_name& name, + const octave_value& val) { if (name.compare ("currentfigure")) { @@ -764,7 +764,7 @@ warning ("set: invalid property `%s'", name.c_str ()); } -octave_value root_figure::root_figure_properties::get (void) const +octave_value root_figure::properties::get (void) const { Octave_map m; @@ -777,7 +777,7 @@ } octave_value -root_figure::root_figure_properties::get (const property_name& name) const +root_figure::properties::get (const property_name& name) const { octave_value retval; @@ -798,12 +798,12 @@ property_list root_figure::factory_properties = root_figure::init_factory_properties (); -std::string root_figure::root_figure_properties::go_name ("root figure"); +std::string root_figure::properties::go_name ("root figure"); // --------------------------------------------------------------------- -figure::figure_properties::figure_properties (const graphics_handle& mh, - const graphics_handle& p) +figure::properties::properties (const graphics_handle& mh, + const graphics_handle& p) : base_properties (go_name, mh, p), __plot_stream__ (Matrix ()), nextplot ("replace"), @@ -815,8 +815,8 @@ { } void -figure::figure_properties::set (const property_name& name, - const octave_value& val) +figure::properties::set (const property_name& name, + const octave_value& val) { bool modified = true; @@ -869,7 +869,7 @@ } octave_value -figure::figure_properties::get (void) const +figure::properties::get (void) const { Octave_map m; @@ -889,7 +889,7 @@ } octave_value -figure::figure_properties::get (const property_name& name) const +figure::properties::get (const property_name& name) const { octave_value retval; @@ -922,7 +922,7 @@ } void -figure::figure_properties::close (void) +figure::properties::close (void) { if (! __plot_stream__.is_empty ()) { @@ -941,7 +941,7 @@ } property_list::pval_map_type -figure::figure_properties::factory_defaults (void) +figure::properties::factory_defaults (void) { property_list::pval_map_type m; @@ -970,11 +970,11 @@ return retval; } -std::string figure::figure_properties::go_name ("figure"); +std::string figure::properties::go_name ("figure"); // --------------------------------------------------------------------- -axes::axes_properties::axes_properties (const graphics_handle& mh, +axes::properties::properties (const graphics_handle& mh, const graphics_handle& p) : base_properties (go_name, mh, p), position (Matrix ()), @@ -1047,7 +1047,7 @@ } void -axes::axes_properties::set (const property_name& name, const octave_value& val) +axes::properties::set (const property_name& name, const octave_value& val) { bool modified = true; @@ -1242,7 +1242,7 @@ } void -axes::axes_properties::set_defaults (base_graphics_object& obj, +axes::properties::set_defaults (base_graphics_object& obj, const std::string& mode) { position = Matrix (); @@ -1324,7 +1324,7 @@ } octave_value -axes::axes_properties::get (void) const +axes::properties::get (void) const { Octave_map m; @@ -1398,7 +1398,7 @@ } octave_value -axes::axes_properties::get (const property_name& name) const +axes::properties::get (const property_name& name) const { octave_value retval; @@ -1535,7 +1535,7 @@ } void -axes::axes_properties::remove_child (const graphics_handle& h) +axes::properties::remove_child (const graphics_handle& h) { if (! xisnan (title) && h == title) title = gh_manager::make_graphics_handle ("text", __myhandle__); @@ -1550,7 +1550,7 @@ } void -axes::axes_properties::delete_children (void) +axes::properties::delete_children (void) { base_properties::delete_children (); @@ -1568,7 +1568,7 @@ } property_list::pval_map_type -axes::axes_properties::factory_defaults (void) +axes::properties::factory_defaults (void) { property_list::pval_map_type m; @@ -1660,7 +1660,7 @@ return retval; } -std::string axes::axes_properties::go_name ("axes"); +std::string axes::properties::go_name ("axes"); // --------------------------------------------------------------------- @@ -1675,8 +1675,8 @@ return retval; } -line::line_properties::line_properties (const graphics_handle& mh, - const graphics_handle& p) +line::properties::properties (const graphics_handle& mh, + const graphics_handle& p) : base_properties (go_name, mh, p), xdata (default_data ()), ydata (default_data ()), @@ -1696,7 +1696,7 @@ { } void -line::line_properties::set (const property_name& name, const octave_value& val) +line::properties::set (const property_name& name, const octave_value& val) { bool modified = true; @@ -1750,7 +1750,7 @@ } octave_value -line::line_properties::get (void) const +line::properties::get (void) const { Octave_map m; @@ -1778,7 +1778,7 @@ } octave_value -line::line_properties::get (const property_name& name) const +line::properties::get (const property_name& name) const { octave_value retval; @@ -1827,7 +1827,7 @@ } property_list::pval_map_type -line::line_properties::factory_defaults (void) +line::properties::factory_defaults (void) { property_list::pval_map_type m; @@ -1850,12 +1850,12 @@ return m; } -std::string line::line_properties::go_name ("line"); +std::string line::properties::go_name ("line"); // --------------------------------------------------------------------- -text::text_properties::text_properties (const graphics_handle& mh, - const graphics_handle& p) +text::properties::properties (const graphics_handle& mh, + const graphics_handle& p) : base_properties (go_name, mh, p), string (""), units ("data"), @@ -1866,7 +1866,7 @@ { } void -text::text_properties::set (const property_name& name, const octave_value& val) +text::properties::set (const property_name& name, const octave_value& val) { bool modified = true; @@ -1902,7 +1902,7 @@ } octave_value -text::text_properties::get (void) const +text::properties::get (void) const { Octave_map m; @@ -1921,7 +1921,7 @@ } octave_value -text::text_properties::get (const property_name& name) const +text::properties::get (const property_name& name) const { octave_value retval; @@ -1952,7 +1952,7 @@ } property_list::pval_map_type -text::text_properties::factory_defaults (void) +text::properties::factory_defaults (void) { property_list::pval_map_type m; @@ -1966,12 +1966,12 @@ return m; } -std::string text::text_properties::go_name ("text"); +std::string text::properties::go_name ("text"); // --------------------------------------------------------------------- -image::image_properties::image_properties (const graphics_handle& mh, - const graphics_handle& p) +image::properties::properties (const graphics_handle& mh, + const graphics_handle& p) : base_properties (go_name, mh, p), cdata (Matrix ()), xdata (Matrix ()), @@ -1979,8 +1979,8 @@ { } void -image::image_properties::set (const property_name& name, - const octave_value& val) +image::properties::set (const property_name& name, + const octave_value& val) { bool modified = true; @@ -2010,7 +2010,7 @@ } octave_value -image::image_properties::get (void) const +image::properties::get (void) const { Octave_map m; @@ -2026,7 +2026,7 @@ } octave_value -image::image_properties::get (const property_name& name) const +image::properties::get (const property_name& name) const { octave_value retval; @@ -2051,7 +2051,7 @@ } property_list::pval_map_type -image::image_properties::factory_defaults (void) +image::properties::factory_defaults (void) { property_list::pval_map_type m; @@ -2062,12 +2062,12 @@ return m; } -std::string image::image_properties::go_name ("image"); +std::string image::properties::go_name ("image"); // --------------------------------------------------------------------- -patch::patch_properties::patch_properties (const graphics_handle& mh, - const graphics_handle& p) +patch::properties::properties (const graphics_handle& mh, + const graphics_handle& p) : base_properties (go_name, mh, p), cdata (Matrix ()), xdata (Matrix ()), @@ -2085,8 +2085,8 @@ { } void -patch::patch_properties::set (const property_name& name, - const octave_value& val) +patch::properties::set (const property_name& name, + const octave_value& val) { bool modified = true; @@ -2137,7 +2137,7 @@ } octave_value -patch::patch_properties::get (void) const +patch::properties::get (void) const { Octave_map m; @@ -2163,7 +2163,7 @@ } octave_value -patch::patch_properties::get (const property_name& name) const +patch::properties::get (const property_name& name) const { octave_value retval; @@ -2208,7 +2208,7 @@ } property_list::pval_map_type -patch::patch_properties::factory_defaults (void) +patch::properties::factory_defaults (void) { property_list::pval_map_type m; @@ -2230,12 +2230,12 @@ return m; } -std::string patch::patch_properties::go_name ("patch"); +std::string patch::properties::go_name ("patch"); // --------------------------------------------------------------------- -surface::surface_properties::surface_properties (const graphics_handle& mh, - const graphics_handle& p) +surface::properties::properties (const graphics_handle& mh, + const graphics_handle& p) : base_properties (go_name, mh, p), xdata (Matrix ()), ydata (Matrix ()), @@ -2244,8 +2244,8 @@ { } void -surface::surface_properties::set (const property_name& name, - const octave_value& val) +surface::properties::set (const property_name& name, + const octave_value& val) { bool modified = true; @@ -2277,7 +2277,7 @@ } octave_value -surface::surface_properties::get (void) const +surface::properties::get (void) const { Octave_map m; @@ -2294,7 +2294,7 @@ } octave_value -surface::surface_properties::get (const property_name& name) const +surface::properties::get (const property_name& name) const { octave_value retval; @@ -2321,7 +2321,7 @@ } property_list::pval_map_type -surface::surface_properties::factory_defaults (void) +surface::properties::factory_defaults (void) { property_list::pval_map_type m; @@ -2333,7 +2333,7 @@ return m; } -std::string surface::surface_properties::go_name ("surface"); +std::string surface::properties::go_name ("surface"); // --------------------------------------------------------------------- @@ -2429,13 +2429,13 @@ { property_list::plist_map_type plist_map; - plist_map["figure"] = figure::figure_properties::factory_defaults (); - plist_map["axes"] = axes::axes_properties::factory_defaults (); - plist_map["line"] = line::line_properties::factory_defaults (); - plist_map["text"] = text::text_properties::factory_defaults (); - plist_map["image"] = image::image_properties::factory_defaults (); - plist_map["patch"] = patch::patch_properties::factory_defaults (); - plist_map["surface"] = surface::surface_properties::factory_defaults (); + plist_map["figure"] = figure::properties::factory_defaults (); + plist_map["axes"] = axes::properties::factory_defaults (); + plist_map["line"] = line::properties::factory_defaults (); + plist_map["text"] = text::properties::factory_defaults (); + plist_map["image"] = image::properties::factory_defaults (); + plist_map["patch"] = patch::properties::factory_defaults (); + plist_map["surface"] = surface::properties::factory_defaults (); return plist_map; } @@ -2898,8 +2898,8 @@ if (obj.isa ("line")) { - line::line_properties& lp - = dynamic_cast<line::line_properties&> (obj.get_properties ()); + line::properties& lp + = dynamic_cast<line::properties&> (obj.get_properties ()); retval = lp.get_xdata (); Matrix m (1, 5); m(0) = 0;
--- a/src/graphics.h +++ b/src/graphics.h @@ -701,16 +701,16 @@ class root_figure : public base_graphics_object { public: - class root_figure_properties : public base_properties + class properties : public base_properties { public: - root_figure_properties (void) + properties (void) : base_properties ("root figure", 0, octave_NaN), currentfigure (octave_NaN), visible ("on") { } - ~root_figure_properties (void) { } + ~properties (void) { } void set (const property_name& name, const octave_value& val); @@ -728,15 +728,15 @@ }; private: - root_figure_properties properties; + properties xproperties; public: - root_figure (void) : properties (), default_properties () { } + root_figure (void) : xproperties (), default_properties () { } - ~root_figure (void) { properties.delete_children (); } + ~root_figure (void) { xproperties.delete_children (); } - std::string type (void) const { return properties.graphics_object_name (); } + std::string type (void) const { return xproperties.graphics_object_name (); } void mark_modified (void) { } @@ -752,7 +752,7 @@ void set_from_list (property_list& plist) { - properties.set_from_list (*this, plist); + xproperties.set_from_list (*this, plist); } void set (const property_name& name, const octave_value& value) @@ -763,12 +763,12 @@ // default_properties map. default_properties.set (name.substr (7), value); else - properties.set (name, value); + xproperties.set (name, value); } octave_value get (void) const { - return properties.get (); + return xproperties.get (); } octave_value get (const property_name& name) const @@ -780,7 +780,7 @@ else if (name.compare ("factory", 7)) return get_factory_default (name.substr (7)); else - retval = properties.get (name); + retval = xproperties.get (name); return retval; } @@ -815,15 +815,15 @@ return factory_properties.as_struct ("factory"); } - graphics_handle get_parent (void) const { return properties.get_parent (); } + graphics_handle get_parent (void) const { return xproperties.get_parent (); } - void remove_child (const graphics_handle& h) { properties.remove_child (h); } + void remove_child (const graphics_handle& h) { xproperties.remove_child (h); } - void adopt (const graphics_handle& h) { properties.adopt (h); } + void adopt (const graphics_handle& h) { xproperties.adopt (h); } - void reparent (const graphics_handle& np) { properties.reparent (np); } + void reparent (const graphics_handle& np) { xproperties.reparent (np); } - base_properties& get_properties (void) { return properties; } + base_properties& get_properties (void) { return xproperties; } bool valid_object (void) const { return true; } @@ -840,12 +840,12 @@ class figure : public base_graphics_object { public: - class figure_properties : public base_properties + class properties : public base_properties { public: - figure_properties (const graphics_handle& mh, const graphics_handle& p); + properties (const graphics_handle& mh, const graphics_handle& p); - ~figure_properties (void) { } + ~properties (void) { } void set (const property_name& name, const octave_value& val); @@ -872,30 +872,30 @@ }; private: - figure_properties properties; + properties xproperties; public: figure (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), properties (mh, p), default_properties () + : base_graphics_object (), xproperties (mh, p), default_properties () { - properties.override_defaults (*this); + xproperties.override_defaults (*this); } ~figure (void) { - properties.delete_children (); - properties.close (); + xproperties.delete_children (); + xproperties.close (); } - std::string type (void) const { return properties.graphics_object_name (); } + std::string type (void) const { return xproperties.graphics_object_name (); } - void mark_modified (void) { properties.mark_modified (); } + void mark_modified (void) { xproperties.mark_modified (); } void override_defaults (base_graphics_object& obj) { // Allow parent (root figure) to override first (properties knows how // to find the parent object). - properties.override_defaults (obj); + xproperties.override_defaults (obj); // Now override with our defaults. If the default_properties // list includes the properties for all defaults (line, @@ -907,7 +907,7 @@ void set_from_list (property_list& plist) { - properties.set_from_list (*this, plist); + xproperties.set_from_list (*this, plist); } void set (const property_name& name, const octave_value& value) @@ -918,12 +918,12 @@ // default_properties map. default_properties.set (name.substr (7), value); else - properties.set (name, value); + xproperties.set (name, value); } octave_value get (void) const { - return properties.get (); + return xproperties.get (); } octave_value get (const property_name& name) const @@ -933,7 +933,7 @@ if (name.compare ("default", 7)) retval = get_default (name.substr (7)); else - retval = properties.get (name); + retval = xproperties.get (name); return retval; } @@ -945,15 +945,15 @@ return default_properties.as_struct ("default"); } - graphics_handle get_parent (void) const { return properties.get_parent (); } + graphics_handle get_parent (void) const { return xproperties.get_parent (); } - void remove_child (const graphics_handle& h) { properties.remove_child (h); } + void remove_child (const graphics_handle& h) { xproperties.remove_child (h); } - void adopt (const graphics_handle& h) { properties.adopt (h); } + void adopt (const graphics_handle& h) { xproperties.adopt (h); } - void reparent (const graphics_handle& np) { properties.reparent (np); } + void reparent (const graphics_handle& np) { xproperties.reparent (np); } - base_properties& get_properties (void) { return properties; } + base_properties& get_properties (void) { return xproperties; } bool valid_object (void) const { return true; } @@ -966,12 +966,12 @@ class axes : public base_graphics_object { public: - class axes_properties : public base_properties + class properties : public base_properties { public: - axes_properties (const graphics_handle& mh, const graphics_handle& p); + properties (const graphics_handle& mh, const graphics_handle& p); - ~axes_properties (void) { } + ~properties (void) { } void set (const property_name& name, const octave_value& val); @@ -1044,26 +1044,26 @@ }; private: - axes_properties properties; + properties xproperties; public: axes (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), properties (mh, p), default_properties () + : base_graphics_object (), xproperties (mh, p), default_properties () { - properties.override_defaults (*this); + xproperties.override_defaults (*this); } - ~axes (void) { properties.delete_children (); } + ~axes (void) { xproperties.delete_children (); } - std::string type (void) const { return properties.graphics_object_name (); } + std::string type (void) const { return xproperties.graphics_object_name (); } - void mark_modified (void) { properties.mark_modified (); } + void mark_modified (void) { xproperties.mark_modified (); } void override_defaults (base_graphics_object& obj) { // Allow parent (figure) to override first (properties knows how // to find the parent object). - properties.override_defaults (obj); + xproperties.override_defaults (obj); // Now override with our defaults. If the default_properties // list includes the properties for all defaults (line, @@ -1075,7 +1075,7 @@ void set_from_list (property_list& plist) { - properties.set_from_list (*this, plist); + xproperties.set_from_list (*this, plist); } void set (const property_name& name, const octave_value& value) @@ -1086,17 +1086,17 @@ // default_properties map. default_properties.set (name.substr (7), value); else - properties.set (name, value); + xproperties.set (name, value); } void set_defaults (const std::string& mode) { - properties.set_defaults (*this, mode); + xproperties.set_defaults (*this, mode); } octave_value get (void) const { - return properties.get (); + return xproperties.get (); } octave_value get (const property_name& name) const @@ -1107,7 +1107,7 @@ if (name.compare ("default", 7)) retval = get_default (name.substr (7)); else - retval = properties.get (name); + retval = xproperties.get (name); return retval; } @@ -1119,15 +1119,15 @@ return default_properties.as_struct ("default"); } - graphics_handle get_parent (void) const { return properties.get_parent (); } + graphics_handle get_parent (void) const { return xproperties.get_parent (); } - void remove_child (const graphics_handle& h) { properties.remove_child (h); } + void remove_child (const graphics_handle& h) { xproperties.remove_child (h); } - void adopt (const graphics_handle& h) { properties.adopt (h); } + void adopt (const graphics_handle& h) { xproperties.adopt (h); } - void reparent (const graphics_handle& np) { properties.reparent (np); } + void reparent (const graphics_handle& np) { xproperties.reparent (np); } - base_properties& get_properties (void) { return properties; } + base_properties& get_properties (void) { return xproperties; } bool valid_object (void) const { return true; } @@ -1140,12 +1140,12 @@ class line : public base_graphics_object { public: - class line_properties : public base_properties + class properties : public base_properties { public: - line_properties (const graphics_handle& mh, const graphics_handle& p); + properties (const graphics_handle& mh, const graphics_handle& p); - ~line_properties (void) { } + ~properties (void) { } void set (const property_name& name, const octave_value& val); @@ -1178,57 +1178,57 @@ }; private: - line_properties properties; + properties xproperties; public: line (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), properties (mh, p) + : base_graphics_object (), xproperties (mh, p) { - properties.override_defaults (*this); + xproperties.override_defaults (*this); } - ~line (void) { properties.delete_children (); } + ~line (void) { xproperties.delete_children (); } - std::string type (void) const { return properties.graphics_object_name (); } + std::string type (void) const { return xproperties.graphics_object_name (); } - void mark_modified (void) { properties.mark_modified (); } + void mark_modified (void) { xproperties.mark_modified (); } void override_defaults (base_graphics_object& obj) { // Allow parent (figure) to override first (properties knows how // to find the parent object). - properties.override_defaults (obj); + xproperties.override_defaults (obj); } void set_from_list (property_list& plist) { - properties.set_from_list (*this, plist); + xproperties.set_from_list (*this, plist); } void set (const property_name& name, const octave_value& val) { - properties.set (name, val); + xproperties.set (name, val); } octave_value get (void) const { - return properties.get (); + return xproperties.get (); } octave_value get (const property_name& name) const { - return properties.get (name); + return xproperties.get (name); } - graphics_handle get_parent (void) const { return properties.get_parent (); } + graphics_handle get_parent (void) const { return xproperties.get_parent (); } - void remove_child (const graphics_handle& h) { properties.remove_child (h); } + void remove_child (const graphics_handle& h) { xproperties.remove_child (h); } - void adopt (const graphics_handle& h) { properties.adopt (h); } + void adopt (const graphics_handle& h) { xproperties.adopt (h); } - void reparent (const graphics_handle& h) { properties.reparent (h); } + void reparent (const graphics_handle& h) { xproperties.reparent (h); } - base_properties& get_properties (void) { return properties; } + base_properties& get_properties (void) { return xproperties; } bool valid_object (void) const { return true; } }; @@ -1238,12 +1238,12 @@ class text : public base_graphics_object { public: - class text_properties : public base_properties + class properties : public base_properties { public: - text_properties (const graphics_handle& mh, const graphics_handle& p); + properties (const graphics_handle& mh, const graphics_handle& p); - ~text_properties (void) { } + ~properties (void) { } void set (const property_name& name, const octave_value& val); @@ -1267,57 +1267,57 @@ }; private: - text_properties properties; + properties xproperties; public: text (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), properties (mh, p) + : base_graphics_object (), xproperties (mh, p) { - properties.override_defaults (*this); + xproperties.override_defaults (*this); } - ~text (void) { properties.delete_children (); } + ~text (void) { xproperties.delete_children (); } - std::string type (void) const { return properties.graphics_object_name (); } + std::string type (void) const { return xproperties.graphics_object_name (); } - void mark_modified (void) { properties.mark_modified (); } + void mark_modified (void) { xproperties.mark_modified (); } void override_defaults (base_graphics_object& obj) { // Allow parent (figure) to override first (properties knows how // to find the parent object). - properties.override_defaults (obj); + xproperties.override_defaults (obj); } void set_from_list (property_list& plist) { - properties.set_from_list (*this, plist); + xproperties.set_from_list (*this, plist); } void set (const property_name& name, const octave_value& val) { - properties.set (name, val); + xproperties.set (name, val); } octave_value get (void) const { - return properties.get (); + return xproperties.get (); } octave_value get (const property_name& name) const { - return properties.get (name); + return xproperties.get (name); } - graphics_handle get_parent (void) const { return properties.get_parent (); } + graphics_handle get_parent (void) const { return xproperties.get_parent (); } - void remove_child (const graphics_handle& h) { properties.remove_child (h); } + void remove_child (const graphics_handle& h) { xproperties.remove_child (h); } - void adopt (const graphics_handle& h) { properties.adopt (h); } + void adopt (const graphics_handle& h) { xproperties.adopt (h); } - void reparent (const graphics_handle& h) { properties.reparent (h); } + void reparent (const graphics_handle& h) { xproperties.reparent (h); } - base_properties& get_properties (void) { return properties; } + base_properties& get_properties (void) { return xproperties; } bool valid_object (void) const { return true; } }; @@ -1327,12 +1327,12 @@ class image : public base_graphics_object { public: - class image_properties : public base_properties + class properties : public base_properties { public: - image_properties (const graphics_handle& mh, const graphics_handle& p); + properties (const graphics_handle& mh, const graphics_handle& p); - ~image_properties (void) { } + ~properties (void) { } void set (const property_name& name, const octave_value& val); @@ -1353,57 +1353,57 @@ }; private: - image_properties properties; + properties xproperties; public: image (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), properties (mh, p) + : base_graphics_object (), xproperties (mh, p) { - properties.override_defaults (*this); + xproperties.override_defaults (*this); } - ~image (void) { properties.delete_children (); } + ~image (void) { xproperties.delete_children (); } - std::string type (void) const { return properties.graphics_object_name (); } + std::string type (void) const { return xproperties.graphics_object_name (); } - void mark_modified (void) { properties.mark_modified (); } + void mark_modified (void) { xproperties.mark_modified (); } void override_defaults (base_graphics_object& obj) { // Allow parent (figure) to override first (properties knows how // to find the parent object). - properties.override_defaults (obj); + xproperties.override_defaults (obj); } void set_from_list (property_list& plist) { - properties.set_from_list (*this, plist); + xproperties.set_from_list (*this, plist); } void set (const property_name& name, const octave_value& val) { - properties.set (name, val); + xproperties.set (name, val); } octave_value get (void) const { - return properties.get (); + return xproperties.get (); } octave_value get (const property_name& name) const { - return properties.get (name); + return xproperties.get (name); } - graphics_handle get_parent (void) const { return properties.get_parent (); } + graphics_handle get_parent (void) const { return xproperties.get_parent (); } - void remove_child (const graphics_handle& h) { properties.remove_child (h); } + void remove_child (const graphics_handle& h) { xproperties.remove_child (h); } - void adopt (const graphics_handle& h) { properties.adopt (h); } + void adopt (const graphics_handle& h) { xproperties.adopt (h); } - void reparent (const graphics_handle& h) { properties.reparent (h); } + void reparent (const graphics_handle& h) { xproperties.reparent (h); } - base_properties& get_properties (void) { return properties; } + base_properties& get_properties (void) { return xproperties; } bool valid_object (void) const { return true; } }; @@ -1413,12 +1413,12 @@ class patch : public base_graphics_object { public: - class patch_properties : public base_properties + class properties : public base_properties { public: - patch_properties (const graphics_handle& mh, const graphics_handle& p); + properties (const graphics_handle& mh, const graphics_handle& p); - ~patch_properties (void) { } + ~properties (void) { } void set (const property_name& name, const octave_value& val); @@ -1449,57 +1449,57 @@ }; private: - patch_properties properties; + properties xproperties; public: patch (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), properties (mh, p) + : base_graphics_object (), xproperties (mh, p) { - properties.override_defaults (*this); + xproperties.override_defaults (*this); } - ~patch (void) { properties.delete_children (); } + ~patch (void) { xproperties.delete_children (); } - std::string type (void) const { return properties.graphics_object_name (); } + std::string type (void) const { return xproperties.graphics_object_name (); } - void mark_modified (void) { properties.mark_modified (); } + void mark_modified (void) { xproperties.mark_modified (); } void override_defaults (base_graphics_object& obj) { // Allow parent (figure) to override first (properties knows how // to find the parent object). - properties.override_defaults (obj); + xproperties.override_defaults (obj); } void set_from_list (property_list& plist) { - properties.set_from_list (*this, plist); + xproperties.set_from_list (*this, plist); } void set (const property_name& name, const octave_value& val) { - properties.set (name, val); + xproperties.set (name, val); } octave_value get (void) const { - return properties.get (); + return xproperties.get (); } octave_value get (const property_name& name) const { - return properties.get (name); + return xproperties.get (name); } - graphics_handle get_parent (void) const { return properties.get_parent (); } + graphics_handle get_parent (void) const { return xproperties.get_parent (); } - void remove_child (const graphics_handle& h) { properties.remove_child (h); } + void remove_child (const graphics_handle& h) { xproperties.remove_child (h); } - void adopt (const graphics_handle& h) { properties.adopt (h); } + void adopt (const graphics_handle& h) { xproperties.adopt (h); } - void reparent (const graphics_handle& h) { properties.reparent (h); } + void reparent (const graphics_handle& h) { xproperties.reparent (h); } - base_properties& get_properties (void) { return properties; } + base_properties& get_properties (void) { return xproperties; } bool valid_object (void) const { return true; } }; @@ -1509,12 +1509,12 @@ class surface : public base_graphics_object { public: - class surface_properties : public base_properties + class properties : public base_properties { public: - surface_properties (const graphics_handle& mh, const graphics_handle& p); + properties (const graphics_handle& mh, const graphics_handle& p); - ~surface_properties (void) { } + ~properties (void) { } void set (const property_name& name, const octave_value& val); @@ -1536,57 +1536,57 @@ }; private: - surface_properties properties; + properties xproperties; public: surface (const graphics_handle& mh, const graphics_handle& p) - : base_graphics_object (), properties (mh, p) + : base_graphics_object (), xproperties (mh, p) { - properties.override_defaults (*this); + xproperties.override_defaults (*this); } - ~surface (void) { properties.delete_children (); } + ~surface (void) { xproperties.delete_children (); } - std::string type (void) const { return properties.graphics_object_name (); } + std::string type (void) const { return xproperties.graphics_object_name (); } - void mark_modified (void) { properties.mark_modified (); } + void mark_modified (void) { xproperties.mark_modified (); } void override_defaults (base_graphics_object& obj) { // Allow parent (figure) to override first (properties knows how // to find the parent object). - properties.override_defaults (obj); + xproperties.override_defaults (obj); } void set_from_list (property_list& plist) { - properties.set_from_list (*this, plist); + xproperties.set_from_list (*this, plist); } void set (const property_name& name, const octave_value& val) { - properties.set (name, val); + xproperties.set (name, val); } octave_value get (void) const { - return properties.get (); + return xproperties.get (); } octave_value get (const property_name& name) const { - return properties.get (name); + return xproperties.get (name); } - graphics_handle get_parent (void) const { return properties.get_parent (); } + graphics_handle get_parent (void) const { return xproperties.get_parent (); } - void remove_child (const graphics_handle& h) { properties.remove_child (h); } + void remove_child (const graphics_handle& h) { xproperties.remove_child (h); } - void adopt (const graphics_handle& h) { properties.adopt (h); } + void adopt (const graphics_handle& h) { xproperties.adopt (h); } - void reparent (const graphics_handle& h) { properties.reparent (h); } + void reparent (const graphics_handle& h) { xproperties.reparent (h); } - base_properties& get_properties (void) { return properties; } + base_properties& get_properties (void) { return xproperties; } bool valid_object (void) const { return true; } };