More changes to support overlong calls like VU4AN/VU3RYH.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@178 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2006-04-21 19:33:30 +00:00
parent 5c0bdab60b
commit eea8944eeb
4 changed files with 11 additions and 9 deletions

View File

@ -11,17 +11,17 @@
enddo
i=22
10 if(i.ge.11 .and. message(i-3:i).eq.' OOO') then
10 if(i.ge.11 .and. (message(i-3:i).eq.' OOO') .or.
+ (message(20:22).eq.' OO')) then
cok='OOO'
flip=-1.0
message=message(1:i-4)
endif
if(message(1:3).eq.'ATT') nspecial=1
! if(message(1:3).eq.'ATT') nspecial=1
if(message(1:2).eq.'RO') nspecial=2
if(message(1:3).eq.'RRR') nspecial=3
if(message(1:2).eq.'73') nspecial=4
return
end

View File

@ -62,8 +62,10 @@
5 icall=icall+1
j1=index(mycall,' ') - 1
if(j1.le.-1) j1=12
if(j1.lt.3) j1=6
j2=index(callsign,' ') - 1
if(j2.le.-1) j2=12
if(j2.lt.3) j2=6
j3=index(mycall,'/')
j4=index(callsign,'/')

View File

@ -1,4 +1,4 @@
#------------------------------------------------------------------- WSJT
#-------------------------------------------------------------------- WSJT
from Tkinter import *
from tkFileDialog import *
import Pmw

View File

@ -165,8 +165,8 @@ C result from the Reed-Solomon decoder.
if(c1.ge.'a' .and. c1.le.'z') decoded(i:i)=char(ichar(c1)-32)
enddo
write(line,1010) cfile6,nsync,nsnr,dtx-1.0,ndf,
+ nint(width),csync,special,decoded(1:18),cooo,kvqual,nqual,itry
1010 format(a6,i3,i5,f5.1,i5,i3,1x,a1,1x,a5,a18,1x,a3,i5,i3,i2)
+ nint(width),csync,special,decoded(1:19),cooo,kvqual,nqual,itry
1010 format(a6,i3,i5,f5.1,i5,i3,1x,a1,1x,a5,a19,1x,a3,i4,i3,i2)
C Blank DT if shorthand message (### wrong logic? ###)
if(special.ne.' ') then
@ -195,13 +195,13 @@ C Write decoded msg unless this is an "Exclude" request:
C Write the average line
if(ns1.ge.1 .and. ns1.ne.ns10) then
if(ns1.lt.10) write(ave1,1021) cfile6,1,nused1,ns1,avemsg1
1021 format(a6,i3,i4,'/',i1,20x,a18)
1021 format(a6,i3,i4,'/',i1,20x,a19)
if(ns1.ge.10 .and. nsave.le.99) write(ave1,1022) cfile6,
+ 1,nused1,ns1,avemsg1
1022 format(a6,i3,i4,'/',i2,19x,a18)
1022 format(a6,i3,i4,'/',i2,19x,a19)
if(ns1.ge.100) write(ave1,1023) cfile6,1,nused1,ns1,
+ avemsg1
1023 format(a6,i3,i4,'/',i3,18x,a18)
1023 format(a6,i3,i4,'/',i3,18x,a19)
if(lcum .and. (avemsg1.ne.' '))
+ write(21,1011) ave1(1:57)//' '
ns10=ns1