[Commit-gnuradio] r3882 - in gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src: lib/runtime python/gnuradio/gr

[jcorgan]

Author: jcorgan
Date: 2006-10-27 16:24:38 -0600 (Fri, 27 Oct 2006)
New Revision: 3882

Added:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
Modified:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
Log:
Work in progress.

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
    2006-10-27 22:23:31 UTC (rev 3881)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
    2006-10-27 22:24:38 UTC (rev 3882)
@@ -53,7 +53,10 @@
 public:
     ~gr_hier_block2();
 
-    // Add a named terminal block to container
+    /*!
+     * \brief Add a named terminal block to container
+     * \ingroup block
+     */
     void define_component(const std::string name, gr_block_sptr comp);
 };
 

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
    2006-10-27 22:23:31 UTC (rev 3881)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
    2006-10-27 22:24:38 UTC (rev 3882)
@@ -33,7 +33,7 @@
  * \brief gr_hier_block2 - Container class for tree of gr_block's
  *
  */
-class gr_hier_block2 
+class gr_hier_block2 : public gr_basic_block
 {
     gr_hier_block2(const std::string name,
                   gr_io_signature_sptr input_signature,

Added: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
                            (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
    2006-10-27 22:24:38 UTC (rev 3882)
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+
+from gnuradio import gr, gr_unittest
+
+class test_hier_block2(gr_unittest.TestCase):
+
+    def setUp(self):
+       pass
+       
+    def tearDown(self):
+       pass
+       
+    def test_001_make(self):
+       hblock = gr.hier_block2("test_block", 
+                               gr.io_signature(1,1,gr.sizeof_int), 
+                               gr.io_signature(1,1,gr.sizeof_int))
+       self.assertEqual("test_block", hblock.name())
+       self.assertEqual(1, hblock.input_signature().max_streams())
+       self.assertEqual(1, hblock.output_signature().min_streams())
+       self.assertEqual(1, hblock.output_signature().max_streams())
+       self.assertEqual(gr.sizeof_int, 
hblock.output_signature().sizeof_stream_item(0))
+
+if __name__ == "__main__":
+    gr_unittest.main()
\ No newline at end of file


Property changes on: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
___________________________________________________________________
Name: svn:executable
   + *