octave: libinterp/corefcn/graphics.in.h comparison

comparison libinterp/corefcn/graphics.in.h @ 26982:8d7265e353a0 stable

Improve performance when closing figures (bug #55908). * graphics.cc (gh_manager::do_free): Don't execute remove_child when deleting from groot. * graphics.[cc,in.h] (delete_children, free): Add optional argument to indicate that an object is deleted from graphics root.

author	Markus Mützel <markus.muetzel@gmx.de>
date	Sat, 16 Mar 2019 22:21:26 +0100
parents	3c7c5b7c3044
children	4313b3caa483 232102b1e920

comparison

equal deleted inserted replaced

-:222f5ac853c8
+:8d7265e353a0
 void delete_children (bool clear = false)
 {
 do_delete_children (clear);
 }
+void delete_children (bool clear, bool from_root)
+{
+do_delete_children (clear, from_root);
+}
 void renumber (graphics_handle old_gh, graphics_handle new_gh)
 {
 for (auto& hchild : children_list)
 {
 if (hchild == old_gh)
 {
 children_list.push_front (val);
 }
 void do_delete_children (bool clear);
+void do_delete_children (bool clear, bool from_root);
 };
 // ---------------------------------------------------------------------
 class callback_property : public base_property
 children.run_listeners ();
 mark_modified ();
 }
 }
+virtual void remove_child (const graphics_handle& h, bool)
+{
+if (children.remove_child (h.value ()))
+{
+children.run_listeners ();
+mark_modified ();
+}
+}
 virtual void adopt (const graphics_handle& h)
 {
 children.adopt (h.value ());
 children.run_listeners ();
 mark_modified ();
 virtual void update_uicontextmenu (void) const;
 virtual void delete_children (bool clear = false)
 {
 children.delete_children (clear);
+}
+virtual void delete_children (bool clear, bool from_root)
+{
+children.delete_children (clear, from_root);
 }
 void renumber_child (graphics_handle old_gh, graphics_handle new_gh)
 {
 children.renumber (old_gh, new_gh);
 error ("base_graphics_object::remove_child: invalid graphics object");
 get_properties ().remove_child (h);
 }
+virtual void remove_child (const graphics_handle& h, bool from_root)
+{
+if (! valid_object ())
+error ("base_graphics_object::remove_child: invalid graphics object");
+get_properties ().remove_child (h, from_root);
+}
 virtual void adopt (const graphics_handle& h)
 {
 if (! valid_object ())
 error ("base_graphics_object::adopt: invalid graphics object");
 class OCTINTERP_API properties : public base_properties
 {
 public:
 void remove_child (const graphics_handle& h);
+void remove_child (const graphics_handle& h, bool from_root);
 Matrix get_boundingbox (bool internal = false,
 const Matrix& parent_pix_size = Matrix ()) const;
 // See the genprops.awk script for an explanation of the
 {
 integerhandle = val;
 }
 void remove_child (const graphics_handle& h);
+void remove_child (const graphics_handle& h, bool from_root);
 void set_visible (const octave_value& val);
 graphics_toolkit get_toolkit (void) const;
 public:
 void set_defaults (base_graphics_object& obj, const std::string& mode);
 void remove_child (const graphics_handle& h);
+void remove_child (const graphics_handle& h, bool from_root);
 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; }
 void set_text_child (handle_property& h, const std::string& who,
 const octave_value& v);
 void delete_text_child (handle_property& h);
+void delete_text_child (handle_property& h, bool from_root);
 // See the genprops.awk script for an explanation of the
 // properties declarations.
 // Programming note: Keep property list sorted if new ones are added.
 class OCTINTERP_API properties : public base_properties
 {
 public:
 void remove_child (const graphics_handle& h);
+void remove_child (const graphics_handle& h, bool from_root);
 void adopt (const graphics_handle& h);
 // See the genprops.awk script for an explanation of the
 // properties declarations.
 // Programming note: Keep property list sorted if new ones are added.
 {
 public:
 void remove_child (const graphics_handle& h)
 {
 base_properties::remove_child (h);
+}
+void remove_child (const graphics_handle& h, bool from_root)
+{
+base_properties::remove_child (h, from_root);
 }
 void adopt (const graphics_handle& h)
 {
 base_properties::adopt (h);
 {
 if (instance_ok ())
 instance->do_free (h);
 }
+static void free (const graphics_handle& h, bool from_root)
+{
+if (instance_ok ())
+instance->do_free (h, from_root);
+}
 static void renumber_figure (const graphics_handle& old_gh,
 const graphics_handle& new_gh)
 {
 if (instance_ok ())
 instance->do_renumber_figure (old_gh, new_gh);
 graphics_handle do_get_handle (bool integer_figure_handle);
 void do_free (const graphics_handle& h);
+void do_free (const graphics_handle& h, bool from_root);
 void do_renumber_figure (const graphics_handle& old_gh,
 const graphics_handle& new_gh);
 graphics_handle do_lookup (double val)
 {

Mercurial > octave

comparison libinterp/corefcn/graphics.in.h @ 26982:8d7265e353a0 stable