summaryrefslogtreecommitdiff
path: root/gr-qtgui
diff options
context:
space:
mode:
Diffstat (limited to 'gr-qtgui')
-rwxr-xr-xgr-qtgui/apps/gr_psd_plot_b3
-rwxr-xr-xgr-qtgui/apps/gr_psd_plot_i3
-rwxr-xr-xgr-qtgui/apps/gr_psd_plot_s2
-rwxr-xr-xgr-qtgui/apps/gr_spectrogram_plot_b5
-rwxr-xr-xgr-qtgui/apps/gr_spectrogram_plot_c3
-rwxr-xr-xgr-qtgui/apps/gr_spectrogram_plot_f3
-rwxr-xr-xgr-qtgui/apps/gr_spectrogram_plot_i5
-rwxr-xr-xgr-qtgui/apps/gr_spectrogram_plot_s5
-rwxr-xr-xgr-qtgui/apps/gr_time_plot_b3
-rwxr-xr-xgr-qtgui/apps/gr_time_plot_i3
-rwxr-xr-xgr-qtgui/apps/gr_time_plot_s2
-rwxr-xr-xgr-qtgui/apps/uhd_display.py8
-rwxr-xr-xgr-qtgui/examples/pyqt_const_c.py3
-rwxr-xr-xgr-qtgui/examples/pyqt_example_c.py3
-rwxr-xr-xgr-qtgui/examples/pyqt_example_f.py5
-rwxr-xr-xgr-qtgui/examples/pyqt_freq_c.py3
-rwxr-xr-xgr-qtgui/examples/pyqt_freq_f.py3
-rwxr-xr-xgr-qtgui/examples/pyqt_time_c.py3
-rwxr-xr-xgr-qtgui/examples/pyqt_time_f.py5
-rwxr-xr-xgr-qtgui/examples/pyqt_waterfall_c.py3
-rwxr-xr-xgr-qtgui/examples/pyqt_waterfall_f.py3
21 files changed, 48 insertions, 28 deletions
diff --git a/gr-qtgui/apps/gr_psd_plot_b b/gr-qtgui/apps/gr_psd_plot_b
index 283bf2950c..b5d2104da2 100755
--- a/gr-qtgui/apps/gr_psd_plot_b
+++ b/gr-qtgui/apps/gr_psd_plot_b
@@ -21,6 +21,7 @@
#
from gnuradio import gr
+from gnuradio import blocks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
import os, sys
@@ -91,7 +92,7 @@ class my_top_block(gr.top_block):
data = read_samples_and_pad(f, self._start,
self._nsamps, self._psd_size)
self.srcs.append(gr.vector_source_b(data))
- self.cnvrt.append(gr.char_to_float(1, self._scale))
+ self.cnvrt.append(blocks.char_to_float(1, self._scale))
# Set default labels based on file names
fname = f.split("/")[-1]
diff --git a/gr-qtgui/apps/gr_psd_plot_i b/gr-qtgui/apps/gr_psd_plot_i
index 022f4ee755..f27011be22 100755
--- a/gr-qtgui/apps/gr_psd_plot_i
+++ b/gr-qtgui/apps/gr_psd_plot_i
@@ -21,6 +21,7 @@
#
from gnuradio import gr
+from gnuradio import blocks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
import os, sys
@@ -91,7 +92,7 @@ class my_top_block(gr.top_block):
data = read_samples_and_pad(f, self._start,
self._nsamps, self._psd_size)
self.srcs.append(gr.vector_source_i(data))
- self.cnvrt.append(gr.int_to_float(1, self._scale))
+ self.cnvrt.append(blocks.int_to_float(1, self._scale))
# Set default labels based on file names
fname = f.split("/")[-1]
diff --git a/gr-qtgui/apps/gr_psd_plot_s b/gr-qtgui/apps/gr_psd_plot_s
index 905d8fde60..cd2d4a516e 100755
--- a/gr-qtgui/apps/gr_psd_plot_s
+++ b/gr-qtgui/apps/gr_psd_plot_s
@@ -91,7 +91,7 @@ class my_top_block(gr.top_block):
data = read_samples_and_pad(f, self._start,
self._nsamps, self._psd_size)
self.srcs.append(gr.vector_source_s(data))
- self.cnvrt.append(gr.short_to_float(1, self._scale))
+ self.cnvrt.append(blocks.short_to_float(1, self._scale))
# Set default labels based on file names
fname = f.split("/")[-1]
diff --git a/gr-qtgui/apps/gr_spectrogram_plot_b b/gr-qtgui/apps/gr_spectrogram_plot_b
index 41c1af521a..649c2834d6 100755
--- a/gr-qtgui/apps/gr_spectrogram_plot_b
+++ b/gr-qtgui/apps/gr_spectrogram_plot_b
@@ -21,6 +21,7 @@
#
from gnuradio import gr
+from gnuradio import blocks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
import os, sys
@@ -81,7 +82,7 @@ class my_top_block(gr.top_block):
self.qapp = QtGui.QApplication(sys.argv)
self.skip = gr.skiphead(gr.sizeof_float, self._start)
- self.add = gr.add_ff()
+ self.add = blocks.add_ff()
self.gui_snk = qtgui.waterfall_sink_f(self._psd_size, gr.firdes.WIN_BLACKMAN_hARRIS,
self._center_freq, self._samp_rate,
"GNU Radio Spectrogram Plot")
@@ -92,7 +93,7 @@ class my_top_block(gr.top_block):
data = read_samples_and_pad(f, self._start,
self._nsamps, self._psd_size)
self.srcs.append(gr.vector_source_b(data))
- self.cnvrt.append(gr.char_to_float(1, self._scale))
+ self.cnvrt.append(blocks.char_to_float(1, self._scale))
n += 1
self.connect(self.add, self.skip)
diff --git a/gr-qtgui/apps/gr_spectrogram_plot_c b/gr-qtgui/apps/gr_spectrogram_plot_c
index 28fa82f298..160072f27c 100755
--- a/gr-qtgui/apps/gr_spectrogram_plot_c
+++ b/gr-qtgui/apps/gr_spectrogram_plot_c
@@ -21,6 +21,7 @@
#
from gnuradio import gr
+from gnuradio import blocks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
import os, sys
@@ -80,7 +81,7 @@ class my_top_block(gr.top_block):
self.qapp = QtGui.QApplication(sys.argv)
self.skip = gr.skiphead(gr.sizeof_gr_complex, self._start)
- self.add = gr.add_cc()
+ self.add = blocks.add_cc()
self.gui_snk = qtgui.waterfall_sink_c(self._psd_size, gr.firdes.WIN_BLACKMAN_hARRIS,
self._center_freq, self._samp_rate,
"GNU Radio Spectrogram Plot")
diff --git a/gr-qtgui/apps/gr_spectrogram_plot_f b/gr-qtgui/apps/gr_spectrogram_plot_f
index d1bb73212a..3e799395b3 100755
--- a/gr-qtgui/apps/gr_spectrogram_plot_f
+++ b/gr-qtgui/apps/gr_spectrogram_plot_f
@@ -21,6 +21,7 @@
#
from gnuradio import gr
+from gnuradio import blocks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
import os, sys
@@ -80,7 +81,7 @@ class my_top_block(gr.top_block):
self.qapp = QtGui.QApplication(sys.argv)
self.skip = gr.skiphead(gr.sizeof_float, self._start)
- self.add = gr.add_ff()
+ self.add = blocks.add_ff()
self.gui_snk = qtgui.waterfall_sink_f(self._psd_size, gr.firdes.WIN_BLACKMAN_hARRIS,
self._center_freq, self._samp_rate,
"GNU Radio Spectrogram Plot")
diff --git a/gr-qtgui/apps/gr_spectrogram_plot_i b/gr-qtgui/apps/gr_spectrogram_plot_i
index a617f9087d..444f4115ad 100755
--- a/gr-qtgui/apps/gr_spectrogram_plot_i
+++ b/gr-qtgui/apps/gr_spectrogram_plot_i
@@ -21,6 +21,7 @@
#
from gnuradio import gr
+from gnuradio import blocks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
import os, sys
@@ -81,7 +82,7 @@ class my_top_block(gr.top_block):
self.qapp = QtGui.QApplication(sys.argv)
self.skip = gr.skiphead(gr.sizeof_float, self._start)
- self.add = gr.add_ff()
+ self.add = blocks.add_ff()
self.gui_snk = qtgui.waterfall_sink_f(self._psd_size, gr.firdes.WIN_BLACKMAN_hARRIS,
self._center_freq, self._samp_rate,
"GNU Radio Spectrogram Plot")
@@ -92,7 +93,7 @@ class my_top_block(gr.top_block):
data = read_samples_and_pad(f, self._start,
self._nsamps, self._psd_size)
self.srcs.append(gr.vector_source_i(data))
- self.cnvrt.append(gr.int_to_float(1, self._scale))
+ self.cnvrt.append(blocks.int_to_float(1, self._scale))
n += 1
self.connect(self.add, self.skip)
diff --git a/gr-qtgui/apps/gr_spectrogram_plot_s b/gr-qtgui/apps/gr_spectrogram_plot_s
index 29f3d3df77..bb3573ba2c 100755
--- a/gr-qtgui/apps/gr_spectrogram_plot_s
+++ b/gr-qtgui/apps/gr_spectrogram_plot_s
@@ -21,6 +21,7 @@
#
from gnuradio import gr
+from gnuradio import blocks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
import os, sys
@@ -81,7 +82,7 @@ class my_top_block(gr.top_block):
self.qapp = QtGui.QApplication(sys.argv)
self.skip = gr.skiphead(gr.sizeof_float, self._start)
- self.add = gr.add_ff()
+ self.add = blocks.add_ff()
self.gui_snk = qtgui.waterfall_sink_f(self._psd_size, gr.firdes.WIN_BLACKMAN_hARRIS,
self._center_freq, self._samp_rate,
"GNU Radio Spectrogram Plot")
@@ -92,7 +93,7 @@ class my_top_block(gr.top_block):
data = read_samples_and_pad(f, self._start,
self._nsamps, self._psd_size)
self.srcs.append(gr.vector_source_s(data))
- self.cnvrt.append(gr.short_to_float(1, self._scale))
+ self.cnvrt.append(blocks.short_to_float(1, self._scale))
n += 1
self.connect(self.add, self.skip)
diff --git a/gr-qtgui/apps/gr_time_plot_b b/gr-qtgui/apps/gr_time_plot_b
index 3ac583eef3..4b63c3fd11 100755
--- a/gr-qtgui/apps/gr_time_plot_b
+++ b/gr-qtgui/apps/gr_time_plot_b
@@ -21,6 +21,7 @@
#
from gnuradio import gr
+from gnuradio import blocks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
import os, sys
@@ -85,7 +86,7 @@ class gr_time_plot_f(gr.top_block):
for f in filelist:
data = read_samples(f, self._start, self._nsamps)
self.srcs.append(gr.vector_source_b(data))
- self.cnvrt.append(gr.char_to_float(1, self._scale))
+ self.cnvrt.append(blocks.char_to_float(1, self._scale))
# Set default labels based on file names
fname = f.split("/")[-1]
diff --git a/gr-qtgui/apps/gr_time_plot_i b/gr-qtgui/apps/gr_time_plot_i
index f9765db672..4895090a10 100755
--- a/gr-qtgui/apps/gr_time_plot_i
+++ b/gr-qtgui/apps/gr_time_plot_i
@@ -21,6 +21,7 @@
#
from gnuradio import gr
+from gnuradio import blocks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
import os, sys
@@ -85,7 +86,7 @@ class gr_time_plot_f(gr.top_block):
for f in filelist:
data = read_samples(f, self._start, self._nsamps)
self.srcs.append(gr.vector_source_i(data))
- self.cnvrt.append(gr.int_to_float(1, self._scale))
+ self.cnvrt.append(blocks.int_to_float(1, self._scale))
# Set default labels based on file names
fname = f.split("/")[-1]
diff --git a/gr-qtgui/apps/gr_time_plot_s b/gr-qtgui/apps/gr_time_plot_s
index 43b098dbdb..581190e6df 100755
--- a/gr-qtgui/apps/gr_time_plot_s
+++ b/gr-qtgui/apps/gr_time_plot_s
@@ -85,7 +85,7 @@ class gr_time_plot_f(gr.top_block):
for f in filelist:
data = read_samples(f, self._start, self._nsamps)
self.srcs.append(gr.vector_source_s(data))
- self.cnvrt.append(gr.short_to_float(1, self._scale))
+ self.cnvrt.append(blocks.short_to_float(1, self._scale))
# Set default labels based on file names
fname = f.split("/")[-1]
diff --git a/gr-qtgui/apps/uhd_display.py b/gr-qtgui/apps/uhd_display.py
index 250d757b6c..bca3126ce7 100755
--- a/gr-qtgui/apps/uhd_display.py
+++ b/gr-qtgui/apps/uhd_display.py
@@ -21,6 +21,8 @@
#
from gnuradio import gr
+from gnuradio import filter
+from gnuradio import blocks
from gnuradio import uhd
from gnuradio import eng_notation
from gnuradio.eng_option import eng_option
@@ -198,14 +200,14 @@ class my_top_block(gr.top_block):
True, True, True, False)
# Set up internal amplifier
- self.amp = gr.multiply_const_cc(0.0)
+ self.amp = blocks.multiply_const_cc(0.0)
self.set_amplifier_gain(100)
# Create a single-pole IIR filter to remove DC
# but don't connect it yet
self.dc_gain = 0.001
- self.dc = gr.single_pole_iir_filter_cc(self.dc_gain)
- self.dc_sub = gr.sub_cc()
+ self.dc = filter.single_pole_iir_filter_cc(self.dc_gain)
+ self.dc_sub = blocks.sub_cc()
self.connect(self.u, self.amp, self.snk)
diff --git a/gr-qtgui/examples/pyqt_const_c.py b/gr-qtgui/examples/pyqt_const_c.py
index 382fbdabee..e26ce0bd90 100755
--- a/gr-qtgui/examples/pyqt_const_c.py
+++ b/gr-qtgui/examples/pyqt_const_c.py
@@ -21,6 +21,7 @@
#
from gnuradio import gr, filter
+from gnuradio import blocks
import sys
try:
@@ -153,7 +154,7 @@ class my_top_block(gr.top_block):
src1 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f1, 0.5, 0)
src2 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f2, 0.5, 0)
- src = gr.add_cc()
+ src = blocks.add_cc()
channel = channels.channel_model(0.001)
thr = gr.throttle(gr.sizeof_gr_complex, 100*npts)
self.snk1 = qtgui.const_sink_c(npts, "Constellation Example", 1)
diff --git a/gr-qtgui/examples/pyqt_example_c.py b/gr-qtgui/examples/pyqt_example_c.py
index 3ed64b7003..ccacc246bf 100755
--- a/gr-qtgui/examples/pyqt_example_c.py
+++ b/gr-qtgui/examples/pyqt_example_c.py
@@ -21,6 +21,7 @@
#
from gnuradio import gr, filter
+from gnuradio import blocks
import sys
try:
@@ -157,7 +158,7 @@ class my_top_block(gr.top_block):
src1 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0)
src2 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0)
- src = gr.add_cc()
+ src = blocks.add_cc()
channel = channels.channel_model(0.001)
thr = gr.throttle(gr.sizeof_gr_complex, 100*fftsize)
self.snk1 = qtgui.sink_c(fftsize, filter.firdes.WIN_BLACKMAN_hARRIS,
diff --git a/gr-qtgui/examples/pyqt_example_f.py b/gr-qtgui/examples/pyqt_example_f.py
index 4e59d78001..f975bf0d1a 100755
--- a/gr-qtgui/examples/pyqt_example_f.py
+++ b/gr-qtgui/examples/pyqt_example_f.py
@@ -21,6 +21,7 @@
#
from gnuradio import gr, filter
+from gnuradio import blocks
import sys
try:
@@ -147,10 +148,10 @@ class my_top_block(gr.top_block):
src1 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0)
src2 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0)
- src = gr.add_ff()
+ src = blocks.add_ff()
thr = gr.throttle(gr.sizeof_float, 100*fftsize)
noise = analog.noise_source_f(analog.GR_GAUSSIAN, 0.001)
- add = gr.add_ff()
+ add = blocks.add_ff()
self.snk1 = qtgui.sink_f(fftsize, filter.firdes.WIN_BLACKMAN_hARRIS,
0, Rs,
"Float Signal Example",
diff --git a/gr-qtgui/examples/pyqt_freq_c.py b/gr-qtgui/examples/pyqt_freq_c.py
index a02ded898d..5941622130 100755
--- a/gr-qtgui/examples/pyqt_freq_c.py
+++ b/gr-qtgui/examples/pyqt_freq_c.py
@@ -21,6 +21,7 @@
#
from gnuradio import gr, filter
+from gnuradio import blocks
import sys
try:
@@ -157,7 +158,7 @@ class my_top_block(gr.top_block):
src1 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0)
src2 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0)
- src = gr.add_cc()
+ src = blocks.add_cc()
channel = channels.channel_model(0.01)
thr = gr.throttle(gr.sizeof_gr_complex, 100*npts)
self.snk1 = qtgui.freq_sink_c(npts, filter.firdes.WIN_BLACKMAN_hARRIS,
diff --git a/gr-qtgui/examples/pyqt_freq_f.py b/gr-qtgui/examples/pyqt_freq_f.py
index 79c1399a73..44d81314a4 100755
--- a/gr-qtgui/examples/pyqt_freq_f.py
+++ b/gr-qtgui/examples/pyqt_freq_f.py
@@ -21,6 +21,7 @@
#
from gnuradio import gr, filter
+from gnuradio import blocks
import sys
try:
@@ -148,7 +149,7 @@ class my_top_block(gr.top_block):
src1 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0)
src2 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0)
- src = gr.add_ff()
+ src = blocks.add_ff()
thr = gr.throttle(gr.sizeof_float, 100*npts)
self.snk1 = qtgui.freq_sink_f(npts, filter.firdes.WIN_BLACKMAN_hARRIS,
0, Rs,
diff --git a/gr-qtgui/examples/pyqt_time_c.py b/gr-qtgui/examples/pyqt_time_c.py
index 6eb97fa9eb..65d62c4167 100755
--- a/gr-qtgui/examples/pyqt_time_c.py
+++ b/gr-qtgui/examples/pyqt_time_c.py
@@ -21,6 +21,7 @@
#
from gnuradio import gr
+from gnuradio import blocks
import sys
try:
@@ -157,7 +158,7 @@ class my_top_block(gr.top_block):
src1 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0)
src2 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0)
- src = gr.add_cc()
+ src = blocks.add_cc()
channel = channels.channel_model(0.01)
thr = gr.throttle(gr.sizeof_gr_complex, 100*npts)
self.snk1 = qtgui.time_sink_c(npts, Rs,
diff --git a/gr-qtgui/examples/pyqt_time_f.py b/gr-qtgui/examples/pyqt_time_f.py
index d7119dcb93..e64d6fcfde 100755
--- a/gr-qtgui/examples/pyqt_time_f.py
+++ b/gr-qtgui/examples/pyqt_time_f.py
@@ -21,6 +21,7 @@
#
from gnuradio import gr
+from gnuradio import blocks
import sys
try:
@@ -147,10 +148,10 @@ class my_top_block(gr.top_block):
src1 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0)
src2 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0)
- src = gr.add_ff()
+ src = blocks.add_ff()
thr = gr.throttle(gr.sizeof_float, 100*npts)
noise = analog.noise_source_f(analog.GR_GAUSSIAN, 0.001)
- add = gr.add_ff()
+ add = blocks.add_ff()
self.snk1 = qtgui.time_sink_f(npts, Rs,
"Complex Time Example", 3)
diff --git a/gr-qtgui/examples/pyqt_waterfall_c.py b/gr-qtgui/examples/pyqt_waterfall_c.py
index 30931227b3..3fce9b9a5a 100755
--- a/gr-qtgui/examples/pyqt_waterfall_c.py
+++ b/gr-qtgui/examples/pyqt_waterfall_c.py
@@ -21,6 +21,7 @@
#
from gnuradio import gr, filter
+from gnuradio import blocks
import sys
try:
@@ -157,7 +158,7 @@ class my_top_block(gr.top_block):
src1 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0)
src2 = analog.sig_source_c(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0)
- src = gr.add_cc()
+ src = blocks.add_cc()
channel = channels.channel_model(0.01)
thr = gr.throttle(gr.sizeof_gr_complex, 100*npts)
self.snk1 = qtgui.waterfall_sink_c(npts, filter.firdes.WIN_BLACKMAN_hARRIS,
diff --git a/gr-qtgui/examples/pyqt_waterfall_f.py b/gr-qtgui/examples/pyqt_waterfall_f.py
index 725117d06b..1c4063e31b 100755
--- a/gr-qtgui/examples/pyqt_waterfall_f.py
+++ b/gr-qtgui/examples/pyqt_waterfall_f.py
@@ -21,6 +21,7 @@
#
from gnuradio import gr, filter
+from gnuradio import blocks
import sys
try:
@@ -147,7 +148,7 @@ class my_top_block(gr.top_block):
src1 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0)
src2 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0)
- src = gr.add_ff()
+ src = blocks.add_ff()
thr = gr.throttle(gr.sizeof_float, 100*npts)
self.snk1 = qtgui.waterfall_sink_f(npts, filter.firdes.WIN_BLACKMAN_hARRIS,
0, Rs,
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 15:15:36 +0000