diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-11-13 15:27:06 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-11-15 15:40:37 -0800 |
| commit | 3f6ad6a74ce92915e1daac763a68c323846ca71c (patch) | |
| tree | 1bd069b7ca1282715d12ebfd725785c417764258 /gr-uhd | |
| parent | 273bbfb51d2db8f9b7481532d97bf6802596e6f2 (diff) | |
uhd: Fix UHD apps to use Qt5
Qt4 no longer supported.
Diffstat (limited to 'gr-uhd')
| -rwxr-xr-x | gr-uhd/apps/uhd_fft | 19 | ||||
| -rwxr-xr-x | gr-uhd/apps/uhd_siggen_gui | 13 |
2 files changed, 17 insertions, 15 deletions
diff --git a/gr-uhd/apps/uhd_fft b/gr-uhd/apps/uhd_fft index 42d7efd341..84be89bd2c 100755 --- a/gr-uhd/apps/uhd_fft +++ b/gr-uhd/apps/uhd_fft @@ -40,7 +40,7 @@ import sip import threading import time from distutils.version import StrictVersion -from PyQt4 import Qt +from PyQt5 import Qt from gnuradio import eng_notation from gnuradio import eng_arg from gnuradio import gr @@ -54,7 +54,7 @@ except ImportError: from gnuradio.uhd.uhd_app import UHDApp -class uhd_fft(gr.top_block, Qt.QWidget, UHDApp): +class uhd_fft(UHDApp, gr.top_block, Qt.QWidget): """ Simple UHD Spectrum Analyzer / Scope App. """ @@ -82,7 +82,7 @@ class uhd_fft(gr.top_block, Qt.QWidget, UHDApp): self.top_grid_layout = Qt.QGridLayout() self.top_layout.addLayout(self.top_grid_layout) self.settings = Qt.QSettings("GNU Radio", "uhd_fft") - self.restoreGeometry(self.settings.value("geometry").toByteArray()) + self.restoreGeometry(self.settings.value("geometry")) ################################################## # Parameters @@ -139,7 +139,7 @@ class uhd_fft(gr.top_block, Qt.QWidget, UHDApp): self._samp_rate__line_edit = Qt.QLineEdit(eng_notation.num_to_str(self.samp_rate)) self._samp_rate__tool_bar.addWidget(self._samp_rate__line_edit) self._samp_rate__line_edit.returnPressed.connect( - lambda: self.set_samp_rate(eng_notation.str_to_num(str(self._samp_rate__line_edit.text().toAscii())))) + lambda: self.set_samp_rate(eng_notation.str_to_num(str(self._samp_rate__line_edit.text())))) self.top_grid_layout.addWidget(self._samp_rate__tool_bar, 3, 2, 1, 2) # Gain: self._gain__range = Range( @@ -157,7 +157,7 @@ class uhd_fft(gr.top_block, Qt.QWidget, UHDApp): self._freq_line_edit = Qt.QLineEdit(eng_notation.num_to_str(self.freq)) self._freq_tool_bar.addWidget(self._freq_line_edit) self._freq_line_edit.returnPressed.connect( - lambda: self.set_freq_qt(eng_notation.str_to_num(str(self._freq_line_edit.text().toAscii())))) + lambda: self.set_freq_qt(eng_notation.str_to_num(str(self._freq_line_edit.text())))) self.top_grid_layout.addWidget(self._freq_tool_bar, 3,0,1,2) # Antenna Selection: self._ant_labels = self._ant_options @@ -484,16 +484,19 @@ def main(): Go, go, go! """ args = setup_argparser().parse_args() - if StrictVersion(Qt.qVersion()) >= StrictVersion("4.5.0"): - Qt.QApplication.setGraphicsSystem(gr.prefs().get_string('qtgui','style','raster')) qapp = Qt.QApplication(sys.argv) tb = uhd_fft(args) tb.start() tb.show() def quitting(): + """ + Action ('Slot' in Qt lingo) to close the flow graph when the Qt window + is closed. + """ + print("\nStopping flowgraph...") tb.stop() tb.wait() - qapp.connect(qapp, Qt.SIGNAL("aboutToQuit()"), quitting) + qapp.aboutToQuit.connect(quitting) qapp.exec_() tb = None #to clean up Qt widgets diff --git a/gr-uhd/apps/uhd_siggen_gui b/gr-uhd/apps/uhd_siggen_gui index d29ca20322..422a6146c4 100755 --- a/gr-uhd/apps/uhd_siggen_gui +++ b/gr-uhd/apps/uhd_siggen_gui @@ -38,8 +38,8 @@ import sys import threading import time from distutils.version import StrictVersion -from PyQt4 import Qt -from PyQt4.QtCore import pyqtSlot +from PyQt5 import Qt +from PyQt5.QtCore import pyqtSlot from gnuradio import analog from gnuradio import eng_notation from gnuradio import gr @@ -85,7 +85,7 @@ class uhd_siggen_gui(Qt.QWidget): self.top_grid_layout = Qt.QGridLayout() self.top_layout.addLayout(self.top_grid_layout) self.settings = Qt.QSettings("GNU Radio", "uhd_siggen_gui") - self.restoreGeometry(self.settings.value("geometry").toByteArray()) + self.restoreGeometry(self.settings.value("geometry")) ################################################## # Widgets + Controls @@ -230,7 +230,7 @@ class uhd_siggen_gui(Qt.QWidget): self._samp_rate_line_edit = Qt.QLineEdit(eng_notation.num_to_str(self._sg[uhd_siggen.SAMP_RATE_KEY])) self._samp_rate_tool_bar.addWidget(self._samp_rate_line_edit) self._samp_rate_line_edit.returnPressed.connect( - lambda: self.set_samp_rate(eng_notation.str_to_num(str(self._samp_rate_line_edit.text().toAscii()))) + lambda: self.set_samp_rate(eng_notation.str_to_num(str(self._samp_rate_line_edit.text()))) ) self.top_grid_layout.addWidget(self._samp_rate_tool_bar, 7,0,1,2) _sync_phases_push_button = Qt.QPushButton("Sync LOs") @@ -448,14 +448,13 @@ def main(): """ Go, go, go! """ parser = setup_parser() args = parser.parse_args() - if StrictVersion(Qt.qVersion()) >= StrictVersion("4.5.0"): - Qt.QApplication.setGraphicsSystem(gr.prefs().get_string('qtgui', 'style', 'raster')) qapp = Qt.QApplication(sys.argv) siggen_gui = uhd_siggen_gui(args) siggen_gui.show() def quitting(): + print("\nStopping flowgraph...") siggen_gui.stop() - qapp.connect(qapp, Qt.SIGNAL("aboutToQuit()"), quitting) + qapp.aboutToQuit.connect(quitting) qapp.exec_() siggen_gui = None #to clean up Qt widgets |