diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-28 14:38:40 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-28 14:38:40 -0500 |
| commit | 9f29e51f2945f355b43f3012da43e37dcd95f6b4 (patch) | |
| tree | bcc71c8975379c107bb6e94da944292a5ee9a03a /gr-qtgui/apps | |
| parent | 7afefc484137bf0bed7ab9a7ed86017c117d6a35 (diff) | |
| parent | 2f55d7dfc33e8d990e44c5bbb7c6d2fbdaddd563 (diff) | |
Merge branch 'next' into perf_monitor
Diffstat (limited to 'gr-qtgui/apps')
| -rw-r--r-- | gr-qtgui/apps/grc_qt_example.grc | 8 | ||||
| -rwxr-xr-x | gr-qtgui/apps/qt_digital.py | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/gr-qtgui/apps/grc_qt_example.grc b/gr-qtgui/apps/grc_qt_example.grc index a0c9a0b6ae..320320edcc 100644 --- a/gr-qtgui/apps/grc_qt_example.grc +++ b/gr-qtgui/apps/grc_qt_example.grc @@ -249,10 +249,10 @@ </param> </block> <block> - <key>gr_throttle</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>gr_throttle_0</value> + <value>blocks_throttle_0</value> </param> <param> <key>_enabled</key> @@ -434,7 +434,7 @@ </block> <connection> <source_block_id>analog_sig_source_x_0</source_block_id> - <sink_block_id>gr_throttle_0</sink_block_id> + <sink_block_id>blocks_throttle_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> @@ -445,7 +445,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>gr_throttle_0</source_block_id> + <source_block_id>blocks_throttle_0</source_block_id> <sink_block_id>channels_channel_model_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-qtgui/apps/qt_digital.py b/gr-qtgui/apps/qt_digital.py index d353e0041c..2e8cf2fd66 100755 --- a/gr-qtgui/apps/qt_digital.py +++ b/gr-qtgui/apps/qt_digital.py @@ -21,6 +21,7 @@ # from gnuradio import gr, digital +from gnuradio import blocks from gnuradio import eng_notation import sys @@ -215,7 +216,7 @@ class my_top_block(gr.top_block): self.to = 1.0 self.channel = gr.channel_model(noise, self.fo, self.to) - self.thr = gr.throttle(gr.sizeof_char, self._sample_rate) + self.thr = blocks.throttle(gr.sizeof_char, self._sample_rate) self.snk_tx = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS, 0, self._sample_rate*self.sps, "Tx", True, True, True, True) |