X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fmuf.pl;h=3c01944bb1e861714a910040b63ced9a1a90eddc;hb=refs%2Fheads%2Fnewusers;hp=488ad8df8153172383c6879449eaccedacdca789;hpb=24bfcc3275f8a8be7e9cdde2acfb46e27e3d875a;p=spider.git diff --git a/cmd/show/muf.pl b/cmd/show/muf.pl index 488ad8df..3c01944b 100644 --- a/cmd/show/muf.pl +++ b/cmd/show/muf.pl @@ -6,8 +6,10 @@ # # as fixed by Steve Franke K9AN # -# $Id$ # +# + +use Minimuf; my ($self, $line) = @_; my @f = split /\s+/, $line; @@ -36,10 +38,13 @@ my ($d, $b1, $b2); # distance, bearing from TX and from RX my ($lat2, $lon2); # lats and longs in radians my $lat1 = $self->user->lat; my $lon1 = $self->user->long; +my $loc1 = $self->user->qth || "unknown"; + if (!$lon1 && !$lat1) { push @out, $self->msg('heade1'); $lat1 = $main::mylatitude; $lon1 = $main::mylongitude; + $loc1 = $main::myqth; } $lat2 = $a->{lat}; $lon2 = $a->{long}; @@ -119,7 +124,7 @@ $delay = ((2 * $hop * sin($dhop) * ($R + $hF)) / cos($beta1) / $VOFL) * 1e6; push @out, sprintf("RxSens: $rsens dBM SFI:%4.0f R:%4.0f Month: $month Day: $day", $flux, $ssn); push @out, sprintf("Power : %3.0f dBW Distance:%6.0f km Delay:%5.1f ms", $dB1, $d * $R, $delay); push @out, sprintf("Location Lat / Long Azim"); -push @out, sprintf("%-30.30s %-18s %3.0f", $main::myqth, DXBearing::lltos($lat1*$r2d, -$lon1*$r2d), $b1 * $r2d); +push @out, sprintf("%-30.30s %-18s %3.0f", $loc1, DXBearing::lltos($lat1*$r2d, -$lon1*$r2d), $b1 * $r2d); push @out, sprintf("%-30.30s %-18s %3.0f", $a->name, DXBearing::lltos($lat2*$r2d, -$lon2*$r2d), $b2 * $r2d); my $head = "UT LT MUF Zen"; for ($i = 0; $i < $nfreq; $i++) {