diff options
| author | Johnathan Corgan | 2009-10-08 22:12:41 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2009-10-08 22:12:41 -0700 |
| commit | 7ba8192e28713049324398f4b0c6d2eebdaa1fc7 (patch) | |
| tree | e9b0d49e60cd6bf82c8d56f203a450f90d4f4337 /gr-wxgui/src/python/fftsink_gl.py | |
| parent | 3a3cfaf293a46d83ffb905de04b43f3b1ff07d88 (diff) | |
| parent | 38d5389f3054164a2f04d6e4e8fe381aa5ee03fc (diff) | |
| download | gnuradio-7ba8192e28713049324398f4b0c6d2eebdaa1fc7.tar.gz gnuradio-7ba8192e28713049324398f4b0c6d2eebdaa1fc7.tar.bz2 gnuradio-7ba8192e28713049324398f4b0c6d2eebdaa1fc7.zip | |
Merge branch 'wip/wxgui' of http://gnuradio.org/git/jblum
* 'wip/wxgui' of http://gnuradio.org/git/jblum:
using gr copy in the wxgui connect, added gr copy to grc xml
Added gr.copy(itemsize) block
point label transpareny, horizontal offset, and toggle on/off capability
simplify some params
moved the wxgui connect helper functions into the wrapper class
making use of update ui event
setup special wxgui connect on sinks, needs testing
working special connect for fftsink
work on a special connect function that registers a callback
added bind to visible event function to callback when visibility changes within tabs
Diffstat (limited to 'gr-wxgui/src/python/fftsink_gl.py')
| -rw-r--r-- | gr-wxgui/src/python/fftsink_gl.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-wxgui/src/python/fftsink_gl.py b/gr-wxgui/src/python/fftsink_gl.py index 3f0a93fc8..9d683d697 100644 --- a/gr-wxgui/src/python/fftsink_gl.py +++ b/gr-wxgui/src/python/fftsink_gl.py @@ -31,7 +31,7 @@ from constants import * ################################################## # FFT sink block (wrapper for old wxgui) ################################################## -class _fft_sink_base(gr.hier_block2): +class _fft_sink_base(gr.hier_block2, common.wxgui_hb): """ An fft block with real/complex inputs and a gui window. """ @@ -73,8 +73,6 @@ 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, fft, sink) #controller self.controller = pubsub() self.controller.subscribe(AVERAGE_KEY, fft.set_average) @@ -106,6 +104,8 @@ class _fft_sink_base(gr.hier_block2): common.register_access_methods(self, self.win) setattr(self.win, 'set_baseband_freq', getattr(self, 'set_baseband_freq')) #BACKWARDS setattr(self.win, 'set_peak_hold', getattr(self, 'set_peak_hold')) #BACKWARDS + #connect + self.wxgui_connect(self, fft, sink) class fft_sink_f(_fft_sink_base): _fft_chain = blks2.logpwrfft_f |