From 0e09eb9aa36586a4ff80dd349fd1cd4c28f46062 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 3 Jul 2007 14:09:22 +0000 Subject: [PATCH] Fixed double-click to produce correct Tx sequence. Rationalized order of params on decoded text line. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@461 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- map65.py | 4 ++-- map65a.f90 | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/map65.py b/map65.py index 20e844d67..8b79aea64 100644 --- a/map65.py +++ b/map65.py @@ -262,7 +262,7 @@ def dbl_click_call(t,t1,event): i3=t1.rfind('\n')+1 #start of selected line if i>6 and i2>i1: try: - nsec=60*int(t1[i3+2:i3+4]) + int(t1[i3+4:i3+6]) + nsec=3600*int(t1[i3+13:i3+15]) + 60*int(t1[i3+15:i3+17]) except: nsec=0 if setseq.get(): TxFirst.set((nsec/Audio.gcom1.trperiod)%2) @@ -1311,7 +1311,7 @@ helpmenu.add('command', label = 'About MAP65', command = about, \ #------------------------------------------------------ Labels under graphics iframe2 = Frame(frame, bd=1, relief=FLAT,height=15) -lab2=Label(iframe2, text='Freq DF Pol UTC dB DT W') +lab2=Label(iframe2, text='Freq DF Pol UTC DT dB') lab2.place(x=3,y=6, anchor='w') lab7=Label(iframe2,text='F3',fg='gray85') lab7.place(x=495,y=6, anchor=CENTER) diff --git a/map65a.f90 b/map65a.f90 index 79124c4a7..a23ec80a7 100644 --- a/map65a.f90 +++ b/map65a.f90 @@ -217,12 +217,13 @@ subroutine map65a(newdat) nsync2=nint(10.0*log10(sync2)) - 40 !### empirical ### nw=0 !### Fix this! ### nwrite=nwrite+1 - write(11,1010) nkHz,ndf,npol,nutc,nsync2,dt,nw,decoded,nkv,nqual -1010 format(i3,i5,i4,i5.4,i4,f5.1,i3,2x,a22,i5,i4) + write(11,1010) nkHz,ndf,npol,nutc,dt,nsync2,decoded,nkv,nqual +1010 format(i3,i5,i4,i5.4,f5.1,i4,2x,a22,i5,i4) endif enddo if(nwrite.eq.0) then - write(11,1010) mousefqso,mousedf,0,nutc,-33,0.0,0 !### Needs work ### + write(11,1011) mousefqso,mousedf,nutc +1011 format(i3,i5,4x,i5.4) endif write(11,*) '$EOF'