Removed waterfall AGC option -- it's there always, now.

Blue background on Decode button only when decoding.
No crash when you hit Decode before any data are available.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@613 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2007-12-28 21:22:31 +00:00
parent f21d717b79
commit 1afbef982d
5 changed files with 7 additions and 20 deletions

View File

@ -17,7 +17,6 @@ integer ndecoding !Decoder status (see decode2.f90) GUI,Decoder
integer ndecoding0 !Status on previous decode GUI,Decoder
integer mousebutton !Which button was clicked? GUI
integer multicast !1 for multicast data, 0 for unicast GUI
integer nagc !Set to 1 to activate waterfall AGC GUI
integer ndecdone !Is decoder finished? GUI,Decoder
integer npingtime !Time in file of mouse-selected ping GUI,Decoder
integer ierr !(why is this here?)
@ -107,7 +106,7 @@ character*8 utcdata !HHMM UTC for the processed data Decoder
common/gcom2/ps0(431),psavg(450),s2(64,3100),ccf(-5:540), &
green(500),fselect,pctlost,fcenter,rxnoise,dphi,ngreen,dgain,iter, &
ndecoding,ndecoding0,mousebutton,multicast,nagc, &
ndecoding,ndecoding0,mousebutton,multicast, &
ndecdone,npingtime,ierr,lauto,mantx,nrestart,ntr,nmsg,nsave,nadd5, &
dftolerance,LDecoded,rxdone,monitoring,nzap,minsigdb, &
nclearave,nfreeze,nafc,ncsmin,newspec,nfa,nfb,nfcal,idphi,nkeep, &

View File

@ -1072,17 +1072,11 @@ def update():
Audio.gcom2.dftolerance=500
fqso0=int(Audio.gcom2.mousefqso)
# if mode.get()[:4]=='JT65' and (Audio.gcom2.ndecoding>0 or \
# (isec>45 and txminute==0 and Audio.gcom2.monitoring==1 and \
# if isec != isec00:
# print isec,Audio.gcom2.ndecoding,txminute,Audio.gcom2.monitoring, \
# Audio.datcom.kkdone
# isec00=isec
if mode.get()[:4]=='JT65' and (Audio.gcom2.ndecoding>0 or \
(isec>=options.nt1.get() and txminute==0 and \
Audio.gcom2.monitoring==1 and \
Audio.datcom.kkdone!=-99 and Audio.gcom2.ndiskdat!=1)):
## if mode.get()[:4]=='JT65' and (Audio.gcom2.ndecoding>0 or \
## (isec>=options.nt1.get() and txminute==0 and \
## Audio.gcom2.monitoring==1 and \
## Audio.datcom.kkdone!=-99 and Audio.gcom2.ndiskdat!=1)):
if mode.get()[:4]=='JT65' and Audio.gcom2.ndecoding>0:
#Set button bg while decoding
bc='#66FFFF'
bdecode.configure(bg=bc,activebackground=bc,state=DISABLED)

View File

@ -72,7 +72,7 @@ subroutine spec(brightness,contrast,ngain,nspeed,a,a2)
do i=ia,ib
n=savg2(i) * (300.0/ave)
if(n.gt.1000) n=1000
hist(n)=hist(n)+1
if(n.ge.0 .and. n.le.1000) hist(n)=hist(n)+1
enddo
sum=0.

View File

@ -47,7 +47,6 @@ mode0=""
mousedf0=0
mousefqso0=0
dftolerance0=500
display_agc=IntVar()
naxis=IntVar()
ncall=0
newMinute=0
@ -377,7 +376,6 @@ def update():
frange0=frange
Audio.gcom2.nfmid=int(fmid)
Audio.gcom2.nfrange=int(frange)
Audio.gcom2.nagc=display_agc.get()
ltime.after(200,update) #Reset the timer
@ -474,7 +472,6 @@ sc3=Scale(iframe2,from_=-100.0,to_=100.0,orient='horizontal',
showvalue=0,sliderlength=5)
sc3.pack(side=LEFT)
balloon.bind(sc3,"Gain", "Digital Gain")
Checkbutton(iframe2,text='Waterfall AGC',variable=display_agc).pack(side=RIGHT)
iframe2.pack(expand=1, fill=X)
#----------------------------------------------- Restore params from INI file
@ -496,7 +493,6 @@ try:
sc2.set(value)
c0=sc2.get()
elif key == 'DigitalGain': sc3.set(value)
elif key == 'DisplayAGC': display_agc.set(value)
elif key == 'AxisLabel': naxis.set(value)
elif key == 'MarkTones': nmark.set(value)
elif key == 'Flatten': nflat.set(value)
@ -565,7 +561,6 @@ f.write("UpdateInterval " + str(nspeed0.get()) + "\n")
f.write("Brightness " + str(b0)+ "\n")
f.write("Contrast " + str(c0)+ "\n")
f.write("DigitalGain " + str(g0)+ "\n")
f.write("DisplayAGC " + str(display_agc.get())+ "\n")
f.write("AxisLabel " + str(naxis.get()) + "\n")
f.write("MarkTones " + str(nmark.get()) + "\n")
f.write("Flatten " + str(nflat.get()) + "\n")

View File

@ -22,7 +22,6 @@ subroutine symspec(id,kbuf,kk,kkdone,nutc,newdat)
kbuf,kk,kkdone,ndecoding,newdat,n
3001 format('s1:',i5.4,i3.2,i5,2i10,2i3,i5)
fac=0.0002
if(nagc.ne.0) fac=0.0002 * 10.0**(0.05*(-rxnoise))
hsym=2048.d0*96000.d0/11025.d0 !Samples per half symbol
npts=hsym !Integral samples per half symbol
ntot=322 !Half symbols per transmission