[Octave-cvsupdate] octave-forge/main/comm apkconst.m,1.2,1.3 eyediagram.m,1.4,1.5 qaskenco.m,1.2,1.3 scatterplot.m,1.7,1.8

[Quentin S. <qsp...@us...>]

Update of /cvsroot/octave/octave-forge/main/comm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23115/main/comm

Modified Files:
	apkconst.m eyediagram.m qaskenco.m scatterplot.m 
Log Message:
Applied patches written by Dmitri Sergatskov to update gset and gplot
to the new gnuplot plotting interface (__gnuplot_set__ etc).


Index: eyediagram.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/comm/eyediagram.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- eyediagram.m	25 May 2004 16:16:10 -0000	1.4
+++ eyediagram.m	2 May 2005 15:30:15 -0000	1.5
@@ -54,6 +54,9 @@
 ## @end deftypefn
 ## @seealso{scatterplot}
 
+## 2005-04-23 Dmitri A. Sergatskov <das...@gm...>
+##     * modified for new gnuplot interface (octave > 2.9.0)
+
 function hout = eyediagram (x, n, _per, _off, str, h)
 
   if ((nargin < 2) || (nargin > 6))
@@ -240,13 +243,13 @@
     xlabel("Time");
     ylabel("Amplitude");
     
-    gset nokey
+    legend("off");
     hold off;
-    gplot tmpfile;
+    __gnuplot_plot__  tmpfile ;
     if (strcmp(signal,"complex"))
       subplot(2,1,2);
       title("Eye-diagram for quadrature signal");
-      gplot tmpfile using 1:3;
+      __gnuplot_plot__ tmpfile using 1:3;
     endif
 
   unwind_protect_cleanup

Index: qaskenco.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/comm/qaskenco.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qaskenco.m	15 Mar 2004 22:23:01 -0000	1.2
+++ qaskenco.m	2 May 2005 15:30:15 -0000	1.3
@@ -57,6 +57,9 @@
 ## @end deftypefn
 ## @seealso{qaskdeco}
 
+## 2005-04-23 Dmitri A. Sergatskov <das...@gm...>
+##     * modified for new gnuplot interface (octave > 2.9.0)
+
 function [a, b] = qaskenco(msg, M)
 
   if (nargin == 1)
@@ -163,10 +166,10 @@
       xlabel("In-phase");
       ylabel("Quadrature");
       axis([min(inphase)-1, max(inphase)+1, min(quadr)-1, max(quadr)+1]);
-      gset nokey;
+      legend("off");
       hold off;
       yy = [inphase, quadr];
-      eval("gplot yy w p 1;");
+      __gnuplot_plot__ yy w p 1;
       hold on;
       xd = 0.02 * max(inphase);
       if (nargin == 2)
@@ -184,7 +187,7 @@
       xlabel("");
       ylabel("");
       title("");
-      gset autoscale;
+      axis();
       hold off;
       text();
       automatic_replot = ar;

Index: scatterplot.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/comm/scatterplot.m,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- scatterplot.m	10 Jul 2004 12:12:00 -0000	1.7
+++ scatterplot.m	2 May 2005 15:30:15 -0000	1.8
@@ -51,6 +51,9 @@
 ## @end deftypefn
 ## @seealso{eyediagram}
 
+## 2005-04-23 Dmitri A. Sergatskov <das...@gm...>
+##     * modified for new gnuplot interface (octave > 2.9.0)
+
 function hout = scatterplot (x, n, _off, str, h)
 
   if ((nargin < 1) || (nargin > 5))
@@ -144,19 +147,19 @@
     title("Scatter plot");
     xlabel("In-phase");
     ylabel("Quadrature");
-    gset nokey;
+    lagend("off");
     if (!strcmp(signal,"complex"))
-      gset yrange [-1:1];
+      __gnuplot_raw__ ("set yrange [-1:1];\n")
     endif
     
-    cmd = sprintf("gplot spts %s", fmt);
+    cmd = sprintf("__gnuplot_plot__ spts %s", fmt);
     eval(cmd);
 
   unwind_protect_cleanup
-    xlabel("");
-    ylabel("");
-    gset autoscale;
-    title("");
+##    xlabel("");
+##    ylabel("");
+##    axis();
+##    title("");
     automatic_replot = ar;
   end_unwind_protect
 

Index: apkconst.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/comm/apkconst.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- apkconst.m	15 Mar 2004 22:23:01 -0000	1.2
+++ apkconst.m	2 May 2005 15:30:15 -0000	1.3
@@ -49,6 +49,12 @@
 ## @end deftypefn
 ## @seealso{dmod,ddemod,modmap,demodmap}
 
+
+## 2005-04-23 Dmitri A. Sergatskov <das...@gm...>
+##     * modified for new gnuplot interface (octave > 2.9.0)
+
+
+
 function yout = apkconst(varargin)
 
   if ((nargin < 1) || (nargin > 5))
@@ -130,7 +136,7 @@
       xlabel("In-phase");
       ylabel("Quadrature");
       axis([-1.1*max(amp), 1.1*max(amp), -1.1*max(amp), 1.1*max(amp)]);
-      gset nokey;
+      legend("off");
       hold off;
       r = [0:0.02:2]'*pi;
       x0 = cos(r) * amp;
@@ -144,13 +150,13 @@
 	  text(real(y(i))+xd,imag(y(i)),num2str(i-1));
 	end
       endif
-      cmd = sprintf("gplot yy %s;", fmt);
+      cmd = sprintf("__gnuplot_plot__ yy %s;", fmt);
       eval(cmd);
     unwind_protect_cleanup
       xlabel("");
       ylabel("");
       title("");
-      gset autoscale;
+      axis();
       hold off;
       if (printnums)
         text();