[Commit-gnuradio] [gnuradio] 02/03: wxgui+grc: stop bypassing hier_block2 proxy class

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 3a3bfd24b184af47cd2a579c7de5c9ad5ea9a0b0
Author: Sebastian Koslowski <address@hidden>
Date:   Tue Dec 30 17:57:32 2014 +0100

    wxgui+grc: stop bypassing hier_block2 proxy class
---
 gr-wxgui/python/wxgui/common.py  | 2 +-
 grc/grc_gnuradio/blks2/packet.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gr-wxgui/python/wxgui/common.py b/gr-wxgui/python/wxgui/common.py
index b051863..de26484 100644
--- a/gr-wxgui/python/wxgui/common.py
+++ b/gr-wxgui/python/wxgui/common.py
@@ -49,7 +49,7 @@ class wxgui_hb(object):
         """
         try:
             assert points[0] == self or points[0][0] == self
-            copy = 
blocks.copy(self._hb.input_signature().sizeof_stream_item(0))
+            copy = blocks.copy(self.input_signature().sizeof_stream_item(0))
             handler = self._handler_factory(copy.set_enabled)
             if not RUN_ALWAYS:
                 handler(False)  # initially disable the copy block
diff --git a/grc/grc_gnuradio/blks2/packet.py b/grc/grc_gnuradio/blks2/packet.py
index 25ed3e4..ef79afd 100644
--- a/grc/grc_gnuradio/blks2/packet.py
+++ b/grc/grc_gnuradio/blks2/packet.py
@@ -202,7 +202,7 @@ class packet_mod_base(gr.hier_block2):
             self,
             "ofdm_mod",
             gr.io_signature(1, 1, self._item_size_in), # Input signature
-            gr.io_signature(1, 1, 
packet_source._hb.output_signature().sizeof_stream_item(0)) # Output signature
+            gr.io_signature(1, 1, 
packet_source.output_signature().sizeof_stream_item(0)) # Output signature
         )
         #create blocks
         msgq = gr.msg_queue(DEFAULT_MSGQ_LIMIT)
@@ -232,7 +232,7 @@ class packet_demod_base(gr.hier_block2):
         gr.hier_block2.__init__(
             self,
             "ofdm_mod",
-            gr.io_signature(1, 1, 
packet_sink._hb.input_signature().sizeof_stream_item(0)), # Input signature
+            gr.io_signature(1, 1, 
packet_sink.input_signature().sizeof_stream_item(0)), # Input signature
             gr.io_signature(1, 1, self._item_size_out) # Output signature
         )
         #create blocks
@@ -241,9 +241,9 @@ class packet_demod_base(gr.hier_block2):
         #connect
         self.connect(self, packet_sink)
         self.connect(msg_source, self)
-        if packet_sink._hb.output_signature().sizeof_stream_item(0):
+        if packet_sink.output_signature().sizeof_stream_item(0):
             self.connect(packet_sink,
-                         
blocks.null_sink(packet_sink._hb.output_signature().sizeof_stream_item(0)))
+                         
blocks.null_sink(packet_sink.output_signature().sizeof_stream_item(0)))
 
     def recv_pkt(self, ok, payload):
         msg = gr.message_from_string(payload, 0, self._item_size_out,