# HG changeset patch # User jwe # Date 1161805140 0 # Node ID 32ea759ea27ead4b044a9e9c885df11859520b9c # Parent 700e121edb94c78e3be6e1b364b186825c7d06e7 [project @ 2006-10-25 19:39:00 by jwe] diff -r 700e121edb94 -r 32ea759ea27e scripts/ChangeLog --- a/scripts/ChangeLog Wed Oct 25 19:03:13 2006 +0000 +++ b/scripts/ChangeLog Wed Oct 25 19:39:00 2006 +0000 @@ -1,3 +1,13 @@ +2006-10-25 John W. Eaton + + * image/image.m: Set x = y = [] when nargin == 0; + +2006-10-25 Quentin Spencer + + * image/image.m: Call __img__ if gnuplot version is > 4.0. + * image/__img__.m: New file, originally from + Daniel J Sebald . + 2006-10-25 John W. Eaton * plot/__gnuplot_version__.m: New function, originally from diff -r 700e121edb94 -r 32ea759ea27e scripts/image/__img__.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/image/__img__.m Wed Oct 25 19:39:00 2006 +0000 @@ -0,0 +1,106 @@ +## Copyright (C) 2006 Daniel Sebald +## +## Octave is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2, or (at your option) +## any later version. +## +## Octave is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, 59 Temple Place - Suite 330, Boston, MA +## 02111-1307, USA. + +## -*- texinfo -*- +## @deftypefn {Function File} {} __img__ (@var{x}, @var{y}, @var{A}) +## Display an image using @code{gnuplot}, where vectors @var{x} and +## @var{y} define the axes and the matrix @var{A} contains the image +## data. +## @end deftypefn + +function __img__ (x, y, A) + + if (nargin != 3) + print_usage (); + endif + + if (isempty (A)) + error ("image matrix is empty"); + endif + + __gnuplot_raw__ ("set nokey\n"); + __current_color_map__ = colormap (); + palette_size = size (__current_color_map__, 1); + __gnuplot_raw__ (sprintf ("set palette positive color model RGB maxcolors %i\n", palette_size)); + if (palette_size <= 128) + ## Break up command to avoid buffer overflow. + __gnuplot_raw__ ("set palette file \"-\"\n"); + for i = 1:palette_size + __gnuplot_raw__ (sprintf ("%g %g %g %g\n", 1e-3 * round (1e3 * [(i-1)/(palette_size-1), __current_color_map__(i,:)]))); + end + __gnuplot_raw__("e\n"); + else + ## Let the file be deleted when Octave exits or `purge_tmp_files' is called. + [fid, binary_file_name, msg] = mkstemp ([P_tmpdir,"/gpimageXXXXXX"], 1); + fwrite (fid, __current_color_map__', "float32", 0, "ieee-le"); + fclose (fid); + __gnuplot_raw__ (sprintf ("set palette file \"%s\" binary record=%d using 1:2:3\n", binary_file_name, palette_size)); + endif + + ## Use the newly added mode of "plot" called "with image". + if (isempty (x)) + x = [1, size(A,2)]; + y = [1, size(A,1)]; + endif + + ## Force rectangular grid by using only end points of + ## first row (column) if x (y) is a matrix or vector. + if ((size (x, 2)) > 1) + x = x(1,:)'; + endif + if (abs (x(end) - x(1)) < (10*eps)) + error ("end points in x dimension must not be equal"); + else + x_dim = size (A, 2); + if (x_dim > 1) + dx = (x(end)-x(1))/(x_dim-1); + else + dx = 1; + endif + endif + if ((size (y, 1)) > 1) + y = y(:,1)'; + endif + if (abs(y(end) - y(1)) < 10*eps) + error ("end points in y dimension must not be equal"); + else + y_dim = size (A, 1); + if (y_dim > 1) + dy = (y(end)-y(1))/(y_dim-1); + else + dy = 1; + endif + endif + + __gnuplot_raw__ (sprintf ("set xrange [%g:%g]\n", x(1)-dx/2, x(end)+dx/2)); + __gnuplot_raw__ (sprintf ("set yrange [%g:%g]\n", y(1)-dy/2, y(end)+dy/2)); + __gnuplot_raw__ ("set autoscale fix\n"); # "fix" is helpful for "a" hotkey + __gnuplot_raw__ ("set tics out\n"); + + A = reshape(A,size(A,1)*size(A,2),1); + ## Let the file be deleted when Octave exits or `purge_tmp_files' is called. + [fid, binary_file_name, msg] = mkstemp ([P_tmpdir, "/gpimageXXXXXX"], 1); + ## Gnuplot reads binary files very quickly. However, the 'fwrite' below + ## is much slower than using the current '__gnuplot_plot__' command. + fwrite (fid, A', "float", 0, "ieee-le"); + fclose (fid); + __gnuplot_raw__ (sprintf ("plot \"%s\" binary array=%dx%d scan=yx flipy origin=(%g,%g) dx=%g dy=%g endian=little using 1 with image\n", binary_file_name, x_dim, y_dim, min (x(1), x(end)), min(y(1), y(end)), abs (dx), abs (dy))); + ## Put back in default data mode. + __gnuplot_raw__ ("set xrange [*:*];\n"); + __gnuplot_raw__ ("set yrange [*:*];\n"); + +endfunction diff -r 700e121edb94 -r 32ea759ea27e scripts/image/image.m --- a/scripts/image/image.m Wed Oct 25 19:03:13 2006 +0000 +++ b/scripts/image/image.m Wed Oct 25 19:39:00 2006 +0000 @@ -43,6 +43,7 @@ ## Load Bobbie Jo Richardson (Born 3/16/94) A = loadimage ("default.img"); zoom = 2; + x = y = []; elseif (nargin == 1) A = x; zoom = []; @@ -57,35 +58,40 @@ print_usage (); endif - if isempty(zoom) - ## Find an integer scale factor which sets the image to - ## approximately the size of the screen. - zoom = min ([350/rows(A), 600/columns(A), 4]); - if (zoom >= 1) - zoom = floor (zoom); - else - zoom = 1 / ceil (1/zoom); + if (compare_versions (__gnuplot_version__ (), "4.0", ">")) + __img__ (x, y, A); + else + + if (isempty (zoom)) + ## Find an integer scale factor which sets the image to + ## approximately the size of the screen. + zoom = min ([350/rows(A), 600/columns(A), 4]); + if (zoom >= 1) + zoom = floor (zoom); + else + zoom = 1 / ceil (1/zoom); + endif endif - endif - ppm_name = tmpnam (); + ppm_name = tmpnam (); - saveimage (ppm_name, A, "ppm"); + saveimage (ppm_name, A, "ppm"); - ## Start the viewer. Try display, xv, then xloadimage. + ## Start the viewer. Try display, xv, then xloadimage. - xv = sprintf ("xv -raw -expand %f \"%s\"", zoom, ppm_name); + xv = sprintf ("xv -raw -expand %f \"%s\"", zoom, ppm_name); - xloadimage = sprintf ("xloadimage -zoom %f \"%s\"", zoom*100, ppm_name); + xloadimage = sprintf ("xloadimage -zoom %f \"%s\"", zoom*100, ppm_name); - ## ImageMagick: - im_display = sprintf ("display -geometry %f%% \"%s\"", zoom*100, ppm_name); + ## ImageMagick: + im_display = sprintf ("display -geometry %f%% \"%s\"", zoom*100, ppm_name); - rm = sprintf ("rm -f \"%s\"", ppm_name); + rm = sprintf ("rm -f \"%s\"", ppm_name); - ## Need to let the shell clean up the tmp file because we are putting - ## the viewer in the background. + ## Need to let the shell clean up the tmp file because we are putting + ## the viewer in the background. - system (sprintf ("( %s || %s || %s && %s ) > /dev/null 2>&1 &", - im_display, xv, xloadimage, rm)); + system (sprintf ("( %s || %s || %s && %s ) > /dev/null 2>&1 &", + im_display, xv, xloadimage, rm)); + endif endfunction