Imported Upstream version 3.2.2

[debian/gnuradio] / gnuradio-examples / python / usrp / test_dft_synth.py

diff --git a/gnuradio-examples/python/usrp/test_dft_synth.py b/gnuradio-examples/python/usrp/test_dft_synth.py
index 60a49e3b3717ceaee6727fcd81d877e33800d3b3..99b1c49237c725b89a7f804115c7ec5ad4784a6f 100755 (executable)
--- a/gnuradio-examples/python/usrp/test_dft_synth.py
+++ b/gnuradio-examples/python/usrp/test_dft_synth.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from gnuradio import gr, gru, blks
-from gnuradio.wxgui import stdgui, fftsink
+from gnuradio import gr, gru, blks2
+from gnuradio.wxgui import stdgui2, fftsink2
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 import wx
@@ -20,9 +20,9 @@ def random_noise_c(gain=1):
     return src
 
 
-class test_graph (stdgui.gui_flow_graph):
+class test_graph (stdgui2.std_top_block):
     def __init__(self, frame, panel, vbox, argv):
-        stdgui.gui_flow_graph.__init__(self, frame, panel, vbox, argv)
+        stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
 
         parser = OptionParser (option_class=eng_option)
         (options, args) = parser.parse_args ()
@@ -31,7 +31,7 @@ class test_graph (stdgui.gui_flow_graph):
         mpoints = 16
         ampl = 1000
         
-        enable = mpoints * [0]
+        enable = mpoints/2 * [1, 0]
         enable[0] = 1
 
         taps = gr.firdes.low_pass(1,   # gain
@@ -40,11 +40,11 @@ class test_graph (stdgui.gui_flow_graph):
                                   1.0/mpoints * 0.1,  # trans width
                                   gr.firdes.WIN_HANN)
 
-        synth = blks.synthesis_filterbank(self, mpoints, taps)
+        synth = blks2.synthesis_filterbank(mpoints, taps)
         
         null_source = gr.null_source(gr.sizeof_gr_complex)
         
-        if 0:
+        if 1:
             for i in range(mpoints):
                 s = gr.sig_source_c(sample_rate/mpoints, gr.GR_SIN_WAVE,
                                     300e3, ampl * enable[i], 0)
@@ -52,10 +52,10 @@ class test_graph (stdgui.gui_flow_graph):
 
         else:
             for i in range(mpoints):
-                if i == 0:
-                    s = gr.sig_source_c(sample_rate/mpoints, gr.GR_SIN_WAVE,
-                                        300e3, ampl * enable[i], 0)
-                    #s = random_noise_c(ampl)
+                if i == 1:
+                    #s = gr.sig_source_c(sample_rate/mpoints, gr.GR_SIN_WAVE,
+                    #                    300e3, ampl * enable[i], 0)
+                    s = random_noise_c(ampl)
                     self.connect(s, (synth, i))
                 else:
                     self.connect(null_source, (synth, i))
@@ -64,15 +64,14 @@ class test_graph (stdgui.gui_flow_graph):
         # We add these throttle blocks so that this demo doesn't
         # suck down all the CPU available.  Normally you wouldn't use these.
         thr = gr.throttle(gr.sizeof_gr_complex, sample_rate)
-        fft = fftsink.fft_sink_c(self, frame, fft_size=1024,
-                                 sample_rate=sample_rate)
+        fft = fftsink2.fft_sink_c(frame, fft_size=1024,sample_rate=sample_rate)
         vbox.Add(fft.win, 1, wx.EXPAND)
 
         self.connect(synth, thr, fft)
 
 
 def main ():
-    app = stdgui.stdapp (test_graph, "Test DFT filterbank")
+    app = stdgui2.stdapp (test_graph, "Test DFT filterbank")
     app.MainLoop ()
 
 if __name__ == '__main__':