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

[jcorgan]

Author: jcorgan
Date: 2006-10-28 00:17:44 -0600 (Sat, 28 Oct 2006)
New Revision: 3888

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/python/gnuradio/gr/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 02:21:35 UTC (rev 3887)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
   2006-10-28 06:17:44 UTC (rev 3888)
@@ -50,3 +50,8 @@
 {
     s_ncurrently_allocated--;
 }
+
+gr_basic_block_sptr gr_basic_block::get_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 02:21:35 UTC (rev 3887)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
    2006-10-28 06:17:44 UTC (rev 3888)
@@ -24,6 +24,7 @@
 #define INCLUDED_GR_BASIC_BLOCK_H
 
 #include <gr_runtime.h>
+#include <boost/enable_shared_from_this.hpp>
 #include <string>
 
 /*!
@@ -37,7 +38,7 @@
  * signal processing functions.
  */
 
-class gr_basic_block
+class gr_basic_block : public boost::enable_shared_from_this<gr_basic_block>
 {
 protected:
     std::string                 d_name;
@@ -65,6 +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();
 };
 
 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 02:21:35 UTC (rev 3887)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.i
    2006-10-28 06:17:44 UTC (rev 3888)
@@ -40,6 +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();
 };
 
 %rename(block_ncurrently_allocated) gr_basic_block_ncurrently_allocated;
@@ -47,5 +48,4 @@
 
 %pythoncode %{
 gr_basic_block_sptr.__repr__ = lambda self: "<gr_basic_block %s (%d)>" % 
(self.name(), self.unique_id ())
-gr_basic_block_sptr.basic_block = lambda self: self
 %}

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 02:21:35 UTC (rev 3887)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
       2006-10-28 06:17:44 UTC (rev 3888)
@@ -37,7 +37,4 @@
        return getattr(self._hb, name)
 
     def define_component(self, name, comp):
-       print "Passing through call to define_component"
-       print type(comp)
-       print type(comp.basic_block())
-       return self._hb.define_component(name, comp.basic_block())
+       return self._hb.define_component(name, comp.get_basic_block())