From d858f1402b4fb4e302d0b488eec0e4628b62296d Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Sun, 24 Feb 2013 19:44:25 -0500
Subject: blocks: removing throttle, threshold, stretch from gnuradio-core.
---
gr-wxgui/python/fftsink_gl.py | 4 ++--
gr-wxgui/python/fftsink_nongl.py | 4 ++--
gr-wxgui/python/histosink_gl.py | 3 ++-
gr-wxgui/python/numbersink2.py | 4 ++--
gr-wxgui/python/scopesink_gl.py | 2 +-
gr-wxgui/python/scopesink_nongl.py | 3 ++-
gr-wxgui/python/waterfallsink_gl.py | 5 +++--
gr-wxgui/python/waterfallsink_nongl.py | 4 ++--
8 files changed, 16 insertions(+), 13 deletions(-)
(limited to 'gr-wxgui/python')
diff --git a/gr-wxgui/python/fftsink_gl.py b/gr-wxgui/python/fftsink_gl.py
index e87b86ec2a..88a5968e2c 100644
--- a/gr-wxgui/python/fftsink_gl.py
+++ b/gr-wxgui/python/fftsink_gl.py
@@ -169,7 +169,7 @@ class test_app_block (stdgui2.std_top_block):
# We add these throttle blocks so that this demo doesn't
# suck down all the CPU available. Normally you wouldn't use these.
- thr1 = gr.throttle(gr.sizeof_gr_complex, input_rate)
+ thr1 = blocks.throttle(gr.sizeof_gr_complex, input_rate)
sink1 = fft_sink_c(panel, title="Complex Data", fft_size=fft_size,
sample_rate=input_rate, baseband_freq=100e3,
@@ -183,7 +183,7 @@ class test_app_block (stdgui2.std_top_block):
#src2 = analog.sig_source_f(input_rate, analog.GR_SIN_WAVE, 2e3, 1)
src2 = analog.sig_source_f (input_rate, analog.GR_CONST_WAVE, 57.50e3, 1)
- thr2 = gr.throttle(gr.sizeof_float, input_rate)
+ thr2 = blocks.throttle(gr.sizeof_float, input_rate)
sink2 = fft_sink_f(panel, title="Real Data", fft_size=fft_size*2,
sample_rate=input_rate, baseband_freq=100e3,
ref_level=0, y_per_div=20, y_divs=10)
diff --git a/gr-wxgui/python/fftsink_nongl.py b/gr-wxgui/python/fftsink_nongl.py
index e9308fd354..d13b296d56 100644
--- a/gr-wxgui/python/fftsink_nongl.py
+++ b/gr-wxgui/python/fftsink_nongl.py
@@ -613,7 +613,7 @@ class test_app_block (stdgui2.std_top_block):
# We add these throttle blocks so that this demo doesn't
# suck down all the CPU available. Normally you wouldn't use these.
- thr1 = gr.throttle(gr.sizeof_gr_complex, input_rate)
+ thr1 = blocks.throttle(gr.sizeof_gr_complex, input_rate)
sink1 = fft_sink_c(panel, title="Complex Data", fft_size=fft_size,
sample_rate=input_rate, baseband_freq=100e3,
@@ -624,7 +624,7 @@ class test_app_block (stdgui2.std_top_block):
#src2 = analog.sig_source_f(input_rate, analog.GR_SIN_WAVE, 100*2e3, 1)
src2 = analog.sig_source_f(input_rate, analog.GR_CONST_WAVE, 100*5.75e3, 1)
- thr2 = gr.throttle(gr.sizeof_float, input_rate)
+ thr2 = blocks.throttle(gr.sizeof_float, input_rate)
sink2 = fft_sink_f(panel, title="Real Data", fft_size=fft_size*2,
sample_rate=input_rate, baseband_freq=100e3,
ref_level=0, y_per_div=20, y_divs=10)
diff --git a/gr-wxgui/python/histosink_gl.py b/gr-wxgui/python/histosink_gl.py
index 8d90204046..6fa7539aa7 100644
--- a/gr-wxgui/python/histosink_gl.py
+++ b/gr-wxgui/python/histosink_gl.py
@@ -26,6 +26,7 @@ import histo_window
import common
from gnuradio import gr
from gnuradio import analog
+from gnuradio import blocks
from pubsub import pubsub
from constants import *
@@ -97,7 +98,7 @@ class test_app_block (stdgui2.std_top_block):
src2 = analog.sig_source_f(input_rate, analog.GR_SIN_WAVE, 2e3, 1)
#src2 = analog.sig_source_f(input_rate, analog.GR_CONST_WAVE, 5.75e3, 1)
- thr2 = gr.throttle(gr.sizeof_float, input_rate)
+ thr2 = blocks.throttle(gr.sizeof_float, input_rate)
sink2 = histo_sink_f(panel, title="Data", num_bins=31, frame_size=1000)
vbox.Add(sink2.win, 1, wx.EXPAND)
diff --git a/gr-wxgui/python/numbersink2.py b/gr-wxgui/python/numbersink2.py
index 1619b09eb6..395bddbd61 100644
--- a/gr-wxgui/python/numbersink2.py
+++ b/gr-wxgui/python/numbersink2.py
@@ -149,8 +149,8 @@ class test_app_flow_graph(stdgui2.std_top_block):
# We add these throttle blocks so that this demo doesn't
# suck down all the CPU available. Normally you wouldn't use these.
- thr1 = gr.throttle(gr.sizeof_float, input_rate)
- thr2 = gr.throttle(gr.sizeof_gr_complex, input_rate)
+ thr1 = blocks.throttle(gr.sizeof_float, input_rate)
+ thr2 = blocks.throttle(gr.sizeof_gr_complex, input_rate)
sink1 = number_sink_f(panel, unit='V',label="Real Data", avg_alpha=0.001,
sample_rate=input_rate, minval=-1, maxval=1,
diff --git a/gr-wxgui/python/scopesink_gl.py b/gr-wxgui/python/scopesink_gl.py
index 647ea60983..7d6cd09ec9 100644
--- a/gr-wxgui/python/scopesink_gl.py
+++ b/gr-wxgui/python/scopesink_gl.py
@@ -216,7 +216,7 @@ class test_top_block (stdgui2.std_top_block):
# We add this throttle block so that this demo doesn't suck down
# all the CPU available. You normally wouldn't use it...
- self.thr = gr.throttle(gr.sizeof_gr_complex, input_rate)
+ self.thr = blocks.throttle(gr.sizeof_gr_complex, input_rate)
scope = scope_sink_c(panel,"Secret Data",sample_rate=input_rate,
v_scale=v_scale, t_scale=t_scale)
diff --git a/gr-wxgui/python/scopesink_nongl.py b/gr-wxgui/python/scopesink_nongl.py
index 6351daa723..5f44eeca74 100644
--- a/gr-wxgui/python/scopesink_nongl.py
+++ b/gr-wxgui/python/scopesink_nongl.py
@@ -22,6 +22,7 @@
from gnuradio import gr, gru, eng_notation
from gnuradio import analog
+from gnuradio import blocks
from gnuradio.wxgui import stdgui2
import wx
import gnuradio.wxgui.plot as plot
@@ -631,7 +632,7 @@ class test_top_block(stdgui2.std_top_block):
# We add this throttle block so that this demo doesn't suck down
# all the CPU available. You normally wouldn't use it...
- self.thr = gr.throttle(gr.sizeof_gr_complex, input_rate)
+ self.thr = blocks.throttle(gr.sizeof_gr_complex, input_rate)
scope = scope_sink_c(panel,"Secret Data",sample_rate=input_rate,
frame_decim=frame_decim,
diff --git a/gr-wxgui/python/waterfallsink_gl.py b/gr-wxgui/python/waterfallsink_gl.py
index 17900a6e4f..dba50ce551 100644
--- a/gr-wxgui/python/waterfallsink_gl.py
+++ b/gr-wxgui/python/waterfallsink_gl.py
@@ -26,6 +26,7 @@ import waterfall_window
import common
from gnuradio import gr, fft
from gnuradio import analog
+from gnuradio import blocks
from gnuradio.fft import logpwrfft
from pubsub import pubsub
from constants import *
@@ -150,7 +151,7 @@ class test_top_block(stdgui2.std_top_block):
# We add these throttle blocks so that this demo doesn't
# suck down all the CPU available. Normally you wouldn't use these.
- self.thr1 = gr.throttle(gr.sizeof_gr_complex, input_rate)
+ self.thr1 = blocks.throttle(gr.sizeof_gr_complex, input_rate)
sink1 = waterfall_sink_c(panel, title="Complex Data", fft_size=fft_size,
sample_rate=input_rate, baseband_freq=100e3)
@@ -159,7 +160,7 @@ class test_top_block(stdgui2.std_top_block):
# generate a real sinusoid
self.src2 = analog.sig_source_f(input_rate, analog.GR_SIN_WAVE, 5.75e3, 1000)
- self.thr2 = gr.throttle(gr.sizeof_float, input_rate)
+ self.thr2 = blocks.throttle(gr.sizeof_float, input_rate)
sink2 = waterfall_sink_f(panel, title="Real Data", fft_size=fft_size,
sample_rate=input_rate, baseband_freq=100e3)
self.connect(self.src2, self.thr2, sink2)
diff --git a/gr-wxgui/python/waterfallsink_nongl.py b/gr-wxgui/python/waterfallsink_nongl.py
index 1ff44a88c6..df1534f993 100644
--- a/gr-wxgui/python/waterfallsink_nongl.py
+++ b/gr-wxgui/python/waterfallsink_nongl.py
@@ -407,7 +407,7 @@ class test_top_block (stdgui2.std_top_block):
# We add these throttle blocks so that this demo doesn't
# suck down all the CPU available. Normally you wouldn't use these.
- self.thr1 = gr.throttle(gr.sizeof_gr_complex, input_rate)
+ self.thr1 = blocks.throttle(gr.sizeof_gr_complex, input_rate)
sink1 = waterfall_sink_c(panel, title="Complex Data", fft_size=fft_size,
sample_rate=input_rate, baseband_freq=100e3)
@@ -416,7 +416,7 @@ class test_top_block (stdgui2.std_top_block):
# generate a real sinusoid
self.src2 = analog.sig_source_f(input_rate, analog.GR_SIN_WAVE, 5.75e3, 1000)
- self.thr2 = gr.throttle(gr.sizeof_float, input_rate)
+ self.thr2 = blocks.throttle(gr.sizeof_float, input_rate)
sink2 = waterfall_sink_f(panel, title="Real Data", fft_size=fft_size,
sample_rate=input_rate, baseband_freq=100e3)
self.connect(self.src2, self.thr2, sink2)
--
cgit v1.2.3