w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-31 04:50:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removed option for setting CSmin.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2453 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2011-09-29 17:46:21 +00:00
parent dd11b4ab98
commit c164a1c597
5 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
display.F90
View File

@ -1,4 +1,4 @@
subroutine display(nkeep,ncsmin) subroutine display(nkeep)
#ifdef CVF #ifdef CVF
use dfport use dfport
@ -143,7 +143,7 @@ subroutine display(nkeep,ncsmin)
if(callsign.ne.' ' .and. callsign.ne.callsign0) then if(callsign.ne.' ' .and. callsign.ne.callsign0) then
len=i2-1 len=i2-1
if(len.lt.0) len=6 if(len.lt.0) len=6
if(len.ge.ncsmin) then !Omit short "callsigns" if(len.ge.4) then !Omit short "callsigns"
nc=nc+1 nc=nc+1
freqcall(nc)=cfreq0//' '//callsign//line3(k)(80:81) freqcall(nc)=cfreq0//' '//callsign//line3(k)(80:81)
callsign0=callsign callsign0=callsign

3
gcom2.f90
View File

@ -38,7 +38,6 @@ integer minsigdb !Decoder threshold setting GUI
integer nclearave !Set to 1 to clear JT65 avg GUI,Decoder integer nclearave !Set to 1 to clear JT65 avg GUI,Decoder
integer nfreeze !Is Freeze checked? GUI integer nfreeze !Is Freeze checked? GUI
integer nafc !Is AFC checked? GUI integer nafc !Is AFC checked? GUI
integer ncsmin !Minimum length of callsign in bandmap GUI
integer newspec !New spectra in ss(4,322,NSMAX) GUI,Decoder integer newspec !New spectra in ss(4,322,NSMAX) GUI,Decoder
integer nfa !Low end of map65 search (def 100 kHz) GUI integer nfa !Low end of map65 search (def 100 kHz) GUI
integer nfb !High end of map65 search (def 160 kHz) GUI integer nfb !High end of map65 search (def 160 kHz) GUI
@ -111,7 +110,7 @@ common/gcom2/fcenter,forcefcenter,ps0(431),psavg(450),s2(64,3100),ccf(-5:540), &
ndecoding,ndecoding0,mcall3,mousebutton,multicast,nsetftx,ierr, & ndecoding,ndecoding0,mcall3,mousebutton,multicast,nsetftx,ierr, &
ndecdone,nfloat,lauto,mantx,nrestart,ntr,nmsg,nsave,nadd5, & ndecdone,nfloat,lauto,mantx,nrestart,ntr,nmsg,nsave,nadd5, &
dftolerance,LDecoded,rxdone,monitoring,nzap,minsigdb, & dftolerance,LDecoded,rxdone,monitoring,nzap,minsigdb, &
nclearave,nfreeze,nafc,ncsmin,newspec,nfa,nfb,nfcal,idphi,nkeep, & nclearave,nfreeze,nafc,newspec,nfa,nfb,nfcal,idphi,nkeep, &
nmode,mode65,nbpp,ndebug,ndphi,nhispol,nt1,nxant, & nmode,mode65,nbpp,ndebug,ndphi,nhispol,nt1,nxant, &
nblank,nport,mousedf,mousefqso,neme,nrw26,naggressive,ntx2,nagain, & nblank,nport,mousedf,mousefqso,neme,nrw26,naggressive,ntx2,nagain, &
shok,sendingsh,d2a(661500),d2b(661500),b(60000),jza,jzb,ntime, & shok,sendingsh,d2a(661500),d2b(661500),b(60000),jza,jzb,ntime, &

6
map65.py
View File

