[Commit-gnuradio] r3974 - gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime

[jcorgan]

Author: jcorgan
Date: 2006-11-12 12:52:15 -0700 (Sun, 12 Nov 2006)
New Revision: 3974

Modified:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
   
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_impl.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.h
Log:
Work in progress.

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.cc
 2006-11-12 18:03:13 UTC (rev 3973)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_block.cc
 2006-11-12 19:52:15 UTC (rev 3974)
@@ -28,6 +28,7 @@
 #include <gr_block_detail.h>
 #include <stdexcept>
 #include <iostream>
+#include <gr_hier_block2.h>
 
 #define GR_BLOCK_DEBUG 1
 
@@ -122,5 +123,10 @@
     // Call my parent, get my assigned inputs and outputs, then call check 
topology,
     // which may be overridden by descendent classes
 
-    return true; // Stub for now
+    int ninputs = 0, noutputs = 0;
+    gr_hier_block2 *parent = dynamic_cast<gr_hier_block2 *>(d_parent);
+    if (parent)
+       parent->get_child_topology(shared_from_this(), ninputs, noutputs);
+
+    return check_topology(ninputs, noutputs);
 }

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
   2006-11-12 18:03:13 UTC (rev 3973)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
   2006-11-12 19:52:15 UTC (rev 3974)
@@ -120,3 +120,9 @@
        
     return d_impl->visit(visitor);
 }
+
+void
+gr_hier_block2::get_child_topology(gr_basic_block_sptr child, int &ninputs, 
int &noutputs)
+{
+    d_impl->get_child_topology(child, ninputs, noutputs);
+}

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-11-12 18:03:13 UTC (rev 3973)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
    2006-11-12 19:52:15 UTC (rev 3974)
@@ -66,6 +66,8 @@
 
     // Overrides gr_basic_block, checks validity of connection/component 
databases
     virtual bool validate();
+
+    void get_child_topology(gr_basic_block_sptr child, int &ninputs, int 
&noutputs);
 };
 
 inline std::ostream &operator << (std::ostream &os, gr_basic_block_sptr 
basic_block)

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
      2006-11-12 18:03:13 UTC (rev 3973)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
      2006-11-12 19:52:15 UTC (rev 3974)
@@ -169,3 +169,9 @@
 
     return blocks;
 }
+
+void
+gr_hier_block2_impl::get_child_topology(gr_basic_block_sptr child, int 
&ninputs, int &noutputs)
+{
+    
+}

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.h
       2006-11-12 18:03:13 UTC (rev 3973)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.h
       2006-11-12 19:52:15 UTC (rev 3974)
@@ -95,7 +95,8 @@
     gr_basic_block_vector_t get_connected_blocks();
     bool visit(gr_tree_visitor &visitor);
     bool validate();
-                                
+    void get_child_topology(gr_basic_block_sptr child, int &ninputs, int 
&noutputs);
+                                    
 public:
     ~gr_hier_block2_impl();
 };