summaryrefslogtreecommitdiff
path: root/gr-qtgui/examples
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-11-12 21:56:06 -0500
committerTom Rondeau <trondeau@vt.edu>2012-11-12 21:56:06 -0500
commit0613db37aa3d87eb3cce2841fa210abc6b7f9c22 (patch)
tree305ea14c939e945017bf9bc9510a44246b301076 /gr-qtgui/examples
parentbbbbf8b042c3443415ae766bf7b6a26134c0119d (diff)
qtgui: Fixed some build issues and made sure all qtgui examples work.
analog: also fixed having a default arg for noise_source seed in Python.
Diffstat (limited to 'gr-qtgui/examples')
-rwxr-xr-xgr-qtgui/examples/pyqt_const_c.py8
-rwxr-xr-xgr-qtgui/examples/pyqt_example_c.py8
-rwxr-xr-xgr-qtgui/examples/pyqt_example_f.py6
-rwxr-xr-xgr-qtgui/examples/pyqt_freq_c.py10
-rwxr-xr-xgr-qtgui/examples/pyqt_freq_f.py2
-rwxr-xr-xgr-qtgui/examples/pyqt_time_c.py10
-rwxr-xr-xgr-qtgui/examples/pyqt_waterfall_c.py8
-rwxr-xr-xgr-qtgui/examples/pyqt_waterfall_f.py2
8 files changed, 42 insertions, 12 deletions
diff --git a/gr-qtgui/examples/pyqt_const_c.py b/gr-qtgui/examples/pyqt_const_c.py
index cf81aa120f..382fbdabee 100755
--- a/gr-qtgui/examples/pyqt_const_c.py
+++ b/gr-qtgui/examples/pyqt_const_c.py
@@ -37,6 +37,12 @@ except ImportError:
sys.stderr.write("Error: Program requires gr-analog.\n")
sys.exit(1)
+try:
+ from gnuradio import channels
+except ImportError:
+ sys.stderr.write("Error: Program requires gr-channels.\n")
+ sys.exit(1)
+
class dialog_box(QtGui.QWidget):
def __init__(self, display, control):
QtGui.QWidget.__init__(self, None)
@@ -148,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()
- channel = filter.channel_model(0.001)
+ 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 294964479a..3ed64b7003 100755
--- a/gr-qtgui/examples/pyqt_example_c.py
+++ b/gr-qtgui/examples/pyqt_example_c.py
@@ -37,6 +37,12 @@ except ImportError:
sys.stderr.write("Error: Program requires gr-analog.\n")
sys.exit(1)
+try:
+ from gnuradio import channels
+except ImportError:
+ sys.stderr.write("Error: Program requires gr-channels.\n")
+ sys.exit(1)
+
class dialog_box(QtGui.QWidget):
def __init__(self, display, control):
QtGui.QWidget.__init__(self, None)
@@ -152,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()
- channel = filter.channel_model(0.001)
+ 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,
0, Rs,
diff --git a/gr-qtgui/examples/pyqt_example_f.py b/gr-qtgui/examples/pyqt_example_f.py
index d2b3d0eb26..4e59d78001 100755
--- a/gr-qtgui/examples/pyqt_example_f.py
+++ b/gr-qtgui/examples/pyqt_example_f.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr
+from gnuradio import gr, filter
import sys
try:
@@ -146,12 +146,12 @@ class my_top_block(gr.top_block):
self.qapp = QtGui.QApplication(sys.argv)
src1 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f1, 0.1, 0)
- src2 = analg.sig_source_f(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0)
+ src2 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0)
src = gr.add_ff()
thr = gr.throttle(gr.sizeof_float, 100*fftsize)
noise = analog.noise_source_f(analog.GR_GAUSSIAN, 0.001)
add = gr.add_ff()
- self.snk1 = qtgui.sink_f(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
+ self.snk1 = qtgui.sink_f(fftsize, filter.firdes.WIN_BLACKMAN_hARRIS,
0, Rs,
"Float Signal Example",
True, True, True, False)
diff --git a/gr-qtgui/examples/pyqt_freq_c.py b/gr-qtgui/examples/pyqt_freq_c.py
index 5f891f8935..a02ded898d 100755
--- a/gr-qtgui/examples/pyqt_freq_c.py
+++ b/gr-qtgui/examples/pyqt_freq_c.py
@@ -37,6 +37,12 @@ except ImportError:
sys.stderr.write("Error: Program requires gr-analog.\n")
sys.exit(1)
+try:
+ from gnuradio import channels
+except ImportError:
+ sys.stderr.write("Error: Program requires gr-channels.\n")
+ sys.exit(1)
+
class dialog_box(QtGui.QWidget):
def __init__(self, display, control):
QtGui.QWidget.__init__(self, None)
@@ -152,9 +158,9 @@ 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()
- channel = filter.channel_model(0.01)
+ channel = channels.channel_model(0.01)
thr = gr.throttle(gr.sizeof_gr_complex, 100*npts)
- self.snk1 = qtgui.freq_sink_c(npts, analog.firdes.WIN_BLACKMAN_hARRIS,
+ self.snk1 = qtgui.freq_sink_c(npts, filter.firdes.WIN_BLACKMAN_hARRIS,
0, Rs,
"Complex Freq Example", 3)
diff --git a/gr-qtgui/examples/pyqt_freq_f.py b/gr-qtgui/examples/pyqt_freq_f.py
index d276d11106..79c1399a73 100755
--- a/gr-qtgui/examples/pyqt_freq_f.py
+++ b/gr-qtgui/examples/pyqt_freq_f.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr
+from gnuradio import gr, filter
import sys
try:
diff --git a/gr-qtgui/examples/pyqt_time_c.py b/gr-qtgui/examples/pyqt_time_c.py
index ba5980a050..6eb97fa9eb 100755
--- a/gr-qtgui/examples/pyqt_time_c.py
+++ b/gr-qtgui/examples/pyqt_time_c.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, filter
+from gnuradio import gr
import sys
try:
@@ -37,6 +37,12 @@ except ImportError:
sys.stderr.write("Error: Program requires gr-analog.\n")
sys.exit(1)
+try:
+ from gnuradio import channels
+except ImportError:
+ sys.stderr.write("Error: Program requires gr-channels.\n")
+ sys.exit(1)
+
class dialog_box(QtGui.QWidget):
def __init__(self, display, control):
QtGui.QWidget.__init__(self, None)
@@ -152,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()
- channel = filter.channel_model(0.01)
+ channel = channels.channel_model(0.01)
thr = gr.throttle(gr.sizeof_gr_complex, 100*npts)
self.snk1 = qtgui.time_sink_c(npts, Rs,
"Complex Time Example", 1)
diff --git a/gr-qtgui/examples/pyqt_waterfall_c.py b/gr-qtgui/examples/pyqt_waterfall_c.py
index eb7e731dfd..30931227b3 100755
--- a/gr-qtgui/examples/pyqt_waterfall_c.py
+++ b/gr-qtgui/examples/pyqt_waterfall_c.py
@@ -37,6 +37,12 @@ except ImportError:
sys.stderr.write("Error: Program requires gr-analog.\n")
sys.exit(1)
+try:
+ from gnuradio import channels
+except ImportError:
+ sys.stderr.write("Error: Program requires gr-channels.\n")
+ sys.exit(1)
+
class dialog_box(QtGui.QWidget):
def __init__(self, display, control):
QtGui.QWidget.__init__(self, None)
@@ -152,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()
- channel = filter.channel_model(0.01)
+ 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,
0, Rs,
diff --git a/gr-qtgui/examples/pyqt_waterfall_f.py b/gr-qtgui/examples/pyqt_waterfall_f.py
index ff79924843..725117d06b 100755
--- a/gr-qtgui/examples/pyqt_waterfall_f.py
+++ b/gr-qtgui/examples/pyqt_waterfall_f.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr
+from gnuradio import gr, filter
import sys
try: