[Commit-gnuradio] r8480 - grc/trunk/src/grc_gnuradio/blks2

[jblum]

Author: jblum
Date: 2008-05-21 23:15:53 -0600 (Wed, 21 May 2008)
New Revision: 8480

Modified:
   grc/trunk/src/grc_gnuradio/blks2/__init__.py
   grc/trunk/src/grc_gnuradio/blks2/queue.py
Log:
queue complex cast

Modified: grc/trunk/src/grc_gnuradio/blks2/__init__.py
===================================================================
--- grc/trunk/src/grc_gnuradio/blks2/__init__.py        2008-05-22 02:02:29 UTC 
(rev 8479)
+++ grc/trunk/src/grc_gnuradio/blks2/__init__.py        2008-05-22 05:15:53 UTC 
(rev 8480)
@@ -18,11 +18,11 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+from queue import queue_sink_thread
+from queue import queue_sink_c, queue_sink_f, queue_sink_i, queue_sink_s, 
queue_sink_b
+from queue import queue_source_c, queue_source_f, queue_source_i, 
queue_source_s, queue_source_b
+
 from selector import selector, valve
 from packet import packet_encoder, packet_decoder
 from error_rate import error_rate
 
-from queue import queue_sink_thread
-from queue import queue_sink_c, queue_sink_f, queue_sink_i, queue_sink_s, 
queue_sink_b
-from queue import queue_source_c, queue_source_f, queue_source_i, 
queue_source_s, queue_source_b
-

Modified: grc/trunk/src/grc_gnuradio/blks2/queue.py
===================================================================
--- grc/trunk/src/grc_gnuradio/blks2/queue.py   2008-05-22 02:02:29 UTC (rev 
8479)
+++ grc/trunk/src/grc_gnuradio/blks2/queue.py   2008-05-22 05:15:53 UTC (rev 
8480)
@@ -22,6 +22,9 @@
 import gnuradio.gr.gr_threading as _threading
 import numpy
 
+#######################################################################################
+##     Queue Sink Thread
+#######################################################################################
 class queue_sink_thread(_threading.Thread):
        """!
        Read samples from the queue sink and execute the callback.
@@ -50,6 +53,9 @@
 class _queue_sink_base(gr.hier_block2):
        """!
        Queue sink base, a queue sink for any size queue.
+       Easy read access to a gnuradio data stream from python.
+       Call pop to read a sample from a gnuradio data stream.
+       Samples are cast as python data types, complex, float, or int.
        """
        
        def __init__(self, vlen=1):
@@ -89,7 +95,7 @@
 class queue_sink_c(_queue_sink_base):
        _item_size = gr.sizeof_gr_complex
        _numpy = numpy.complex64
-       _cast = complex
+       def _cast(self, arg): return complex(arg.real, arg.imag)                
        
 class queue_sink_f(_queue_sink_base):
        _item_size = gr.sizeof_float
@@ -117,6 +123,8 @@
 class _queue_source_base(gr.hier_block2):
        """!
        Queue source base, a queue source for any size queue.
+       Easy write access to a gnuradio data stream from python.
+       Call push to to write a sample into the gnuradio data stream.
        """
        
        def __init__(self, vlen=1):