Revision: 11445
http://plplot.svn.sourceforge.net/plplot/?rev=11445&view=rev
Author: andrewross
Date: 2011-01-06 13:38:54 +0000 (Thu, 06 Jan 2011)
Log Message:
-----------
Fix up some obsolete calls to plcol in octave higher level support which prevented the p?? examples from working with the new swig generated octave bindings.
Modified Paths:
--------------
trunk/bindings/octave/PLplot/arrow.m
trunk/bindings/octave/PLplot/comet.m
trunk/bindings/octave/PLplot/fill.m
trunk/bindings/octave/PLplot/plot3.m
trunk/bindings/octave/PLplot/set_view.m
trunk/bindings/octave/PLplot/shade.m
trunk/bindings/octave/PLplot/subplot.m
trunk/bindings/octave/PLplot/support/__pl_contour.m
trunk/bindings/octave/PLplot/support/__pl_draw_legend.m
trunk/bindings/octave/PLplot/support/__pl_fill.m
trunk/bindings/octave/PLplot/support/__pl_meshplotit.m
trunk/bindings/octave/PLplot/support/__pl_plenv.m
trunk/bindings/octave/PLplot/support/__pl_plot3.m
trunk/bindings/octave/PLplot/support/__pl_plotit.m
Modified: trunk/bindings/octave/PLplot/arrow.m
===================================================================
--- trunk/bindings/octave/PLplot/arrow.m 2011-01-06 08:12:30 UTC (rev 11444)
+++ trunk/bindings/octave/PLplot/arrow.m 2011-01-06 13:38:54 UTC (rev 11445)
@@ -51,7 +51,7 @@
xx = (x .* t(1,1) .+ y .* t(2,1)) .* mag + coord(1);
yy = (x .* t(1,2) .+ y .* t(2,2)) .* mag + coord(2);
- plcol(col);plline(xx,yy);
+ plcol0(col);plline(xx,yy);
plflush; pleop;
endif
Modified: trunk/bindings/octave/PLplot/comet.m
===================================================================
--- trunk/bindings/octave/PLplot/comet.m 2011-01-06 08:12:30 UTC (rev 11444)
+++ trunk/bindings/octave/PLplot/comet.m 2011-01-06 13:38:54 UTC (rev 11445)
@@ -54,7 +54,7 @@
[r, g, b] = plgcol0(1);
plscol0(1, 255, 0, 255);
- plcol(1);
+ plcol0(1);
pllsty(1);
old_hold = ishold;
Modified: trunk/bindings/octave/PLplot/fill.m
===================================================================
--- trunk/bindings/octave/PLplot/fill.m 2011-01-06 08:12:30 UTC (rev 11444)
+++ trunk/bindings/octave/PLplot/fill.m 2011-01-06 13:38:54 UTC (rev 11445)
@@ -83,7 +83,7 @@
## endif
if (!ishold)
- plcol(15);
+ plcol0(15);
__pl_plenv(xmin, xmax, ymin, ymax, 0, -1);
hold on;
endif
Modified: trunk/bindings/octave/PLplot/plot3.m
===================================================================
--- trunk/bindings/octave/PLplot/plot3.m 2011-01-06 08:12:30 UTC (rev 11444)
+++ trunk/bindings/octave/PLplot/plot3.m 2011-01-06 13:38:54 UTC (rev 11445)
@@ -91,7 +91,7 @@
h_st = ishold;
if (!ishold)
- plcol(15);
+ plcol0(15);
__pl_plenv(-1.6, 1.6, -1.6, 2.6, 0, -2);
pllab("", "", tdeblank(__pl.tlabel(strm,:)));
plw3d(2, 2, 2, xm, xM, ym, yM, zm, zM,...
Modified: trunk/bindings/octave/PLplot/set_view.m
===================================================================
--- trunk/bindings/octave/PLplot/set_view.m 2011-01-06 08:12:30 UTC (rev 11444)
+++ trunk/bindings/octave/PLplot/set_view.m 2011-01-06 13:38:54 UTC (rev 11445)
@@ -61,7 +61,7 @@
xm = ym = zm = 0;
xM = yM = zM = 1;
- plcol(15);
+ plcol0(15);
__pl_plenv(-1.5, 1.5, -1.5, 2.5, 0, -2);
plw3d(2, 2, 2, xm, xM, ym, yM, zm, zM, alt, az)
Modified: trunk/bindings/octave/PLplot/shade.m
===================================================================
--- trunk/bindings/octave/PLplot/shade.m 2011-01-06 08:12:30 UTC (rev 11444)
+++ trunk/bindings/octave/PLplot/shade.m 2011-01-06 13:38:54 UTC (rev 11445)
@@ -103,7 +103,7 @@
endif
__pl.plcol(strm) = 1;
- plcol(15);pllsty(1);
+ plcol0(15);pllsty(1);
__pl_plenv(xm, xM, ym, yM, 0, -2);
else
if (columns(__pl.axis(strm,:)) != 6)
@@ -175,10 +175,10 @@
endfor
if (__pl.grid(strm)) # this has to be done after shading
- plcol(15);
+ plcol0(15);
plbox("bcnsgt",0,0,"bcnsgtv",0,0)
else
- plcol(15);
+ plcol0(15);
plbox("bcnst",0,0,"bcnstv",0,0)
endif
@@ -186,7 +186,7 @@
__pl_draw_legend;
endif
- plcol(15);
+ plcol0(15);
pllab(tdeblank(__pl.xlabel(strm,:)), tdeblank(__pl.ylabel(strm,:)), tdeblank(__pl.tlabel(strm,:)));
plflush;
Modified: trunk/bindings/octave/PLplot/subplot.m
===================================================================
--- trunk/bindings/octave/PLplot/subplot.m 2011-01-06 08:12:30 UTC (rev 11444)
+++ trunk/bindings/octave/PLplot/subplot.m 2011-01-06 13:38:54 UTC (rev 11445)
@@ -101,7 +101,7 @@
pladv(index);
plvpor(0,1,0,1)
plwind(0,1,0,1)
- plcol(0); plpsty(0)
+ plcol0(0); plpsty(0)
plfill([0; 1; 1; 0],[0; 0; 1; 1]);
plflush; pleop;
else
Modified: trunk/bindings/octave/PLplot/support/__pl_contour.m
===================================================================
--- trunk/bindings/octave/PLplot/support/__pl_contour.m 2011-01-06 08:12:30 UTC (rev 11444)
+++ trunk/bindings/octave/PLplot/support/__pl_contour.m 2011-01-06 13:38:54 UTC (rev 11445)
@@ -61,7 +61,7 @@
__pl.pllsty(strm) = 1;
__pl.lab_pos(strm) = 1;
__pl.lab_str = "";
- plcol(15); pllsty(1);
+ plcol0(15); pllsty(1);
__pl_plenv(xm, xM, ym, yM, 0, grid);
else
if (columns(__pl.axis(strm,:)) != 6)
@@ -85,7 +85,7 @@
endif
for i=1:n
- plcol(__pl.plcol(strm)); pllsty(__pl.pllsty(strm));
+ plcol0(__pl.plcol(strm)); pllsty(__pl.pllsty(strm));
plcont(z, 1, xlen, 1, ylen, clevel(i), tr);
__pl.lab_str = [__pl.lab_str; sprintf("%#+.2G", clevel(i))];
__pl.lab_col(strm,__pl.lab_pos(strm)) = __pl.plcol(strm);
@@ -102,7 +102,7 @@
__pl_draw_legend
endif
- plcol(15);
+ plcol0(15);
pllab(tdeblank(__pl.xlabel(strm,:)),
tdeblank(__pl.ylabel(strm,:)),
tdeblank(__pl.tlabel(strm,:)));
Modified: trunk/bindings/octave/PLplot/support/__pl_draw_legend.m
===================================================================
--- trunk/bindings/octave/PLplot/support/__pl_draw_legend.m 2011-01-06 08:12:30 UTC (rev 11444)
+++ trunk/bindings/octave/PLplot/support/__pl_draw_legend.m 2011-01-06 13:38:54 UTC (rev 11445)
@@ -46,9 +46,9 @@
yyb = (__pl.legend_ypos(strm) - ch_height * k);
if (__pl.legend(strm) == 2) # opaque
- plcol(0); # background color (erase lines behind legend)
+ plcol0(0); # background color (erase lines behind legend)
plfill([xxl;xxr;xxr;xxl], [yyb; yyb; yyt; yyt])
- plcol(15);pllsty(1);
+ plcol0(15);pllsty(1);
plline([xxl;xxr;xxr;xxl;xxl], [yyb; yyb; yyt; yyt;yyb])
endif
@@ -71,7 +71,7 @@
min_color, min_width, max_color, max_width, 1, tr);
endfor
endif
- plcol(15);pllsty(1);
+ plcol0(15);pllsty(1);
plline([xxl;xxr;xxr;xxl;xxl], [yyb; yyb; yyt; yyt;yyb]);
endif
@@ -81,10 +81,10 @@
xx = __pl.legend_xpos(strm);
yy = (__pl.legend_ypos(strm) - ch_height * k++ );
- plcol(15);
+ plcol0(15);
plptex(xx, yy, 0, 0, __pl.legend_xpos(strm), __pl.lab_str(i,:));
if(__pl.type(strm) != -2)
- plcol(__pl.lab_col(strm,i)); pllsty(__pl.lab_lsty(strm,i));
+ plcol0(__pl.lab_col(strm,i)); pllsty(__pl.lab_lsty(strm,i));
plline([xxl; xxr],[yy-ch_height/2; yy-ch_height/2]);
try
if (__pl.lab_sym(strm,i) != 0)
Modified: trunk/bindings/octave/PLplot/support/__pl_fill.m
===================================================================
--- trunk/bindings/octave/PLplot/support/__pl_fill.m 2011-01-06 08:12:30 UTC (rev 11444)
+++ trunk/bindings/octave/PLplot/support/__pl_fill.m 2011-01-06 13:38:54 UTC (rev 11445)
@@ -51,7 +51,7 @@
endif
if (!ishold)
- plcol(15);
+ plcol0(15);
__pl_plenv(min(x), max(x), min(y), max(y), 0, -1);
endif
@@ -60,17 +60,17 @@
coln = ['r','g','b','c','m','y','w','k'];
coli = [2, 4, 10, 12, 14, 3, 16, 1];
col = coli(find(c == coln))-1;
- plcol(col);
+ plcol0(col);
elseif (isscalar(c))
if (ceil(c) == c) #integer
- plcol(c);
+ plcol0(c);
else
plcol1(c);
endif
elseif (isvector(c) & length(c) == 3)
## FIXME -- color 15 became permanently set!
plscol0(15, c(1), c(2), c(3));
- plcol(15);
+ plcol0(15);
elseif (isvector(c) & length(x) == length(x))
## If C is a vector the same length as X and Y, its elements are
Modified: trunk/bindings/octave/PLplot/support/__pl_meshplotit.m
===================================================================
--- trunk/bindings/octave/PLplot/support/__pl_meshplotit.m 2011-01-06 08:12:30 UTC (rev 11444)
+++ trunk/bindings/octave/PLplot/support/__pl_meshplotit.m 2011-01-06 13:38:54 UTC (rev 11445)
@@ -53,7 +53,7 @@
__pl.axis(strm,5) = zm; __pl.axis(strm,6) = zM;
endif
- plcol(15);pllsty(1);
+ plcol0(15);pllsty(1);
if (__pl.multi(strm) == 1) # multiplot, erase current subwindow
plclear;
else
@@ -66,7 +66,7 @@
plbox3("bnstu", tdeblank(__pl.xlabel(strm,:)), 0.0, 0,
"bnstu", tdeblank(__pl.ylabel(strm,:)), 0.0, 0,
"bcmnstuv", tdeblank(__pl.zlabel(strm,:)), 0.0, 0);
- plcol(1)
+ plcol0(1);
nlev = 10;
st = (zM-zm)/nlev/2;
@@ -110,8 +110,8 @@
endfor
- plcol(15);
+ plcol0(15);
plmtex("t", 1, 0.5,0.5, tdeblank(__pl.tlabel(strm,:)));
plflush;
-endfunction
\ No newline at end of file
+endfunction
Modified: trunk/bindings/octave/PLplot/support/__pl_plenv.m
===================================================================
--- trunk/bindings/octave/PLplot/support/__pl_plenv.m 2011-01-06 08:12:30 UTC (rev 11444)
+++ trunk/bindings/octave/PLplot/support/__pl_plenv.m 2011-01-06 13:38:54 UTC (rev 11445)
@@ -159,7 +159,7 @@
yopt = strrep (yopt, "n", "");
endif
- plcol(15); pllsty(1);
+ plcol0(15); pllsty(1);
plbox(xopt, __pl.xticks(strm,1), __pl.xticks(strm,2),
yopt, __pl.yticks(strm,1), __pl.yticks(strm,2));
Modified: trunk/bindings/octave/PLplot/support/__pl_plot3.m
===================================================================
--- trunk/bindings/octave/PLplot/support/__pl_plot3.m 2011-01-06 08:12:30 UTC (rev 11444)
+++ trunk/bindings/octave/PLplot/support/__pl_plot3.m 2011-01-06 13:38:54 UTC (rev 11445)
@@ -58,7 +58,7 @@
endif
if (!ishold)
- plcol(15);
+ plcol0(15);
__pl_plenv(-1.6, 1.6, -1.6, 2.6, 0, -2);
pllab("", "", tdeblank(__pl.tlabel(strm,:)));
plw3d(2, 2, 2, xm, xM, ym, yM, zm, zM,...
@@ -68,7 +68,7 @@
"bcdmnstuv", tdeblank(__pl.zlabel(strm,:)), 0.0, 0)
endif
- plcol(color)
+ plcol0(color)
switch (style)
case (1)
Modified: trunk/bindings/octave/PLplot/support/__pl_plotit.m
===================================================================
--- trunk/bindings/octave/PLplot/support/__pl_plotit.m 2011-01-06 08:12:30 UTC (rev 11444)
+++ trunk/bindings/octave/PLplot/support/__pl_plotit.m 2011-01-06 13:38:54 UTC (rev 11445)
@@ -90,7 +90,7 @@
endif
## set plot limits, plot box, grid and axis type
- plcol(15); pllsty(1);
+ plcol0(15); pllsty(1);
if (__pl.type(strm) == -1) # polar plot is special
__pl_plenv(__pl_lxm, __pl_lxM, __pl_lym, __pl_lyM, 1, __pl.type(strm));
if (__pl.grid(strm) == 1)
@@ -190,7 +190,7 @@
endif
if (lab != ">") ## log plots may have a CTRL-A as the label plot
- plcol(__pl.plcol(strm));
+ plcol0(__pl.plcol(strm));
__pl.plcol(strm) = rem(__pl.plcol(strm), 15)+1;
pllsty(__pl.pllsty(strm));
if (__pl.line_style(strm))
@@ -275,7 +275,7 @@
__pl_draw_legend
endif
- plcol(15);
+ plcol0(15);
pllab(tdeblank(__pl.xlabel(strm,:)), tdeblank(__pl.ylabel(strm,:)), tdeblank(__pl.tlabel(strm,:)));
plflush;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|