w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-12-02 09:05:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added "Display AGC" checkbox on Waterfall screen.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@510 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2007-07-22 02:08:01 +00:00
parent 1549fa7cf4
commit f7925458c0
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcom2.f90
View File

@ -16,6 +16,7 @@ integer iter !(why is this here??)
integer ndecoding !Decoder status (see decode2.f90) GUI,Decoder integer ndecoding !Decoder status (see decode2.f90) GUI,Decoder
integer ndecoding0 !Status on previous decode GUI,Decoder integer ndecoding0 !Status on previous decode GUI,Decoder
integer mousebutton !Which button was clicked? GUI integer mousebutton !Which button was clicked? GUI
integer nagc !Set to 1 to activate waterfall AGC GUI
integer ndecdone !Is decoder finished? GUI,Decoder integer ndecdone !Is decoder finished? GUI,Decoder
integer npingtime !Time in file of mouse-selected ping GUI,Decoder integer npingtime !Time in file of mouse-selected ping GUI,Decoder
integer ierr !(why is this here?) integer ierr !(why is this here?)
@ -104,7 +105,7 @@ character*8 utcdata !HHMM UTC for the processed data Decoder
common/gcom2/ps0(431),psavg(450),s2(64,3100),ccf(-5:540), & common/gcom2/ps0(431),psavg(450),s2(64,3100),ccf(-5:540), &
green(500),fselect,pctlost,fcenter,rxnoise,dphi,ngreen,dgain,iter, & green(500),fselect,pctlost,fcenter,rxnoise,dphi,ngreen,dgain,iter, &
ndecoding,ndecoding0,mousebutton, & ndecoding,ndecoding0,mousebutton,nagc, &
ndecdone,npingtime,ierr,lauto,mantx,nrestart,ntr,nmsg,nsave,nadd5, & ndecdone,npingtime,ierr,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,ncsmin,newspec,nfa,nfb,nfcal,idphi,nkeep, &
@ -118,3 +119,4 @@ common/gcom2/ps0(431),psavg(450),s2(64,3100),ccf(-5:540), &
pttport,utcdata pttport,utcdata
!### volatile /gcom2/ !### volatile /gcom2/

2
map65.py
View File

@ -1,4 +1,4 @@
#--------------------------------------------------------------------- MAP65 #-------------------------------------------------------------------- MAP65
# $Date$ $Revision$ # $Date$ $Revision$
# #
from Tkinter import * from Tkinter import *

5
specjt.py
View File

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

3
symspec.f90
View File

@ -20,7 +20,8 @@ subroutine symspec(id,kbuf,kk,kkdone,nutc,newdat)
if(ndebug.eq.2) write(*,3001) nutc,mod(int(sec_midn()),60) if(ndebug.eq.2) write(*,3001) nutc,mod(int(sec_midn()),60)
3001 format('symspec 1:',i5.4,i3.2) 3001 format('symspec 1:',i5.4,i3.2)
fac=0.0002 * 10.0**(0.05*(-rxnoise)) 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 hsym=2048.d0*96000.d0/11025.d0 !Samples per half symbol
npts=hsym !Integral samples per half symbol npts=hsym !Integral samples per half symbol
ntot=322 !Half symbols per transmission ntot=322 !Half symbols per transmission