Added CSmin to Options page.

Corrected the saving of brightness/contrast settings.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@495 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

map65.py

@@ -1209,6 +1209,7 @@ def update():
     Audio.gcom2.dftolerance=ntol[itol]
     Audio.gcom2.neme=neme.get()
     Audio.gcom2.ndepth=ndepth.get()
+    Audio.gcom2.ncsmin=options.ncsmin.get()
     try:
         Audio.gcom2.idinterval=options.IDinterval.get()
     except:
@@ -1719,6 +1720,7 @@ try:
         elif key == 'fa': options.fa.set(value)
         elif key == 'fb': options.fb.set(value)
         elif key == 'fcal': options.fcal.set(value)
+        elif key == 'CSmin': options.ncsmin.set(value)
         elif key == 'dphi': options.dphi.set(value)
         elif key == 'savedir': options.savedir.set(value)
         
@@ -1762,7 +1764,6 @@ Audio.ftn_init()
 GenStdMsgs()
 Audio.gcom4.addpfx=(options.addpfx.get().lstrip()+'        ')[:8]
 Audio.gcom2.mousefqso=125
-Audio.gcom2.ncsmin=4
 Audio.gcom2.nfullspec=0
 monitor()
 first=1
@@ -1811,6 +1812,7 @@ f.write("dphi " + str(options.dphi.get()) + "\n")
 f.write("fa " + str(options.fa.get()) + "\n")
 f.write("fb " + str(options.fb.get()) + "\n")
 f.write("fcal " + str(options.fcal.get()) + "\n")
+f.write("CSmin " + str(options.ncsmin.get()) + "\n")
 f.write("SaveDir " + str(options.savedir.get()) + "\n")
 f.write("TxFirst " + str(TxFirst.get()) + "\n")
 f.write("KB8RQ " + str(kb8rq.get()) + "\n")

options.py

@@ -46,6 +46,7 @@ dphi=IntVar()
 fa=IntVar()
 fb=IntVar()
 fcal=IntVar()
+ncsmin=IntVar()
 savedir=StringVar()
 
 mycall=Pmw.EntryField(g1.interior(),labelpos=W,label_text='My Call:',
@@ -101,10 +102,12 @@ fb_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='Fmax (kHz):',
     entry_width=9,value=160,entry_textvariable=fb)
 fcal_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='Fcal (Hz):',
     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)
 savedir_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='SaveDir:',
     entry_width=23,value=g.appdir+'\save',entry_textvariable=savedir)
 widgets = (temp_prefix,aux_ra,aux_dec,nkeep_entry,dphi_entry, \
-           fa_entry,fb_entry,fcal_entry,savedir_entry,)
+           fa_entry,fb_entry,fcal_entry,min_callsign_entry,savedir_entry,)
 for widget in widgets:
     widget.pack(padx=2,pady=2)
 Pmw.alignlabels(widgets)

specjt.py

@@ -298,8 +298,8 @@ def update():
             line02.putdata(a2[NX*i:NX*(i+1)])#One row of pixels to line0
             im2.paste(line02,(0,i))         #Paste in new top line(s)
         nscroll=nscroll+n
-        b0=brightness                       #Save scale values
-        c0=contrast
+    b0=brightness                           #Save scale values
+    c0=contrast
 
     if newspec:
         if Audio.gcom2.monitoring: