summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2021-01-24 20:08:38 +0100
committerMartin Braun <martin@gnuradio.org>2021-03-16 08:22:08 -0700
commitcb9fe59e3abe58e97f1408f1d57885aef22814fe (patch)
treedb4d6000f750b821cabeeda4b2d9109d0758f39c
parent1eec7a36d530b8f079f6b43594a721412a4ad958 (diff)
uhd: Fix Qt apps (XInitThreads call order, terminate handling)
uhd_fft and uhd_siggen_gui are standalone apps that, a long time ago, were spun off from GRC apps. In the last years, there were some fixes to Qt apps that haven't yet made it into these two UHD apps: - 0cc238fb: Better terminate handling - 40f5e6cd: XInitThreads() as early as possible. This was accidentally moved downwards as part of refactoring in 77871a9b. Signed-off-by: Martin Braun <martin.braun@ettus.com>
Diffstat
-rwxr-xr-xgr-uhd/apps/uhd_fft54
-rwxr-xr-xgr-uhd/apps/uhd_siggen_gui55
2 files changed, 65 insertions, 44 deletions
diff --git a/gr-uhd/apps/uhd_fft b/gr-uhd/apps/uhd_fft
index a71d0b1006..adb63c9209 100755
--- a/gr-uhd/apps/uhd_fft
+++ b/gr-uhd/apps/uhd_fft
@@ -24,13 +24,23 @@ UHD FFT: Simple Spectrum Analyzer for UHD.
# I prefer grouping the imports myself in this case, due to all the special cases
# pylint: disable=wrong-import-order
+# pylint: disable=wrong-import-position
# pylint: disable=ungrouped-imports
-import ctypes
import sys
+if __name__ == '__main__':
+ import ctypes
+ if sys.platform.startswith('linux'):
+ try:
+ X11 = ctypes.cdll.LoadLibrary('libX11.so')
+ X11.XInitThreads()
+ except:
+ print("Warning: failed to XInitThreads()")
+
import threading
import time
import math
+import signal
from PyQt5 import Qt
import sip # Needs to be imported after PyQt5, could fail otherwise
from gnuradio import eng_notation
@@ -100,10 +110,10 @@ class uhd_fft(UHDApp, gr.top_block, Qt.QWidget):
##################################################
# Variables
##################################################
- self.chan0_lo_locked = chan0_lo_locked = uhd.sensor_value("", False, "", "")
+ self.chan0_lo_locked = uhd.sensor_value("", False, "", "")
self.usrp_device_info = "[No USRP Device Info Found!]"
self.uhd_version_info = uhd.get_version_string()
- self.lo_locked_probe = chan0_lo_locked.to_bool()
+ self.lo_locked_probe = self.chan0_lo_locked.to_bool()
self.fft_average = 1.0
if args.avg_alpha is not None:
if args.avg_alpha < 0.0 or args.avg_alpha > 1.0:
@@ -441,11 +451,16 @@ class uhd_fft(UHDApp, gr.top_block, Qt.QWidget):
self.connect(src_port1, (multiplier, 0), blocks.complex_to_arg(), dst_port)
self.connect(src_port2, blocks.conjugate_cc(), (multiplier, 1))
+ # This is a Qt name:
+ # pylint: disable=invalid-name
def closeEvent(self, event):
""" Execute when window closes """
self.settings = Qt.QSettings("GNU Radio", "uhd_fft")
self.settings.setValue("geometry", self.saveGeometry())
+ self.stop()
+ self.wait()
event.accept()
+ # pylint: enable=invalid-name
def set_antenna(self, antenna):
""" Execute when antenna changes """
@@ -557,26 +572,21 @@ def main():
"""
args = setup_argparser().parse_args()
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.aboutToQuit.connect(quitting)
+ top_block = uhd_fft(args)
+ top_block.start()
+ top_block.show()
+ # Make sure SIGINT/SIGTERM handling is enabled
+ # pylint: disable=unused-argument
+ def sig_handler(sig=None, frame=None):
+ top_block.stop()
+ top_block.wait()
+ Qt.QApplication.quit()
+ signal.signal(signal.SIGINT, sig_handler)
+ signal.signal(signal.SIGTERM, sig_handler)
+ timer = Qt.QTimer()
+ timer.start(500)
+ timer.timeout.connect(lambda: None)
qapp.exec_()
- tb = None #to clean up Qt widgets
if __name__ == '__main__':
- if sys.platform.startswith('linux'):
- try:
- X11 = ctypes.cdll.LoadLibrary('libX11.so')
- X11.XInitThreads()
- except:
- print("Warning: failed to XInitThreads()")
main()
diff --git a/gr-uhd/apps/uhd_siggen_gui b/gr-uhd/apps/uhd_siggen_gui
index 5b0b48a57a..cea90f2f42 100755
--- a/gr-uhd/apps/uhd_siggen_gui
+++ b/gr-uhd/apps/uhd_siggen_gui
@@ -20,8 +20,21 @@ Signal Generator App
# Generated: Sun Jun 28 17:21:28 2015
##################################################
+# I prefer grouping the imports myself in this case, due to all the special cases
+# pylint: disable=wrong-import-order
+# pylint: disable=wrong-import-position
+# pylint: disable=ungrouped-imports
import sys
+if __name__ == '__main__':
+ import ctypes
+ if sys.platform.startswith('linux'):
+ try:
+ X11 = ctypes.cdll.LoadLibrary('libX11.so')
+ X11.XInitThreads()
+ except:
+ print("Warning: failed to XInitThreads()")
import threading
+import signal
import time
import math
from PyQt5 import Qt
@@ -32,7 +45,6 @@ from gnuradio import eng_notation
from gnuradio import qtgui
from gnuradio import uhd
from gnuradio import fft
-from gnuradio.filter import firdes
from gnuradio.qtgui import Range, RangeWidget
try:
import uhd_siggen_base as uhd_siggen
@@ -227,10 +239,12 @@ class uhd_siggen_gui(Qt.QWidget):
self.samp_rate = self._sg[uhd_siggen.SAMP_RATE_KEY]
self._samp_rate_tool_bar = Qt.QToolBar(self)
self._samp_rate_tool_bar.addWidget(Qt.QLabel("Sampling Rate: "))
- self._samp_rate_line_edit = Qt.QLineEdit(eng_notation.num_to_str(self._sg[uhd_siggen.SAMP_RATE_KEY]))
+ 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())))
+ 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")
@@ -250,7 +264,8 @@ class uhd_siggen_gui(Qt.QWidget):
Qt.Q_ARG("int", self._ant_options.index(i))
)
self._ant_callback(self.usrp.get_antenna(self._sg.channels[0]))
- self._ant_combo_box.currentIndexChanged.connect(lambda i: self.set_ant(self._ant_options[i]))
+ self._ant_combo_box.currentIndexChanged.connect(
+ lambda i: self.set_ant(self._ant_options[i]))
self.top_grid_layout.addWidget(self._ant_tool_bar, 7, 4, 1, 1)
# Labels + Lock Sensors
self._lo_locked_probe_0_tool_bar = Qt.QToolBar(self)
@@ -277,14 +292,16 @@ class uhd_siggen_gui(Qt.QWidget):
self._label_rf_freq_tool_bar = Qt.QToolBar(self)
self._label_rf_freq_formatter = lambda x: x
self._label_rf_freq_tool_bar.addWidget(Qt.QLabel("LO freq: "))
- self._label_rf_freq_label = Qt.QLabel(str(self._label_rf_freq_formatter(self.label_rf_freq)))
+ self._label_rf_freq_label = \
+ Qt.QLabel(str(self._label_rf_freq_formatter(self.label_rf_freq)))
self._label_rf_freq_tool_bar.addWidget(self._label_rf_freq_label)
self.top_grid_layout.addWidget(self._label_rf_freq_tool_bar, 8, 1, 1, 1)
self.label_dsp_freq = self._sg.tr.actual_dsp_freq
self._label_dsp_freq_tool_bar = Qt.QToolBar(self)
self._label_dsp_freq_formatter = lambda x: x
self._label_dsp_freq_tool_bar.addWidget(Qt.QLabel("DSP Freq: "))
- self._label_dsp_freq_label = Qt.QLabel(str(self._label_dsp_freq_formatter(self.label_dsp_freq)))
+ self._label_dsp_freq_label = \
+ Qt.QLabel(str(self._label_dsp_freq_formatter(self.label_dsp_freq)))
self._label_dsp_freq_tool_bar.addWidget(self._label_dsp_freq_label)
self.top_grid_layout.addWidget(self._label_dsp_freq_tool_bar, 8, 2, 1, 1)
##################################################
@@ -327,6 +344,8 @@ class uhd_siggen_gui(Qt.QWidget):
""" Qt closeEvent() """
self.settings = Qt.QSettings("GNU Radio", "uhd_siggen_gui")
self.settings.setValue("geometry", self.saveGeometry())
+ self._sg.stop()
+ self._sg.wait()
event.accept()
def stop(self):
@@ -484,24 +503,16 @@ def main():
qapp = Qt.QApplication(sys.argv)
siggen_gui = uhd_siggen_gui(args)
siggen_gui.show()
- def quitting():
- print("\nStopping flowgraph...")
+ # pylint: disable=unused-argument
+ def sig_handler(sig=None, frame=None):
siggen_gui.stop()
- qapp.aboutToQuit.connect(quitting)
+ Qt.QApplication.quit()
+ signal.signal(signal.SIGINT, sig_handler)
+ signal.signal(signal.SIGTERM, sig_handler)
+ timer = Qt.QTimer()
+ timer.start(500)
+ timer.timeout.connect(lambda: None)
qapp.exec_()
- siggen_gui = None #to clean up Qt widgets
-
-def x11_init_threads():
- " If on X11, init threads "
- if sys.platform.startswith('linux'):
- try:
- # pylint: disable=import-outside-toplevel
- import ctypes
- x11 = ctypes.cdll.LoadLibrary('libX11.so')
- x11.XInitThreads()
- except:
- print("Warning: failed to XInitThreads()")
if __name__ == '__main__':
- x11_init_threads()
main()
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-24 09:15:41 +0000