62 lines
2.3 KiB
Diff
62 lines
2.3 KiB
Diff
From b12439f3f600b9d0be03189e8a82310d9ceabdd6 Mon Sep 17 00:00:00 2001
|
|
From: "A. Maitland Bottoms" <bottoms@debian.org>
|
|
Date: Sun, 25 Feb 2018 13:27:38 -0500
|
|
Subject: [PATCH 21/22] gnuradio runtime ctrlport qt5
|
|
|
|
---
|
|
gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py | 4 ++--
|
|
gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor | 4 ++--
|
|
gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx | 4 ++--
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
|
|
index c5bfd0a8cb..6d78565b3b 100644
|
|
--- a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
|
|
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py
|
|
@@ -28,10 +28,10 @@ import sys, time, struct
|
|
|
|
try:
|
|
from gnuradio import qtgui
|
|
- from PyQt4 import QtGui, QtCore
|
|
+ from PyQt5 import QtGui, QtCore
|
|
import sip
|
|
except ImportError:
|
|
- print "Error: Program requires PyQt4 and gr-qtgui."
|
|
+ sys.stderr.write("Error: Program requires PyQt5 and gr-qtgui.\n")
|
|
sys.exit(1)
|
|
|
|
class GrDataPlotParent(gr.top_block, QtGui.QWidget):
|
|
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor
|
|
index c866776355..ce53c60c0e 100644
|
|
--- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor
|
|
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor
|
|
@@ -20,8 +20,8 @@
|
|
# Boston, MA 02110-1301, USA.
|
|
#
|
|
|
|
-from PyQt4 import QtCore,Qt
|
|
-import PyQt4.QtGui as QtGui
|
|
+from PyQt5 import QtCore,Qt
|
|
+import PyQt5.QtGui as QtGui
|
|
import os, sys, time, struct
|
|
|
|
from gnuradio import gr, ctrlport
|
|
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
|
|
index 15a2153a0f..a9e43bff41 100644
|
|
--- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
|
|
+++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
|
|
@@ -46,8 +46,8 @@ except ImportError:
|
|
"Please check that they are installed and try again."
|
|
sys.exit(1)
|
|
|
|
-from PyQt4 import QtCore,Qt
|
|
-import PyQt4.QtGui as QtGui
|
|
+from PyQt5 import QtCore,Qt
|
|
+import PyQt5.QtGui as QtGui
|
|
import itertools
|
|
|
|
from gnuradio import gr, ctrlport
|
|
--
|
|
2.11.0
|
|
|