Corrected deep65 so that station with add-on prefix can decode

CQ messages using deep search.
Added green bar to indocate Fmin-Fmax range.
Added current utc to end of tmp26, in case there were no messages decoded.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@485 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

deep65.F

@@ -83,6 +83,7 @@
          mz=1
          if(n.eq.1 .and. j3.lt.1 .and. j4.lt.1 .and.
      +      callsign(1:6).ne.'      ') mz=MAXRPT+1
+
 C  Test for messages with MyCall + HisCall + report
          do m=1,mz
             if(m.gt.1) grid=rpt(m-1)
@@ -93,7 +94,9 @@ C  Test for messages with MyCall + HisCall + report
             testmsg(k)=message
             call encode65(message,ncode(1,k))
             nflip(k)=flip
+
 C  Insert CQ message
+            if(j4.lt.1) callgrid(icall)=callsign(1:j2)//' '//grid
             message='CQ '//callgrid(icall)
             k=k+1
             testmsg(k)=message

display.F90

@@ -28,8 +28,8 @@ subroutine display(nkeep)
   enddo
 
 10 nz=i-1
-
   utcz=utc(nz)
+  nz=nz-1
   nquad=nkeep/4
   do i=1,nz
      nage=utcz-utc(i)

map65.py

@@ -1,4 +1,4 @@
-#--------------------------------------------------------------------- MAP65
+#-------------------------------------------------------------------- MAP65
 # $Date$ $Revision$
 #
 from Tkinter import *

map65a.F90

@@ -333,6 +333,9 @@ subroutine map65a(newdat)
      endif
      j=j+nsiz(n)
   enddo
+  write(26,1015) nutc
+1015 format(39x,i4.4)
+  call flushqqq(26)
   call display(nkeep)
   ndecdone=2
 

specjt.py

@@ -150,6 +150,9 @@ def df_mark():
     df=96.0/750.0
     x1=393.0 + (Audio.gcom2.mousefqso-125)/df
     c.create_line(x1,25,x1,12,fill=color,width=2)
+    x1=393.0 + (Audio.gcom2.nfa-125)/df
+    x2=393.0 + (Audio.gcom2.nfb-125)/df
+    c.create_line(x1,25,x2,25,fill=color,width=2)
 
     df=96000.0/32768.0
 # Mark sync tone and top JT65 tone (green) and shorthand tones (red)
@@ -195,7 +198,7 @@ def freeze_decode2(event):
 #---------------------------------------------------- update
 def update():
     global a,a2,b0,c0,g0,im,im2,isec0,line0,line02,newMinute,\
-           nscroll,pim,pim2, \
+           nscroll,pim,pim2,nfa0,nfb0, \
            root_geom,t0,mousedf0,mousefqso0,nfreeze0,tol0,mode0,nmark0, \
            fmid,fmid0,frange,frange0,dftolerance0
     
@@ -274,14 +277,16 @@ def update():
 
     if (Audio.gcom2.mousedf != mousedf0 or
             Audio.gcom2.mousefqso != mousefqso0 or
-            Audio.gcom2.dftolerance != dftolerance0):
+            Audio.gcom2.dftolerance != dftolerance0 or
+            Audio.gcom2.nfa != nfa0 or Audio.gcom2.nfb != nfb0): 
         df_mark()
-        
 # The following int() calls are to ensure that the values copied to
 # mousedf0 and mousefqso0 are static.
         mousedf0=int(Audio.gcom2.mousedf)
         mousefqso0=int(Audio.gcom2.mousefqso)
         dftolerance0=int(Audio.gcom2.dftolerance)
+        nfa0=int(Audio.gcom2.nfa)
+        nfb0=int(Audio.gcom2.nfb)
 
     if Audio.gcom2.nfreeze != nfreeze0:
         if not Audio.gcom2.nfreeze: draw_axis()