From: Quentin S. <qsp...@us...> - 2005-05-02 15:30:32
|
Update of /cvsroot/octave/octave-forge/FIXES In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23115/FIXES Modified Files: grid.m Log Message: Applied patches written by Dmitri Sergatskov to update gset and gplot to the new gnuplot plotting interface (__gnuplot_set__ etc). Index: grid.m =================================================================== RCS file: /cvsroot/octave/octave-forge/FIXES/grid.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- grid.m 31 Jan 2002 06:11:53 -0000 1.2 +++ grid.m 2 May 2005 15:30:14 -0000 1.3 @@ -37,6 +37,8 @@ ## 2001-04-02 Laurent Mazet <ma...@cr...> ## * add support for semilog[xy] and loglog minor grid. ## * add mode feature (suggested by Paul Kienzle). +## 2005-04-23 Dmitri A. Sergatskov <das...@gm...> +## * modified to use new gnuplot interface in octave > 2.9.0 function grid (mode) @@ -62,7 +64,7 @@ if isempty(mode) - gset nogrid; + __gnuplot_raw__ ("unset grid;\n") else @@ -72,23 +74,33 @@ if any(mode(i) == "xyz") [n, has_n, err, next] = sscanf(mode(i+1:len), "%d", 1); if has_n - eval(sprintf("gset m%stics %d;", mode(i), n)); - eval(sprintf("gset grid %stics m%stics;", mode(i), mode(i))); + cmd = sprintf("set m%stics %d;", mode(i), n); + __gnuplot_raw__ (cmd) + cmd = sprintf("set grid %stics m%stics;", mode(i), mode(i)); + __gnuplot_raw__ (cmd) i = i + next; elseif i+1<=len && mode(i+1) == '-' - eval(sprintf("gset grid %stics m%stics;", mode(i), mode(i))); + cmd = sprintf("set grid %stics m%stics;", mode(i), mode(i)); + __gnuplot_raw__ (cmd) i = i + 2; else - eval(sprintf("gset grid %stics nom%stics;", mode(i), mode(i))); + cmd = sprintf("set grid %stics nom%stics;", mode(i), mode(i)); + __gnuplot_raw__ (cmd) i = i + 1; endif else error("grid: unknown mode %s at character %d", mode, i); endif endwhile - if all(mode != "x"), gset grid noxtics nomxtics; endif - if all(mode != "y"), gset grid noytics nomytics; endif - if all(mode != "z"), gset grid noztics nomztics; endif + if all(mode != "x") + __gnuplot_raw__ ("set grid noxtics nomxtics;\n") + endif + if all(mode != "y") + __gnuplot_raw__ ("set grid noytics nomytics;\n") + endif + if all(mode != "z") + __gnuplot_raw__ ("set grid noztics nomztics;\n") + endif endif endfunction |