X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=scripts%2Fgenspic2gnuplot;h=7c213c32711838d7331ab429ade2d69b89da752b;hp=86df13e4ae71da7aa3919a5b0cfcac684b659f9d;hb=37e52bdb96b9730add76a3183a0fd0f6bbd6acf7;hpb=6e7c525d2d9e43a0132c1b59b75685a4bb4be018

diff --git a/scripts/genspic2gnuplot b/scripts/genspic2gnuplot
index 86df13e..7c213c3 100755
--- a/scripts/genspic2gnuplot
+++ b/scripts/genspic2gnuplot
@@ -23,7 +23,7 @@
 # This program and its documentation are free software; you can
 # redistribute them and/or modify them under the terms of the GNU
 # General Public License as published by the Free Software Foundation;
-# either version 2, or (at your option) any later version.
+# either version 3, or (at your option) any later version.
 # 
 # This program and its documentation are distributed in the hope that
 # they will be useful, but WITHOUT ANY WARRANTY; without even the
@@ -31,8 +31,8 @@
 # PURPOSE.  See the GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 die unless @ARGV==1;
 die if $ARGV[0] =~ m/^\-/;
@@ -52,18 +52,18 @@ END
 
 for (;;) {
     ($c,@s)= split /\s+/, <STDIN>;
-print STDERR ">$c< >@s<\n";
     if ($c eq 'S') {
-	($cplot,$logy2,@columns) = @s;
+	($cplot,$logxy,@columns) = @s;
+	$cplot .= $counter{$cplot}++;
 	unshift @columns, 'x:';
 	@mmm= map { s/^(\w+)\:// or die; $1; } @columns;
 	open S, "> $ofb,$cplot.gnuplot-cmd" or die $!;
 	print S <<END
-set data style linespoints
+set data style lines
 set title '$cplot'
 END
         or die $!;
-	print S "set logscale xy\n" or die $! if $logy2;
+	print S "set logscale xy\n" or die $! if $logxy;
 	print S "set y2tics autofreq\n" or die $! if grep { $_ eq 'y2' } @mmm;
 	undef %min;
 	undef %max;
@@ -95,7 +95,6 @@ END
     } elsif ($c eq 'D') {
 	die unless @mmm;
 	@numbers= @s;
-print STDERR "$#numbers $#columns.\n";
 	die unless @numbers == @columns;
 	for ($yn=0; $yn<=$#columns; $yn++) {
 	    $_= $numbers[$yn];
@@ -125,4 +124,4 @@ close A or die $!;
 
 print ": generated ; $sof\n" or die $!;
 
-# $Id: genspic2gnuplot,v 1.1 2004-03-24 23:53:41 ianmdlvl Exp $
+# $Id: genspic2gnuplot,v 1.6 2007-09-21 21:21:15 ianmdlvl Exp $