[Commit-gnuradio] r11588 - gnuradio/branches/developers/eb/vrt2/gr-utils/src/python

[jblum]

Author: jblum
Date: 2009-08-12 16:52:44 -0600 (Wed, 12 Aug 2009)
New Revision: 11588

Modified:
   gnuradio/branches/developers/eb/vrt2/gr-utils/src/python/qr_fft.py
Log:
added drop down to gui for gains

Modified: gnuradio/branches/developers/eb/vrt2/gr-utils/src/python/qr_fft.py
===================================================================
--- gnuradio/branches/developers/eb/vrt2/gr-utils/src/python/qr_fft.py  
2009-08-12 20:34:34 UTC (rev 11587)
+++ gnuradio/branches/developers/eb/vrt2/gr-utils/src/python/qr_fft.py  
2009-08-12 22:52:44 UTC (rev 11588)
@@ -205,13 +205,13 @@
 
         hbox.Add((5,0), 0)
         vbox.Add(hbox, 0, wx.EXPAND)
-        self.u.set_beamforming([16.7e6, 0, 0, 0]);
         ##### db control stuff #####
         self.subscribe('cal_div_lo_freq', lambda x: self.u.set_lo_freq(x) and 
time.sleep(0.01))
         self.subscribe('cal_div_lo_freq', self.u.set_center_freq) #TODO should 
be combined with set lo freq
         self.subscribe('cal_div_cal_freq', lambda x: self.u.set_cal_freq(x) 
and time.sleep(0.01))
         self.subscribe('db_ctrl_atten0', self.u.set_attenuation0)
         self.subscribe('db_ctrl_atten1', self.u.set_attenuation1)
+        self.subscribe('sys_beaming', self.u.set_beamforming)
         #self.subscribe('db_ctrl_10db', self.u.set_10dB_atten)
         self.subscribe('db_ctrl_adcgain', self.u.set_adc_gain)
         self.subscribe('db_ctrl_diggain', self.u.set_digital_gain)
@@ -230,6 +230,7 @@
         self['db_ctrl_diggain'] = 0.0
         self['db_ctrl_type'] = 'rf'
         self['db_test_signal'] = vrt.VRT_TEST_SIG_NORMAL
+       self['sys_beaming'] = [16.7e6, 0, 0, 0]
         #slider and box for freqs
         for key, name in (('cal_div_lo_freq', 'LO Freq'), ('cal_div_cal_freq', 
'Cal Freq')):
             hbox = wx.BoxSizer(wx.HORIZONTAL)
@@ -378,9 +379,20 @@
             labels=['A', 'B', 'C', 'D'],
             sizer=hbox,
             parent=panel,
-            proportion=2,
+            proportion=0,
         )
         hbox.AddSpacer(10)
+        forms.radio_buttons(
+            label='RF Input',
+            ps=self,
+            key='db_ctrl_type',
+            choices=['rf', 'cal'],
+            labels=['Main RF', 'Calibrator'],
+            sizer=hbox,
+            parent=panel,
+            proportion=0,
+        )
+        hbox.AddSpacer(10)
         #create radio buttons for band sel
         types = sorted(
             filter(lambda x: x.startswith('VRT_TEST_SIG_'), dir(vrt)),
@@ -394,19 +406,19 @@
             labels=types,
             sizer=hbox,
             parent=panel,
-            proportion=2,
+            proportion=0,
         )
         hbox.AddSpacer(10)
         #create radio buttons for type
-        forms.radio_buttons(
-            label='RF Input',
+        forms.drop_down(
+            label='Beamformer',
             ps=self,
-            key='db_ctrl_type',
-            choices=['rf', 'cal'],
-            labels=['Main RF', 'Calibrator'],
+            key='sys_beaming',
+            choices=[[16.7e6, 0, 0, 0], [0, 16.7e6, 0, 0], [0, 0, 16.7e6, 0], 
[0, 0, 0, 16.7e6], [4.19e6]*4],
+            labels=['Ant0', 'Ant1', 'Ant2', 'Ant3', 'Equal Gain'],
             sizer=hbox,
             parent=panel,
-            proportion=1,
+            proportion=0,
         )
         hbox.AddSpacer(10)
         vbox.Add(hbox, 0, wx.EXPAND)