diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-06 15:14:19 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-06 15:14:19 -0500 |
| commit | cf2c954ba4fc54909515f8550fd55741c9603a11 (patch) | |
| tree | f3520b072bd7e3f98fbef80052327411d5c32246 /gr-wxgui/python | |
| parent | 2fb54bc604578db99ee788799a7723ed5eddb65a (diff) | |
core: removed all complex_to_<type> blocks from core; using gr-blocks.
Diffstat (limited to 'gr-wxgui/python')
| -rw-r--r-- | gr-wxgui/python/fftsink_gl.py | 2 | ||||
| -rw-r--r-- | gr-wxgui/python/fftsink_nongl.py | 4 | ||||
| -rw-r--r-- | gr-wxgui/python/scopesink_gl.py | 2 | ||||
| -rw-r--r-- | gr-wxgui/python/scopesink_nongl.py | 2 | ||||
| -rw-r--r-- | gr-wxgui/python/waterfallsink_nongl.py | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/gr-wxgui/python/fftsink_gl.py b/gr-wxgui/python/fftsink_gl.py index b5bb5c6c60..272a2456ce 100644 --- a/gr-wxgui/python/fftsink_gl.py +++ b/gr-wxgui/python/fftsink_gl.py @@ -190,7 +190,7 @@ class test_app_block (stdgui2.std_top_block): vbox.Add(sink2.win, 1, wx.EXPAND) combine2 = blocks.add_ff() - c2f2 = gr.complex_to_float() + c2f2 = blocks.complex_to_float() self.connect(src2, (combine2,0)) self.connect(noise,c2f2,(combine2,1)) diff --git a/gr-wxgui/python/fftsink_nongl.py b/gr-wxgui/python/fftsink_nongl.py index ee5145dfd7..73bc7f41b0 100644 --- a/gr-wxgui/python/fftsink_nongl.py +++ b/gr-wxgui/python/fftsink_nongl.py @@ -130,7 +130,7 @@ class fft_sink_f(gr.hier_block2, fft_sink_base): for tap in mywindow: power += tap*tap - self.c2mag = gr.complex_to_mag(self.fft_size) + self.c2mag = blocks.complex_to_mag(self.fft_size) self.avg = filter.single_pole_iir_filter_ff(1.0, self.fft_size) # FIXME We need to add 3dB to all bins but the DC bin @@ -176,7 +176,7 @@ class fft_sink_c(gr.hier_block2, fft_sink_base): for tap in mywindow: power += tap*tap - self.c2mag = gr.complex_to_mag(self.fft_size) + self.c2mag = blocks.complex_to_mag(self.fft_size) self.avg = filter.single_pole_iir_filter_ff(1.0, self.fft_size) # FIXME We need to add 3dB to all bins but the DC bin diff --git a/gr-wxgui/python/scopesink_gl.py b/gr-wxgui/python/scopesink_gl.py index 8fca9f9a20..21d7169026 100644 --- a/gr-wxgui/python/scopesink_gl.py +++ b/gr-wxgui/python/scopesink_gl.py @@ -158,7 +158,7 @@ class _scope_sink_base(gr.hier_block2, common.wxgui_hb): ) else: for i in range(num_inputs): - c2f = gr.complex_to_float() + c2f = blocks.complex_to_float() self.wxgui_connect((self, i), c2f) for j in range(2): self.connect( diff --git a/gr-wxgui/python/scopesink_nongl.py b/gr-wxgui/python/scopesink_nongl.py index 5f44eeca74..2c5ff9278a 100644 --- a/gr-wxgui/python/scopesink_nongl.py +++ b/gr-wxgui/python/scopesink_nongl.py @@ -66,7 +66,7 @@ class scope_sink_c(gr.hier_block2): msgq = gr.msg_queue(2) # message queue that holds at most 2 messages self.guts = gr.oscope_sink_f(sample_rate, msgq) for i in range(num_inputs): - c2f = gr.complex_to_float() + c2f = blocks.complex_to_float() self.connect((self, i), c2f) self.connect((c2f, 0),(self.guts, 2*i+0)) self.connect((c2f, 1),(self.guts, 2*i+1)) diff --git a/gr-wxgui/python/waterfallsink_nongl.py b/gr-wxgui/python/waterfallsink_nongl.py index 11dfd106c5..37b8281927 100644 --- a/gr-wxgui/python/waterfallsink_nongl.py +++ b/gr-wxgui/python/waterfallsink_nongl.py @@ -95,7 +95,7 @@ class waterfall_sink_f(gr.hier_block2, waterfall_sink_base): mywindow = window.blackmanharris(self.fft_size) self.fft = fft.fft_vfc(self.fft_size, True, mywindow) - self.c2mag = gr.complex_to_mag(self.fft_size) + self.c2mag = blocks.complex_to_mag(self.fft_size) self.avg = filter.single_pole_iir_filter_ff(1.0, self.fft_size) self.log = blocks.nlog10_ff(20, self.fft_size, -20*math.log10(self.fft_size)) self.sink = blocks.message_sink(gr.sizeof_float * self.fft_size, self.msgq, True) @@ -126,7 +126,7 @@ class waterfall_sink_c(gr.hier_block2, waterfall_sink_base): mywindow = window.blackmanharris(self.fft_size) self.fft = fft.fft_vcc(self.fft_size, True, mywindow) - self.c2mag = gr.complex_to_mag(self.fft_size) + self.c2mag = blocks.complex_to_mag(self.fft_size) self.avg = filter.single_pole_iir_filter_ff(1.0, self.fft_size) self.log = blocks.nlog10_ff(20, self.fft_size, -20*math.log10(self.fft_size)) self.sink = blocks.message_sink(gr.sizeof_float * self.fft_size, self.msgq, True) |