diff options
| author | jcorgan | 2009-04-19 20:45:40 +0000 |
|---|---|---|
| committer | jcorgan | 2009-04-19 20:45:40 +0000 |
| commit | 77bfe4faccd79741b49e0dee3bb0a21bd21da53f (patch) | |
| tree | a805e117081c30cc7fa24f1561145c17f4024c11 /gr-wxgui | |
| parent | d7f15ef8f1411db89585f9541198896de5924fc8 (diff) | |
| download | gnuradio-77bfe4faccd79741b49e0dee3bb0a21bd21da53f.tar.gz gnuradio-77bfe4faccd79741b49e0dee3bb0a21bd21da53f.tar.bz2 gnuradio-77bfe4faccd79741b49e0dee3bb0a21bd21da53f.zip | |
Merged r10875:10880 from jcorgan/t161 into trunk. Implements ticket:161, allowing multiple internal blocks to be connected to a hier_block2 external input.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10881 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-wxgui')
| -rw-r--r-- | gr-wxgui/src/python/fftsink_gl.py | 3 | ||||
| -rw-r--r-- | gr-wxgui/src/python/scopesink_gl.py | 5 | ||||
| -rw-r--r-- | gr-wxgui/src/python/waterfallsink_gl.py | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/gr-wxgui/src/python/fftsink_gl.py b/gr-wxgui/src/python/fftsink_gl.py index 30ebd3fde..3f0a93fc8 100644 --- a/gr-wxgui/src/python/fftsink_gl.py +++ b/gr-wxgui/src/python/fftsink_gl.py @@ -63,7 +63,6 @@ class _fft_sink_base(gr.hier_block2): gr.io_signature(0, 0, 0), ) #blocks - copy = gr.kludge_copy(self._item_size) fft = self._fft_chain( sample_rate=sample_rate, fft_size=fft_size, @@ -75,7 +74,7 @@ class _fft_sink_base(gr.hier_block2): msgq = gr.msg_queue(2) sink = gr.message_sink(gr.sizeof_float*fft_size, msgq, True) #connect - self.connect(self, copy, fft, sink) + self.connect(self, fft, sink) #controller self.controller = pubsub() self.controller.subscribe(AVERAGE_KEY, fft.set_average) diff --git a/gr-wxgui/src/python/scopesink_gl.py b/gr-wxgui/src/python/scopesink_gl.py index 6e9ff832a..b4ae0f339 100644 --- a/gr-wxgui/src/python/scopesink_gl.py +++ b/gr-wxgui/src/python/scopesink_gl.py @@ -42,13 +42,12 @@ class ac_couple_block(gr.hier_block2): gr.io_signature(1, 1, gr.sizeof_float), ) #blocks - copy = gr.kludge_copy(gr.sizeof_float) lpf = gr.single_pole_iir_filter_ff(0.0) sub = gr.sub_ff() mute = gr.mute_ff() #connect - self.connect(self, copy, sub, self) - self.connect(copy, lpf, mute, (sub, 1)) + self.connect(self, sub, self) + self.connect(self, lpf, mute, (sub, 1)) #subscribe controller.subscribe(ac_couple_key, lambda x: mute.set_mute(not x)) controller.subscribe(sample_rate_key, lambda x: lpf.set_taps(2.0/x)) diff --git a/gr-wxgui/src/python/waterfallsink_gl.py b/gr-wxgui/src/python/waterfallsink_gl.py index 344640af0..91c1c7eb5 100644 --- a/gr-wxgui/src/python/waterfallsink_gl.py +++ b/gr-wxgui/src/python/waterfallsink_gl.py @@ -63,7 +63,6 @@ class _waterfall_sink_base(gr.hier_block2): gr.io_signature(0, 0, 0), ) #blocks - copy = gr.kludge_copy(self._item_size) fft = self._fft_chain( sample_rate=sample_rate, fft_size=fft_size, @@ -75,7 +74,7 @@ class _waterfall_sink_base(gr.hier_block2): msgq = gr.msg_queue(2) sink = gr.message_sink(gr.sizeof_float*fft_size, msgq, True) #connect - self.connect(self, copy, fft, sink) + self.connect(self, fft, sink) #controller self.controller = pubsub() self.controller.subscribe(AVERAGE_KEY, fft.set_average) |