octave-nkf: src/graphics.cc comparison

comparison src/graphics.cc @ 11576:8ac9687dbe9f

rename backend to graphics_toolkit

author	John W. Eaton <jwe@octave.org>
date	Thu, 20 Jan 2011 02:29:57 -0500
parents	7d6d8c1e471f
children	12df7854fa7c

comparison

equal deleted inserted replaced

-:d6619410e79c
+:8ac9687dbe9f
 base_property::set (const octave_value& v, bool do_run )
 {
 if (do_set (v))
 {
-// notify backend
+// Notify graphics toolkit.
 if (id >= 0)
 {
 graphics_object go = gh_manager::get_object (parent);
 if (go)
 {
-graphics_backend backend = go.get_backend();
+graphics_toolkit toolkit = go.get_toolkit ();
-if (backend)
+if (toolkit)
-backend.update (go, id);
+toolkit.update (go, id);
 }
 }
 // run listeners
 if (do_run && ! error_state)
 octave_value val = bp.get_deletefcn ();
 bp.execute_deletefcn ();
-// notify backend
+// Notify graphics toolkit.
-graphics_backend backend = p->second.get_backend ();
+graphics_toolkit toolkit = p->second.get_toolkit ();
-if (backend)
+if (toolkit)
-backend.finalize (p->second);
+toolkit.finalize (p->second);
 // Note: this will be valid only for first explicitly
 // deleted object.  All its children will then have an
-// unknown backend.
+// unknown graphics toolkit.
 // Graphics handles for non-figure objects are negative
 // integers plus some random fractional part.  To avoid
 // running out of integers, we recycle the integer part
 // but tack on a new random part each time.
 }
 // ---------------------------------------------------------------------
 void
-base_graphics_backend::update (const graphics_handle& h, int id)
+base_graphics_toolkit::update (const graphics_handle& h, int id)
 {
 graphics_object go = gh_manager::get_object (h);
 update (go, id);
 }
 void
-base_graphics_backend::initialize (const graphics_handle& h)
+base_graphics_toolkit::initialize (const graphics_handle& h)
 {
 graphics_object go = gh_manager::get_object (h);
 initialize (go);
 }
 void
-base_graphics_backend::finalize (const graphics_handle& h)
+base_graphics_toolkit::finalize (const graphics_handle& h)
 {
 graphics_object go = gh_manager::get_object (h);
 finalize (go);
 }
 if (obj)
 obj.update_axis_limits (axis_type, h);
 }
-graphics_backend
+graphics_toolkit
-base_properties::get_backend (void) const
+base_properties::get_toolkit (void) const
 {
 graphics_object go = gh_manager::get_object (get_parent ());
 if (go)
-return go.get_backend ();
+return go.get_toolkit ();
 else
-return graphics_backend ();
+return graphics_toolkit ();
 }
 void
 base_properties::update_boundingbox (void)
 {
 p.delete_listener (v, mode);
 }
 // ---------------------------------------------------------------------
-class gnuplot_backend : public base_graphics_backend
+class gnuplot_toolkit : public base_graphics_toolkit
 {
 public:
-gnuplot_backend (void)
+gnuplot_toolkit (void)
-: base_graphics_backend ("gnuplot") { }
+: base_graphics_toolkit ("gnuplot") { }
-~gnuplot_backend (void) { }
+~gnuplot_toolkit (void) { }
 bool is_valid (void) const { return true; }
 void finalize (const graphics_object& go)
 {
 }
 }
 }
 };
-graphics_backend
+graphics_toolkit
-graphics_backend::default_backend (void)
+graphics_toolkit::default_toolkit (void)
 {
-if (available_backends.size () == 0)
+if (available_toolkits.size () == 0)
-register_backend (new gnuplot_backend ());
+register_toolkit (new gnuplot_toolkit ());
-return available_backends["gnuplot"];
+return available_toolkits["gnuplot"];
 }
-std::map<std::string, graphics_backend> graphics_backend::available_backends;
+std::map<std::string, graphics_toolkit> graphics_toolkit::available_toolkits;
 // ---------------------------------------------------------------------
 void
 base_graphics_object::update_axis_limits (const std::string& axis_type)
 {
 double af;
 // FIXME -- was this really needed?  When compared to Matlab, it
 // does not seem to be required. Need investigation with concrete
-// backend to see results visually.
+// graphics toolkit to see results visually.
 if (false && dowarp)
 af = 1.0 / (xM > yM ? xM : yM);
 else
 {
 if ((bb(2)/bb(3)) > (xM/yM))
 : handle_map (), handle_free_list (),
 next_handle (-1.0 - (rand () + 1.0) / (RAND_MAX + 2.0))
 {
 handle_map[0] = graphics_object (new root_figure ());
-// Make sure the default backend is registered.
+// Make sure the default graphics toolkit is registered.
-graphics_backend::default_backend ();
+graphics_toolkit::default_toolkit ();
 }
 graphics_handle
 gh_manager::do_make_graphics_handle (const std::string& go_name,
 const graphics_handle& p, bool do_createfcn)
 handle_map[h] = obj;
 if (do_createfcn)
 go->get_properties ().execute_createfcn ();
-// notify backend
+// Notify graphics toolkit.
-graphics_backend backend = go->get_backend ();
+graphics_toolkit toolkit = go->get_toolkit ();
-if (backend)
+if (toolkit)
-backend.initialize (obj);
+toolkit.initialize (obj);
 }
 else
 error ("gh_manager::do_make_graphics_handle: invalid object type `%s'",
 go_name.c_str ());
 base_graphics_object* go = new figure (h, 0);
 graphics_object obj (go);
 handle_map[h] = obj;
-// notify backend
+// Notify graphics toolkit.
-graphics_backend backend = go->get_backend ();
+graphics_toolkit toolkit = go->get_toolkit ();
-if (backend)
+if (toolkit)
-backend.initialize (obj);
+toolkit.initialize (obj);
 return h;
 }
 void
 print_usage ();
 return retval;
 }
-DEFUN (available_backends, , ,
+DEFUN (available_graphics_toolkits, , ,
 "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} available_backends ()\n\
+@deftypefn {Built-in Function} {} available_graphiscs_toolkits ()\n\
-Return a cell array of registered graphics backends.\n\
+Return a cell array of registered graphics toolkits.\n\
 @end deftypefn")
 {
 gh_manager::autolock guard;
-return octave_value (graphics_backend::available_backends_list ());
+return octave_value (graphics_toolkit::available_toolkits_list ());
 }
 DEFUN (drawnow, args, ,
 "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} drawnow ()\n\
 {
 if (fprops.is_visible ())
 {
 gh_manager::unlock ();
-fprops.get_backend ().redraw_figure (go);
+fprops.get_toolkit ().redraw_figure (go);
 gh_manager::lock ();
 }
 fprops.set_modified (false);
 {
 graphics_object go = gh_manager::get_object (h);
 gh_manager::unlock ();
-go.get_backend ()
+go.get_toolkit ()
 .print_figure (go, term, file, mono, debug_file);
 gh_manager::lock ();
 }
 else

Mercurial > octave-nkf

comparison src/graphics.cc @ 11576:8ac9687dbe9f