pyxida-cvs-commits

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

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

Modified Files:
	animateNC.pl 
Log Message:
Fixed bug in regex

Index: animateNC.pl
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/bin/animateNC.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** animateNC.pl	15 Feb 2007 18:52:43 -0000	1.12
--- animateNC.pl	16 Feb 2007 10:10:12 -0000	1.13
***************
*** 102,106 ****
  
  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);
--- 102,106 ----
  
  while (my $line = <>) {
! 	if ($line =~ m/\w\w (\d+) \S+ a=(\S+) .+ sc2=\[(.+),(.+),(.+),h(.+)\] ac2=\[(.+),(.+),(.+),h(.+)\]/) {
  		my ($ts, $addr) = ($1 / 1000, $2);
  		my @sc = ($3, $4, $5, $6);
***************
*** 170,185 ****
  
  	my $xmin = $xrange->percentile(100 - $rangePercentile);
  	my $xmax = $xrange->percentile($rangePercentile);
  	my $ymin = $yrange->percentile(100 - $rangePercentile);
  	my $ymax = $yrange->percentile($rangePercentile);
  	my $zmin = $zrange->percentile(100 - $rangePercentile);
  	my $zmax = $zrange->percentile($rangePercentile);
  	
! 	$s_xmin = $xmin unless $s_xmin;
! 	$s_xmax = $xmax unless $s_xmax;
! 	$s_ymin = $ymin unless $s_ymin;
! 	$s_ymax = $ymax unless $s_ymax;
! 	$s_zmin = $zmin unless $s_zmin;
! 	$s_zmax = $zmax unless $s_zmax;	
  	
  	$s_xmin = (1 - $alpha) * $s_xmin + ($alpha * $xmin);
--- 170,196 ----
  
  	my $xmin = $xrange->percentile(100 - $rangePercentile);
+ 	$xmin = 0 unless defined $xmin;
+ 	
  	my $xmax = $xrange->percentile($rangePercentile);
+ 	$xmax = 0 unless defined $xmax;
+ 	
  	my $ymin = $yrange->percentile(100 - $rangePercentile);
+ 	$ymin = 0 unless defined $ymin;
+ 
  	my $ymax = $yrange->percentile($rangePercentile);
+ 	$ymax = 0 unless defined $ymax;
+ 
  	my $zmin = $zrange->percentile(100 - $rangePercentile);
+ 	$zmin = 0 unless defined $zmin;
+ 
  	my $zmax = $zrange->percentile($rangePercentile);
+ 	$zmax = 0 unless defined $zmax;
  	
! 	$s_xmin = $xmin unless defined $s_xmin;
! 	$s_xmax = $xmax unless defined $s_xmax;
! 	$s_ymin = $ymin unless defined $s_ymin;
! 	$s_ymax = $ymax unless defined $s_ymax;
! 	$s_zmin = $zmin unless defined $s_zmin;
! 	$s_zmax = $zmax unless defined $s_zmax;	
  	
  	$s_xmin = (1 - $alpha) * $s_xmin + ($alpha * $xmin);