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

[jcorgan]

Author: jcorgan
Date: 2006-10-28 16:39:26 -0600 (Sat, 28 Oct 2006)
New Revision: 3890

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


Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
   2006-10-28 06:53:52 UTC (rev 3889)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
   2006-10-28 22:39:26 UTC (rev 3890)
@@ -51,7 +51,7 @@
     s_ncurrently_allocated--;
 }
 
-gr_basic_block_sptr gr_basic_block::get_basic_block()
+gr_basic_block_sptr gr_basic_block::basic_block()
 {
     return shared_from_this();
 }

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
    2006-10-28 06:53:52 UTC (rev 3889)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
    2006-10-28 22:39:26 UTC (rev 3890)
@@ -66,7 +66,7 @@
     std::string name() const { return d_name; }
     gr_io_signature_sptr input_signature() const  { return d_input_signature; }
     gr_io_signature_sptr output_signature() const { return d_output_signature; 
}
-    gr_basic_block_sptr get_basic_block();
+    gr_basic_block_sptr basic_block();
 };
 
 long gr_basic_block_ncurrently_allocated();

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.i
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.i
    2006-10-28 06:53:52 UTC (rev 3889)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.i
    2006-10-28 22:39:26 UTC (rev 3890)
@@ -40,7 +40,7 @@
     gr_io_signature_sptr input_signature() const;
     gr_io_signature_sptr output_signature() const;
     long unique_id() const;
-    gr_basic_block_sptr get_basic_block();
+    gr_basic_block_sptr basic_block();
 };
 
 %rename(block_ncurrently_allocated) gr_basic_block_ncurrently_allocated;

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-28 06:53:52 UTC (rev 3889)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
    2006-10-28 22:39:26 UTC (rev 3890)
@@ -45,5 +45,6 @@
     ~gr_hier_block2 ();
 
     // Add a named block to the container
-    void define_component(const std::string name, gr_basic_block_sptr comp);
+    void define_component(const std::string name, gr_basic_block_sptr comp)
+       throw (std::invalid_argument);
 };

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
       2006-10-28 06:53:52 UTC (rev 3889)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
       2006-10-28 22:39:26 UTC (rev 3890)
@@ -37,4 +37,4 @@
        return getattr(self._hb, name)
 
     def define_component(self, name, comp):
-       return self._hb.define_component(name, comp.get_basic_block())
+       return self._hb.define_component(name, comp.basic_block())

Modified: 
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
    2006-10-28 06:53:52 UTC (rev 3889)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
    2006-10-28 22:39:26 UTC (rev 3890)
@@ -31,7 +31,6 @@
        hblock.define_component("source", src1)
        hblock.define_component("sink", sink1)
 
-    """
     def test_003_define_component_already_defined(self):
        hblock = gr.hier_block2("test_block", 
                                gr.io_signature(1,1,gr.sizeof_int), 
@@ -41,8 +40,8 @@
        sink1 = gr.null_sink(gr.sizeof_int)
            
        hblock.define_component("source", src1)
-       self.assertRaises(RuntimeError, lambda: 
hblock.define_component("source", sink1))
-    """
+       self.assertRaises(ValueError, lambda: hblock.define_component("source", 
sink1))
     
+    
 if __name__ == "__main__":
     gr_unittest.main()
\ No newline at end of file