Fixed bug that suppressed occasional quick decodes.

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

map65.py

@@ -987,7 +987,7 @@ def update():
     txminute=0
     if Audio.gcom2.lauto and utc[4]%2 == Audio.gcom1.txfirst: txminute=1
     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)):
 #Set button bg while decoding
         bc='#66FFFF'

map65a.f90

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