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-analog/python/qa_sig_source.py | 43 ++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

(limited to 'gr-analog/python/qa_sig_source.py')

diff --git a/gr-analog/python/qa_sig_source.py b/gr-analog/python/qa_sig_source.py
index bc48333ed1..0aa03c7402 100755
--- a/gr-analog/python/qa_sig_source.py
+++ b/gr-analog/python/qa_sig_source.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2007,2010,2012 Free Software Foundation, Inc.
+# Copyright 2004,2007,2010,2012,2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -22,6 +22,7 @@
 
 from gnuradio import gr, gr_unittest
 import analog_swig as analog
+import blocks_swig as blocks
 import math
 
 class test_sig_source(gr_unittest.TestCase):
@@ -36,8 +37,8 @@ class test_sig_source(gr_unittest.TestCase):
         tb = self.tb
         expected_result = (1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5)
         src1 = analog.sig_source_f(1e6, analog.GR_CONST_WAVE, 0, 1.5)
-        op = gr.head(gr.sizeof_float, 10)
-        dst1 = gr.vector_sink_f()
+        op = blocks.head(gr.sizeof_float, 10)
+        dst1 = blocks.vector_sink_f()
         tb.connect(src1, op)
         tb.connect(op, dst1)
         tb.run()
@@ -48,8 +49,8 @@ class test_sig_source(gr_unittest.TestCase):
         tb = self.tb
         expected_result = (1, 1, 1, 1)
         src1 = analog.sig_source_i(1e6, analog.GR_CONST_WAVE, 0, 1)
-        op = gr.head(gr.sizeof_int, 4)
-        dst1 = gr.vector_sink_i()
+        op = blocks.head(gr.sizeof_int, 4)
+        dst1 = blocks.vector_sink_i()
         tb.connect(src1, op)
         tb.connect(op, dst1)
         tb.run()
@@ -61,8 +62,8 @@ class test_sig_source(gr_unittest.TestCase):
         sqrt2 = math.sqrt(2) / 2
         expected_result = (0, sqrt2, 1, sqrt2, 0, -sqrt2, -1, -sqrt2, 0)
         src1 = analog.sig_source_f(8, analog.GR_SIN_WAVE, 1.0, 1.0)
-        op = gr.head(gr.sizeof_float, 9)
-        dst1 = gr.vector_sink_f()
+        op = blocks.head(gr.sizeof_float, 9)
+        dst1 = blocks.vector_sink_f()
         tb.connect(src1, op)
         tb.connect(op, dst1)
         tb.run()
@@ -74,8 +75,8 @@ class test_sig_source(gr_unittest.TestCase):
         sqrt2 = math.sqrt(2) / 2
         expected_result = (1, sqrt2, 0, -sqrt2, -1, -sqrt2, 0, sqrt2, 1)
         src1 = analog.sig_source_f(8, analog.GR_COS_WAVE, 1.0, 1.0)
-        op = gr.head(gr.sizeof_float, 9)
-        dst1 = gr.vector_sink_f()
+        op = blocks.head(gr.sizeof_float, 9)
+        dst1 = blocks.vector_sink_f()
         tb.connect(src1, op)
         tb.connect(op, dst1)
         tb.run()
@@ -86,8 +87,8 @@ class test_sig_source(gr_unittest.TestCase):
         tb = self.tb			#arg6 is a bit before -PI/2
         expected_result = (1j, 1j, 0, 0, 1, 1, 1+0j, 1+1j, 1j)
         src1 = analog.sig_source_c(8, analog.GR_SQR_WAVE, 1.0, 1.0)
-        op = gr.head(gr.sizeof_gr_complex, 9)
-        dst1 = gr.vector_sink_c()
+        op = blocks.head(gr.sizeof_gr_complex, 9)
+        dst1 = blocks.vector_sink_c()
         tb.connect(src1, op)
         tb.connect(op, dst1)
         tb.run()
@@ -99,8 +100,8 @@ class test_sig_source(gr_unittest.TestCase):
         expected_result = (1+.5j, .75+.75j, .5+1j, .25+.75j, 0+.5j,
                            .25+.25j, .5+0j, .75+.25j, 1+.5j)
         src1 = analog.sig_source_c(8, analog.GR_TRI_WAVE, 1.0, 1.0)
-        op = gr.head(gr.sizeof_gr_complex, 9)
-        dst1 = gr.vector_sink_c()
+        op = blocks.head(gr.sizeof_gr_complex, 9)
+        dst1 = blocks.vector_sink_c()
         tb.connect(src1, op)
         tb.connect(op, dst1)
         tb.run()
@@ -112,8 +113,8 @@ class test_sig_source(gr_unittest.TestCase):
         expected_result = (.5+.25j, .625+.375j, .75+.5j, .875+.625j,
                             0+.75j, .125+.875j, .25+1j, .375+.125j, .5+.25j)
         src1 = analog.sig_source_c(8, analog.GR_SAW_WAVE, 1.0, 1.0)
-        op = gr.head(gr.sizeof_gr_complex, 9)
-        dst1 = gr.vector_sink_c()
+        op = blocks.head(gr.sizeof_gr_complex, 9)
+        dst1 = blocks.vector_sink_c()
         tb.connect(src1, op)
         tb.connect(op, dst1)
         tb.run()
@@ -124,8 +125,8 @@ class test_sig_source(gr_unittest.TestCase):
         tb = self.tb
         expected_result = (0, 0, 0, 0, 1, 1, 1, 1, 0)
         src1 = analog.sig_source_f(8, analog.GR_SQR_WAVE, 1.0, 1.0)
-        op = gr.head(gr.sizeof_float, 9)
-        dst1 = gr.vector_sink_f()
+        op = blocks.head(gr.sizeof_float, 9)
+        dst1 = blocks.vector_sink_f()
         tb.connect(src1, op)
         tb.connect(op, dst1)
         tb.run()
@@ -136,8 +137,8 @@ class test_sig_source(gr_unittest.TestCase):
         tb = self.tb
         expected_result = (1, .75, .5, .25, 0, .25, .5, .75, 1)
         src1 = analog.sig_source_f(8, analog.GR_TRI_WAVE, 1.0, 1.0)
-        op = gr.head(gr.sizeof_float, 9)
-        dst1 = gr.vector_sink_f()
+        op = blocks.head(gr.sizeof_float, 9)
+        dst1 = blocks.vector_sink_f()
         tb.connect(src1, op)
         tb.connect(op, dst1)
         tb.run()
@@ -148,8 +149,8 @@ class test_sig_source(gr_unittest.TestCase):
         tb = self.tb
         expected_result = (.5, .625, .75, .875, 0, .125, .25, .375, .5)
         src1 = analog.sig_source_f(8, analog.GR_SAW_WAVE, 1.0, 1.0)
-        op = gr.head(gr.sizeof_float, 9)
-        dst1 = gr.vector_sink_f()
+        op = blocks.head(gr.sizeof_float, 9)
+        dst1 = blocks.vector_sink_f()
         tb.connect(src1, op)
         tb.connect(op, dst1)
         tb.run()
-- 
cgit v1.2.3