get_fname: If entry in ToRadio is blank, use Mon_ as prefix of recorded

file names.
decode2:   Corrected starting locations of mouse-picked decodes in JT6M mode
decode3, pix2d: Put yellow tick marks at frequency of JT6M sync tone.
wsjtgen:   Remove diagnostic print statement associated with Tx of test files.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@230 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2006-08-02 18:51:08 +00:00
parent 0037e7ad05
commit e7c1d178b3
6 changed files with 23 additions and 12 deletions

View File

@ -28,6 +28,7 @@ subroutine decode2
endif
istart=1.0 + 11025*0.001*npingtime - lenpick/2
if(mode(1:4).eq.'JT6M') istart=istart+11025
if(istart.lt.2) istart=2
if(ndecoding.eq.1) then
! Normal decoding at end of Rx period (or at t=53s in JT65)
@ -80,7 +81,6 @@ subroutine decode2
if(mode(1:4).eq.'JT6M') then
jzz=4*11025
if(mousebutton.eq.3) jzz=10*11025
istart=istart+11025
else
istart=istart + 3300 - jzz/2
endif
@ -97,7 +97,6 @@ subroutine decode2
if(istart+lenpick.gt.jza) istart=jza-lenpick
call decode3(d2a(istart),lenpick,istart,fnamea)
endif
fnameb=fnamea
999 return

View File

@ -78,10 +78,10 @@ subroutine decode3(d2,jz,istart,filename)
call pix2d65(d2d,jz)
else if(mode.eq.'FSK441') then
nz=s2(1,1)
call pix2d(d2d,jz,mousebutton,s2,64,nz,b)
call pix2d(d2d,jz,mousebutton,mode,s2,64,nz,b)
else if(mode(1:4).eq.'JT6M' .and. mousebutton.eq.0) then
nz=s2(1,1)
call pix2d(d2d,jz,mousebutton,s2,64,nz,b)
call pix2d(d2d,jz,mousebutton,mode,s2,64,nz,b)
endif
! Compute red and magenta cutves for small plot area, FSK441/JT6M only

View File

@ -22,7 +22,7 @@ subroutine get_fname(hiscall,ntime,trperiod,lauto,fname)
i=index(hiscall,'/')
if(i.ge.5) tag=hiscall(1:i-1)
if(i.ge.2.and.i.le.4) tag=hiscall(i+1:)
if(lauto.eq.0) tag='Mon'
if(hiscall(1:1).eq.' ' .or. lauto.eq.0) tag='Mon'
i=index(tag,' ')
fname=tag(1:i-1)//fname

View File

@ -1,9 +1,10 @@
subroutine pix2d(d2,jz,mousebutton,s2,nchan,nz,b)
subroutine pix2d(d2,jz,mousebutton,mode,s2,nchan,nz,b)
! Compute pixels to represent the 2-d spectrum s2(nchan,nz), and the
! green line.
integer*2 d2(jz) !Raw input data
character*6 mode
real s2(nchan,nz) !2-d spectrum
integer*2 b(60000) !Pixels corresponding to 2-d spectrum
data nx0/0/
@ -89,16 +90,28 @@ subroutine pix2d(d2,jz,mousebutton,s2,nchan,nz,b)
ng0=ng
endif
enddo
if(mode.eq.'FSK441') then
! Insert yellow tick marks at frequencies of the FSK441 tones
do i=2,5
f=441*i
ich=58-nint(f/43.066)
do i=2,5
f=441*i
ich=58-nint(f/43.066)
do j=1,5
b((ich-1)*500+j+2)=254
b((ich-1)*500+j+248)=254
b((ich-1)*500+j+495)=254
enddo
enddo
else if(mode.eq.'JT6M') then
! Insert yellow tick marks at frequencies of the JT6M sync tone
f=1076.66
ich=60-nint(f/43.066) !Why 58 for FSK441, above?
do j=1,5
b((ich-1)*500+j+2)=254
b((ich-1)*500+j+248)=254
b((ich-1)*500+j+495)=254
enddo
enddo
endif
! Mark the best ping with a red tick
if(tbest.gt.0.0) then

View File

@ -1,4 +1,4 @@
#------------------------------------------------------------------ WSJT
#------------------------------------------------------------------- WSJT
from Tkinter import *
from tkFileDialog import *

View File

@ -85,7 +85,6 @@ subroutine wsjtgen
enddo
#endif
nwave=ndata/2
print*,nwave
do i=nwave,NTXMAX
iwave(i)=0
enddo