From 645ab0cfa4ab46e057ab4df74066ab434ad5b90a Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 6 Oct 2009 22:28:09 -0700 Subject: work on a special connect function that registers a callback --- gr-wxgui/src/python/fftsink_gl.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gr-wxgui/src/python/fftsink_gl.py') diff --git a/gr-wxgui/src/python/fftsink_gl.py b/gr-wxgui/src/python/fftsink_gl.py index 3f0a93fc8..4edb11b4a 100644 --- a/gr-wxgui/src/python/fftsink_gl.py +++ b/gr-wxgui/src/python/fftsink_gl.py @@ -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,9 @@ 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 + common.special_connect(self, fft, hb=self, win=self.win, size=self._item_size) + self.connect(fft, sink) class fft_sink_f(_fft_sink_base): _fft_chain = blks2.logpwrfft_f -- cgit From af5e21e35cda1d9d3e4bd659364dafe181274064 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 7 Oct 2009 09:48:24 -0700 Subject: setup special wxgui connect on sinks, needs testing --- gr-wxgui/src/python/fftsink_gl.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gr-wxgui/src/python/fftsink_gl.py') diff --git a/gr-wxgui/src/python/fftsink_gl.py b/gr-wxgui/src/python/fftsink_gl.py index 4edb11b4a..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. """ @@ -105,8 +105,7 @@ class _fft_sink_base(gr.hier_block2): 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 - common.special_connect(self, fft, hb=self, win=self.win, size=self._item_size) - self.connect(fft, sink) + self.wxgui_connect(self, fft, sink) class fft_sink_f(_fft_sink_base): _fft_chain = blks2.logpwrfft_f -- cgit