comparison scripts/plot/graphics_toolkit.m @ 14046:c3fab3891460 stable

Trivial bug fixes for graphics_toolkit(). * graphics_toolkit.m: Do not return output when used as a command. Respect documented syntax: OLD_NAME = graphics_toolkit (NAME). Add tests.
author Ben Abbott <bpabbott@mac.com>
date Wed, 14 Dec 2011 13:39:23 -0500
parents e3bed294b117
children 72c96de7a403
comparison
equal deleted inserted replaced
14045:db264e617a98 14046:c3fab3891460
33 33
34 if (nargin > 2) 34 if (nargin > 2)
35 print_usage (); 35 print_usage ();
36 endif 36 endif
37 37
38 if (nargout > 0 || nargin == 0)
39 retval = get (0, "defaultfigure__graphics_toolkit__");
40 endif
41
38 if (nargin == 0) 42 if (nargin == 0)
39 retval = get (0, "defaultfigure__graphics_toolkit__");
40 return; 43 return;
41 elseif (nargin == 1) 44 elseif (nargin == 1)
42 if (! ischar (name)) 45 if (! ischar (name))
43 error ("graphics_toolkit: invalid graphics toolkit NAME"); 46 error ("graphics_toolkit: invalid graphics toolkit NAME");
44 endif 47 endif
63 set (0, "defaultfigure__graphics_toolkit__", name); 66 set (0, "defaultfigure__graphics_toolkit__", name);
64 else 67 else
65 set (hlist, "__graphics_toolkit__", name); 68 set (hlist, "__graphics_toolkit__", name);
66 endif 69 endif
67 70
68 if (isargout (1))
69 retval = name;
70 endif
71
72 endfunction 71 endfunction
73 72
74 73
75 %!testif HAVE_FLTK 74 %!testif HAVE_FLTK
76 %! unwind_protect 75 %! unwind_protect
81 %! assert (get (hf, "__graphics_toolkit__"), "fltk"); 80 %! assert (get (hf, "__graphics_toolkit__"), "fltk");
82 %! unwind_protect_cleanup 81 %! unwind_protect_cleanup
83 %! close (hf); 82 %! close (hf);
84 %! end_unwind_protect 83 %! end_unwind_protect
85 84
85 %!testif HAVE_FLTK
86 %! old_toolkit = graphics_toolkit ();
87 %! switch old_toolkit
88 %! case {"gnuplot"}
89 %! new_toolkit = "fltk";
90 %! otherwise
91 %! new_toolkit = "gnuplot";
92 %! endswitch
93 %! assert (graphics_toolkit (new_toolkit), old_toolkit)
94 %! assert (graphics_toolkit (old_toolkit), new_toolkit)
95