[Pyxida-cvs-commits] Pyxida/bin animateNC.pl,1.11,1.12

[Peter P. <pr...@us...>]

Update of /cvsroot/pyxida/Pyxida/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv767/bin

Modified Files:
	animateNC.pl 
Log Message:
Updated animate script to support new 3D+h log format (untested)

Index: animateNC.pl
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/bin/animateNC.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** animateNC.pl	9 Feb 2007 12:23:59 -0000	1.11
--- animateNC.pl	15 Feb 2007 18:52:43 -0000	1.12
***************
*** 102,109 ****
  
  while (my $line = <>) {
! 	if ($line =~ m/\w\w (\d+) .* addr=(.+) sc=\[(.+),(.+),(.+),(.+),h(.+)\] ac=\[(.+),(.+),(.+),(.+),h(.+)\]/) {
  		my ($ts, $addr) = ($1 / 1000, $2);
! 		my @sc = ($3, $4, $5, $6, $7);
! 		my @ac = ($8, $9, $10, $11, $12);
  		my $dateTS = localtime($ts);
  		print STDERR $line if ($debug);
--- 102,109 ----
  
  while (my $line = <>) {
! 	if ($line =~ m/\w\w (\d+) .* a=(.+) .* sc2=\[(.+),(.+),(.+),h(.+)\] ac2=\[(.+),(.+),(.+),h(.+)\]/) {
  		my ($ts, $addr) = ($1 / 1000, $2);
! 		my @sc = ($3, $4, $5, $6);
! 		my @ac = ($7, $8, $9, $10);
  		my $dateTS = localtime($ts);
  		print STDERR $line if ($debug);
***************
*** 246,250 ****
  }
  
! sub projectClever() {
  	my @coord4D = @_;
  	print STDERR "4D: $coord4D[0] $coord4D[1] $coord4D[2] $coord4D[3]\n" if ($debug);
--- 246,250 ----
  }
  
! sub projectClever4D() {
  	my @coord4D = @_;
  	print STDERR "4D: $coord4D[0] $coord4D[1] $coord4D[2] $coord4D[3]\n" if ($debug);
***************
*** 264,270 ****
  
  sub projectSimple() {
! 	my @coord4D = @_;
! 	print STDERR "4D: $coord4D[0] $coord4D[1] $coord4D[2] $coord4D[3]\n" if ($debug);
! 	my @coord3D = ($coord4D[0], $coord4D[1], $coord4D[2]);
  	return @coord3D;
  }
--- 264,270 ----
  
  sub projectSimple() {
! 	my @coord3Dh = @_;
! 	print STDERR "3D+h: $coord3Dh[0] $coord3Dh[1] $coord3Dh[2] $coord3Dh[3]\n" if ($debug);
! 	my @coord3D = ($coord3Dh[0], $coord3Dh[1], $coord3Dh[2]);
  	return @coord3D;
  }