From b1c75fc83d3dd1d82a2022f6ace2cc20ced19194 Mon Sep 17 00:00:00 2001 From: Dirk Koopman Date: Fri, 26 Nov 2021 14:23:28 +0000 Subject: [PATCH] *really* changed the DX Spot to "the way it was" --- Changes | 4 ++++ perl/DXCommandmode.pm | 2 +- perl/Spot.pm | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index 67bf4dc7..88901906 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,7 @@ +26Nov21======================================================================= +1. *Really* change spot display format and sh/dx format "back the way they + were. But They won't stay that way for long!!!! There are four (yes, count + them) completely unused spaces at the end of the line!!!! 25Nov21======================================================================= 1. Restored spot format back to the way it was. 2. Added CTY-3127 prefixes diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index 08b28acd..a5ae268b 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -1007,7 +1007,7 @@ sub format_dx_spot my $t = ztime($_[2]); my $loc = ''; - my $clth = 31 + $self->{width} - 80; # allow comment to grow according the screen width + my $clth = 30 + $self->{width} - 80; # allow comment to grow according the screen width # --$clth if $self->{consort} eq 'local'; my $comment = substr (($_[3] || ''), 0, $clth); diff --git a/perl/Spot.pm b/perl/Spot.pm index 385abb31..7f6265ac 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -465,7 +465,7 @@ sub formatl $comment =~ s/\t+/ /g; my $cl = length $comment; my $s = sprintf "%9.1f %-11s %s %s", $_[1], $_[2], $d, $t; - my $width = ($_[0] ? $_[0] : 80) - length($spotter) - length($s) - 2; + my $width = ($_[0] ? $_[0] : 80) - length($spotter) - length($s) - 4; $comment = substr $comment, 0, $width if $cl > $width; $comment .= ' ' x ($width-$cl) if $cl < $width; -- 2.43.0