Can now change brightess or contrast of next spectrum. Waterfall still

updates only at end of minute, hoiwever.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@465 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2007-07-03 18:58:29 +00:00
parent 8f11360523
commit a7b7805de3
3 changed files with 22 additions and 30 deletions

View File

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

View File

@ -30,11 +30,9 @@ subroutine map65a(newdat)
rewind 11 rewind 11
rewind 12 rewind 12
if(nrw26.ne.0) then if(nrw26.ne.0) rewind 26
print*,'Rewinding 26' nrw26=0
rewind 26
nrw26=0
endif
if(nutc.ne.nutc0) nfile=nfile+1 if(nutc.ne.nutc0) nfile=nfile+1
nutc0=nutc nutc0=nutc
nutcdata=nutc nutcdata=nutc

View File

@ -219,30 +219,24 @@ def update():
newspec=Audio.gcom2.newspec #True if new data available newspec=Audio.gcom2.newspec #True if new data available
if newspec: if newspec:
Audio.spec(brightness,contrast,g0,nspeed,a,a2) #Call Fortran routine spec Audio.spec(brightness,contrast,g0,nspeed,a,a2) #Call Fortran routine spec
n=Audio.gcom2.nlines
if newspec or brightness!=b0 or contrast!=c0: box=(0,0,NX,130-n) #Define region
if brightness==b0 and contrast==c0: region=im.crop(box) #Get all but last line(s)
n=Audio.gcom2.nlines region2=im2.crop(box) #Get all but last line(s)
box=(0,0,NX,130-n) #Define region box=(125,0,624,120)
region=im.crop(box) #Get all but last line(s) try:
region2=im2.crop(box) #Get all but last line(s) im.paste(region,(0,n)) #Move waterfall down
box=(125,0,624,120) im2.paste(region2,(0,n)) #Move waterfall down
try: except:
im.paste(region,(0,n)) #Move waterfall down print "Images did not match, continuing anyway."
im2.paste(region2,(0,n)) #Move waterfall down for i in range(n):
except: line0.putdata(a[NX*i:NX*(i+1)]) #One row of pixels to line0
print "Images did not match, continuing anyway." im.paste(line0,(0,i)) #Paste in new top line(s)
for i in range(n): line02.putdata(a2[NX*i:NX*(i+1)])#One row of pixels to line0
line0.putdata(a[NX*i:NX*(i+1)]) #One row of pixels to line0 im2.paste(line02,(0,i)) #Paste in new top line(s)
im.paste(line0,(0,i)) #Paste in new top line(s) nscroll=nscroll+n
line02.putdata(a2[NX*i:NX*(i+1)])#One row of pixels to line0 # b0=brightness #Save scale values
im2.paste(line02,(0,i)) #Paste in new top line(s) # c0=contrast
nscroll=nscroll+n
else: #A scale factor has changed
im.putdata(a) #Compute whole new image
im2.putdata(a2) #Compute whole new image
b0=brightness #Save scale values
c0=contrast
if newspec: if newspec:
if Audio.gcom2.monitoring: if Audio.gcom2.monitoring: