Put descriptive names at top of principal windows.

Changed "Measure" from a "Save" option to a mode.


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

astro.py

@@ -11,7 +11,7 @@ root=Toplevel()
 root.withdraw()
 root.protocol('WM_DELETE_WINDOW',done)
 if g.Win32: root.iconbitmap("wsjt.ico")
-root.title("Astronomical data")
+root.title("AstroData")
 frame=Frame(root)
 frame.pack()
 

decode1.F90

@@ -26,7 +26,7 @@ subroutine decode1(iarg)
   if(newdat2.gt.0) then
      call getfile2(fname80,nlen)
   endif
-  if(ndecoding.gt.0) then
+  if(ndecoding.gt.0 .and. mode(1:4).eq.'JT65') then
      ndecdone=0
      call map65a
      if(mousebutton.eq.0) ndecoding0=ndecoding

map65.py

@@ -169,6 +169,7 @@ def testmsgs():
 def bandmap(event=NONE):
     global Version,bm,bm_geom,bmtext
     bm=Toplevel(root)
+    bm.title("Messages")
     bm.geometry(bm_geom)
     if g.Win32: bm.iconbitmap("wsjt.ico")
     iframe_bm1 = Frame(bm, bd=1, relief=SUNKEN)
@@ -188,6 +189,7 @@ def bandmap(event=NONE):
 def bandmap2(event=NONE):
     global Version,bm2,bm2_geom,bm2text
     bm2=Toplevel(root)
+    bm2.title("Band Map")
     bm2.geometry(bm2_geom)
     if g.Win32: bm2.iconbitmap("wsjt.ico")
     iframe_bm2 = Frame(bm2, bd=1, relief=SUNKEN)
@@ -956,7 +958,7 @@ def update():
         graph2.create_text(13,85,anchor=W, text="Dop:%6d" % g.ndop,font=g2font)
         graph2.create_text(13,109,anchor=W,text="Dgrd:%5.1f" % g.Dgrd,font=g2font)
 
-    if g.freeze_decode:
+    if g.freeze_decode and mode.get()[:4]=='JT65':
         itol=2
         ltol.configure(text='Tol    '+str(50))
         Audio.gcom2.dftolerance=50
@@ -1001,7 +1003,8 @@ def update():
     t="QSO DF:%4d" % (int(Audio.gcom2.mousedf),)
     msg4.configure(text=t)    
     bdecode.configure(bg='gray85',activebackground='gray95')
-    if Audio.gcom2.ndecoding:       #Set button bg=light_blue while decoding
+    if mode.get()[:4]=='JT65' and Audio.gcom2.ndecoding:
+#Set button bg while decoding
         bc='#66FFFF'
         if g.ndecphase==1: bc='orange'
         if g.ndecphase==2: bc='yellow'
@@ -1259,6 +1262,8 @@ modemenu.add_radiobutton(label = 'JT65B', variable=mode, command = ModeJT65B, \
                          accelerator='Shift+F8')
 modemenu.add_radiobutton(label = 'JT65C', variable=mode, command = ModeJT65C, \
             state=DISABLED, accelerator='Ctrl+F8')
+modemenu.add_radiobutton(label = 'Measure', variable=mode)
+modemenu.add_radiobutton(label = 'Pulsar', variable=mode,state=DISABLED)
 
 #------------------------------------------------------ Decode menu
 decodebutton = Menubutton(mbar, text = 'Decode')
@@ -1284,9 +1289,8 @@ savemenu = Menu(savebutton, tearoff=1)
 savebutton['menu'] = savemenu
 nsave=IntVar()
 savemenu.add_radiobutton(label = 'None', variable=nsave,value=0)
-savemenu.add_radiobutton(label = 'Save timf2', variable=nsave,value=1)
+savemenu.add_radiobutton(label = 'Save timf2', variable=nsave,value=1,
-savemenu.add_radiobutton(label = 'Measure', variable=nsave,value=2)
+            state=DISABLED)
-savemenu.add_radiobutton(label = 'Pulsar', variable=nsave,value=3)
 nsave.set(0)
 
 #------------------------------------------------------ Band menu

recvpkt.F90

@@ -20,7 +20,7 @@ subroutine recvpkt(iarg)
   include 'gcom1.f90'
   include 'gcom2.f90'
   equivalence (id,d8)
-  data nblock0/0/,first/.true./,kb/1/,ntx/0/
+  data nblock0/0/,first/.true./,kb/1/,ntx/0/,npkt/0/,nw/0/
   data sqave/0.0/,u/0.001/,rxnoise/0.0/
   save
 
@@ -31,19 +31,21 @@ subroutine recvpkt(iarg)
   nsec0=-999
 
 10 call recv_pkt(center_freq)
-  lost=nblock-nblock0-1
-  if(lost.ne.0 .and. .not.first) then
-!     print*,'Lost packets?',nblock,nblock0,lost,rxnoise
-     nlost=nlost + lost
-     do i=1,174*lost
-        k=k+1
-        d8(k)=0
-     enddo
-  endif
-  first=.false.
-  nblock0=nblock
-
   if(monitoring.eq.1) then
+     lost=nblock-nblock0-1
+     nblock0=nblock
+
+     if(lost.ne.0 .and. .not.first) then
+!        print*,'Lost packets?',nblock,nblock0,lost,rxnoise,mode
+!  Fill in zeros for the lost data.
+        nlost=nlost + lost
+        do i=1,174*lost
+           k=k+1
+           d8(k)=0
+        enddo
+     endif
+     first=.false.
+
      nsec=msec/1000
      if(mod(nsec,60).eq.1) nreset=1
      if(mod(nsec,60).eq.0 .and. nreset.eq.1) then
@@ -68,7 +70,24 @@ subroutine recvpkt(iarg)
         enddo
         sqave=sqave + u*(sq-sqave)
         rxnoise=10.0*log10(sqave) - 48.0
+
+        if(mode.eq.'Measur') then
+           npkt=npkt+1
+           if(npkt.ge.551) then
+              npkt=0
+              nw=nw+1
+              write(11,1000) nw,rxnoise
+1000          format(i6,f8.2)
+              call flushqqq(11)
+              ndecdone=1
+              write(24,1000) nw,rxnoise
+           endif
+        else
+           nw=0
+        endif
+
      else
+!  We're transmitting, zero out this packet.
         do i=1,174
            k=k+1
            d8(k)=0.d0

specjt.py

@@ -510,7 +510,7 @@ ltime.after(200,update)
 root.deiconify()
 g.showspecjt=2
 if g.Win32: root.iconbitmap("wsjt.ico")
-root.title('  MAP65     by K1JT')
+root.title('Waterfall')
 if(__name__=="__main__"):
     Audio.gcom2.monitoring=1
 root.mainloop()