w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-07 17:46:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug that suppressed occasional quick decodes.

Browse Source 
Another tweak to logic for disabling Decode button.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@463 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2007-07-03 16:53:28 +00:00
parent a93c9c65ed
commit 4995845c09
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
map65.py
View File

@ -987,7 +987,7 @@ def update():
txminute=0 txminute=0
if Audio.gcom2.lauto and utc[4]%2 == Audio.gcom1.txfirst: txminute=1 if Audio.gcom2.lauto and utc[4]%2 == Audio.gcom1.txfirst: txminute=1
if mode.get()[:4]=='JT65' and (Audio.gcom2.ndecoding>0 or \ if mode.get()[:4]=='JT65' and (Audio.gcom2.ndecoding>0 or \
(isec>45 and txminute==0 and \ (isec>45 and (txminute==0 or Audio.gcom2.monitoring==0) and \
Audio.datcom.kkdone!=-99 and Audio.gcom2.ndiskdat!=1)): Audio.datcom.kkdone!=-99 and Audio.gcom2.ndiskdat!=1)):
#Set button bg while decoding #Set button bg while decoding
bc='#66FFFF' bc='#66FFFF'
@ -1313,7 +1313,7 @@ helpmenu.add('command', label = 'About MAP65', command = about, \
#------------------------------------------------------ Labels under graphics #------------------------------------------------------ Labels under graphics
iframe2 = Frame(frame, bd=1, relief=FLAT,height=15) iframe2 = Frame(frame, bd=1, relief=FLAT,height=15)
lab2=Label(iframe2, text='Freq DF Pol UTC DT dB') lab2=Label(iframe2, text='Freq DF Pol UTC DT dB')
lab2.place(x=3,y=6, anchor='w') lab2.place(x=3,y=6, anchor='w')
lab7=Label(iframe2,text='F3',fg='gray85') lab7=Label(iframe2,text='F3',fg='gray85')
lab7.place(x=495,y=6, anchor=CENTER) lab7.place(x=495,y=6, anchor=CENTER)

14
map65a.f90
View File

@ -95,6 +95,7 @@ subroutine map65a(newdat)
call ccf65(ss(1,1,i),nhsym,sync1,ipol,dt,flipk, & call ccf65(ss(1,1,i),nhsym,sync1,ipol,dt,flipk, &
syncshort,snr2,ipol2,dt2) syncshort,snr2,ipol2,dt2)
! ########################### Search for Shorthand Messages #################
shmsg=' ' shmsg=' '
! Is there a shorthand tone above threshold? ! Is there a shorthand tone above threshold?
if(syncshort.gt.1.0) then if(syncshort.gt.1.0) then
@ -145,16 +146,15 @@ subroutine map65a(newdat)
enddo enddo
endif endif
! ########################### Search for Normal Messages ###########
! Is sync1 above threshold? ! Is sync1 above threshold?
if(sync1.gt.1.0) then if(sync1.gt.1.0) then
! Keep only the best candidate within ftol. ! Keep only the best candidate within ftol.
! (Am I deleting any good decodes by doing this? Any harm in omitting ! (Am I deleting any good decodes by doing this?)
! these statements??)
if(freq-freq0.le.ftol .and. sync1.gt.sync10 .and. & if(freq-freq0.le.ftol .and. sync1.gt.sync10 .and. &
nkm.eq.1 .and.nqd.eq.0) km=km-1 nkm.eq.1) km=km-1
if(freq-freq0.gt.ftol .or. sync1.gt.sync10) then
if(freq-freq0.gt.ftol .or. sync1.gt.sync10 .and. nqd.eq.0) then
nflip=nint(flipk) nflip=nint(flipk)
call decode1a(id(1,1,kbuf),newdat,nfilt,freq,nflip, & call decode1a(id(1,1,kbuf),newdat,nfilt,freq,nflip, &
mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi, & mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi, &
@ -222,8 +222,8 @@ subroutine map65a(newdat)
endif endif
enddo enddo
if(nwrite.eq.0) then if(nwrite.eq.0) then
write(11,1011) mousefqso,mousedf,nutc write(11,1011) mousefqso,nutc
1011 format(i3,i5,4x,i5.4) 1011 format(i3,9x,i5.4)
endif endif
write(11,*) '$EOF' write(11,*) '$EOF'