From cdd47ab8e7774f61bb714ce41adecfc58b6f3f27 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 6 Mar 2019 23:27:14 +0000 Subject: [PATCH] drop much debug --- generate-board | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/generate-board b/generate-board index f35a699..7f32b11 100755 --- a/generate-board +++ b/generate-board @@ -199,8 +199,8 @@ sub transform_coordinates () { my $transform = Math::GSL::Matrix->new(2,2); $transform->set_row(0, [ $c, -$s ]); $transform->set_row(1, [ $s, $c ]); - print STDERR "rotate was=",prvec($dir)," theta=$theta", - " rotateby=$rotateby s=$s c=$c\n"; + # print STDERR "rotate was=",prvec($dir)," theta=$theta", + # " rotateby=$rotateby s=$s c=$c\n"; my @lims; foreach my $topend (qw(0 1)) { my $v = $topend ? -$GSL_DBL_MAX : $GSL_DBL_MAX; @@ -228,9 +228,9 @@ sub transform_coordinates () { } } }); - print STDERR "lims ",prvec($lims[0])," .. ",prvec($lims[1]),"\n"; + #print STDERR "lims ",prvec($lims[0])," .. ",prvec($lims[1]),"\n"; my $translate = -$lims[0]; - print STDERR "translate ",prvec($translate),"\n"; + #print STDERR "translate ",prvec($translate),"\n"; my $scale = $c{GraphScale} * MM2PT; for_each_pos(sub { my ($pr) = @_; @@ -249,7 +249,7 @@ sub adjust_nz() { foreach my $v (@$poly) { $v->{NZ_Occurs} = $occurs{$v->{VxName}}; } - print STDERR " nz ".(scalar @$poly)."\n"; + #print STDERR " nz ".(scalar @$poly)."\n"; my $occurs_m = sub { my ($ei) = @_; $poly->[($ei+@$poly) % @$poly]{NZ_Occurs} > 1 @@ -258,12 +258,12 @@ sub adjust_nz() { next if $occurs_m->($ei); next unless $occurs_m->($ei-1); next unless $occurs_m->($ei+1); - print STDERR " nz would adjust $poly->[$ei]{VxName}\n"; + #print STDERR " nz would adjust $poly->[$ei]{VxName}\n"; # adjust coord outwards } for my $ei (0..$#$poly) { next unless $occurs_m->($ei); - print STDERR " nz occurs_m $ei $poly->[$ei]{VxName}\n"; + #print STDERR " nz occurs_m $ei $poly->[$ei]{VxName}\n"; next unless $occurs_m->($ei-1); my $dleft = mkvec(-1000,0); foreach my $which (0,-1) { @@ -272,10 +272,10 @@ sub adjust_nz() { my $posj = \ $poly->[$ej]{Pos}; my $posk = \ $poly->[$ek]{Pos}; my $dout = $$posk - $$posj; - print STDERR " nz adj j=$ej ",prvec($$posj)," $poly->[$ej]{VxName}\n"; - print STDERR " nz adj k=$ek ",prvec($$posk)," $poly->[$ek]{VxName}\n"; + #print STDERR " nz adj j=$ej ",prvec($$posj)," $poly->[$ej]{VxName}\n"; + #print STDERR " nz adj k=$ek ",prvec($$posk)," $poly->[$ek]{VxName}\n"; if ($poly->[$ej]{VxName} =~ /Noorderzijlvest/) { - print STDERR " nz adj extra\n"; + #print STDERR " nz adj extra\n"; $$posk = $$posj + 10 * mkvec(100,-50); } $$posj = $$posj + $dleft + $dout*10; @@ -422,7 +422,7 @@ sub pscolour ($$$$) { m/^([CMYK])([0-7](?:\.\d*)?|8)_?$/ or confess $_.' ?'; confess if defined $cmyk{$1}; $cmyk{$1} = $2 / 8.; - print STDERR " CMYK $1 $2\n"; + #print STDERR " CMYK $1 $2\n"; } @r = map { $cmyk{$_} // 0 } qw(C M Y K); $rw = 'setcmykcolor'; @@ -438,13 +438,13 @@ sub pscolour ($$$$) { sub lighterpscolour ($$) { my ($colourname, $retain) = @_; - print STDERR "COLOUR LIGHTER $retain $colourname\n"; + #print STDERR "COLOUR LIGHTER $retain $colourname\n"; pscolour($colourname, 0, $retain, 1-$retain); } sub darkerpscolour ($$) { my ($colourname, $retain) = @_; - print STDERR "COLOUR DARKER $retain $colourname\n"; + #print STDERR "COLOUR DARKER $retain $colourname\n"; pscolour($colourname, 2, $retain, 0); } @@ -455,7 +455,7 @@ sub facepscolour ($) { sub miscpscolour ($) { my ($colourname) = @_; - print STDERR "COLOUR MISC $colourname\n"; + #print STDERR "COLOUR MISC $colourname\n"; pscolour($colourname, 1, 1,0); } @@ -566,7 +566,7 @@ END $pos = $rr->{Centre} + mkvec( 0, 0.5 * $sz * @$words ); } if ($hs{$rr->{Name}}) { - print STDERR "adjust hs $rr->{Name}\n"; + #print STDERR "adjust hs $rr->{Name}\n"; $pos -= mkvec(0, -$hs_sz* ( $rr->{Colour} eq 'green' ? 0.25 : 0.65 )); my $hspos = $pos - mkvec(0, $sz * @$words + $hs_sz/2 + $hs_lw @@ -580,7 +580,7 @@ END my $w = $rr->{Water}; $w = 2 if $rr->{Special} || $rr->{Name} eq 'ZZ'; if ($w) { - print STDERR " water $w in $rr->{Name}\n"; + #print STDERR " water $w in $rr->{Name}\n"; my $down = water_cubes_sz(2) - water_cubes_sz(1) + $cube_gap; $pos -= mkvec(0, -0.5 * $down); my $cube_y = -($sz * @$words); @@ -749,7 +749,7 @@ sub dykes(){ my $t_sz = $symbol_sz * 1.0; my $t_at = sub { my ($ang) = @_; - print STDERR "ANG $ang\n"; + #print STDERR "ANG $ang\n"; map { $t_sz * 0.5 * $_ } cos($ang), sin($ang); }; my @t0 = $t_at->((TAU) * 0.25 ); -- 2.30.2