forked from pool/gnuradio
73 lines
2.4 KiB
Diff
73 lines
2.4 KiB
Diff
From 18f5edf38cc6a24836f943d6976d913a4f35cab3 Mon Sep 17 00:00:00 2001
|
|
From: "A. Maitland Bottoms" <bottoms@debian.org>
|
|
Date: Sun, 25 Feb 2018 13:28:05 -0500
|
|
Subject: [PATCH 22/22] gr uhd qt5
|
|
|
|
---
|
|
gr-uhd/apps/uhd_fft | 8 ++++----
|
|
gr-uhd/apps/uhd_siggen_gui | 10 +++++-----
|
|
2 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
--- a/gr-uhd/apps/uhd_fft
|
|
+++ b/gr-uhd/apps/uhd_fft
|
|
@@ -40,7 +40,7 @@
|
|
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
|
|
@@ -478,8 +478,8 @@
|
|
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'))
|
|
+ #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()
|
|
@@ -487,7 +487,7 @@
|
|
def quitting():
|
|
tb.stop()
|
|
tb.wait()
|
|
- qapp.connect(qapp, Qt.SIGNAL("aboutToQuit()"), quitting)
|
|
+ qapp.aboutToQuit.connect(quitting)
|
|
qapp.exec_()
|
|
tb = None #to clean up Qt widgets
|
|
|
|
--- a/gr-uhd/apps/uhd_siggen_gui
|
|
+++ b/gr-uhd/apps/uhd_siggen_gui
|
|
@@ -38,8 +38,8 @@
|
|
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
|
|
@@ -448,14 +448,14 @@
|
|
""" 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'))
|
|
+ #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():
|
|
siggen_gui.stop()
|
|
- qapp.connect(qapp, Qt.SIGNAL("aboutToQuit()"), quitting)
|
|
+ qapp.aboutToQuit.connect(quitting)
|
|
qapp.exec_()
|
|
siggen_gui = None #to clean up Qt widgets
|
|
|