Mercurial > octave
annotate doc/interpreter/plotimages.m @ 16994:333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
matrix concatenation is ~80% faster than cstrcat().
* doc/interpreter/strings.txi: Document preference for matrix concatenation
as opposed to alternatives.
* doc/interpreter/geometryimages.m, doc/interpreter/interpimages.m,
doc/interpreter/plotimages.m, doc/interpreter/sparseimages.m,
doc/interpreter/splineimages.m, scripts/general/genvarname.m,
scripts/general/int2str.m, scripts/general/num2str.m,
scripts/help/__makeinfo__.m, scripts/help/help.m,
scripts/miscellaneous/copyfile.m, scripts/miscellaneous/dir.m,
scripts/miscellaneous/edit.m, scripts/miscellaneous/fact.m,
scripts/miscellaneous/fullfile.m, scripts/miscellaneous/mkoctfile.m,
scripts/miscellaneous/movefile.m, scripts/miscellaneous/perl.m,
scripts/miscellaneous/python.m, scripts/miscellaneous/run.m,
scripts/miscellaneous/tempdir.m, scripts/miscellaneous/unpack.m,
scripts/pkg/private/configure_make.m, scripts/pkg/private/create_pkgadddel.m,
scripts/pkg/private/extract_pkg.m, scripts/pkg/private/get_description.m,
scripts/pkg/private/get_forge_pkg.m, scripts/pkg/private/getarch.m,
scripts/pkg/private/getarchprefix.m, scripts/pkg/private/install.m,
scripts/pkg/private/installed_packages.m,
scripts/pkg/private/load_packages_and_dependencies.m,
scripts/pkg/private/rebuild.m, scripts/pkg/private/repackage.m,
scripts/pkg/private/shell.m, scripts/pkg/private/uninstall.m,
scripts/plot/private/__go_draw_axes__.m, scripts/signal/spectral_adf.m,
scripts/signal/spectral_xdf.m, scripts/statistics/tests/z_test.m,
scripts/statistics/tests/z_test_2.m, scripts/strings/mat2str.m,
scripts/strings/strtok.m, scripts/testfun/__run_test_suite__.m,
scripts/testfun/assert.m, scripts/testfun/demo.m, scripts/testfun/speed.m,
scripts/testfun/test.m, test/eval-catch.tst, test/io.tst, test/try.tst: Replace
cstrcat() with matrix concatenation where possible.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 17 Jul 2013 14:02:32 -0700 |
| parents | 72c96de7a403 |
| children | 0e34c475c956 |
| rev | line source |
|---|---|
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
11576
diff
changeset
|
1 ## Copyright (C) 2007-2012 John W. Eaton and David Bateman |
| 7018 | 2 ## |
| 3 ## This file is part of Octave. | |
| 4 ## | |
| 5 ## Octave is free software; you can redistribute it and/or modify it | |
| 6 ## under the terms of the GNU General Public License as published by | |
| 7 ## the Free Software Foundation; either version 3 of the License, or (at | |
| 8 ## your option) any later version. | |
| 9 ## | |
| 10 ## Octave is distributed in the hope that it will be useful, but | |
| 11 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 ## General Public License for more details. | |
| 14 ## | |
| 15 ## You should have received a copy of the GNU General Public License | |
| 16 ## along with Octave; see the file COPYING. If not, see | |
| 17 ## <http://www.gnu.org/licenses/>. | |
| 18 | |
| 6888 | 19 function plotimages (nm, typ) |
|
11576
8ac9687dbe9f
rename backend to graphics_toolkit
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
20 graphics_toolkit ("gnuplot"); |
|
9088
77e71f3da3d6
Fix documentation image printing under new development code
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
21 set_print_size (); |
|
77e71f3da3d6
Fix documentation image printing under new development code
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
22 hide_output (); |
| 7257 | 23 if (strcmp (typ, "png")) |
| 24 set (0, "defaulttextfontname", "*"); | |
| 25 endif | |
|
9914
e76d8c767584
Switch to color output for PostScript documentation images
Rik <rdrider0-list@yahoo.com>
parents:
9912
diff
changeset
|
26 if (strcmp (typ, "eps")) |
|
e76d8c767584
Switch to color output for PostScript documentation images
Rik <rdrider0-list@yahoo.com>
parents:
9912
diff
changeset
|
27 d_typ = "-depsc2"; |
|
e76d8c767584
Switch to color output for PostScript documentation images
Rik <rdrider0-list@yahoo.com>
parents:
9912
diff
changeset
|
28 else |
|
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
14138
diff
changeset
|
29 d_typ = ["-d", typ]; |
|
9914
e76d8c767584
Switch to color output for PostScript documentation images
Rik <rdrider0-list@yahoo.com>
parents:
9912
diff
changeset
|
30 endif |
|
9912
e9fe12c1b0c0
Set default papersize to the desired imagesize
Rik <rdrider0-list@yahoo.com>
parents:
9298
diff
changeset
|
31 |
| 7256 | 32 if (strcmp(typ , "txt")) |
| 33 image_as_txt(nm); | |
| 34 elseif (strcmp (nm, "plot")) | |
| 6888 | 35 x = -10:0.1:10; |
| 36 plot (x, sin (x)); | |
|
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
14138
diff
changeset
|
37 print ([nm "." typ], d_typ); |
| 6888 | 38 elseif (strcmp (nm, "hist")) |
|
11033
d9c8916bb9dd
Untabify a few remaining .m scripts.
Rik <octave@nomad.inbox5.com>
parents:
9914
diff
changeset
|
39 rand ("state", 2); |
| 6888 | 40 hist (randn (10000, 1), 30); |
|
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
14138
diff
changeset
|
41 print ([nm "." typ], d_typ); |
| 6888 | 42 elseif (strcmp (nm, "errorbar")) |
|
11033
d9c8916bb9dd
Untabify a few remaining .m scripts.
Rik <octave@nomad.inbox5.com>
parents:
9914
diff
changeset
|
43 rand ("state", 2); |
| 6888 | 44 x = 0:0.1:10; |
| 45 y = sin (x); | |
|
9298
20ee7f9cc904
Correct bugs in plot images produced for documentation
Rik <rdrider0-list@yahoo.com>
parents:
9245
diff
changeset
|
46 yl = 0.1 .* rand (size (x)); |
|
20ee7f9cc904
Correct bugs in plot images produced for documentation
Rik <rdrider0-list@yahoo.com>
parents:
9245
diff
changeset
|
47 yu = 0.1 .* rand (size (x)); |
|
20ee7f9cc904
Correct bugs in plot images produced for documentation
Rik <rdrider0-list@yahoo.com>
parents:
9245
diff
changeset
|
48 errorbar (x, sin (x), yl, yu); |
|
11033
d9c8916bb9dd
Untabify a few remaining .m scripts.
Rik <octave@nomad.inbox5.com>
parents:
9914
diff
changeset
|
49 axis ([0, 10, -1.1, 1.1]); |
|
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
14138
diff
changeset
|
50 print ([nm "." typ], d_typ); |
| 6888 | 51 elseif (strcmp (nm, "polar")) |
| 52 polar (0:0.1:10*pi, 0:0.1:10*pi); | |
|
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
14138
diff
changeset
|
53 print ([nm "." typ], d_typ); |
| 6888 | 54 elseif (strcmp (nm, "mesh")) |
| 55 tx = ty = linspace (-8, 8, 41)'; | |
| 56 [xx, yy] = meshgrid (tx, ty); | |
| 57 r = sqrt (xx .^ 2 + yy .^ 2) + eps; | |
| 58 tz = sin (r) ./ r; | |
| 59 mesh (tx, ty, tz); | |
|
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
14138
diff
changeset
|
60 print ([nm "." typ], d_typ); |
| 6888 | 61 elseif (strcmp (nm, "plot3")) |
| 62 t = 0:0.1:10*pi; | |
| 63 r = linspace (0, 1, numel (t)); | |
| 64 z = linspace (0, 1, numel (t)); | |
| 65 plot3 (r.*sin(t), r.*cos(t), z); | |
|
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
14138
diff
changeset
|
66 print ([nm "." typ], d_typ); |
| 7189 | 67 elseif (strcmp (nm, "extended")) |
| 68 x = 0:0.01:3; | |
| 69 plot(x,erf(x)); | |
| 70 hold on; | |
| 71 plot(x,x,"r"); | |
| 72 axis([0, 3, 0, 1]); | |
|
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
14138
diff
changeset
|
73 text(0.65, 0.6175, ['\leftarrow x = {2/\surd\pi {\fontsize{16}', ... |
|
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
14138
diff
changeset
|
74 '\int_{\fontsize{8}0}^{\fontsize{8}x}} e^{-t^2} dt} = 0.6175']); |
|
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
14138
diff
changeset
|
75 print ([nm "." typ], d_typ); |
| 6888 | 76 else |
| 77 error ("unrecognized plot requested"); | |
| 78 endif | |
|
9088
77e71f3da3d6
Fix documentation image printing under new development code
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
79 hide_output (); |
| 6888 | 80 endfunction |
| 81 | |
|
9088
77e71f3da3d6
Fix documentation image printing under new development code
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
82 function set_print_size () |
|
77e71f3da3d6
Fix documentation image printing under new development code
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
83 image_size = [5.0, 3.5]; # in inches, 16:9 format |
|
77e71f3da3d6
Fix documentation image printing under new development code
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
84 border = 0; # For postscript use 50/72 |
|
77e71f3da3d6
Fix documentation image printing under new development code
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
85 set (0, "defaultfigurepapertype", "<custom>"); |
|
9912
e9fe12c1b0c0
Set default papersize to the desired imagesize
Rik <rdrider0-list@yahoo.com>
parents:
9298
diff
changeset
|
86 set (0, "defaultfigurepaperorientation", "landscape"); |
|
9088
77e71f3da3d6
Fix documentation image printing under new development code
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
87 set (0, "defaultfigurepapersize", image_size + 2*border); |
|
77e71f3da3d6
Fix documentation image printing under new development code
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
88 set (0, "defaultfigurepaperposition", [border, border, image_size]); |
|
77e71f3da3d6
Fix documentation image printing under new development code
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
89 endfunction |
|
77e71f3da3d6
Fix documentation image printing under new development code
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
90 |
|
9912
e9fe12c1b0c0
Set default papersize to the desired imagesize
Rik <rdrider0-list@yahoo.com>
parents:
9298
diff
changeset
|
91 ## Use this function before plotting commands and after every call to |
|
e9fe12c1b0c0
Set default papersize to the desired imagesize
Rik <rdrider0-list@yahoo.com>
parents:
9298
diff
changeset
|
92 ## print since print() resets output to stdout (unfortunately, gnpulot |
|
e9fe12c1b0c0
Set default papersize to the desired imagesize
Rik <rdrider0-list@yahoo.com>
parents:
9298
diff
changeset
|
93 ## can't pop output as it can the terminal type). |
|
9088
77e71f3da3d6
Fix documentation image printing under new development code
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
94 function hide_output () |
| 6888 | 95 f = figure (1); |
| 96 set (f, "visible", "off"); | |
| 97 endfunction | |
| 7256 | 98 |
| 99 ## generate something for the texinfo @image command to process | |
| 100 function image_as_txt(nm) | |
| 101 fid = fopen (sprintf ("%s.txt", nm), "wt"); | |
| 102 fputs (fid, "\n"); | |
| 103 fputs (fid, "+---------------------------------+\n"); | |
| 104 fputs (fid, "| Image unavailable in text mode. |\n"); | |
| 105 fputs (fid, "+---------------------------------+\n"); | |
| 106 fclose (fid); | |
| 107 endfunction |