octave-nkf: src/graphics.cc comparison

comparison src/graphics.cc @ 8059:75c99d3f97d7

Octave to backend notification scheme

author	John W. Eaton <jwe@octave.org>
date	Tue, 26 Aug 2008 13:24:15 -0400
parents	ca39c21fa4b8
children	f819e8992367

comparison

equal deleted inserted replaced

-:ca39c21fa4b8
+:75c99d3f97d7
 #include <algorithm>
 #include <list>
 #include <map>
 #include <set>
 #include <string>
+#include <sstream>
 #include "file-ops.h"
 #include "file-stat.h"
 #include "cmd-edit.h"
 base_property::set (const octave_value& v, bool do_run )
 {
 do_set (v);
 // notify backend
-graphics_object go = gh_manager::get_object (parent);
+if (id >= 0)
-if (go)
+{
-{
+graphics_object go = gh_manager::get_object (parent);
-graphics_backend backend = go.get_backend();
+if (go)
-if (backend)
+	{
-backend.property_changed (parent, name);
+	  graphics_backend backend = go.get_backend();
+	  if (backend)
+	    backend.property_changed (go, id);
+	}
 }
 // run listeners
 if (do_run && ! error_state)
 run_listeners (POSTSET);
 	{
 	  iterator p = handle_map.find (h);
 	  if (p != handle_map.end ())
 	    {
+	      // FIXME: should we explicitely free all children first?
+	      //        => call delete_children () ?
 	      p->second.get_properties ().set_beingdeleted (true);
 	      p->second.get_properties ().execute_deletefcn ();
 	      // notify backend
 	      graphics_backend backend = p->second.get_backend ();
 	      if (backend)
-backend.object_destroyed (h);
+backend.object_destroyed (p->second);
 // note - this will be valid only for first explicitly deleted object.
 // All his children will have unknown backend then.
 	      handle_map.erase (p);
 {
 graphics_object obj = gh_manager::get_object (h);
 obj.get_properties ().execute_createfcn  ();
 }
+// ---------------------------------------------------------------------
+void
+base_graphics_backend::property_changed (const graphics_handle& h, int id)
+{
+graphics_object go = gh_manager::get_object (h);
+property_changed (go, id);
+}
+void
+base_graphics_backend::object_created (const graphics_handle& h)
+{
+graphics_object go = gh_manager::get_object (h);
+object_created (go);
+}
+void
+base_graphics_backend::object_destroyed (const graphics_handle& h)
+{
+graphics_object go = gh_manager::get_object (h);
+object_destroyed (go);
+}
 // ---------------------------------------------------------------------
 static int
 compare (const void *a_arg, const void *b_arg)
 {
 : base_graphics_backend ("gnuplot") { }
 ~gnuplot_backend (void) { }
 bool is_valid (void) const { return true; }
-void close_figure (const octave_value& pstream) const
+void object_destroyed (const graphics_object& go)
+{
+if (go.isa ("figure"))
+	{
+	  const figure::properties& props =
+	      dynamic_cast<const figure::properties&> (go.get_properties ());
+	  send_quit (props.get___plot_stream__ ());
+	}
+}
+void property_changed (const graphics_object& go, int id)
+{
+if (go.isa ("figure"))
+	{
+	  graphics_object obj (go);
+	  figure::properties& props =
+	      dynamic_cast<figure::properties&> (obj.get_properties ());
+	  switch (id)
+	    {
+	    case base_properties::VISIBLE:
+	      if (! props.is_visible ())
+		{
+		  send_quit (props.get___plot_stream__ ());
+		  props.set___plot_stream__ (Matrix ());
+		  props.set___enhanced__ (false);
+		}
+	      break;
+	    }
+	}
+}
+void redraw_figure (const graphics_object& go) const
+{
+octave_value_list args;
+args(0) = go.get_handle ().as_octave_value ();
+feval ("gnuplot_drawnow", args);
+}
+void print_figure (const graphics_object& go, const std::string& term,
+		     const std::string& file, bool mono,
+		     const std::string& debug_file) const
+{
+octave_value_list args;
+if (! debug_file.empty ())
+	args(4) = debug_file;
+args(3) = mono;
+args(2) = file;
+args(1) = term;
+args(0) = go.get_handle ().as_octave_value ();
+feval ("gnuplot_drawnow", args);
+}
+Matrix get_canvas_size (const graphics_handle&) const
+{
+Matrix sz (1, 2, 0.0);
+return sz;
+}
+double get_screen_resolution (void) const
+{ return 72.0; }
+Matrix get_screen_size (void) const
+{ return Matrix (1, 2, 0.0); }
+private:
+void send_quit (const octave_value& pstream) const
 {
 if (! pstream.is_empty())
 	{
 	  octave_value_list args;
 	  Matrix fids = pstream.matrix_value ();
 		  feval ("pclose", args);
 		}
 	    }
 	}
 }
-void redraw_figure (const graphics_handle& fh) const
-{
-octave_value_list args;
-args(0) = fh.as_octave_value ();
-feval ("gnuplot_drawnow", args);
-}
-void print_figure (const graphics_handle& fh, const std::string& term,
-		     const std::string& file, bool mono,
-		     const std::string& debug_file) const
-{
-octave_value_list args;
-if (! debug_file.empty ())
-	args(4) = debug_file;
-args(3) = mono;
-args(2) = file;
-args(1) = term;
-args(0) = fh.as_octave_value ();
-feval ("gnuplot_drawnow", args);
-}
-Matrix get_canvas_size (const graphics_handle&) const
-{
-Matrix sz (1, 2, 0.0);
-return sz;
-}
-double get_screen_resolution (void) const
-{ return 72.0; }
-Matrix get_screen_size (void) const
-{ return Matrix (1, 2, 0.0); }
 };
 graphics_backend
 graphics_backend::default_backend (void)
 {
 callbackobject = val;
 }
 else
 gripe_set_invalid ("callbackobject");
+}
+void
+root_figure::properties::remove_child (const graphics_handle& gh)
+{
+gh_manager::pop_figure (gh);
+graphics_handle cf = gh_manager::current_figure ();
+xset (0, "currentfigure", cf.value ());
+base_properties::remove_child (gh);
 }
 property_list
 root_figure::factory_properties = root_figure::init_factory_properties ();
 visible = val;
 }
 }
