diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-28 14:38:40 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-28 14:38:40 -0500 |
| commit | 9f29e51f2945f355b43f3012da43e37dcd95f6b4 (patch) | |
| tree | bcc71c8975379c107bb6e94da944292a5ee9a03a /gr-wxgui/python/waterfallsink_gl.py | |
| parent | 7afefc484137bf0bed7ab9a7ed86017c117d6a35 (diff) | |
| parent | 2f55d7dfc33e8d990e44c5bbb7c6d2fbdaddd563 (diff) | |
Merge branch 'next' into perf_monitor
Diffstat (limited to 'gr-wxgui/python/waterfallsink_gl.py')
| -rw-r--r-- | gr-wxgui/python/waterfallsink_gl.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gr-wxgui/python/waterfallsink_gl.py b/gr-wxgui/python/waterfallsink_gl.py index 17900a6e4f..dba50ce551 100644 --- a/gr-wxgui/python/waterfallsink_gl.py +++ b/gr-wxgui/python/waterfallsink_gl.py @@ -26,6 +26,7 @@ import waterfall_window import common from gnuradio import gr, fft from gnuradio import analog +from gnuradio import blocks from gnuradio.fft import logpwrfft from pubsub import pubsub from constants import * @@ -150,7 +151,7 @@ class test_top_block(stdgui2.std_top_block): # We add these throttle blocks so that this demo doesn't # suck down all the CPU available. Normally you wouldn't use these. - self.thr1 = gr.throttle(gr.sizeof_gr_complex, input_rate) + self.thr1 = blocks.throttle(gr.sizeof_gr_complex, input_rate) sink1 = waterfall_sink_c(panel, title="Complex Data", fft_size=fft_size, sample_rate=input_rate, baseband_freq=100e3) @@ -159,7 +160,7 @@ class test_top_block(stdgui2.std_top_block): # generate a real sinusoid self.src2 = analog.sig_source_f(input_rate, analog.GR_SIN_WAVE, 5.75e3, 1000) - self.thr2 = gr.throttle(gr.sizeof_float, input_rate) + self.thr2 = blocks.throttle(gr.sizeof_float, input_rate) sink2 = waterfall_sink_f(panel, title="Real Data", fft_size=fft_size, sample_rate=input_rate, baseband_freq=100e3) self.connect(self.src2, self.thr2, sink2) |