From d4f6b86a9bdea09c2c158b9982559a727f8c6a0b Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Sun, 17 Mar 2013 12:24:38 -0400
Subject: blocks: converting references to vector source/sink, null
source/sink, nop, copy, head, skiphead, vector_map, and annotator blocks to
use gr-blocks.
---
gr-fft/python/qa_fft.py | 12 ++++++------
gr-fft/python/qa_goertzel.py | 5 +++--
2 files changed, 9 insertions(+), 8 deletions(-)
(limited to 'gr-fft/python')
diff --git a/gr-fft/python/qa_fft.py b/gr-fft/python/qa_fft.py
index 0a66a2c1fc..c90eea69c5 100755
--- a/gr-fft/python/qa_fft.py
+++ b/gr-fft/python/qa_fft.py
@@ -87,11 +87,11 @@ class test_fft(gr_unittest.TestCase):
(689.48553466796875-918.2142333984375j),
(1646.539306640625-1694.1956787109375j))
- src = gr.vector_source_c(src_data)
+ src = blocks.vector_source_c(src_data)
s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, fft_size)
op = fft.fft_vcc(fft_size, True, [], False)
v2s = blocks.vector_to_stream(gr.sizeof_gr_complex, fft_size)
- dst = gr.vector_sink_c()
+ dst = blocks.vector_sink_c()
tb.connect(src, s2v, op, v2s, dst)
tb.run()
result_data = dst.data()
@@ -141,11 +141,11 @@ class test_fft(gr_unittest.TestCase):
expected_result = tuple([complex(primes[2*i], primes[2*i+1]) for i in range(fft_size)])
- src = gr.vector_source_c(src_data)
+ src = blocks.vector_source_c(src_data)
s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, fft_size)
op = fft.fft_vcc(fft_size, False, [], False)
v2s = blocks.vector_to_stream(gr.sizeof_gr_complex, fft_size)
- dst = gr.vector_sink_c()
+ dst = blocks.vector_sink_c()
tb.connect(src, s2v, op, v2s, dst)
tb.run()
result_data = dst.data()
@@ -199,11 +199,11 @@ class test_fft(gr_unittest.TestCase):
nthreads = 2
- src = gr.vector_source_c(src_data)
+ src = blocks.vector_source_c(src_data)
s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, fft_size)
op = fft.fft_vcc(fft_size, False, [], False, nthreads)
v2s = blocks.vector_to_stream(gr.sizeof_gr_complex, fft_size)
- dst = gr.vector_sink_c()
+ dst = blocks.vector_sink_c()
tb.connect(src, s2v, op, v2s, dst)
tb.run()
result_data = dst.data()
diff --git a/gr-fft/python/qa_goertzel.py b/gr-fft/python/qa_goertzel.py
index 27f9d370e1..33f1413b6d 100755
--- a/gr-fft/python/qa_goertzel.py
+++ b/gr-fft/python/qa_goertzel.py
@@ -23,6 +23,7 @@
from gnuradio import gr, gr_unittest
from math import pi, cos
import fft_swig as fft
+import blocks_swig as blocks
class test_goertzel(gr_unittest.TestCase):
@@ -36,9 +37,9 @@ class test_goertzel(gr_unittest.TestCase):
return [cos(2*pi*x*freq/rate) for x in range(rate)]
def transform(self, src_data, rate, freq):
- src = gr.vector_source_f(src_data, False)
+ src = blocks.vector_source_f(src_data, False)
dft = fft.goertzel_fc(rate, rate, freq)
- dst = gr.vector_sink_c()
+ dst = blocks.vector_sink_c()
self.tb.connect(src, dft, dst)
self.tb.run()
return dst.data()
--
cgit v1.2.3