-void
-figure::properties::close (bool pop)
-{
-if (backend)
-backend.close_figure (get___plot_stream__ ());
-if (pop)
-{
-gh_manager::pop_figure (__myhandle__);
-graphics_handle cf = gh_manager::current_figure ();
-xset (0, "currentfigure", cf.value ());
-}
-}
 Matrix
 figure::properties::get_boundingbox (bool) const
 {
 graphics_backend b = get_backend ();
 // FIXME: screen size should be obtained from root object
 position = v;
 new_bb = get_boundingbox ();
 if (old_bb != new_bb)
 	{
-	  // FIXME: maybe this should be converted into a more generic
-	  //        call like "update_gui (this)"
-	  get_backend ().set_figure_position (__myhandle__, new_bb);
 	  if (old_bb(2) != new_bb(2) || old_bb(3) != new_bb(3))
 	    {
 	      execute_resizefcn ();
 	      update_boundingbox ();
 	    }
 	}
 mark_modified ();
 }
+}
+std::string
+figure::properties::get_title (void) const
+{
+if (is_numbertitle ())
+{
+std::ostringstream os;
+std::string name = get_name ();
+os << "Figure " << __myhandle__.value ();
+if (! name.empty ())
+	os << ": " << get_name ();
+return os.str ();
+}
+else
+return get_name ();
 }
 octave_value
 figure::get_default (const caseless_str& name) const
 {
 go = make_graphics_object_from_type (go_name, h, p);
 if (go)
 {
-handle_map[h] = graphics_object (go);
+graphics_object obj (go);
+handle_map[h] = obj;
 if (do_createfcn)
 go->get_properties ().execute_createfcn ();
 // notify backend
 graphics_backend backend = go->get_backend ();
 if (backend)
-backend.object_created (h);
+backend.object_created (obj);
 }
 else
 error ("gh_manager::do_make_graphics_handle: invalid object type `%s'",
 	   go_name.c_str ());
 gh_manager::do_make_figure_handle (double val)
 {
 graphics_handle h = val;
 base_graphics_object* go = new figure (h, 0);
-handle_map[h] = graphics_object (go);
+graphics_object obj (go);
+handle_map[h] = obj;
 // notify backend
 graphics_backend backend = go->get_backend ();
 if (backend)
-backend.object_created (h);
+backend.object_created (obj);
 return h;
 }
 void
 		    {
 		      if (fprops.is_visible ())
 			{
 			  gh_manager::unlock ();
-			  fprops.get_backend ().redraw_figure (h);
+			  fprops.get_backend ().redraw_figure (go);
 			  gh_manager::lock ();
 			}
-		      else if (! fprops.get___plot_stream__ ().is_empty ())
-			{
-			  fprops.close (false);
-			  fprops.set___plot_stream__ (Matrix ());
-			  fprops.set___enhanced__ (false);
-			}
 		      fprops.set_modified (false);
 		    }
 		}
 	    }
 			      graphics_object go = gh_manager::get_object (h);
 			      gh_manager::unlock ();
 			      go.get_backend ()
-				.print_figure (h, term, file, mono, debug_file);
+				.print_figure (go, term, file, mono, debug_file);
 			      gh_manager::lock ();
 			    }
 			  else
 			    error ("drawnow: nothing to draw");

Mercurial > octave-nkf

comparison src/graphics.cc @ 8059:75c99d3f97d7