Re: graphics-branch in CVS

[John W. Eaton]

On 31-Jan-2007, Søren Hauberg wrote:

| John W. Eaton skrev:
| > I've merged the changes from the branch.  After updating, you will
| > need to at least run config.status in the top-level and scripts
| > directories.
| Using the new code I can't display images:
| 
| octave:1> imshow(rand(100))
| error: `img' undefined near line 57 column 16
| error: evaluating argument list element number 1
| error: if: error evaluating conditional expression
| error: evaluating if command near line 57, column 3
| error: called from `image' in file 
| `/home/sh/Programmer//share/octave/2.9.9+/m/image/image.m'
| error: called from `imshow' in file 
| `/home/sh/Programmer//share/octave/2.9.9+/m/image/imshow.m'
| error: octave_base_value::array_value(): wrong type argument `complex 
| matrix'
| error: evaluating if command near line 29, column 3
| error: called from `__uiobject_draw_axes__' in file 
| `/home/sh/Programmer//share/octave/2.9.9+/m/plot/__uiobject_draw_axes__.m'
| error: evaluating switch command near line 55, column 4
| error: evaluating for command near line 53, column 2
| error: evaluating if command near line 37, column 7
| error: evaluating if command near line 30, column 5
| error: evaluating if command near line 29, column 3
| error: called from `__uiobject_draw_figure__' in file 
| `/home/sh/Programmer//share/octave/2.9.9+/m/plot/__uiobject_draw_figure__.m'
| error: evaluating if command near line 57, column 5
| error: evaluating if command near line 33, column 3
| error: called from `drawnow' in file 
| `/home/sh/Programmer//share/octave/2.9.9+/m/plot/drawnow.m'

The following patch should get you past this problem.

| P.S. Do you need the "drawnow()" at the end of image.m?

Maybe not.

| Won't that be called when the function returns to the prompt?

Yes.

jwe


2007-01-31  John W. Eaton  <address@hidden>

        * image/image.m: Accept 2 args, but ignore the second for now.


Index: scripts/image/image.m
===================================================================
RCS file: /cvs/octave/scripts/image/image.m,v
retrieving revision 1.29
diff -u -u -r1.29 image.m
--- scripts/image/image.m       30 Jan 2007 19:16:52 -0000      1.29
+++ scripts/image/image.m       31 Jan 2007 09:03:41 -0000
@@ -47,7 +47,9 @@
     ## Load Bobbie Jo Richardson (Born 3/16/94)
     img = loadimage ("default.img");
     x = y = [];
-  elseif (nargin == 1)
+  elseif (nargin == 1 || nargin == 2)
+    ## FIXME -- should we handle the old zoom argument?  How?  What
+    ## figure property should we be setting?
     img = x;
     x = y = [];
   elseif (nargin > 3)