@ -1342,10 +1342,6 @@ def update():
Audio.gcom2.nfcal=options.fcal.get() Audio.gcom2.nfcal=options.fcal.get()
except: except:
Audio.gcom2.nfcal=0 Audio.gcom2.nfcal=0
try:
Audio.gcom2.ncsmin=options.ncsmin.get()
except:
Audio.gcom2.ncsmin=20
try: try:
Audio.gcom2.nt1=options.nt1.get() Audio.gcom2.nt1=options.nt1.get()
except: except:
@ -1870,7 +1866,6 @@ try:
elif key == 'fa': options.fa.set(value) elif key == 'fa': options.fa.set(value)
elif key == 'fb': options.fb.set(value) elif key == 'fb': options.fb.set(value)
elif key == 'fcal': options.fcal.set(value) elif key == 'fcal': options.fcal.set(value)
elif key == 'CSmin': options.ncsmin.set(value)
elif key == 'Nt1': options.nt1.set(value) elif key == 'Nt1': options.nt1.set(value)
elif key == 'ForceFcenter': options.forceFcenter.set(value) elif key == 'ForceFcenter': options.forceFcenter.set(value)
elif key == 'dphi': options.dphi.set(value) elif key == 'dphi': options.dphi.set(value)
@ -1969,7 +1964,6 @@ f.write("dphi " + str(options.dphi.get()) + "\n")
f.write("fa " + str(options.fa.get()) + "\n") f.write("fa " + str(options.fa.get()) + "\n")
f.write("fb " + str(options.fb.get()) + "\n") f.write("fb " + str(options.fb.get()) + "\n")
f.write("fcal " + str(options.fcal.get()) + "\n") f.write("fcal " + str(options.fcal.get()) + "\n")
f.write("CSmin " + str(options.ncsmin.get()) + "\n")
f.write("Nt1 " + str(options.nt1.get()) + "\n") f.write("Nt1 " + str(options.nt1.get()) + "\n")
f.write("ForceFcenter " + str(options.forceFcenter.get()) + "\n") f.write("ForceFcenter " + str(options.forceFcenter.get()) + "\n")
savedir2=options.savedir.get().replace(" ","#") savedir2=options.savedir.get().replace(" ","#")

2
map65a.F90
View File

@ -392,7 +392,7 @@ subroutine map65a(newdat)
1015 format(39x,i4.4) 1015 format(39x,i4.4)
call flushqqq(26) call flushqqq(26)
call cs_unlock call cs_unlock
call display(nkeep,ncsmin) call display(nkeep)
ndecdone=2 ndecdone=2
!### Temporarily disable the optional saving of raw data !### Temporarily disable the optional saving of raw data

7
options.py
View File

@ -47,7 +47,6 @@ dphi=IntVar()
fa=IntVar() fa=IntVar()
fb=IntVar() fb=IntVar()
fcal=IntVar() fcal=IntVar()
ncsmin=IntVar()
nt1=IntVar() nt1=IntVar()
savedir=StringVar() savedir=StringVar()
azeldir=StringVar() azeldir=StringVar()
@ -114,8 +113,6 @@ fb_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='Fmax (kHz):',
entry_width=9,value=160,entry_textvariable=fb) entry_width=9,value=160,entry_textvariable=fb)
fcal_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='Fcal (Hz):', fcal_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='Fcal (Hz):',
entry_width=9,entry_textvariable=fcal) entry_width=9,entry_textvariable=fcal)
min_callsign_entry=Pmw.EntryField(g3.interior(),labelpos=W, \
label_text='CSmin:',entry_width=9,value=4,entry_textvariable=ncsmin)
nt1_entry=Pmw.EntryField(g3.interior(),labelpos=W, \ nt1_entry=Pmw.EntryField(g3.interior(),labelpos=W, \
label_text='Rx t1:',entry_width=9,value=48,entry_textvariable=nt1) label_text='Rx t1:',entry_width=9,value=48,entry_textvariable=nt1)
forceFreq_entry=Pmw.EntryField(g3.interior(),labelpos=W, \ forceFreq_entry=Pmw.EntryField(g3.interior(),labelpos=W, \
@ -125,8 +122,8 @@ savedir_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='SaveDir:',
azeldir_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='AzElDir:', azeldir_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='AzElDir:',
entry_width=23,value=g.appdir,entry_textvariable=azeldir) entry_width=23,value=g.appdir,entry_textvariable=azeldir)
widgets = (temp_prefix,aux_ra,aux_dec,nkeep_entry,dphi_entry, \ widgets = (temp_prefix,aux_ra,aux_dec,nkeep_entry,dphi_entry, \
fa_entry,fb_entry,fcal_entry,min_callsign_entry, \ fa_entry,fb_entry,fcal_entry,nt1_entry,forceFreq_entry, \
nt1_entry,forceFreq_entry,savedir_entry,azeldir_entry,) savedir_entry,azeldir_entry)
for widget in widgets: for widget in widgets:
widget.pack(padx=2,pady=2) widget.pack(padx=2,pady=2)
Pmw.alignlabels(widgets) Pmw.alignlabels(widgets)