[Commit-gnuradio] r9862 - gnuradio/trunk/gr-utils/src/python

[jcorgan]

Author: jcorgan
Date: 2008-10-26 18:22:12 -0600 (Sun, 26 Oct 2008)
New Revision: 9862

Modified:
   gnuradio/trunk/gr-utils/src/python/usrp2_fft.py
Log:
Fix gain slider for configurations that have no gain control

Modified: gnuradio/trunk/gr-utils/src/python/usrp2_fft.py
===================================================================
--- gnuradio/trunk/gr-utils/src/python/usrp2_fft.py     2008-10-27 00:20:10 UTC 
(rev 9861)
+++ gnuradio/trunk/gr-utils/src/python/usrp2_fft.py     2008-10-27 00:22:12 UTC 
(rev 9862)
@@ -133,10 +133,10 @@
 
         hbox.Add((5,0), 0, 0)
         g = self.u.gain_range()
-       if self.u.daughterboard_id() == 0x0003: # FIXME: get range right in 
firmware for TVRX
-         g[1] = 104
-         
-        myform['gain'] = form.slider_field(parent=self.panel, sizer=hbox, 
label="Gain",
+
+       # some configurations don't have gain control
+       if g[1] > g[0]:
+           myform['gain'] = form.slider_field(parent=self.panel, sizer=hbox, 
label="Gain",
                                            weight=3,
                                            min=int(g[0]), max=int(g[1]),
                                            callback=self.set_gain)
@@ -218,7 +218,8 @@
         return False
 
     def set_gain(self, gain):
-        self.myform['gain'].set_value(gain)     # update displayed value
+       if self.myform.has_key('gain'):
+           self.myform['gain'].set_value(gain)     # update displayed value
         self.u.set_gain(gain)
 
     def set_decim(self, decim):