Mercurial > octave-nkf
changeset 6270:c8d25f552230
[project @ 2007-02-05 21:41:26 by jwe]
| author | jwe |
|---|---|
| date | Mon, 05 Feb 2007 21:42:21 +0000 |
| parents | 2f357df626cb |
| children | 6fab59e81b4e |
| files | ChangeLog demo.m scripts/ChangeLog scripts/plot/__uiobject_draw_axes__.m |
| diffstat | 4 files changed, 13 insertions(+), 69 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Feb 05 21:36:54 2007 +0000 +++ b/ChangeLog Mon Feb 05 21:42:21 2007 +0000 @@ -1,3 +1,7 @@ +2007-02-05 John W. Eaton <jwe@octave.org> + + * demo.m: Delete obsolete file. + 2007-01-29 Michael Goffioul <michael.goffioul@swing.be> * configure.in (*-*-msdosmsvc): Set NO_OCT_FILE_STRIP to true.
--- a/demo.m Mon Feb 05 21:36:54 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -# Octave demo - -# This is not a function file. -1; - -function demo_clear () - clc (); -endfunction - -function demo_set_term () - term = getenv ("TERM"); - display = getenv ("DISPLAY"); - if (! strcmp (term, "xterm") || columns (display) == 0) - graphics_terminal = input ("enter graphics terminal type: ", "s"); - command = sprintf ("set term %s", graphics_terminal); - eval (command); - endif -endfunction - -function demo_graphics () - demo_clear (); - demo_set_term () - demo_clear (); - printf ("Graphics\n"); - fflush (stdout); - sombrero (31); - pause (10); - printf ("press return to continue\n"); - fflush (stdout); - pause (); -endfunction - -function demo_linear_algebra () - demo_clear (); - printf ("Solving Linear Algebra Problems\n"); - fflush (stdout); - pause (); -endfunction - -function demo_odes () - demo_clear (); - printf ("Solving ODEs and DAEs\n"); - fflush (stdout); - pause (); -endfunction - -while (1) - - demo_clear (); - - choice = menu ("Octave\n======\n\n", ... - "Graphics", ... - "Linear Algebra", ... - "ODEs and DAEs", ... - "Exit"); - - if (choice == 1) - demo_graphics (); - elseif (choice == 2) - demo_linear_algebra (); - elseif (choice == 3) - demo_odes (); - elseif (choice == 4) - printf ("\nGoodbye and good luck!\n\n"); - fflush (stdout); - break; - endif - -endwhile
--- a/scripts/ChangeLog Mon Feb 05 21:36:54 2007 +0000 +++ b/scripts/ChangeLog Mon Feb 05 21:42:21 2007 +0000 @@ -1,3 +1,8 @@ +2007-02-05 Thomas Treichl <Thomas.Treichl@gmx.net> + + * plot/__uiobject_draw_axes__.m (do_linestyle_command): + Always set lt and pt. + 2007-02-05 Shai Ayal <shaiay@users.sourceforge.net> * plot/contourc.m: Correctly compute X and Y.
--- a/scripts/plot/__uiobject_draw_axes__.m Mon Feb 05 21:36:54 2007 +0000 +++ b/scripts/plot/__uiobject_draw_axes__.m Mon Feb 05 21:42:21 2007 +0000 @@ -694,6 +694,8 @@ otherwise lt = ""; endswitch + else + lt = ""; endif if (isfield (obj, "linewidth")) @@ -738,6 +740,8 @@ fprintf (plot_stream, " pointtype %s", pt); found_style = true; endif + else + pt = ""; endif if (isfield (obj, "markersize"))