Menu
▾
▴
plplot-cvs
|
From: <ai...@us...> - 2010-12-26 23:10:40
|
Revision: 11389
http://plplot.svn.sourceforge.net/plplot/?rev=11389&view=rev
Author: airwin
Date: 2010-12-26 23:10:33 +0000 (Sun, 26 Dec 2010)
Log Message:
-----------
Remove default xwin device, which (a) is not necessarily the best
default, and (b) that was not taken as the default by all x??c.m
examples in any case.
Also remove call to plplot_stub if that hadn't been called already
since that normally unnecessary call was not done uniformly for all
x??cm examples in any case.
Modified Paths:
--------------
trunk/examples/octave/x01c.m
trunk/examples/octave/x02c.m
trunk/examples/octave/x03c.m
trunk/examples/octave/x04c.m
trunk/examples/octave/x05c.m
trunk/examples/octave/x06c.m
trunk/examples/octave/x07c.m
trunk/examples/octave/x08c.m
trunk/examples/octave/x09c.m
trunk/examples/octave/x10c.m
trunk/examples/octave/x11c.m
trunk/examples/octave/x12c.m
trunk/examples/octave/x13c.m
trunk/examples/octave/x14c.m
trunk/examples/octave/x15c.m
trunk/examples/octave/x16c.m
trunk/examples/octave/x17c.m
trunk/examples/octave/x18c.m
trunk/examples/octave/x22c.m
trunk/examples/octave/x27c.m
trunk/examples/octave/x31c.m
Modified: trunk/examples/octave/x01c.m
===================================================================
--- trunk/examples/octave/x01c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x01c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -24,14 +24,6 @@
strm = stdout;
endif
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
## plplot initialization */
## Parse and process command line arguments */
Modified: trunk/examples/octave/x02c.m
===================================================================
--- trunk/examples/octave/x02c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x02c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -20,14 +20,6 @@
function ix02c
## Initialize plplot */
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
plinit();
## Parse and process command line arguments */
Modified: trunk/examples/octave/x03c.m
===================================================================
--- trunk/examples/octave/x03c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x03c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -19,14 +19,6 @@
function x03c
## Initialize plplot */
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
## Set orientation to portrait - note not all device drivers
## support this, in particular most interactive drivers do not */
plsori(1);
Modified: trunk/examples/octave/x04c.m
===================================================================
--- trunk/examples/octave/x04c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x04c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -25,14 +25,6 @@
## (void) plparseopts(&argc, argv, PL_PARSE_FULL);
## Initialize plplot */
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
plinit();
plfont(2);
Modified: trunk/examples/octave/x05c.m
===================================================================
--- trunk/examples/octave/x05c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x05c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -18,14 +18,6 @@
function x05c
## Initialize plplot */
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
plinit;
NPTS=2047;
Modified: trunk/examples/octave/x06c.m
===================================================================
--- trunk/examples/octave/x06c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x06c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -17,15 +17,6 @@
function x06c
- ## Initialize plplot */
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
## Parse and process command line arguments */
## (void) plparseopts(&argc, argv, PL_PARSE_FULL);
Modified: trunk/examples/octave/x07c.m
===================================================================
--- trunk/examples/octave/x07c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x07c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -17,14 +17,6 @@
function x07c
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
## Parse and process command line arguments */
## (void) plparseopts(&argc, argv, PL_PARSE_FULL);
Modified: trunk/examples/octave/x08c.m
===================================================================
--- trunk/examples/octave/x08c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x08c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -36,14 +36,6 @@
function ix08c
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
XPTS=35; ## Data points in x
YPTS=46; ## Datat points in y
Modified: trunk/examples/octave/x09c.m
===================================================================
--- trunk/examples/octave/x09c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x09c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -183,14 +183,6 @@
function ix09c
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
global XPTS
global YPTS
global tr
Modified: trunk/examples/octave/x10c.m
===================================================================
--- trunk/examples/octave/x10c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x10c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -18,14 +18,6 @@
function x10c
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
## Parse and process command line arguments */
## (void) plparseopts(&argc, argv, PL_PARSE_FULL);
Modified: trunk/examples/octave/x11c.m
===================================================================
--- trunk/examples/octave/x11c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x11c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -31,14 +31,6 @@
function ix11c
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
XPTS = 35; ## Data points in x */
YPTS = 46; ## Datat points in y */
Modified: trunk/examples/octave/x12c.m
===================================================================
--- trunk/examples/octave/x12c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x12c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -21,14 +21,6 @@
function ix12c
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
## Parse and process command line arguments */
## (void) plparseopts(&argc, argv, PL_PARSE_FULL);
Modified: trunk/examples/octave/x13c.m
===================================================================
--- trunk/examples/octave/x13c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x13c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -17,14 +17,6 @@
function x13c
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
text =[
"Maurice",
"Geoffrey",
Modified: trunk/examples/octave/x14c.m
===================================================================
--- trunk/examples/octave/x14c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x14c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -30,10 +30,6 @@
strm = stdout;
endif
- if (!exist("plinit"))
- plplot_stub
- endif
-
xleng0 = 400; yleng0 = 300; xoff0 = 200; yoff0 = 200;
xleng1 = 400; yleng1 = 300; xoff1 = 500; yoff1 = 500;
Modified: trunk/examples/octave/x15c.m
===================================================================
--- trunk/examples/octave/x15c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x15c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -21,14 +21,6 @@
function ix15c
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
XPTS= 35; ## Data points in x */
YPTS= 46; ## Datat points in y */
global tr = [2/(XPTS-1); 0.0; -1.0; 0.0; 2/(YPTS-1); -1.0];
Modified: trunk/examples/octave/x16c.m
===================================================================
--- trunk/examples/octave/x16c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x16c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -31,14 +31,6 @@
function ix16c
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
global tr; global nx; global ny;
## Fundamental settings. See notes[] for more info.
Modified: trunk/examples/octave/x17c.m
===================================================================
--- trunk/examples/octave/x17c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x17c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -16,14 +16,6 @@
function x17c
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
nsteps = 1000;
## If db is used the plot is much more smooth. However, because of the
Modified: trunk/examples/octave/x18c.m
===================================================================
--- trunk/examples/octave/x18c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x18c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -24,14 +24,6 @@
function ix18c
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
global alt;
global az;
global opt = [ 1, 0, 1, 0 ];
Modified: trunk/examples/octave/x22c.m
===================================================================
--- trunk/examples/octave/x22c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x22c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -20,14 +20,6 @@
function ix22c
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
## Parse and process command line arguments */
## plparseopts(&argc, argv, PL_PARSE_FULL);
Modified: trunk/examples/octave/x27c.m
===================================================================
--- trunk/examples/octave/x27c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x27c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -46,14 +46,6 @@
20.0, 13.0, 20.0, 20.0;
20.0,-13.0, 20.0, 20.0];
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
## Parse and process command line arguments
## (void) plparseopts(&argc, argv, PL_PARSE_FULL);
Modified: trunk/examples/octave/x31c.m
===================================================================
--- trunk/examples/octave/x31c.m 2010-12-26 08:41:18 UTC (rev 11388)
+++ trunk/examples/octave/x31c.m 2010-12-26 23:10:33 UTC (rev 11389)
@@ -31,14 +31,6 @@
strm = stdout;
endif
- if (!exist("plinit"))
- plplot_stub
- endif
-
- if(isempty(sprintf("%s",plgdev')))
- plsdev("xwin");
- endif
-
PL_NOTSET = -42.0;
## Clear status flag to begin with
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-12-27 02:00:31
|
Revision: 11391
http://plplot.svn.sourceforge.net/plplot/?rev=11391&view=rev
Author: airwin
Date: 2010-12-27 02:00:22 +0000 (Mon, 27 Dec 2010)
Log Message:
-----------
Replace deprecated plcol with plcol0.
Modified Paths:
--------------
trunk/examples/octave/x09c.m
trunk/examples/octave/x12c.m
trunk/examples/octave/x13c.m
trunk/examples/octave/x14c.m
trunk/examples/octave/x15c.m
trunk/examples/octave/x18c.m
trunk/examples/octave/x20c.m
Modified: trunk/examples/octave/x09c.m
===================================================================
--- trunk/examples/octave/x09c.m 2010-12-26 23:14:13 UTC (rev 11390)
+++ trunk/examples/octave/x09c.m 2010-12-27 02:00:22 UTC (rev 11391)
@@ -291,10 +291,10 @@
plcol0(2);
plcont2(z, 1, XPTS, 1, YPTS, clevel, xg2, yg2);
plstyl(mark1, space1);
- plcol(3);
+ plcol0(3);
plcont2(w, 1, XPTS, 1, YPTS, clevel, xg2, yg2);
plstyl(mark0, space0);
- plcol(1);
+ plcol0(1);
pllab("X Coordinate", "Y Coordinate", "Streamlines of flow");
if(0)
pl_setcontlabelparam(0.006, 0.3, 0.1, 1);
Modified: trunk/examples/octave/x12c.m
===================================================================
--- trunk/examples/octave/x12c.m 2010-12-26 23:14:13 UTC (rev 11390)
+++ trunk/examples/octave/x12c.m 2010-12-27 02:00:22 UTC (rev 11391)
@@ -32,7 +32,7 @@
plvsta();
plwind(1980.0, 1990.0, 0.0, 35.0);
plbox("bc", 1.0, 0, "bcnv", 10.0, 0);
- plcol(2);
+ plcol0(2);
pllab("Year", "Widget Sales (millions)", "#frPLplot Example 12");
y0 = [5; 15; 12; 24; 28;30; 20; 8; 12; 3];
@@ -46,7 +46,7 @@
plscmap1l(1,pos,red,green,blue,rev);
for i=0:9
- ##plcol(i + 1);
+ ##plcol0(i + 1);
plcol1(i/9.0);
@@ -71,7 +71,7 @@
x(4) = x0 + 1.;
y(4) = 0.;
plfill(x', y');
- plcol(1);
+ plcol0(1);
pllsty(1);
plline(x', y');
Modified: trunk/examples/octave/x13c.m
===================================================================
--- trunk/examples/octave/x13c.m 2010-12-26 23:14:13 UTC (rev 11390)
+++ trunk/examples/octave/x13c.m 2010-12-27 02:00:22 UTC (rev 11391)
@@ -44,7 +44,7 @@
plvasp(1.0);
plwind(0., 10., 0., 10.);
##plenv(0., 10., 0., 10., 1, -2);
- plcol(2);
+ plcol0(2);
theta0 = 0.;
dthet = 2 * pi / 500;
@@ -64,10 +64,10 @@
y(j+1) = 5 + 3 * sin(theta);
j=j+1;
endfor
- plcol(i+1);
+ plcol0(i+1);
plpsty(rem((i + 3), 8) + 1);
plfill(x', y');
- plcol(1);
+ plcol0(1);
plline(x', y');
just = (theta0 + theta1) / 2.;
dx = .25 * cos(just); dy = .25 * sin(just);
Modified: trunk/examples/octave/x14c.m
===================================================================
--- trunk/examples/octave/x14c.m 2010-12-26 23:14:13 UTC (rev 11390)
+++ trunk/examples/octave/x14c.m 2010-12-27 02:00:22 UTC (rev 11391)
@@ -175,19 +175,19 @@
## scaled separately (just = 0), and we just draw a labelled */
## box (axis = 0). */
- plcol(1);
+ plcol0(1);
plenv(xmin, xmax, ymin, ymax, 0, 0);
- plcol(6);
+ plcol0(6);
pllab("(x)", "(y)", "#frPLplot Example 1 - y=x#u2");
## Plot the data points */
- plcol(9);
+ plcol0(9);
plpoin(xs', ys', 9);
## Draw the line through the data */
- plcol(4);
+ plcol0(4);
plline(x', y');
plflush;#pleop();
@@ -199,9 +199,9 @@
## 10.0, and the range in Y is -0.4 to 2.0. The axes are scaled separately
## (just = 0), and we draw a box with axes (axis = 1).
- plcol(1);
+ plcol0(1);
plenv(-2.0, 10.0, -0.4, 1.2, 0, 1);
- plcol(2);
+ plcol0(2);
pllab("(x)", "sin(x)/x", "#frPLplot Example 1 - Sinc Function");
## Fill up the arrays */
@@ -216,7 +216,7 @@
## Draw the line */
- plcol(3);
+ plcol0(3);
plline(x', y');
plflush;#pleop();
endfunction
@@ -237,18 +237,18 @@
## Draw a box with ticks spaced 60 degrees apart in X, and 0.2 in Y. */
- plcol(1);
+ plcol0(1);
plbox("bcnst", 60.0, 2, "bcnstv", 0.2, 2);
## Superimpose a dashed line grid, with 1.5 mm marks and spaces. plstyl
## expects a pointer!! */
plstyl(mark1, space1);
- plcol(2);
+ plcol0(2);
plbox("g", 30.0, 0, "g", 0.2, 0);
plstyl(mark0, space0);
- plcol(3);
+ plcol0(3);
pllab("Angle (degrees)", "sine", "#frPLplot Example 1 - Sine function");
for i = 0:100
@@ -256,7 +256,7 @@
y(i+1) = sin(x(i+1) * 3.141592654 / 180.0);
endfor
- plcol(4);
+ plcol0(4);
plline(x', y');
plflush;#pleop();
@@ -284,7 +284,7 @@
plline(x, y);
endfor
- plcol(2);
+ plcol0(2);
for i = 0:11
theta = 30.0 * i;
dx = cos(dtr * theta);
@@ -310,10 +310,10 @@
x = x0 .* r;
y = y0 .* r;
- plcol(3);
+ plcol0(3);
plline(x, y);
- plcol(4);
+ plcol0(4);
plmtex("t", 2.0, 0.5, 0.5,
"#frPLplot Example 3 - r(#gh)=sin 5#gh");
plflush;#pleop();
@@ -354,12 +354,12 @@
endfor
plenv(-1.0, 1.0, -1.0, 1.0, 0, 0);
- plcol(2);
+ plcol0(2);
plcont(z, 1, XPTS, 1, YPTS, clevel, tr, 0);
plstyl(mark, space);
- plcol(3);
+ plcol0(3);
plcont(w, 1, XPTS, 1, YPTS, clevel, tr, 0);
- plcol(1);
+ plcol0(1);
pllab("X Coordinate", "Y Coordinate", "Streamlines of flow");
plflush;#pleop();
endfunction
Modified: trunk/examples/octave/x15c.m
===================================================================
--- trunk/examples/octave/x15c.m 2010-12-26 23:14:13 UTC (rev 11390)
+++ trunk/examples/octave/x15c.m 2010-12-27 02:00:22 UTC (rev 11391)
@@ -158,9 +158,9 @@
sh_cmap, sh_color, sh_width,
min_color, min_width, max_color, max_width, 1, tr);
- plcol(1);
+ plcol0(1);
plbox("bcnst", 0.0, 0, "bcnstv", 0.0, 0);
- plcol(2);
+ plcol0(2);
pllab("distance", "altitude", "Bogon flux");
endfunction
@@ -197,9 +197,9 @@
min_color, min_width, max_color, max_width,1,tr);
endfor
- plcol(1);
+ plcol0(1);
plbox("bcnst", 0.0, 0, "bcnstv", 0.0, 0);
- plcol(2);
+ plcol0(2);
pllab("distance", "altitude", "Bogon flux");
endfunction
Modified: trunk/examples/octave/x18c.m
===================================================================
--- trunk/examples/octave/x18c.m 2010-12-26 23:14:13 UTC (rev 11390)
+++ trunk/examples/octave/x18c.m 2010-12-27 02:00:22 UTC (rev 11391)
@@ -57,13 +57,13 @@
pladv(0);
plvpor(0.0, 1.0, 0.0, 0.9);
plwind(-1.0, 1.0, -0.9, 1.1);
- plcol(1);
+ plcol0(1);
plw3d(1.0, 1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, alt(k+1), az(k+1));
plbox3("bnstu", "x axis", 0.0, 0,
"bnstu", "y axis", 0.0, 0,
"bcdmnstuv", "z axis", 0.0, 0);
- plcol(2);
+ plcol0(2);
if (opt(k+1))
plline3( x', y', z' );
@@ -71,7 +71,7 @@
plpoin3( x', y', z', 1 );
endif
- plcol(3);
+ plcol0(3);
title=sprintf("#frPLplot Example 18 - Alt=%.0f, Az=%.0f",
alt(k+1), az(k+1));
plmtex("t", 1.0, 0.5, 0.5, title);
@@ -103,13 +103,13 @@
pladv(0);
plvpor(0.0, 1.0, 0.0, 0.9);
plwind(-1.0, 1.0, -0.9, 1.1);
- plcol(1);
+ plcol0(1);
plw3d(1.0, 1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, alt(k+1), az(k+1));
plbox3("bnstu", "x axis", 0.0, 0,
"bnstu", "y axis", 0.0, 0,
"bcdmnstuv", "z axis", 0.0, 0);
- plcol(2);
+ plcol0(2);
for i=0:19
@@ -142,7 +142,7 @@
endfor
endfor
- plcol(3);
+ plcol0(3);
plmtex("t", 1.0, 0.5, 0.5, "unit radius sphere" );
endfunction
Modified: trunk/examples/octave/x20c.m
===================================================================
--- trunk/examples/octave/x20c.m 2010-12-26 23:14:13 UTC (rev 11390)
+++ trunk/examples/octave/x20c.m 2010-12-27 02:00:22 UTC (rev 11391)
@@ -146,7 +146,7 @@
img_max = max(max(img));
img_min = min(min(img));
- plcol(2)
+ plcol0(2)
plenv(0., width, 0., height, 1, -1)
pllab("", "", "Reduced dynamic range image example")
plimagefr(img, 0., width, 0., height, 0., 0., img_min + img_max * 0.25, img_max - img_max * 0.25)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2011-01-05 08:16:32
|
Revision: 11440
http://plplot.svn.sourceforge.net/plplot/?rev=11440&view=rev
Author: airwin
Date: 2011-01-05 08:16:26 +0000 (Wed, 05 Jan 2011)
Log Message:
-----------
Make octave examples 18 (plstring3 replaces plpoin3) and 27
(additional plfill pages) give results that are equivalent to those
from C.
Modified Paths:
--------------
trunk/examples/octave/x18c.m
trunk/examples/octave/x27c.m
Modified: trunk/examples/octave/x18c.m
===================================================================
--- trunk/examples/octave/x18c.m 2011-01-05 08:14:16 UTC (rev 11439)
+++ trunk/examples/octave/x18c.m 2011-01-05 08:16:26 UTC (rev 11440)
@@ -68,7 +68,8 @@
if (opt(k+1))
plline3( x', y', z' );
else
- plpoin3( x', y', z', 1 );
+ ## U+22C5 DOT OPERATOR.
+ plstring3( x', y', z', "⋅" );
endif
plcol0(3);
Modified: trunk/examples/octave/x27c.m
===================================================================
--- trunk/examples/octave/x27c.m 2011-01-05 08:14:16 UTC (rev 11439)
+++ trunk/examples/octave/x27c.m 2011-01-05 08:16:26 UTC (rev 11440)
@@ -65,7 +65,7 @@
for i = 1:9
pladv(0);
plvpor( 0.0, 1.0, 0.0, 1.0 );
- spiro( params(i,:) );
+ spiro( params(i,:), 0 );
endfor
pladv(0);
@@ -74,9 +74,18 @@
for i=1:9
pladv(0);
plvpor( 0.0, 1.0, 0.0, 1.0 );
- spiro( params(i,:) );
+ spiro( params(i,:), 0 );
endfor
+ ## Fill the curves.
+ pladv( 0 );
+ plssub( 1, 1 ); ## One window per curve
+ for i=1:9
+ pladv(0);
+ plvpor( 0.0, 1.0, 0.0, 1.0 );
+ spiro( params(i,:), 1 );
+ endfor
+
## Don't forget to call plend() to finish off!
plend1();
@@ -90,7 +99,7 @@
## ===============================================================
-function spiro(params)
+ function spiro(params, fill)
NPNT=20000;
@@ -125,7 +134,11 @@
plwind( xmin, xmax, ymin, ymax );
plcol0(1);
- plline( xcoord, ycoord );
+ if ( fill )
+ plfill( xcoord, ycoord );
+ else
+ plline( xcoord, ycoord );
+ endif
endfunction
## Log-linear plot.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2011-01-09 20:05:40
|
Revision: 11459
http://plplot.svn.sourceforge.net/plplot/?rev=11459&view=rev
Author: airwin
Date: 2011-01-09 20:05:34 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
Replace specific assignment of PLplot variable values with the global
command for needed PLplot variables which effectively uses the exact
value of those variables #defined in bindings/swig-support/plplotcapi.i.
Modified Paths:
--------------
trunk/examples/octave/x08c.m
trunk/examples/octave/x11c.m
trunk/examples/octave/x31c.m
Modified: trunk/examples/octave/x08c.m
===================================================================
--- trunk/examples/octave/x08c.m 2011-01-09 20:01:17 UTC (rev 11458)
+++ trunk/examples/octave/x08c.m 2011-01-09 20:05:34 UTC (rev 11459)
@@ -36,14 +36,10 @@
function ix08c
+ global MAG_COLOR BASE_CONT SURF_CONT FACETED
XPTS=35; ## Data points in x
YPTS=46; ## Datat points in y
- DRAW_LINEXY = 3;
- MAG_COLOR = 4;
- BASE_CONT = 8;
- SURF_CONT = 32;
- FACETED = 128;
alt=[60.0, 20.0];
az =[30.0, 60.0];
Modified: trunk/examples/octave/x11c.m
===================================================================
--- trunk/examples/octave/x11c.m 2011-01-09 20:01:17 UTC (rev 11458)
+++ trunk/examples/octave/x11c.m 2011-01-09 20:05:34 UTC (rev 11459)
@@ -31,12 +31,10 @@
function ix11c
+ global DRAW_LINEXY MAG_COLOR BASE_CONT
XPTS = 35; ## Data points in x */
YPTS = 46; ## Datat points in y */
- DRAW_LINEXY = 3;
- MAG_COLOR = 4;
- BASE_CONT = 8;
opt = [DRAW_LINEXY, DRAW_LINEXY ]';
alt = [33, 17]';
Modified: trunk/examples/octave/x31c.m
===================================================================
--- trunk/examples/octave/x31c.m 2011-01-09 20:01:17 UTC (rev 11458)
+++ trunk/examples/octave/x31c.m 2011-01-09 20:05:34 UTC (rev 11459)
@@ -26,12 +26,12 @@
function status = ix31c(strm)
+ global PL_NOTSET
# Redirect output to file if required
if (nargin == 0)
strm = stdout;
endif
- PL_NOTSET = -42.0;
## Clear status flag to begin with
status = 0;
@@ -141,7 +141,7 @@
fprintf(strm,"plvpor: xmin, xmax, ymin, ymax = %f %f %f %f\n", xmin, xmax, ymin, ymax);
if (xmin != 0.01 || xmax != 0.99 || ymin != 0.02 || ymax != 0.49)
fputs(stderr,"plgvpd test failed\n");
- status = 1;
+ status = 1;
endif
xmid = 0.5*(xmin+xmax);
ymid = 0.5*(ymin+ymax);
@@ -183,7 +183,7 @@
fprintf(strm,"x axis parameters: digmax, digits = %d %d\n", digmax, digits);
if (digmax != 3)
fputs(stderr,"plgxax test failed\n");
- status = 1;
+ status = 1;
return;
endif
@@ -232,7 +232,7 @@
fprintf(strm,"zoomed plot-space window parameters: xmin, ymin, xmax, ymax = %f %f %f %f\n", zxmin, zymin, zxmax, zymax);
if ( abs(zxmin -(xmin + (xmax-xmin)*0.1)) > 1.0E-5 || abs(zxmax -(xmin+(xmax-xmin)*0.9)) > 1.0E-5 || abs(zymin -(ymin+(ymax-ymin)*0.1)) > 1.0E-5 || abs(zymax -(ymin+(ymax-ymin)*0.9)) > 1.0E-5 )
fputs(stderr,"plsdiplz test failed\n");
- status = 1;
+ status = 1;
endif
plscolbg(10,20,30);
@@ -256,7 +256,7 @@
endfunction
if (exist("strm","var"))
- ix31c(strm)
+ ix31c(strm);
else
- ix31c()
+ ix31c();
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2011-01-10 23:08:07
|
Revision: 11466
http://plplot.svn.sourceforge.net/plplot/?rev=11466&view=rev
Author: airwin
Date: 2011-01-10 23:08:00 +0000 (Mon, 10 Jan 2011)
Log Message:
-----------
Call plstring and pllegend appropriately in examples 4 and 26 to
get rid of the differences with the C results.
Modified Paths:
--------------
trunk/examples/octave/x04c.m
trunk/examples/octave/x26c.m
Modified: trunk/examples/octave/x04c.m
===================================================================
--- trunk/examples/octave/x04c.m 2011-01-10 21:59:30 UTC (rev 11465)
+++ trunk/examples/octave/x04c.m 2011-01-10 23:08:00 UTC (rev 11466)
@@ -38,7 +38,7 @@
## Log-linear plot.
function plot1(type)
-
+ global PL_LEGEND_LINE PL_LEGEND_SYMBOL PL_LEGEND_BACKGROUND PL_LEGEND_BOUNDING_BOX
pladv(0);
## Set up data for log plot */
@@ -70,7 +70,7 @@
plcol0(2);
plline(freql', ampl');
- plcol0(1);
+ plcol0(2);
plptex(1.6, -30.0, 1.0, -20.0, 0.5, "-20 dB/decade");
## Put labels on */
@@ -89,13 +89,88 @@
plbox("", 0.0, 0, "cmstv", 30.0, 3);
plcol0(3);
plline(freql', phase');
+ plstring(freql', phase', "*");
plcol0(3);
plmtex("r", 5.0, 0.5, 0.5, "Phase shift (degrees)");
+ nlegend = 2;
+ else
+ nlegend = 1;
endif
-endfunction
+ ## Draw a legend.
+ ## Set up legend arrays with the correct size, type. In octave this may
+ ## be done by clearing the array (in case it was used before) and then
+ ## writing the last element of the array with a placeholder of the right
+ ## type. Note that for strings the right placeholder length doesn't
+ ## matter. Octave keeps track of the longest string in each array and pads
+ ## out all other members with blanks to that length if a subsequent string
+ ## assignment for an array element exceeds that length.
+ opt_array = 0;
+ text_colors = 0;
+ text = " ";
+ box_colors = 0;
+ box_patterns = 0;
+ box_scales = 0.;
+ box_line_widths = 0;
+ line_colors = 0;
+ line_styles = 0;
+ line_widths = 0;
+ symbol_colors = 0;
+ symbol_scales = 0.;
+ symbol_numbers = 0;
+ symbols = " ";
-ix04c
+ opt_array(nlegend,1) = 0;
+ text_colors(nlegend,1) = 0;
+ text(nlegend,1:length(" ")) = " ";
+ box_colors(nlegend,1) = 0;
+ box_patterns(nlegend,1) = 0;
+ box_scales(nlegend,1) = 0.;
+ box_line_widths(nlegend,1) = 0;
+ line_colors(nlegend,1) = 0;
+ line_styles(nlegend,1) = 0;
+ line_widths(nlegend,1) = 0;
+ symbol_colors(nlegend,1) = 0;
+ symbol_scales(nlegend,1) = 0.;
+ symbol_numbers(nlegend,1) = 0;
+ symbols(nlegend,1:length(" ")) = " ";
+ ## Only specify legend data that are required according to the
+ ## value of opt_array for that entry.
+ ## Data for first legend entry.
+ opt_array(1) = PL_LEGEND_LINE;
+ text_colors(1) = 2;
+ text(1,1:length("Amplitude")) = "Amplitude";
+ line_colors(1) = 2;
+ line_styles(1) = 1;
+ line_widths(1) = 1;
+
+ ## Data for second legend entry.
+ if(nlegend > 1)
+ opt_array(2) = bitor(PL_LEGEND_LINE, PL_LEGEND_SYMBOL);
+ text_colors(2) = 3;
+ text(2,1:length("Phase shift")) = "Phase shift";
+ line_colors(2) = 3;
+ line_styles(2) = 1;
+ line_widths(2) = 1;
+ symbol_colors(2) = 3;
+ symbol_scales(2) = 1.;
+ symbol_numbers(2) = 4;
+ symbols(2,1:length("*")) = "*";
+ endif
+
+ plscol0a( 15, 32, 32, 32, 0.70 );
+
+ [legend_width, legend_height] = \
+ pllegend( bitor(PL_LEGEND_BACKGROUND, PL_LEGEND_BOUNDING_BOX), 0.0, 0.0,
+ 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, 1.0, 2.0,
+ 1., text_colors, text,
+ box_colors, box_patterns, box_scales, box_line_widths,
+ line_colors, line_styles, line_widths,
+ symbol_colors, symbol_scales, symbol_numbers, symbols );
+
+endfunction
+
+ix04c
Modified: trunk/examples/octave/x26c.m
===================================================================
--- trunk/examples/octave/x26c.m 2011-01-10 21:59:30 UTC (rev 11465)
+++ trunk/examples/octave/x26c.m 2011-01-10 23:08:00 UTC (rev 11466)
@@ -65,54 +65,62 @@
function ix26c
-x_label = [
- "Frequency";
- "Частота";
-];
+ x_label = [
+ "Frequency";
+ "Частота";
+ ];
-y_label = [
- "Amplitude (dB)";
- "Амплитуда (dB)";
-];
+ y_label = [
+ "Amplitude (dB)";
+ "Амплитуда (dB)";
+ ];
-alty_label = [
- "Phase shift (degrees)";
- "Фазовый сдвиг (градусы)";
-];
+ alty_label = [
+ "Phase shift (degrees)";
+ "Фазовый сдвиг (градусы)";
+ ];
-title_label = [
- "Single Pole Low-Pass Filter";
- "Однополюсный Низко-Частотный Фильтр";
-];
+ title_label = [
+ "Single Pole Low-Pass Filter";
+ "Однополюсный Низко-Частотный Фильтр";
+ ];
-line_label = [
- "-20 dB/decade";
- "-20 dB/десяток";
-];
+ line_label = [
+ "-20 dB/decade";
+ "-20 dB/десяток";
+ ];
-## Illustration of logarithmic axes, and redefinition of window.
+ ## Short rearranged versions of y_label and alty_label.
+ legend_text = {
+ ["Amplitude"; "Phase shift"],
+ ["Амплитуда"; "Фазовый сдвиг"]
+ };
-## Parse and process command line arguments
-## (void) plparseopts(&argc, argv, PL_PARSE_FULL);
+ ## Illustration of logarithmic axes, and redefinition of window.
-## Initialize plplot
+ ## Parse and process command line arguments
+ ## (void) plparseopts(&argc, argv, PL_PARSE_FULL);
+
+ ## Initialize plplot
+
plinit;
plfont(2);
## Make log plots using two different styles.
for i = 1:size(x_label)(1);
- plot1(0, deblank(x_label(i,:)), deblank(y_label(i,:)), deblank(alty_label(i,:)), deblank(title_label(i,:)), deblank(line_label(i,:)));
+ plot1(0, deblank(x_label(i,:)), deblank(y_label(i,:)), deblank(alty_label(i,:)), deblank(title_label(i,:)), deblank(line_label(i,:)), legend_text{i});
endfor
-
+
plend1;
-end
+endfunction
## Log-linear plot.
-function plot1(plottype, x_label, y_label, alty_label, title_label, line_label)
+function plot1(plottype, x_label, y_label, alty_label, title_label, line_label, legend_text)
+ global PL_LEGEND_LINE PL_LEGEND_SYMBOL PL_LEGEND_BACKGROUND PL_LEGEND_BOUNDING_BOX
pladv(0);
@@ -145,7 +153,7 @@
plcol0(2);
plline(freql', ampl');
- plcol0(1);
+ plcol0(2);
plptex(1.6, -30.0, 1.0, -20.0, 0.5, line_label);
## Put labels on */
@@ -164,10 +172,86 @@
plbox("", 0.0, 0, "cmstv", 30.0, 3);
plcol0(3);
plline(freql', phase');
+ plstring(freql', phase', "*");
plcol0(3);
plmtex("r", 5.0, 0.5, 0.5, alty_label);
+ nlegend = 2;
+ else
+ nlegend = 1
endif
+ ## Set up legend arrays with the correct size, type. In octave this may
+ ## be done by clearing the array (in case it was used before) and then
+ ## writing the last element of the array with a placeholder of the right
+ ## type. Note that for strings the right placeholder length doesn't
+ ## matter. Octave keeps track of the longest string in each array and pads
+ ## out all other members with blanks to that length if a subsequent string
+ ## assignment for an array element exceeds that length.
-end
+ opt_array = 0;
+ text_colors = 0;
+ text = " ";
+ box_colors = 0;
+ box_patterns = 0;
+ box_scales = 0.;
+ box_line_widths = 0;
+ line_colors = 0;
+ line_styles = 0;
+ line_widths = 0;
+ symbol_colors = 0;
+ symbol_scales = 0.;
+ symbol_numbers = 0;
+ symbols = " ";
+ opt_array(nlegend,1) = 0;
+ text_colors(nlegend,1) = 0;
+ text(nlegend,1:length(" ")) = " ";
+ box_colors(nlegend,1) = 0;
+ box_patterns(nlegend,1) = 0;
+ box_scales(nlegend,1) = 0.;
+ box_line_widths(nlegend,1) = 0;
+ line_colors(nlegend,1) = 0;
+ line_styles(nlegend,1) = 0;
+ line_widths(nlegend,1) = 0;
+ symbol_colors(nlegend,1) = 0;
+ symbol_scales(nlegend,1) = 0.;
+ symbol_numbers(nlegend,1) = 0;
+ symbols(nlegend,1:length(" ")) = " ";
+
+ ## Only specify legend data that are required according to the
+ ## value of opt_array for that entry.
+
+ ## Data for first legend entry.
+ opt_array(1) = PL_LEGEND_LINE;
+ text_colors(1) = 2;
+ text(1,1:length(legend_text(1,:))) = legend_text(1,:);
+ line_colors(1) = 2;
+ line_styles(1) = 1;
+ line_widths(1) = 1;
+
+ ## Data for second legend entry.
+ if(nlegend > 1)
+ opt_array(2) = bitor(PL_LEGEND_LINE, PL_LEGEND_SYMBOL);
+ text_colors(2) = 3;
+ text(2,1:length(legend_text(1,:))) = legend_text(2,:);
+ line_colors(2) = 3;
+ line_styles(2) = 1;
+ line_widths(2) = 1;
+ symbol_colors(2) = 3;
+ symbol_scales(2) = 1.;
+ symbol_numbers(2) = 4;
+ symbols(2,1:length("*")) = "*";
+ endif
+
+ plscol0a( 15, 32, 32, 32, 0.70 );
+
+ [legend_width, legend_height] = \
+ pllegend( bitor(PL_LEGEND_BACKGROUND, PL_LEGEND_BOUNDING_BOX), 0.0, 0.0,
+ 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, 1.0, 2.0,
+ 1., text_colors, text,
+ box_colors, box_patterns, box_scales, box_line_widths,
+ line_colors, line_styles, line_widths,
+ symbol_colors, symbol_scales, symbol_numbers, symbols );
+
+endfunction
+
ix26c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2014-02-28 13:18:57
|
Revision: 13029
http://sourceforge.net/p/plplot/code/13029
Author: andrewross
Date: 2014-02-28 13:18:53 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Remove extraneous whitespace from examples.
Modified Paths:
--------------
trunk/examples/octave/x28c.m
trunk/examples/octave/x33c.m
Modified: trunk/examples/octave/x28c.m
===================================================================
--- trunk/examples/octave/x28c.m 2014-02-28 12:54:44 UTC (rev 13028)
+++ trunk/examples/octave/x28c.m 2014-02-28 13:18:53 UTC (rev 13029)
@@ -84,8 +84,8 @@
plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
plcol0(2);
- plbox3("b", "", xrange, 0,
- "b", "", yrange, 0,
+ plbox3("b", "", xrange, 0,
+ "b", "", yrange, 0,
"bcd", "", zrange, 0);
## z = zmin.
@@ -100,9 +100,9 @@
x_shear = -0.5*xrange*sin_omega;
y_shear = 0.5*yrange*cos_omega;
z_shear = 0.;
- plptex3(xmid, ymid, zmin,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(xmid, ymid, zmin,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.0, " revolution");
endfor
## x = xmax.
@@ -117,9 +117,9 @@
x_shear = 0.;
y_shear = 0.5*yrange*sin_omega;
z_shear = 0.5*zrange*cos_omega;
- plptex3(xmax, ymid, zmid,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(xmax, ymid, zmid,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.0, " revolution");
endfor
@@ -135,10 +135,10 @@
x_shear = -0.5*xrange*sin_omega;
y_shear = 0.;
z_shear = 0.5*zrange*cos_omega;
- plptex3(
- xmid, ymax, zmid,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(
+ xmid, ymax, zmid,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.0, " revolution");
endfor
## Draw minimal 3D grid to finish defining the 3D box.
@@ -151,8 +151,8 @@
plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
plcol0(2);
- plbox3("b", "", xrange, 0,
- "b", "", yrange, 0,
+ plbox3("b", "", xrange, 0,
+ "b", "", yrange, 0,
"bcd", "", zrange, 0);
## y = ymax.
@@ -168,10 +168,10 @@
y_shear = 0.5*yrange*sin_omega;
z_shear = 0.5*zrange*cos_omega;
zs = zsmax - dzsrot*i;
- plptex3(
- xmid, ymax, zs,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(
+ xmid, ymax, zs,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "rotation for y = y#dmax#u");
endfor
@@ -188,10 +188,10 @@
x_shear = 0.5*xrange*sin_omega;
z_shear = 0.5*zrange*cos_omega;
zs = zsmax - dzsrot*i;
- plptex3(
- xmax, ymid, zs,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(
+ xmax, ymid, zs,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "rotation for x = x#dmax#u");
endfor
@@ -208,10 +208,10 @@
y_shear = 0.5*yrange*cos_omega;
z_shear = 0.5*zrange*sin_omega;
ys = ysmax - dysrot*i;
- plptex3(
- xmid, ys, zmin,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(
+ xmid, ys, zmin,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "rotation for z = z#dmin#u");
endfor
## Draw minimal 3D grid to finish defining the 3D box.
@@ -228,8 +228,8 @@
plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
plcol0(2);
- plbox3("b", "", xrange, 0,
- "b", "", yrange, 0,
+ plbox3("b", "", xrange, 0,
+ "b", "", yrange, 0,
"bcd", "", zrange, 0);
## y = ymax.
@@ -245,10 +245,10 @@
x_shear = 0.5*xrange*sin_omega;
z_shear = 0.5*zrange*cos_omega;
zs = zsmax-dzsshear*i;
- plptex3(
- xmid, ymax, zs,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(
+ xmid, ymax, zs,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "shear for y = y#dmax#u");
endfor
@@ -265,10 +265,10 @@
y_shear = -0.5*yrange*sin_omega;
z_shear = 0.5*zrange*cos_omega;
zs = zsmax-dzsshear*i;
- plptex3(
- xmax, ymid, zs,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(
+ xmax, ymid, zs,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "shear for x = x#dmax#u");
endfor
@@ -285,10 +285,10 @@
y_shear = 0.5*yrange*cos_omega;
x_shear = 0.5*xrange*sin_omega;
ys = ysmax-dysshear*i;
- plptex3(
- xmid, ys, zmin,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3
+ xmid, ys, zmin,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "shear for z = z#dmin#u");
endfor
## Draw minimal 3D grid to finish defining the 3D box.
@@ -301,8 +301,8 @@
plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 40., -30.);
plcol0(2);
- plbox3("b", "", xrange, 0,
- "b", "", yrange, 0,
+ plbox3("b", "", xrange, 0,
+ "b", "", yrange, 0,
"bcd", "", zrange, 0);
plschr(0., 1.2);
@@ -332,10 +332,10 @@
y_shear = 0.;
z_shear = 1.;
p1string = pstring(i:i);
- plptex3(
- xpos, ypos, zpos,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(
+ xpos, ypos, zpos,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, p1string);
omega += domega;
endfor
@@ -349,8 +349,8 @@
plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
plcol0(2);
- plbox3("b", "", xrange, 0,
- "b", "", yrange, 0,
+ plbox3("b", "", xrange, 0,
+ "b", "", yrange, 0,
"bcd", "", zrange, 0);
plschr(0., 1.0);
Modified: trunk/examples/octave/x33c.m
===================================================================
--- trunk/examples/octave/x33c.m 2014-02-28 12:54:44 UTC (rev 13028)
+++ trunk/examples/octave/x33c.m 2014-02-28 13:18:53 UTC (rev 13029)
@@ -193,12 +193,12 @@
plwind( 0.0, 1.0, 0.0, 1.0 );
# Set interesting background colour.
plscol0a( 15, 0, 0, 0, 0.20 );
- [colorbar_width, colorbar_height] = plcolorbar(
- bitor(opt, bitor(PL_COLORBAR_BOUNDING_BOX, PL_COLORBAR_BACKGROUND)),
- position, x, y, x_length, y_length,
- 15, 1, 1, low_cap_color, high_cap_color,
- cont_color, cont_width, label_opts, label,
- axis_opts, ticks, sub_ticks,
+ [colorbar_width, colorbar_height] = plcolorbar(
+ bitor(opt, bitor(PL_COLORBAR_BOUNDING_BOX, PL_COLORBAR_BACKGROUND)),
+ position, x, y, x_length, y_length,
+ 15, 1, 1, low_cap_color, high_cap_color,
+ cont_color, cont_width, label_opts, label,
+ axis_opts, ticks, sub_ticks,
n_values_array, values_array );
# Reset text and tick sizes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2014-07-01 11:41:14
|
Revision: 13132
http://sourceforge.net/p/plplot/code/13132
Author: andrewross
Date: 2014-07-01 11:41:11 +0000 (Tue, 01 Jul 2014)
Log Message:
-----------
Tidy up continuation lines to remove deprecated backslashes.
Modified Paths:
--------------
trunk/examples/octave/x01c.m
trunk/examples/octave/x04c.m
trunk/examples/octave/x07c.m
trunk/examples/octave/x08c.m
trunk/examples/octave/x26c.m
trunk/examples/octave/x29c.m
Modified: trunk/examples/octave/x01c.m
===================================================================
--- trunk/examples/octave/x01c.m 2014-06-20 23:13:53 UTC (rev 13131)
+++ trunk/examples/octave/x01c.m 2014-07-01 11:41:11 UTC (rev 13132)
@@ -85,7 +85,7 @@
printf("\n\nYou are in Locate mode. Click any mouse button or press any key\n\
and the current cursor position will be printed.\n\
Please keep <NumLock> and <CapsLock> off.\n\
-Terminate locate mode with the <Enter> key.\n\
+Terminate locate mode with the <Enter> key.\n\
Finish the plot with the <Enter> or <ESC> key or the 3d mouse button\n");
fflush(stdout);
Modified: trunk/examples/octave/x04c.m
===================================================================
--- trunk/examples/octave/x04c.m 2014-06-20 23:13:53 UTC (rev 13131)
+++ trunk/examples/octave/x04c.m 2014-07-01 11:41:11 UTC (rev 13132)
@@ -155,7 +155,7 @@
plscol0a( 15, 32, 32, 32, 0.70 );
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( bitor(PL_LEGEND_BACKGROUND, PL_LEGEND_BOUNDING_BOX), 0, 0.0, 0.0,
0.1, 15, 1, 1, 0, 0, opt_array, 1.0, 1.0, 2.0,
1., text_colors, text,
Modified: trunk/examples/octave/x07c.m
===================================================================
--- trunk/examples/octave/x07c.m 2014-06-20 23:13:53 UTC (rev 13131)
+++ trunk/examples/octave/x07c.m 2014-07-01 11:41:11 UTC (rev 13132)
@@ -24,7 +24,7 @@
## Initialize plplot */
plinit();
- base=[0, 100, 0, 100, 200, 500, 600, 700, 800, 900, \
+ base=[0, 100, 0, 100, 200, 500, 600, 700, 800, 900,
2000, 2100, 2200, 2300, 2400, 2500, 2600, 2700, 2800, 2900];
plfontld(0);
Modified: trunk/examples/octave/x08c.m
===================================================================
--- trunk/examples/octave/x08c.m 2014-06-20 23:13:53 UTC (rev 13131)
+++ trunk/examples/octave/x08c.m 2014-07-01 11:41:11 UTC (rev 13132)
@@ -101,11 +101,9 @@
plmtex("t", 1.0, 0.5, 0.5, title(k,:));
plcol0(1);
if (rosen)
- plw3d(1.0, 1.0, 1.0, -1.5, 1.5, -0.5, 1.5, zmin, zmax, \
- alt(k), az(k));
+ plw3d(1.0, 1.0, 1.0, -1.5, 1.5, -0.5, 1.5, zmin, zmax, alt(k), az(k));
else
- plw3d(1.0, 1.0, 1.0, -1.0, 1.0, -1.0, 1.0, zmin, zmax, \
- alt(k), az(k));
+ plw3d(1.0, 1.0, 1.0, -1.0, 1.0, -1.0, 1.0, zmin, zmax, alt(k), az(k));
endif
plbox3("bnstu", "x axis", 0.0, 0,
Modified: trunk/examples/octave/x26c.m
===================================================================
--- trunk/examples/octave/x26c.m 2014-06-20 23:13:53 UTC (rev 13131)
+++ trunk/examples/octave/x26c.m 2014-07-01 11:41:11 UTC (rev 13132)
@@ -240,7 +240,7 @@
plscol0a( 15, 32, 32, 32, 0.70 );
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( bitor(PL_LEGEND_BACKGROUND, PL_LEGEND_BOUNDING_BOX), 0, 0.0, 0.0,
0.1, 15, 1, 1, 0, 0, opt_array, 1.0, 1.0, 2.0,
1., text_colors, text,
Modified: trunk/examples/octave/x29c.m
===================================================================
--- trunk/examples/octave/x29c.m 2014-06-20 23:13:53 UTC (rev 13131)
+++ trunk/examples/octave/x29c.m 2014-07-01 11:41:11 UTC (rev 13132)
@@ -120,8 +120,8 @@
i = 0:npts-1;
x = i*60.0*60.0*24.0;
p = asin(0.39795*cos(0.2163108 + 2*atan(0.9671396*tan(0.00860*(i-186)))));
- d = 24.0 - (24.0/pi)*acos( (sin(0.8333*pi/180.0) + \
- sin(lat*pi/180.0)*sin(p)) \
+ d = 24.0 - (24.0/pi)*acos( (sin(0.8333*pi/180.0) + ...
+ sin(lat*pi/180.0)*sin(p)) ...
./(cos(lat*pi/180.0)*cos(p)) );
y = d;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X