diff --git a/PKGBUILD b/PKGBUILD index 0239e63..baee1dc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ pkgdesc="Spectrum analyzer for multiple SDR platforms (PyQtGraph based GUI for s arch=('any') url="https://github.com/xmikos/qspectrumanalyzer" license=('GPL3') -depends=('python-pyqt4' 'python-pyqtgraph' 'soapy_power') +depends=('python-pyqt5' 'python-pyqtgraph' 'soapy_power') makedepends=('python-setuptools') optdepends=( 'rtl_power_fftw-git: alternative RTL-SDR backend using FFTW library (much faster than rtl_power)' diff --git a/README.rst b/README.rst index e2e1c13..a213a0d 100644 --- a/README.rst +++ b/README.rst @@ -15,7 +15,8 @@ Requirements ------------ - Python >= 3.3 -- PyQt >= 4.5 +- PyQt4 / PyQt5 / PySide / PySide2 +- Qt.py (https://github.com/mottosso/Qt.py) - PyQtGraph (http://www.pyqtgraph.org) - soapy_power (https://github.com/xmikos/soapy_power) - Optional: rx_tools / rtl-sdr / rtl_power_fftw / hackrf @@ -127,7 +128,7 @@ Ubuntu: sudo apt-get update # Install basic dependencies - sudo apt-get install python3-pip python3-pyqt4 python3-numpy soapysdr python3-soapysdr + sudo apt-get install python3-pip python3-pyqt5 python3-numpy python3-scipy soapysdr python3-soapysdr # Install SoapySDR drivers for your hardware (e.g. RTL-SDR, Airspy, HackRF, LimeSDR, etc.) sudo apt-get install soapysdr-module-rtlsdr soapysdr-module-airspy soapysdr-module-hackrf soapysdr-module-lms7 diff --git a/qspectrumanalyzer/__main__.py b/qspectrumanalyzer/__main__.py index 086c546..9165ba1 100755 --- a/qspectrumanalyzer/__main__.py +++ b/qspectrumanalyzer/__main__.py @@ -2,7 +2,7 @@ import sys, signal, time -from PyQt4 import QtCore, QtGui +from Qt import QtCore, QtGui, QtWidgets, __binding__ from qspectrumanalyzer import backends from qspectrumanalyzer.version import __version__ @@ -22,7 +22,7 @@ signal.signal(signal.SIGINT, signal.SIG_DFL) signal.signal(signal.SIGTERM, signal.SIG_DFL) -class QSpectrumAnalyzerSettings(QtGui.QDialog, Ui_QSpectrumAnalyzerSettings): +class QSpectrumAnalyzerSettings(QtWidgets.QDialog, Ui_QSpectrumAnalyzerSettings): """QSpectrumAnalyzer settings dialog""" def __init__(self, parent=None): # Initialize UI @@ -59,14 +59,14 @@ class QSpectrumAnalyzerSettings(QtGui.QDialog, Ui_QSpectrumAnalyzerSettings): self.backendComboBox.setCurrentIndex(i) self.backendComboBox.blockSignals(False) - @QtCore.pyqtSlot() + @QtCore.Slot() def on_executableButton_clicked(self): """Open file dialog when button is clicked""" - filename = QtGui.QFileDialog.getOpenFileName(self, self.tr("Select executable - QSpectrumAnalyzer")) + filename = QtWidgets.QFileDialog.getOpenFileName(self, self.tr("Select executable - QSpectrumAnalyzer"))[0] if filename: self.executableEdit.setText(filename) - @QtCore.pyqtSlot() + @QtCore.Slot() def on_helpButton_clicked(self): """Open help dialog when button is clicked""" try: @@ -83,7 +83,7 @@ class QSpectrumAnalyzerSettings(QtGui.QDialog, Ui_QSpectrumAnalyzerSettings): self.help_dialog.raise_() self.help_dialog.activateWindow() - @QtCore.pyqtSlot(str) + @QtCore.Slot(str) def on_backendComboBox_currentIndexChanged(self, text): """Change executable when backend is changed""" self.executableEdit.setText(text) @@ -108,10 +108,10 @@ class QSpectrumAnalyzerSettings(QtGui.QDialog, Ui_QSpectrumAnalyzerSettings): settings.setValue("params", self.paramsEdit.text()) settings.setValue("sample_rate", self.sampleRateSpinBox.value()) settings.setValue("backend", self.backendComboBox.currentText()) - QtGui.QDialog.accept(self) + QtWidgets.QDialog.accept(self) -class QSpectrumAnalyzerSettingsHelp(QtGui.QDialog, Ui_QSpectrumAnalyzerSettingsHelp): +class QSpectrumAnalyzerSettingsHelp(QtWidgets.QDialog, Ui_QSpectrumAnalyzerSettingsHelp): """QSpectrumAnalyzer settings help dialog""" def __init__(self, text, parent=None): # Initialize UI @@ -124,7 +124,7 @@ class QSpectrumAnalyzerSettingsHelp(QtGui.QDialog, Ui_QSpectrumAnalyzerSettingsH self.helpTextEdit.setPlainText(text) -class QSpectrumAnalyzerSmooth(QtGui.QDialog, Ui_QSpectrumAnalyzerSmooth): +class QSpectrumAnalyzerSmooth(QtWidgets.QDialog, Ui_QSpectrumAnalyzerSmooth): """QSpectrumAnalyzer spectrum smoothing dialog""" def __init__(self, parent=None): # Initialize UI @@ -147,10 +147,10 @@ class QSpectrumAnalyzerSmooth(QtGui.QDialog, Ui_QSpectrumAnalyzerSmooth): settings = QtCore.QSettings() settings.setValue("smooth_length", self.windowLengthSpinBox.value()) settings.setValue("smooth_window", self.windowFunctionComboBox.currentText()) - QtGui.QDialog.accept(self) + QtWidgets.QDialog.accept(self) -class QSpectrumAnalyzerPersistence(QtGui.QDialog, Ui_QSpectrumAnalyzerPersistence): +class QSpectrumAnalyzerPersistence(QtWidgets.QDialog, Ui_QSpectrumAnalyzerPersistence): """QSpectrumAnalyzer spectrum persistence dialog""" def __init__(self, parent=None): # Initialize UI @@ -173,10 +173,10 @@ class QSpectrumAnalyzerPersistence(QtGui.QDialog, Ui_QSpectrumAnalyzerPersistenc settings = QtCore.QSettings() settings.setValue("persistence_length", self.persistenceLengthSpinBox.value()) settings.setValue("persistence_decay", self.decayFunctionComboBox.currentText()) - QtGui.QDialog.accept(self) + QtWidgets.QDialog.accept(self) -class QSpectrumAnalyzerColors(QtGui.QDialog, Ui_QSpectrumAnalyzerColors): +class QSpectrumAnalyzerColors(QtWidgets.QDialog, Ui_QSpectrumAnalyzerColors): """QSpectrumAnalyzer colors dialog""" def __init__(self, parent=None): # Initialize UI @@ -199,10 +199,10 @@ class QSpectrumAnalyzerColors(QtGui.QDialog, Ui_QSpectrumAnalyzerColors): settings.setValue("peak_hold_min_color", color_to_str(self.peakHoldMinColorButton.color())) settings.setValue("average_color", color_to_str(self.averageColorButton.color())) settings.setValue("persistence_color", color_to_str(self.persistenceColorButton.color())) - QtGui.QDialog.accept(self) + QtWidgets.QDialog.accept(self) -class QSpectrumAnalyzerMainWindow(QtGui.QMainWindow, Ui_QSpectrumAnalyzerMainWindow): +class QSpectrumAnalyzerMainWindow(QtWidgets.QMainWindow, Ui_QSpectrumAnalyzerMainWindow): """QSpectrumAnalyzer main window""" def __init__(self, parent=None): # Initialize UI @@ -441,47 +441,47 @@ class QSpectrumAnalyzerMainWindow(QtGui.QMainWindow, Ui_QSpectrumAnalyzerMainWin if self.power_thread.alive: self.power_thread.stop() - @QtCore.pyqtSlot() + @QtCore.Slot() def on_startButton_clicked(self): self.start() - @QtCore.pyqtSlot() + @QtCore.Slot() def on_singleShotButton_clicked(self): self.start(single_shot=True) - @QtCore.pyqtSlot() + @QtCore.Slot() def on_stopButton_clicked(self): self.stop() - @QtCore.pyqtSlot(bool) + @QtCore.Slot(bool) def on_mainCurveCheckBox_toggled(self, checked): self.spectrumPlotWidget.main_curve = checked if self.spectrumPlotWidget.curve.xData is None: self.spectrumPlotWidget.update_plot(self.data_storage) self.spectrumPlotWidget.curve.setVisible(checked) - @QtCore.pyqtSlot(bool) + @QtCore.Slot(bool) def on_peakHoldMaxCheckBox_toggled(self, checked): self.spectrumPlotWidget.peak_hold_max = checked if self.spectrumPlotWidget.curve_peak_hold_max.xData is None: self.spectrumPlotWidget.update_peak_hold_max(self.data_storage) self.spectrumPlotWidget.curve_peak_hold_max.setVisible(checked) - @QtCore.pyqtSlot(bool) + @QtCore.Slot(bool) def on_peakHoldMinCheckBox_toggled(self, checked): self.spectrumPlotWidget.peak_hold_min = checked if self.spectrumPlotWidget.curve_peak_hold_min.xData is None: self.spectrumPlotWidget.update_peak_hold_min(self.data_storage) self.spectrumPlotWidget.curve_peak_hold_min.setVisible(checked) - @QtCore.pyqtSlot(bool) + @QtCore.Slot(bool) def on_averageCheckBox_toggled(self, checked): self.spectrumPlotWidget.average = checked if self.spectrumPlotWidget.curve_average.xData is None: self.spectrumPlotWidget.update_average(self.data_storage) self.spectrumPlotWidget.curve_average.setVisible(checked) - @QtCore.pyqtSlot(bool) + @QtCore.Slot(bool) def on_persistenceCheckBox_toggled(self, checked): self.spectrumPlotWidget.persistence = checked if self.spectrumPlotWidget.persistence_curves[0].xData is None: @@ -489,7 +489,7 @@ class QSpectrumAnalyzerMainWindow(QtGui.QMainWindow, Ui_QSpectrumAnalyzerMainWin for curve in self.spectrumPlotWidget.persistence_curves: curve.setVisible(checked) - @QtCore.pyqtSlot(bool) + @QtCore.Slot(bool) def on_smoothCheckBox_toggled(self, checked): settings = QtCore.QSettings() self.data_storage.set_smooth( @@ -499,7 +499,7 @@ class QSpectrumAnalyzerMainWindow(QtGui.QMainWindow, Ui_QSpectrumAnalyzerMainWin recalculate=True ) - @QtCore.pyqtSlot() + @QtCore.Slot() def on_smoothButton_clicked(self): dialog = QSpectrumAnalyzerSmooth(self) if dialog.exec_(): @@ -511,7 +511,7 @@ class QSpectrumAnalyzerMainWindow(QtGui.QMainWindow, Ui_QSpectrumAnalyzerMainWin recalculate=True ) - @QtCore.pyqtSlot() + @QtCore.Slot() def on_persistenceButton_clicked(self): prev_persistence_length = self.spectrumPlotWidget.persistence_length dialog = QSpectrumAnalyzerPersistence(self) @@ -527,7 +527,7 @@ class QSpectrumAnalyzerMainWindow(QtGui.QMainWindow, Ui_QSpectrumAnalyzerMainWin else: self.spectrumPlotWidget.recalculate_persistence(self.data_storage) - @QtCore.pyqtSlot() + @QtCore.Slot() def on_colorsButton_clicked(self): dialog = QSpectrumAnalyzerColors(self) if dialog.exec_(): @@ -539,18 +539,18 @@ class QSpectrumAnalyzerMainWindow(QtGui.QMainWindow, Ui_QSpectrumAnalyzerMainWin self.spectrumPlotWidget.persistence_color = str_to_color(settings.value("persistence_color", "0, 255, 0, 255")) self.spectrumPlotWidget.set_colors() - @QtCore.pyqtSlot() + @QtCore.Slot() def on_action_Settings_triggered(self): dialog = QSpectrumAnalyzerSettings(self) if dialog.exec_(): self.setup_power_thread() - @QtCore.pyqtSlot() + @QtCore.Slot() def on_action_About_triggered(self): - QtGui.QMessageBox.information(self, self.tr("About - QSpectrumAnalyzer"), - self.tr("QSpectrumAnalyzer {}").format(__version__)) + QtWidgets.QMessageBox.information(self, self.tr("About - QSpectrumAnalyzer"), + self.tr("QSpectrumAnalyzer {}").format(__version__)) - @QtCore.pyqtSlot() + @QtCore.Slot() def on_action_Quit_triggered(self): self.close() @@ -561,7 +561,7 @@ class QSpectrumAnalyzerMainWindow(QtGui.QMainWindow, Ui_QSpectrumAnalyzerMainWin def main(): - app = QtGui.QApplication(sys.argv) + app = QtWidgets.QApplication(sys.argv) app.setOrganizationName("QSpectrumAnalyzer") app.setOrganizationDomain("qspectrumanalyzer.eutopia.cz") app.setApplicationName("QSpectrumAnalyzer") diff --git a/qspectrumanalyzer/backends/__init__.py b/qspectrumanalyzer/backends/__init__.py index 1a8bb9f..c1e8755 100644 --- a/qspectrumanalyzer/backends/__init__.py +++ b/qspectrumanalyzer/backends/__init__.py @@ -1,6 +1,6 @@ import os, glob, subprocess, threading -from PyQt4 import QtCore +from Qt import QtCore class BaseInfo: @@ -45,8 +45,8 @@ class BaseInfo: class BasePowerThread(QtCore.QThread): """Thread which runs Power Spectral Density acquisition and calculation process""" - powerThreadStarted = QtCore.pyqtSignal() - powerThreadStopped = QtCore.pyqtSignal() + powerThreadStarted = QtCore.Signal() + powerThreadStopped = QtCore.Signal() def __init__(self, data_storage, parent=None): super().__init__(parent) diff --git a/qspectrumanalyzer/backends/hackrf_sweep.py b/qspectrumanalyzer/backends/hackrf_sweep.py index 4f5eeb9..20dd2fc 100644 --- a/qspectrumanalyzer/backends/hackrf_sweep.py +++ b/qspectrumanalyzer/backends/hackrf_sweep.py @@ -1,7 +1,7 @@ import subprocess, pprint, struct, shlex import numpy as np -from PyQt4 import QtCore +from Qt import QtCore from qspectrumanalyzer.backends import BaseInfo, BasePowerThread diff --git a/qspectrumanalyzer/backends/rtl_power.py b/qspectrumanalyzer/backends/rtl_power.py index 1ae0298..891c013 100644 --- a/qspectrumanalyzer/backends/rtl_power.py +++ b/qspectrumanalyzer/backends/rtl_power.py @@ -1,7 +1,7 @@ import subprocess, pprint, shlex import numpy as np -from PyQt4 import QtCore +from Qt import QtCore from qspectrumanalyzer.backends import BaseInfo, BasePowerThread diff --git a/qspectrumanalyzer/backends/rtl_power_fftw.py b/qspectrumanalyzer/backends/rtl_power_fftw.py index 78500d2..a3559d2 100644 --- a/qspectrumanalyzer/backends/rtl_power_fftw.py +++ b/qspectrumanalyzer/backends/rtl_power_fftw.py @@ -1,6 +1,6 @@ import subprocess, math, pprint, shlex -from PyQt4 import QtCore +from Qt import QtCore from qspectrumanalyzer.backends import BaseInfo, BasePowerThread diff --git a/qspectrumanalyzer/backends/rx_power.py b/qspectrumanalyzer/backends/rx_power.py index ff7583f..aef71df 100644 --- a/qspectrumanalyzer/backends/rx_power.py +++ b/qspectrumanalyzer/backends/rx_power.py @@ -1,7 +1,7 @@ import subprocess, pprint, shlex import numpy as np -from PyQt4 import QtCore +from Qt import QtCore from qspectrumanalyzer.backends import BaseInfo, BasePowerThread diff --git a/qspectrumanalyzer/backends/soapy_power.py b/qspectrumanalyzer/backends/soapy_power.py index b9d268e..c3b4c2d 100644 --- a/qspectrumanalyzer/backends/soapy_power.py +++ b/qspectrumanalyzer/backends/soapy_power.py @@ -1,7 +1,7 @@ import os, subprocess, pprint, sys, shlex import numpy as np -from PyQt4 import QtCore +from Qt import QtCore from qspectrumanalyzer.backends import BaseInfo, BasePowerThread from soapypower.writer import SoapyPowerBinFormat diff --git a/qspectrumanalyzer/data.py b/qspectrumanalyzer/data.py index 0f600e6..bb0c385 100644 --- a/qspectrumanalyzer/data.py +++ b/qspectrumanalyzer/data.py @@ -1,6 +1,6 @@ import time, sys -from PyQt4 import QtCore +from Qt import QtCore import numpy as np from qspectrumanalyzer.utils import smooth @@ -36,7 +36,7 @@ class HistoryBuffer: class TaskSignals(QtCore.QObject): """Task signals emitter""" - result = QtCore.pyqtSignal(object) + result = QtCore.Signal(object) class Task(QtCore.QRunnable): @@ -57,12 +57,12 @@ class Task(QtCore.QRunnable): class DataStorage(QtCore.QObject): """Data storage for spectrum measurements""" - history_updated = QtCore.pyqtSignal(object) - data_updated = QtCore.pyqtSignal(object) - data_recalculated = QtCore.pyqtSignal(object) - average_updated = QtCore.pyqtSignal(object) - peak_hold_max_updated = QtCore.pyqtSignal(object) - peak_hold_min_updated = QtCore.pyqtSignal(object) + history_updated = QtCore.Signal(object) + data_updated = QtCore.Signal(object) + data_recalculated = QtCore.Signal(object) + average_updated = QtCore.Signal(object) + peak_hold_max_updated = QtCore.Signal(object) + peak_hold_min_updated = QtCore.Signal(object) def __init__(self, max_history_size=100, parent=None): super().__init__(parent) diff --git a/qspectrumanalyzer/languages/qspectrumanalyzer_cs.ts b/qspectrumanalyzer/languages/qspectrumanalyzer_cs.ts index 6b35f1a..6584d54 100644 --- a/qspectrumanalyzer/languages/qspectrumanalyzer_cs.ts +++ b/qspectrumanalyzer/languages/qspectrumanalyzer_cs.ts @@ -3,37 +3,37 @@ QSpectrumAnalyzerColors - + Colors - QSpectrumAnalyzer - + Main curve color: - + ... - + Average color: - + Persistence color: - + Max. peak hold color: - + Min. peak hold color: @@ -41,42 +41,42 @@ QSpectrumAnalyzerMainWindow - + QSpectrumAnalyzer - + Settings - + MHz - + kHz - + auto - + Frequency - + Controls - + Levels @@ -101,122 +101,122 @@ - + &File - + &Help - + &Start - + S&top - + Si&ngle shot - + Start: - + Stop: - + Bin size: - + Interval [s]: - + Gain [dB]: - + Corr. [ppm]: - + Crop [%]: - + Main curve - + Colors... - + Max. hold - + Min. hold - + Average - + Smoothing - + ... - + Persistence - + &Settings... - + &Quit - + Ctrl+Q - + &About @@ -224,27 +224,27 @@ QSpectrumAnalyzerPersistence - + Persistence - QSpectrumAnalyzer - + Decay function: - + linear - + exponential - + Persistence length: @@ -257,72 +257,72 @@ - + Settings - QSpectrumAnalyzer - + &Backend: - + soapy_power - + rx_power - + rtl_power_fftw - + rtl_power - + hackrf_sweep - + E&xecutable: - + ... - + Sa&mple rate: - + &Waterfall history size: - + &Device: - + Additional &parameters: - + ? @@ -330,7 +330,7 @@ QSpectrumAnalyzerSettingsHelp - + Help - QSpectrumAnalyzer @@ -338,42 +338,42 @@ QSpectrumAnalyzerSmooth - + Smoothing - QSpectrumAnalyzer - + &Window function: - + rectangular - + hanning - + hamming - + bartlett - + blackman - + Window len&gth: diff --git a/qspectrumanalyzer/plot.py b/qspectrumanalyzer/plot.py index 9efef4d..7cce6b0 100644 --- a/qspectrumanalyzer/plot.py +++ b/qspectrumanalyzer/plot.py @@ -1,6 +1,6 @@ import collections, math -from PyQt4 import QtCore +from Qt import QtCore import pyqtgraph as pg # Basic PyQtGraph settings diff --git a/qspectrumanalyzer/ui_qspectrumanalyzer.py b/qspectrumanalyzer/ui_qspectrumanalyzer.py index 1a76881..f38d80f 100644 --- a/qspectrumanalyzer/ui_qspectrumanalyzer.py +++ b/qspectrumanalyzer/ui_qspectrumanalyzer.py @@ -2,116 +2,102 @@ # Form implementation generated from reading ui file 'qspectrumanalyzer/qspectrumanalyzer.ui' # -# Created by: PyQt4 UI code generator 4.12 +# Created by: PyQt5 UI code generator 5.7.1 # # WARNING! All changes made in this file will be lost! -from PyQt4 import QtCore, QtGui - -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - def _fromUtf8(s): - return s - -try: - _encoding = QtGui.QApplication.UnicodeUTF8 - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) -except AttributeError: - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) +from Qt import QtCore, QtGui, QtWidgets class Ui_QSpectrumAnalyzerMainWindow(object): def setupUi(self, QSpectrumAnalyzerMainWindow): - QSpectrumAnalyzerMainWindow.setObjectName(_fromUtf8("QSpectrumAnalyzerMainWindow")) + QSpectrumAnalyzerMainWindow.setObjectName("QSpectrumAnalyzerMainWindow") QSpectrumAnalyzerMainWindow.resize(1200, 810) - self.centralwidget = QtGui.QWidget(QSpectrumAnalyzerMainWindow) - self.centralwidget.setObjectName(_fromUtf8("centralwidget")) - self.horizontalLayout = QtGui.QHBoxLayout(self.centralwidget) - self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - self.plotSplitter = QtGui.QSplitter(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) + self.centralwidget = QtWidgets.QWidget(QSpectrumAnalyzerMainWindow) + self.centralwidget.setObjectName("centralwidget") + self.horizontalLayout = QtWidgets.QHBoxLayout(self.centralwidget) + self.horizontalLayout.setObjectName("horizontalLayout") + self.plotSplitter = QtWidgets.QSplitter(self.centralwidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.plotSplitter.sizePolicy().hasHeightForWidth()) self.plotSplitter.setSizePolicy(sizePolicy) self.plotSplitter.setOrientation(QtCore.Qt.Vertical) - self.plotSplitter.setObjectName(_fromUtf8("plotSplitter")) + self.plotSplitter.setObjectName("plotSplitter") self.mainPlotLayout = GraphicsLayoutWidget(self.plotSplitter) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.mainPlotLayout.sizePolicy().hasHeightForWidth()) self.mainPlotLayout.setSizePolicy(sizePolicy) - self.mainPlotLayout.setObjectName(_fromUtf8("mainPlotLayout")) + self.mainPlotLayout.setObjectName("mainPlotLayout") self.waterfallPlotLayout = GraphicsLayoutWidget(self.plotSplitter) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.waterfallPlotLayout.sizePolicy().hasHeightForWidth()) self.waterfallPlotLayout.setSizePolicy(sizePolicy) - self.waterfallPlotLayout.setObjectName(_fromUtf8("waterfallPlotLayout")) + self.waterfallPlotLayout.setObjectName("waterfallPlotLayout") self.horizontalLayout.addWidget(self.plotSplitter) QSpectrumAnalyzerMainWindow.setCentralWidget(self.centralwidget) - self.menubar = QtGui.QMenuBar(QSpectrumAnalyzerMainWindow) + self.menubar = QtWidgets.QMenuBar(QSpectrumAnalyzerMainWindow) self.menubar.setGeometry(QtCore.QRect(0, 0, 1200, 30)) - self.menubar.setObjectName(_fromUtf8("menubar")) - self.menu_File = QtGui.QMenu(self.menubar) - self.menu_File.setObjectName(_fromUtf8("menu_File")) - self.menu_Help = QtGui.QMenu(self.menubar) - self.menu_Help.setObjectName(_fromUtf8("menu_Help")) + self.menubar.setObjectName("menubar") + self.menu_File = QtWidgets.QMenu(self.menubar) + self.menu_File.setObjectName("menu_File") + self.menu_Help = QtWidgets.QMenu(self.menubar) + self.menu_Help.setObjectName("menu_Help") QSpectrumAnalyzerMainWindow.setMenuBar(self.menubar) - self.statusbar = QtGui.QStatusBar(QSpectrumAnalyzerMainWindow) - self.statusbar.setObjectName(_fromUtf8("statusbar")) + self.statusbar = QtWidgets.QStatusBar(QSpectrumAnalyzerMainWindow) + self.statusbar.setObjectName("statusbar") QSpectrumAnalyzerMainWindow.setStatusBar(self.statusbar) - self.controlsDockWidget = QtGui.QDockWidget(QSpectrumAnalyzerMainWindow) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Minimum) + self.controlsDockWidget = QtWidgets.QDockWidget(QSpectrumAnalyzerMainWindow) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.controlsDockWidget.sizePolicy().hasHeightForWidth()) self.controlsDockWidget.setSizePolicy(sizePolicy) self.controlsDockWidget.setMinimumSize(QtCore.QSize(10, 10)) - self.controlsDockWidget.setFeatures(QtGui.QDockWidget.DockWidgetFloatable|QtGui.QDockWidget.DockWidgetMovable) - self.controlsDockWidget.setObjectName(_fromUtf8("controlsDockWidget")) - self.controlsDockWidgetContents = QtGui.QWidget() - self.controlsDockWidgetContents.setObjectName(_fromUtf8("controlsDockWidgetContents")) - self.gridLayout_2 = QtGui.QGridLayout(self.controlsDockWidgetContents) - self.gridLayout_2.setMargin(0) - self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2")) - self.startButton = QtGui.QPushButton(self.controlsDockWidgetContents) - self.startButton.setObjectName(_fromUtf8("startButton")) + self.controlsDockWidget.setFeatures(QtWidgets.QDockWidget.DockWidgetFloatable|QtWidgets.QDockWidget.DockWidgetMovable) + self.controlsDockWidget.setObjectName("controlsDockWidget") + self.controlsDockWidgetContents = QtWidgets.QWidget() + self.controlsDockWidgetContents.setObjectName("controlsDockWidgetContents") + self.gridLayout_2 = QtWidgets.QGridLayout(self.controlsDockWidgetContents) + self.gridLayout_2.setContentsMargins(0, 0, 0, 0) + self.gridLayout_2.setObjectName("gridLayout_2") + self.startButton = QtWidgets.QPushButton(self.controlsDockWidgetContents) + self.startButton.setObjectName("startButton") self.gridLayout_2.addWidget(self.startButton, 0, 0, 1, 1) - self.stopButton = QtGui.QPushButton(self.controlsDockWidgetContents) - self.stopButton.setObjectName(_fromUtf8("stopButton")) + self.stopButton = QtWidgets.QPushButton(self.controlsDockWidgetContents) + self.stopButton.setObjectName("stopButton") self.gridLayout_2.addWidget(self.stopButton, 0, 1, 1, 1) - self.singleShotButton = QtGui.QPushButton(self.controlsDockWidgetContents) - self.singleShotButton.setObjectName(_fromUtf8("singleShotButton")) + self.singleShotButton = QtWidgets.QPushButton(self.controlsDockWidgetContents) + self.singleShotButton.setObjectName("singleShotButton") self.gridLayout_2.addWidget(self.singleShotButton, 1, 0, 1, 2) - spacerItem = QtGui.QSpacerItem(20, 561, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + spacerItem = QtWidgets.QSpacerItem(20, 561, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) self.gridLayout_2.addItem(spacerItem, 2, 0, 1, 1) self.controlsDockWidget.setWidget(self.controlsDockWidgetContents) QSpectrumAnalyzerMainWindow.addDockWidget(QtCore.Qt.DockWidgetArea(2), self.controlsDockWidget) - self.frequencyDockWidget = QtGui.QDockWidget(QSpectrumAnalyzerMainWindow) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Minimum) + self.frequencyDockWidget = QtWidgets.QDockWidget(QSpectrumAnalyzerMainWindow) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.frequencyDockWidget.sizePolicy().hasHeightForWidth()) self.frequencyDockWidget.setSizePolicy(sizePolicy) self.frequencyDockWidget.setMinimumSize(QtCore.QSize(10, 10)) - self.frequencyDockWidget.setFeatures(QtGui.QDockWidget.DockWidgetFloatable|QtGui.QDockWidget.DockWidgetMovable) - self.frequencyDockWidget.setObjectName(_fromUtf8("frequencyDockWidget")) - self.frequencyDockWidgetContents = QtGui.QWidget() - self.frequencyDockWidgetContents.setObjectName(_fromUtf8("frequencyDockWidgetContents")) - self.formLayout = QtGui.QFormLayout(self.frequencyDockWidgetContents) - self.formLayout.setFieldGrowthPolicy(QtGui.QFormLayout.ExpandingFieldsGrow) - self.formLayout.setMargin(0) - self.formLayout.setObjectName(_fromUtf8("formLayout")) - self.label_2 = QtGui.QLabel(self.frequencyDockWidgetContents) - self.label_2.setObjectName(_fromUtf8("label_2")) - self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_2) - self.startFreqSpinBox = QtGui.QDoubleSpinBox(self.frequencyDockWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + self.frequencyDockWidget.setFeatures(QtWidgets.QDockWidget.DockWidgetFloatable|QtWidgets.QDockWidget.DockWidgetMovable) + self.frequencyDockWidget.setObjectName("frequencyDockWidget") + self.frequencyDockWidgetContents = QtWidgets.QWidget() + self.frequencyDockWidgetContents.setObjectName("frequencyDockWidgetContents") + self.formLayout = QtWidgets.QFormLayout(self.frequencyDockWidgetContents) + self.formLayout.setFieldGrowthPolicy(QtWidgets.QFormLayout.ExpandingFieldsGrow) + self.formLayout.setContentsMargins(0, 0, 0, 0) + self.formLayout.setObjectName("formLayout") + self.label_2 = QtWidgets.QLabel(self.frequencyDockWidgetContents) + self.label_2.setObjectName("label_2") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_2) + self.startFreqSpinBox = QtWidgets.QDoubleSpinBox(self.frequencyDockWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.startFreqSpinBox.sizePolicy().hasHeightForWidth()) @@ -121,13 +107,13 @@ class Ui_QSpectrumAnalyzerMainWindow(object): self.startFreqSpinBox.setMinimum(24.0) self.startFreqSpinBox.setMaximum(1766.0) self.startFreqSpinBox.setProperty("value", 87.0) - self.startFreqSpinBox.setObjectName(_fromUtf8("startFreqSpinBox")) - self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.startFreqSpinBox) - self.label_3 = QtGui.QLabel(self.frequencyDockWidgetContents) - self.label_3.setObjectName(_fromUtf8("label_3")) - self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.label_3) - self.stopFreqSpinBox = QtGui.QDoubleSpinBox(self.frequencyDockWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + self.startFreqSpinBox.setObjectName("startFreqSpinBox") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.startFreqSpinBox) + self.label_3 = QtWidgets.QLabel(self.frequencyDockWidgetContents) + self.label_3.setObjectName("label_3") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_3) + self.stopFreqSpinBox = QtWidgets.QDoubleSpinBox(self.frequencyDockWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.stopFreqSpinBox.sizePolicy().hasHeightForWidth()) @@ -137,13 +123,13 @@ class Ui_QSpectrumAnalyzerMainWindow(object): self.stopFreqSpinBox.setMinimum(24.0) self.stopFreqSpinBox.setMaximum(1766.0) self.stopFreqSpinBox.setProperty("value", 108.0) - self.stopFreqSpinBox.setObjectName(_fromUtf8("stopFreqSpinBox")) - self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.stopFreqSpinBox) - self.label = QtGui.QLabel(self.frequencyDockWidgetContents) - self.label.setObjectName(_fromUtf8("label")) - self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.label) - self.binSizeSpinBox = QtGui.QDoubleSpinBox(self.frequencyDockWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + self.stopFreqSpinBox.setObjectName("stopFreqSpinBox") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.stopFreqSpinBox) + self.label = QtWidgets.QLabel(self.frequencyDockWidgetContents) + self.label.setObjectName("label") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label) + self.binSizeSpinBox = QtWidgets.QDoubleSpinBox(self.frequencyDockWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.binSizeSpinBox.sizePolicy().hasHeightForWidth()) @@ -152,123 +138,123 @@ class Ui_QSpectrumAnalyzerMainWindow(object): self.binSizeSpinBox.setDecimals(3) self.binSizeSpinBox.setMaximum(2800.0) self.binSizeSpinBox.setProperty("value", 10.0) - self.binSizeSpinBox.setObjectName(_fromUtf8("binSizeSpinBox")) - self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.binSizeSpinBox) - spacerItem1 = QtGui.QSpacerItem(20, 0, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.formLayout.setItem(3, QtGui.QFormLayout.SpanningRole, spacerItem1) + self.binSizeSpinBox.setObjectName("binSizeSpinBox") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.binSizeSpinBox) + spacerItem1 = QtWidgets.QSpacerItem(20, 0, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.formLayout.setItem(3, QtWidgets.QFormLayout.SpanningRole, spacerItem1) self.frequencyDockWidget.setWidget(self.frequencyDockWidgetContents) QSpectrumAnalyzerMainWindow.addDockWidget(QtCore.Qt.DockWidgetArea(2), self.frequencyDockWidget) - self.settingsDockWidget = QtGui.QDockWidget(QSpectrumAnalyzerMainWindow) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) + self.settingsDockWidget = QtWidgets.QDockWidget(QSpectrumAnalyzerMainWindow) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.settingsDockWidget.sizePolicy().hasHeightForWidth()) self.settingsDockWidget.setSizePolicy(sizePolicy) - self.settingsDockWidget.setFeatures(QtGui.QDockWidget.DockWidgetFloatable|QtGui.QDockWidget.DockWidgetMovable) - self.settingsDockWidget.setObjectName(_fromUtf8("settingsDockWidget")) - self.settingsDockWidgetContents = QtGui.QWidget() - self.settingsDockWidgetContents.setObjectName(_fromUtf8("settingsDockWidgetContents")) - self.gridLayout = QtGui.QGridLayout(self.settingsDockWidgetContents) - self.gridLayout.setMargin(0) - self.gridLayout.setObjectName(_fromUtf8("gridLayout")) - self.label_4 = QtGui.QLabel(self.settingsDockWidgetContents) - self.label_4.setObjectName(_fromUtf8("label_4")) + self.settingsDockWidget.setFeatures(QtWidgets.QDockWidget.DockWidgetFloatable|QtWidgets.QDockWidget.DockWidgetMovable) + self.settingsDockWidget.setObjectName("settingsDockWidget") + self.settingsDockWidgetContents = QtWidgets.QWidget() + self.settingsDockWidgetContents.setObjectName("settingsDockWidgetContents") + self.gridLayout = QtWidgets.QGridLayout(self.settingsDockWidgetContents) + self.gridLayout.setContentsMargins(0, 0, 0, 0) + self.gridLayout.setObjectName("gridLayout") + self.label_4 = QtWidgets.QLabel(self.settingsDockWidgetContents) + self.label_4.setObjectName("label_4") self.gridLayout.addWidget(self.label_4, 0, 0, 1, 1) - self.label_6 = QtGui.QLabel(self.settingsDockWidgetContents) - self.label_6.setObjectName(_fromUtf8("label_6")) + self.label_6 = QtWidgets.QLabel(self.settingsDockWidgetContents) + self.label_6.setObjectName("label_6") self.gridLayout.addWidget(self.label_6, 0, 1, 1, 1) - self.intervalSpinBox = QtGui.QDoubleSpinBox(self.settingsDockWidgetContents) + self.intervalSpinBox = QtWidgets.QDoubleSpinBox(self.settingsDockWidgetContents) self.intervalSpinBox.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.intervalSpinBox.setMaximum(999.0) self.intervalSpinBox.setProperty("value", 1.0) - self.intervalSpinBox.setObjectName(_fromUtf8("intervalSpinBox")) + self.intervalSpinBox.setObjectName("intervalSpinBox") self.gridLayout.addWidget(self.intervalSpinBox, 1, 0, 1, 1) - self.gainSpinBox = QtGui.QSpinBox(self.settingsDockWidgetContents) + self.gainSpinBox = QtWidgets.QSpinBox(self.settingsDockWidgetContents) self.gainSpinBox.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.gainSpinBox.setMinimum(-1) self.gainSpinBox.setMaximum(49) self.gainSpinBox.setProperty("value", -1) - self.gainSpinBox.setObjectName(_fromUtf8("gainSpinBox")) + self.gainSpinBox.setObjectName("gainSpinBox") self.gridLayout.addWidget(self.gainSpinBox, 1, 1, 1, 2) - self.label_5 = QtGui.QLabel(self.settingsDockWidgetContents) - self.label_5.setObjectName(_fromUtf8("label_5")) + self.label_5 = QtWidgets.QLabel(self.settingsDockWidgetContents) + self.label_5.setObjectName("label_5") self.gridLayout.addWidget(self.label_5, 2, 0, 1, 1) - self.label_7 = QtGui.QLabel(self.settingsDockWidgetContents) - self.label_7.setObjectName(_fromUtf8("label_7")) + self.label_7 = QtWidgets.QLabel(self.settingsDockWidgetContents) + self.label_7.setObjectName("label_7") self.gridLayout.addWidget(self.label_7, 2, 1, 1, 1) - self.ppmSpinBox = QtGui.QSpinBox(self.settingsDockWidgetContents) + self.ppmSpinBox = QtWidgets.QSpinBox(self.settingsDockWidgetContents) self.ppmSpinBox.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.ppmSpinBox.setMinimum(-999) self.ppmSpinBox.setMaximum(999) - self.ppmSpinBox.setObjectName(_fromUtf8("ppmSpinBox")) + self.ppmSpinBox.setObjectName("ppmSpinBox") self.gridLayout.addWidget(self.ppmSpinBox, 3, 0, 1, 1) - self.mainCurveCheckBox = QtGui.QCheckBox(self.settingsDockWidgetContents) + self.mainCurveCheckBox = QtWidgets.QCheckBox(self.settingsDockWidgetContents) self.mainCurveCheckBox.setChecked(True) - self.mainCurveCheckBox.setObjectName(_fromUtf8("mainCurveCheckBox")) + self.mainCurveCheckBox.setObjectName("mainCurveCheckBox") self.gridLayout.addWidget(self.mainCurveCheckBox, 4, 0, 1, 1) - self.colorsButton = QtGui.QPushButton(self.settingsDockWidgetContents) - self.colorsButton.setObjectName(_fromUtf8("colorsButton")) + self.colorsButton = QtWidgets.QPushButton(self.settingsDockWidgetContents) + self.colorsButton.setObjectName("colorsButton") self.gridLayout.addWidget(self.colorsButton, 4, 1, 1, 2) - self.peakHoldMaxCheckBox = QtGui.QCheckBox(self.settingsDockWidgetContents) - self.peakHoldMaxCheckBox.setObjectName(_fromUtf8("peakHoldMaxCheckBox")) + self.peakHoldMaxCheckBox = QtWidgets.QCheckBox(self.settingsDockWidgetContents) + self.peakHoldMaxCheckBox.setObjectName("peakHoldMaxCheckBox") self.gridLayout.addWidget(self.peakHoldMaxCheckBox, 5, 0, 1, 1) - self.peakHoldMinCheckBox = QtGui.QCheckBox(self.settingsDockWidgetContents) - self.peakHoldMinCheckBox.setObjectName(_fromUtf8("peakHoldMinCheckBox")) + self.peakHoldMinCheckBox = QtWidgets.QCheckBox(self.settingsDockWidgetContents) + self.peakHoldMinCheckBox.setObjectName("peakHoldMinCheckBox") self.gridLayout.addWidget(self.peakHoldMinCheckBox, 5, 1, 1, 2) - self.averageCheckBox = QtGui.QCheckBox(self.settingsDockWidgetContents) - self.averageCheckBox.setObjectName(_fromUtf8("averageCheckBox")) + self.averageCheckBox = QtWidgets.QCheckBox(self.settingsDockWidgetContents) + self.averageCheckBox.setObjectName("averageCheckBox") self.gridLayout.addWidget(self.averageCheckBox, 6, 0, 1, 1) - self.smoothCheckBox = QtGui.QCheckBox(self.settingsDockWidgetContents) - self.smoothCheckBox.setObjectName(_fromUtf8("smoothCheckBox")) + self.smoothCheckBox = QtWidgets.QCheckBox(self.settingsDockWidgetContents) + self.smoothCheckBox.setObjectName("smoothCheckBox") self.gridLayout.addWidget(self.smoothCheckBox, 7, 0, 1, 1) - self.smoothButton = QtGui.QToolButton(self.settingsDockWidgetContents) + self.smoothButton = QtWidgets.QToolButton(self.settingsDockWidgetContents) self.smoothButton.setAutoRaise(False) - self.smoothButton.setObjectName(_fromUtf8("smoothButton")) + self.smoothButton.setObjectName("smoothButton") self.gridLayout.addWidget(self.smoothButton, 7, 2, 1, 1) - self.persistenceCheckBox = QtGui.QCheckBox(self.settingsDockWidgetContents) - self.persistenceCheckBox.setObjectName(_fromUtf8("persistenceCheckBox")) + self.persistenceCheckBox = QtWidgets.QCheckBox(self.settingsDockWidgetContents) + self.persistenceCheckBox.setObjectName("persistenceCheckBox") self.gridLayout.addWidget(self.persistenceCheckBox, 8, 0, 1, 1) - self.persistenceButton = QtGui.QToolButton(self.settingsDockWidgetContents) + self.persistenceButton = QtWidgets.QToolButton(self.settingsDockWidgetContents) self.persistenceButton.setAutoRaise(False) - self.persistenceButton.setObjectName(_fromUtf8("persistenceButton")) + self.persistenceButton.setObjectName("persistenceButton") self.gridLayout.addWidget(self.persistenceButton, 8, 2, 1, 1) - spacerItem2 = QtGui.QSpacerItem(20, 1, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + spacerItem2 = QtWidgets.QSpacerItem(20, 1, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) self.gridLayout.addItem(spacerItem2, 9, 0, 1, 1) - self.cropSpinBox = QtGui.QSpinBox(self.settingsDockWidgetContents) + self.cropSpinBox = QtWidgets.QSpinBox(self.settingsDockWidgetContents) self.cropSpinBox.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) - self.cropSpinBox.setObjectName(_fromUtf8("cropSpinBox")) + self.cropSpinBox.setObjectName("cropSpinBox") self.gridLayout.addWidget(self.cropSpinBox, 3, 1, 1, 2) self.settingsDockWidget.setWidget(self.settingsDockWidgetContents) QSpectrumAnalyzerMainWindow.addDockWidget(QtCore.Qt.DockWidgetArea(2), self.settingsDockWidget) - self.levelsDockWidget = QtGui.QDockWidget(QSpectrumAnalyzerMainWindow) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) + self.levelsDockWidget = QtWidgets.QDockWidget(QSpectrumAnalyzerMainWindow) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.levelsDockWidget.sizePolicy().hasHeightForWidth()) self.levelsDockWidget.setSizePolicy(sizePolicy) - self.levelsDockWidget.setFeatures(QtGui.QDockWidget.DockWidgetFloatable|QtGui.QDockWidget.DockWidgetMovable) - self.levelsDockWidget.setObjectName(_fromUtf8("levelsDockWidget")) - self.levelsDockWidgetContents = QtGui.QWidget() - self.levelsDockWidgetContents.setObjectName(_fromUtf8("levelsDockWidgetContents")) - self.verticalLayout_6 = QtGui.QVBoxLayout(self.levelsDockWidgetContents) - self.verticalLayout_6.setMargin(0) - self.verticalLayout_6.setObjectName(_fromUtf8("verticalLayout_6")) + self.levelsDockWidget.setFeatures(QtWidgets.QDockWidget.DockWidgetFloatable|QtWidgets.QDockWidget.DockWidgetMovable) + self.levelsDockWidget.setObjectName("levelsDockWidget") + self.levelsDockWidgetContents = QtWidgets.QWidget() + self.levelsDockWidgetContents.setObjectName("levelsDockWidgetContents") + self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.levelsDockWidgetContents) + self.verticalLayout_6.setContentsMargins(0, 0, 0, 0) + self.verticalLayout_6.setObjectName("verticalLayout_6") self.histogramPlotLayout = GraphicsLayoutWidget(self.levelsDockWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Ignored, QtGui.QSizePolicy.Expanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.histogramPlotLayout.sizePolicy().hasHeightForWidth()) self.histogramPlotLayout.setSizePolicy(sizePolicy) - self.histogramPlotLayout.setObjectName(_fromUtf8("histogramPlotLayout")) + self.histogramPlotLayout.setObjectName("histogramPlotLayout") self.verticalLayout_6.addWidget(self.histogramPlotLayout) self.levelsDockWidget.setWidget(self.levelsDockWidgetContents) QSpectrumAnalyzerMainWindow.addDockWidget(QtCore.Qt.DockWidgetArea(2), self.levelsDockWidget) - self.action_Settings = QtGui.QAction(QSpectrumAnalyzerMainWindow) - self.action_Settings.setObjectName(_fromUtf8("action_Settings")) - self.action_Quit = QtGui.QAction(QSpectrumAnalyzerMainWindow) - self.action_Quit.setObjectName(_fromUtf8("action_Quit")) - self.action_About = QtGui.QAction(QSpectrumAnalyzerMainWindow) - self.action_About.setObjectName(_fromUtf8("action_About")) + self.action_Settings = QtWidgets.QAction(QSpectrumAnalyzerMainWindow) + self.action_Settings.setObjectName("action_Settings") + self.action_Quit = QtWidgets.QAction(QSpectrumAnalyzerMainWindow) + self.action_Quit.setObjectName("action_Quit") + self.action_About = QtWidgets.QAction(QSpectrumAnalyzerMainWindow) + self.action_About.setObjectName("action_About") self.menu_File.addAction(self.action_Settings) self.menu_File.addSeparator() self.menu_File.addAction(self.action_Quit) @@ -308,39 +294,40 @@ class Ui_QSpectrumAnalyzerMainWindow(object): QSpectrumAnalyzerMainWindow.setTabOrder(self.mainPlotLayout, self.waterfallPlotLayout) def retranslateUi(self, QSpectrumAnalyzerMainWindow): - QSpectrumAnalyzerMainWindow.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "QSpectrumAnalyzer", None)) - self.menu_File.setTitle(_translate("QSpectrumAnalyzerMainWindow", "&File", None)) - self.menu_Help.setTitle(_translate("QSpectrumAnalyzerMainWindow", "&Help", None)) - self.controlsDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "Controls", None)) - self.startButton.setText(_translate("QSpectrumAnalyzerMainWindow", "&Start", None)) - self.stopButton.setText(_translate("QSpectrumAnalyzerMainWindow", "S&top", None)) - self.singleShotButton.setText(_translate("QSpectrumAnalyzerMainWindow", "Si&ngle shot", None)) - self.frequencyDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "Frequency", None)) - self.label_2.setText(_translate("QSpectrumAnalyzerMainWindow", "Start:", None)) - self.startFreqSpinBox.setSuffix(_translate("QSpectrumAnalyzerMainWindow", " MHz", None)) - self.label_3.setText(_translate("QSpectrumAnalyzerMainWindow", "Stop:", None)) - self.stopFreqSpinBox.setSuffix(_translate("QSpectrumAnalyzerMainWindow", " MHz", None)) - self.label.setText(_translate("QSpectrumAnalyzerMainWindow", "Bin size:", None)) - self.binSizeSpinBox.setSuffix(_translate("QSpectrumAnalyzerMainWindow", " kHz", None)) - self.settingsDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "Settings", None)) - self.label_4.setText(_translate("QSpectrumAnalyzerMainWindow", "Interval [s]:", None)) - self.label_6.setText(_translate("QSpectrumAnalyzerMainWindow", "Gain [dB]:", None)) - self.gainSpinBox.setSpecialValueText(_translate("QSpectrumAnalyzerMainWindow", "auto", None)) - self.label_5.setText(_translate("QSpectrumAnalyzerMainWindow", "Corr. [ppm]:", None)) - self.label_7.setText(_translate("QSpectrumAnalyzerMainWindow", "Crop [%]:", None)) - self.mainCurveCheckBox.setText(_translate("QSpectrumAnalyzerMainWindow", "Main curve", None)) - self.colorsButton.setText(_translate("QSpectrumAnalyzerMainWindow", "Colors...", None)) - self.peakHoldMaxCheckBox.setText(_translate("QSpectrumAnalyzerMainWindow", "Max. hold", None)) - self.peakHoldMinCheckBox.setText(_translate("QSpectrumAnalyzerMainWindow", "Min. hold", None)) - self.averageCheckBox.setText(_translate("QSpectrumAnalyzerMainWindow", "Average", None)) - self.smoothCheckBox.setText(_translate("QSpectrumAnalyzerMainWindow", "Smoothing", None)) - self.smoothButton.setText(_translate("QSpectrumAnalyzerMainWindow", "...", None)) - self.persistenceCheckBox.setText(_translate("QSpectrumAnalyzerMainWindow", "Persistence", None)) - self.persistenceButton.setText(_translate("QSpectrumAnalyzerMainWindow", "...", None)) - self.levelsDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "Levels", None)) - self.action_Settings.setText(_translate("QSpectrumAnalyzerMainWindow", "&Settings...", None)) - self.action_Quit.setText(_translate("QSpectrumAnalyzerMainWindow", "&Quit", None)) - self.action_Quit.setShortcut(_translate("QSpectrumAnalyzerMainWindow", "Ctrl+Q", None)) - self.action_About.setText(_translate("QSpectrumAnalyzerMainWindow", "&About", None)) + _translate = QtCore.QCoreApplication.translate + QSpectrumAnalyzerMainWindow.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "QSpectrumAnalyzer")) + self.menu_File.setTitle(_translate("QSpectrumAnalyzerMainWindow", "&File")) + self.menu_Help.setTitle(_translate("QSpectrumAnalyzerMainWindow", "&Help")) + self.controlsDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "Controls")) + self.startButton.setText(_translate("QSpectrumAnalyzerMainWindow", "&Start")) + self.stopButton.setText(_translate("QSpectrumAnalyzerMainWindow", "S&top")) + self.singleShotButton.setText(_translate("QSpectrumAnalyzerMainWindow", "Si&ngle shot")) + self.frequencyDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "Frequency")) + self.label_2.setText(_translate("QSpectrumAnalyzerMainWindow", "Start:")) + self.startFreqSpinBox.setSuffix(_translate("QSpectrumAnalyzerMainWindow", " MHz")) + self.label_3.setText(_translate("QSpectrumAnalyzerMainWindow", "Stop:")) + self.stopFreqSpinBox.setSuffix(_translate("QSpectrumAnalyzerMainWindow", " MHz")) + self.label.setText(_translate("QSpectrumAnalyzerMainWindow", "Bin size:")) + self.binSizeSpinBox.setSuffix(_translate("QSpectrumAnalyzerMainWindow", " kHz")) + self.settingsDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "Settings")) + self.label_4.setText(_translate("QSpectrumAnalyzerMainWindow", "Interval [s]:")) + self.label_6.setText(_translate("QSpectrumAnalyzerMainWindow", "Gain [dB]:")) + self.gainSpinBox.setSpecialValueText(_translate("QSpectrumAnalyzerMainWindow", "auto")) + self.label_5.setText(_translate("QSpectrumAnalyzerMainWindow", "Corr. [ppm]:")) + self.label_7.setText(_translate("QSpectrumAnalyzerMainWindow", "Crop [%]:")) + self.mainCurveCheckBox.setText(_translate("QSpectrumAnalyzerMainWindow", "Main curve")) + self.colorsButton.setText(_translate("QSpectrumAnalyzerMainWindow", "Colors...")) + self.peakHoldMaxCheckBox.setText(_translate("QSpectrumAnalyzerMainWindow", "Max. hold")) + self.peakHoldMinCheckBox.setText(_translate("QSpectrumAnalyzerMainWindow", "Min. hold")) + self.averageCheckBox.setText(_translate("QSpectrumAnalyzerMainWindow", "Average")) + self.smoothCheckBox.setText(_translate("QSpectrumAnalyzerMainWindow", "Smoothing")) + self.smoothButton.setText(_translate("QSpectrumAnalyzerMainWindow", "...")) + self.persistenceCheckBox.setText(_translate("QSpectrumAnalyzerMainWindow", "Persistence")) + self.persistenceButton.setText(_translate("QSpectrumAnalyzerMainWindow", "...")) + self.levelsDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "Levels")) + self.action_Settings.setText(_translate("QSpectrumAnalyzerMainWindow", "&Settings...")) + self.action_Quit.setText(_translate("QSpectrumAnalyzerMainWindow", "&Quit")) + self.action_Quit.setShortcut(_translate("QSpectrumAnalyzerMainWindow", "Ctrl+Q")) + self.action_About.setText(_translate("QSpectrumAnalyzerMainWindow", "&About")) from pyqtgraph import GraphicsLayoutWidget diff --git a/qspectrumanalyzer/ui_qspectrumanalyzer_colors.py b/qspectrumanalyzer/ui_qspectrumanalyzer_colors.py index de7e249..19e105f 100644 --- a/qspectrumanalyzer/ui_qspectrumanalyzer_colors.py +++ b/qspectrumanalyzer/ui_qspectrumanalyzer_colors.py @@ -2,96 +2,82 @@ # Form implementation generated from reading ui file 'qspectrumanalyzer/qspectrumanalyzer_colors.ui' # -# Created by: PyQt4 UI code generator 4.12 +# Created by: PyQt5 UI code generator 5.7.1 # # WARNING! All changes made in this file will be lost! -from PyQt4 import QtCore, QtGui - -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - def _fromUtf8(s): - return s - -try: - _encoding = QtGui.QApplication.UnicodeUTF8 - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) -except AttributeError: - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) +from Qt import QtCore, QtGui, QtWidgets class Ui_QSpectrumAnalyzerColors(object): def setupUi(self, QSpectrumAnalyzerColors): - QSpectrumAnalyzerColors.setObjectName(_fromUtf8("QSpectrumAnalyzerColors")) + QSpectrumAnalyzerColors.setObjectName("QSpectrumAnalyzerColors") QSpectrumAnalyzerColors.resize(232, 260) - self.verticalLayout = QtGui.QVBoxLayout(QSpectrumAnalyzerColors) - self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.formLayout = QtGui.QFormLayout() - self.formLayout.setObjectName(_fromUtf8("formLayout")) - self.label_2 = QtGui.QLabel(QSpectrumAnalyzerColors) - self.label_2.setObjectName(_fromUtf8("label_2")) - self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_2) + self.verticalLayout = QtWidgets.QVBoxLayout(QSpectrumAnalyzerColors) + self.verticalLayout.setObjectName("verticalLayout") + self.formLayout = QtWidgets.QFormLayout() + self.formLayout.setObjectName("formLayout") + self.label_2 = QtWidgets.QLabel(QSpectrumAnalyzerColors) + self.label_2.setObjectName("label_2") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_2) self.mainColorButton = ColorButton(QSpectrumAnalyzerColors) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.mainColorButton.sizePolicy().hasHeightForWidth()) self.mainColorButton.setSizePolicy(sizePolicy) - self.mainColorButton.setObjectName(_fromUtf8("mainColorButton")) - self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.mainColorButton) - self.label_4 = QtGui.QLabel(QSpectrumAnalyzerColors) - self.label_4.setObjectName(_fromUtf8("label_4")) - self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.label_4) + self.mainColorButton.setObjectName("mainColorButton") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.mainColorButton) + self.label_4 = QtWidgets.QLabel(QSpectrumAnalyzerColors) + self.label_4.setObjectName("label_4") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_4) self.peakHoldMaxColorButton = ColorButton(QSpectrumAnalyzerColors) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.peakHoldMaxColorButton.sizePolicy().hasHeightForWidth()) self.peakHoldMaxColorButton.setSizePolicy(sizePolicy) - self.peakHoldMaxColorButton.setObjectName(_fromUtf8("peakHoldMaxColorButton")) - self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.peakHoldMaxColorButton) - self.label_6 = QtGui.QLabel(QSpectrumAnalyzerColors) - self.label_6.setObjectName(_fromUtf8("label_6")) - self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.label_6) + self.peakHoldMaxColorButton.setObjectName("peakHoldMaxColorButton") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.peakHoldMaxColorButton) + self.label_6 = QtWidgets.QLabel(QSpectrumAnalyzerColors) + self.label_6.setObjectName("label_6") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_6) self.peakHoldMinColorButton = ColorButton(QSpectrumAnalyzerColors) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.peakHoldMinColorButton.sizePolicy().hasHeightForWidth()) self.peakHoldMinColorButton.setSizePolicy(sizePolicy) - self.peakHoldMinColorButton.setObjectName(_fromUtf8("peakHoldMinColorButton")) - self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.peakHoldMinColorButton) - self.label_5 = QtGui.QLabel(QSpectrumAnalyzerColors) - self.label_5.setObjectName(_fromUtf8("label_5")) - self.formLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.label_5) + self.peakHoldMinColorButton.setObjectName("peakHoldMinColorButton") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.peakHoldMinColorButton) + self.label_5 = QtWidgets.QLabel(QSpectrumAnalyzerColors) + self.label_5.setObjectName("label_5") + self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_5) self.averageColorButton = ColorButton(QSpectrumAnalyzerColors) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.averageColorButton.sizePolicy().hasHeightForWidth()) self.averageColorButton.setSizePolicy(sizePolicy) - self.averageColorButton.setObjectName(_fromUtf8("averageColorButton")) - self.formLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.averageColorButton) - self.label_3 = QtGui.QLabel(QSpectrumAnalyzerColors) - self.label_3.setObjectName(_fromUtf8("label_3")) - self.formLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.label_3) + self.averageColorButton.setObjectName("averageColorButton") + self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.averageColorButton) + self.label_3 = QtWidgets.QLabel(QSpectrumAnalyzerColors) + self.label_3.setObjectName("label_3") + self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_3) self.persistenceColorButton = ColorButton(QSpectrumAnalyzerColors) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.persistenceColorButton.sizePolicy().hasHeightForWidth()) self.persistenceColorButton.setSizePolicy(sizePolicy) - self.persistenceColorButton.setObjectName(_fromUtf8("persistenceColorButton")) - self.formLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.persistenceColorButton) + self.persistenceColorButton.setObjectName("persistenceColorButton") + self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.persistenceColorButton) self.verticalLayout.addLayout(self.formLayout) - spacerItem = QtGui.QSpacerItem(20, 2, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + spacerItem = QtWidgets.QSpacerItem(20, 2, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) self.verticalLayout.addItem(spacerItem) - self.buttonBox = QtGui.QDialogButtonBox(QSpectrumAnalyzerColors) + self.buttonBox = QtWidgets.QDialogButtonBox(QSpectrumAnalyzerColors) self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) - self.buttonBox.setObjectName(_fromUtf8("buttonBox")) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok) + self.buttonBox.setObjectName("buttonBox") self.verticalLayout.addWidget(self.buttonBox) self.label_2.setBuddy(self.mainColorButton) self.label_4.setBuddy(self.peakHoldMaxColorButton) @@ -100,8 +86,8 @@ class Ui_QSpectrumAnalyzerColors(object): self.label_3.setBuddy(self.persistenceColorButton) self.retranslateUi(QSpectrumAnalyzerColors) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), QSpectrumAnalyzerColors.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), QSpectrumAnalyzerColors.reject) + self.buttonBox.accepted.connect(QSpectrumAnalyzerColors.accept) + self.buttonBox.rejected.connect(QSpectrumAnalyzerColors.reject) QtCore.QMetaObject.connectSlotsByName(QSpectrumAnalyzerColors) QSpectrumAnalyzerColors.setTabOrder(self.mainColorButton, self.peakHoldMaxColorButton) QSpectrumAnalyzerColors.setTabOrder(self.peakHoldMaxColorButton, self.peakHoldMinColorButton) @@ -110,16 +96,17 @@ class Ui_QSpectrumAnalyzerColors(object): QSpectrumAnalyzerColors.setTabOrder(self.persistenceColorButton, self.buttonBox) def retranslateUi(self, QSpectrumAnalyzerColors): - QSpectrumAnalyzerColors.setWindowTitle(_translate("QSpectrumAnalyzerColors", "Colors - QSpectrumAnalyzer", None)) - self.label_2.setText(_translate("QSpectrumAnalyzerColors", "Main curve color:", None)) - self.mainColorButton.setText(_translate("QSpectrumAnalyzerColors", "...", None)) - self.label_4.setText(_translate("QSpectrumAnalyzerColors", "Max. peak hold color:", None)) - self.peakHoldMaxColorButton.setText(_translate("QSpectrumAnalyzerColors", "...", None)) - self.label_6.setText(_translate("QSpectrumAnalyzerColors", "Min. peak hold color:", None)) - self.peakHoldMinColorButton.setText(_translate("QSpectrumAnalyzerColors", "...", None)) - self.label_5.setText(_translate("QSpectrumAnalyzerColors", "Average color:", None)) - self.averageColorButton.setText(_translate("QSpectrumAnalyzerColors", "...", None)) - self.label_3.setText(_translate("QSpectrumAnalyzerColors", "Persistence color:", None)) - self.persistenceColorButton.setText(_translate("QSpectrumAnalyzerColors", "...", None)) + _translate = QtCore.QCoreApplication.translate + QSpectrumAnalyzerColors.setWindowTitle(_translate("QSpectrumAnalyzerColors", "Colors - QSpectrumAnalyzer")) + self.label_2.setText(_translate("QSpectrumAnalyzerColors", "Main curve color:")) + self.mainColorButton.setText(_translate("QSpectrumAnalyzerColors", "...")) + self.label_4.setText(_translate("QSpectrumAnalyzerColors", "Max. peak hold color:")) + self.peakHoldMaxColorButton.setText(_translate("QSpectrumAnalyzerColors", "...")) + self.label_6.setText(_translate("QSpectrumAnalyzerColors", "Min. peak hold color:")) + self.peakHoldMinColorButton.setText(_translate("QSpectrumAnalyzerColors", "...")) + self.label_5.setText(_translate("QSpectrumAnalyzerColors", "Average color:")) + self.averageColorButton.setText(_translate("QSpectrumAnalyzerColors", "...")) + self.label_3.setText(_translate("QSpectrumAnalyzerColors", "Persistence color:")) + self.persistenceColorButton.setText(_translate("QSpectrumAnalyzerColors", "...")) from pyqtgraph import ColorButton diff --git a/qspectrumanalyzer/ui_qspectrumanalyzer_persistence.py b/qspectrumanalyzer/ui_qspectrumanalyzer_persistence.py index 9d5a46d..4fa0557 100644 --- a/qspectrumanalyzer/ui_qspectrumanalyzer_persistence.py +++ b/qspectrumanalyzer/ui_qspectrumanalyzer_persistence.py @@ -2,72 +2,59 @@ # Form implementation generated from reading ui file 'qspectrumanalyzer/qspectrumanalyzer_persistence.ui' # -# Created by: PyQt4 UI code generator 4.12 +# Created by: PyQt5 UI code generator 5.7.1 # # WARNING! All changes made in this file will be lost! -from PyQt4 import QtCore, QtGui - -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - def _fromUtf8(s): - return s - -try: - _encoding = QtGui.QApplication.UnicodeUTF8 - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) -except AttributeError: - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) +from Qt import QtCore, QtGui, QtWidgets class Ui_QSpectrumAnalyzerPersistence(object): def setupUi(self, QSpectrumAnalyzerPersistence): - QSpectrumAnalyzerPersistence.setObjectName(_fromUtf8("QSpectrumAnalyzerPersistence")) + QSpectrumAnalyzerPersistence.setObjectName("QSpectrumAnalyzerPersistence") QSpectrumAnalyzerPersistence.resize(250, 130) - self.verticalLayout = QtGui.QVBoxLayout(QSpectrumAnalyzerPersistence) - self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.formLayout = QtGui.QFormLayout() - self.formLayout.setObjectName(_fromUtf8("formLayout")) - self.label_2 = QtGui.QLabel(QSpectrumAnalyzerPersistence) - self.label_2.setObjectName(_fromUtf8("label_2")) - self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_2) - self.decayFunctionComboBox = QtGui.QComboBox(QSpectrumAnalyzerPersistence) - self.decayFunctionComboBox.setObjectName(_fromUtf8("decayFunctionComboBox")) - self.decayFunctionComboBox.addItem(_fromUtf8("")) - self.decayFunctionComboBox.addItem(_fromUtf8("")) - self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.decayFunctionComboBox) - self.label = QtGui.QLabel(QSpectrumAnalyzerPersistence) - self.label.setObjectName(_fromUtf8("label")) - self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.label) - self.persistenceLengthSpinBox = QtGui.QSpinBox(QSpectrumAnalyzerPersistence) + self.verticalLayout = QtWidgets.QVBoxLayout(QSpectrumAnalyzerPersistence) + self.verticalLayout.setObjectName("verticalLayout") + self.formLayout = QtWidgets.QFormLayout() + self.formLayout.setObjectName("formLayout") + self.label_2 = QtWidgets.QLabel(QSpectrumAnalyzerPersistence) + self.label_2.setObjectName("label_2") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_2) + self.decayFunctionComboBox = QtWidgets.QComboBox(QSpectrumAnalyzerPersistence) + self.decayFunctionComboBox.setObjectName("decayFunctionComboBox") + self.decayFunctionComboBox.addItem("") + self.decayFunctionComboBox.addItem("") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.decayFunctionComboBox) + self.label = QtWidgets.QLabel(QSpectrumAnalyzerPersistence) + self.label.setObjectName("label") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label) + self.persistenceLengthSpinBox = QtWidgets.QSpinBox(QSpectrumAnalyzerPersistence) self.persistenceLengthSpinBox.setProperty("value", 5) - self.persistenceLengthSpinBox.setObjectName(_fromUtf8("persistenceLengthSpinBox")) - self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.persistenceLengthSpinBox) + self.persistenceLengthSpinBox.setObjectName("persistenceLengthSpinBox") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.persistenceLengthSpinBox) self.verticalLayout.addLayout(self.formLayout) - spacerItem = QtGui.QSpacerItem(20, 5, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + spacerItem = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) self.verticalLayout.addItem(spacerItem) - self.buttonBox = QtGui.QDialogButtonBox(QSpectrumAnalyzerPersistence) + self.buttonBox = QtWidgets.QDialogButtonBox(QSpectrumAnalyzerPersistence) self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) - self.buttonBox.setObjectName(_fromUtf8("buttonBox")) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok) + self.buttonBox.setObjectName("buttonBox") self.verticalLayout.addWidget(self.buttonBox) self.label_2.setBuddy(self.decayFunctionComboBox) self.label.setBuddy(self.persistenceLengthSpinBox) self.retranslateUi(QSpectrumAnalyzerPersistence) self.decayFunctionComboBox.setCurrentIndex(1) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), QSpectrumAnalyzerPersistence.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), QSpectrumAnalyzerPersistence.reject) + self.buttonBox.accepted.connect(QSpectrumAnalyzerPersistence.accept) + self.buttonBox.rejected.connect(QSpectrumAnalyzerPersistence.reject) QtCore.QMetaObject.connectSlotsByName(QSpectrumAnalyzerPersistence) QSpectrumAnalyzerPersistence.setTabOrder(self.decayFunctionComboBox, self.persistenceLengthSpinBox) QSpectrumAnalyzerPersistence.setTabOrder(self.persistenceLengthSpinBox, self.buttonBox) def retranslateUi(self, QSpectrumAnalyzerPersistence): - QSpectrumAnalyzerPersistence.setWindowTitle(_translate("QSpectrumAnalyzerPersistence", "Persistence - QSpectrumAnalyzer", None)) - self.label_2.setText(_translate("QSpectrumAnalyzerPersistence", "Decay function:", None)) - self.decayFunctionComboBox.setItemText(0, _translate("QSpectrumAnalyzerPersistence", "linear", None)) - self.decayFunctionComboBox.setItemText(1, _translate("QSpectrumAnalyzerPersistence", "exponential", None)) - self.label.setText(_translate("QSpectrumAnalyzerPersistence", "Persistence length:", None)) + _translate = QtCore.QCoreApplication.translate + QSpectrumAnalyzerPersistence.setWindowTitle(_translate("QSpectrumAnalyzerPersistence", "Persistence - QSpectrumAnalyzer")) + self.label_2.setText(_translate("QSpectrumAnalyzerPersistence", "Decay function:")) + self.decayFunctionComboBox.setItemText(0, _translate("QSpectrumAnalyzerPersistence", "linear")) + self.decayFunctionComboBox.setItemText(1, _translate("QSpectrumAnalyzerPersistence", "exponential")) + self.label.setText(_translate("QSpectrumAnalyzerPersistence", "Persistence length:")) diff --git a/qspectrumanalyzer/ui_qspectrumanalyzer_settings.py b/qspectrumanalyzer/ui_qspectrumanalyzer_settings.py index 7ccda66..dd3e4ed 100644 --- a/qspectrumanalyzer/ui_qspectrumanalyzer_settings.py +++ b/qspectrumanalyzer/ui_qspectrumanalyzer_settings.py @@ -2,101 +2,87 @@ # Form implementation generated from reading ui file 'qspectrumanalyzer/qspectrumanalyzer_settings.ui' # -# Created by: PyQt4 UI code generator 4.12 +# Created by: PyQt5 UI code generator 5.7.1 # # WARNING! All changes made in this file will be lost! -from PyQt4 import QtCore, QtGui - -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - def _fromUtf8(s): - return s - -try: - _encoding = QtGui.QApplication.UnicodeUTF8 - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) -except AttributeError: - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) +from Qt import QtCore, QtGui, QtWidgets class Ui_QSpectrumAnalyzerSettings(object): def setupUi(self, QSpectrumAnalyzerSettings): - QSpectrumAnalyzerSettings.setObjectName(_fromUtf8("QSpectrumAnalyzerSettings")) + QSpectrumAnalyzerSettings.setObjectName("QSpectrumAnalyzerSettings") QSpectrumAnalyzerSettings.resize(600, 310) - self.verticalLayout = QtGui.QVBoxLayout(QSpectrumAnalyzerSettings) - self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.formLayout = QtGui.QFormLayout() - self.formLayout.setObjectName(_fromUtf8("formLayout")) - self.label_3 = QtGui.QLabel(QSpectrumAnalyzerSettings) - self.label_3.setObjectName(_fromUtf8("label_3")) - self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_3) - self.backendComboBox = QtGui.QComboBox(QSpectrumAnalyzerSettings) - self.backendComboBox.setObjectName(_fromUtf8("backendComboBox")) - self.backendComboBox.addItem(_fromUtf8("")) - self.backendComboBox.addItem(_fromUtf8("")) - self.backendComboBox.addItem(_fromUtf8("")) - self.backendComboBox.addItem(_fromUtf8("")) - self.backendComboBox.addItem(_fromUtf8("")) - self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.backendComboBox) - self.label = QtGui.QLabel(QSpectrumAnalyzerSettings) - self.label.setObjectName(_fromUtf8("label")) - self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.label) - self.horizontalLayout = QtGui.QHBoxLayout() - self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - self.executableEdit = QtGui.QLineEdit(QSpectrumAnalyzerSettings) - self.executableEdit.setObjectName(_fromUtf8("executableEdit")) + self.verticalLayout = QtWidgets.QVBoxLayout(QSpectrumAnalyzerSettings) + self.verticalLayout.setObjectName("verticalLayout") + self.formLayout = QtWidgets.QFormLayout() + self.formLayout.setObjectName("formLayout") + self.label_3 = QtWidgets.QLabel(QSpectrumAnalyzerSettings) + self.label_3.setObjectName("label_3") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_3) + self.backendComboBox = QtWidgets.QComboBox(QSpectrumAnalyzerSettings) + self.backendComboBox.setObjectName("backendComboBox") + self.backendComboBox.addItem("") + self.backendComboBox.addItem("") + self.backendComboBox.addItem("") + self.backendComboBox.addItem("") + self.backendComboBox.addItem("") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.backendComboBox) + self.label = QtWidgets.QLabel(QSpectrumAnalyzerSettings) + self.label.setObjectName("label") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label) + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + self.executableEdit = QtWidgets.QLineEdit(QSpectrumAnalyzerSettings) + self.executableEdit.setObjectName("executableEdit") self.horizontalLayout.addWidget(self.executableEdit) - self.executableButton = QtGui.QToolButton(QSpectrumAnalyzerSettings) - self.executableButton.setObjectName(_fromUtf8("executableButton")) + self.executableButton = QtWidgets.QToolButton(QSpectrumAnalyzerSettings) + self.executableButton.setObjectName("executableButton") self.horizontalLayout.addWidget(self.executableButton) - self.formLayout.setLayout(1, QtGui.QFormLayout.FieldRole, self.horizontalLayout) - self.label_5 = QtGui.QLabel(QSpectrumAnalyzerSettings) - self.label_5.setObjectName(_fromUtf8("label_5")) - self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.label_5) - self.deviceEdit = QtGui.QLineEdit(QSpectrumAnalyzerSettings) - self.deviceEdit.setObjectName(_fromUtf8("deviceEdit")) - self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.deviceEdit) - self.label_4 = QtGui.QLabel(QSpectrumAnalyzerSettings) - self.label_4.setObjectName(_fromUtf8("label_4")) - self.formLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.label_4) - self.sampleRateSpinBox = QtGui.QSpinBox(QSpectrumAnalyzerSettings) + self.formLayout.setLayout(1, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout) + self.label_5 = QtWidgets.QLabel(QSpectrumAnalyzerSettings) + self.label_5.setObjectName("label_5") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_5) + self.deviceEdit = QtWidgets.QLineEdit(QSpectrumAnalyzerSettings) + self.deviceEdit.setObjectName("deviceEdit") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.deviceEdit) + self.label_4 = QtWidgets.QLabel(QSpectrumAnalyzerSettings) + self.label_4.setObjectName("label_4") + self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_4) + self.sampleRateSpinBox = QtWidgets.QSpinBox(QSpectrumAnalyzerSettings) self.sampleRateSpinBox.setMinimum(0) self.sampleRateSpinBox.setMaximum(25000000) self.sampleRateSpinBox.setSingleStep(10000) self.sampleRateSpinBox.setProperty("value", 2560000) - self.sampleRateSpinBox.setObjectName(_fromUtf8("sampleRateSpinBox")) - self.formLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.sampleRateSpinBox) - self.label_2 = QtGui.QLabel(QSpectrumAnalyzerSettings) - self.label_2.setObjectName(_fromUtf8("label_2")) - self.formLayout.setWidget(5, QtGui.QFormLayout.LabelRole, self.label_2) - self.waterfallHistorySizeSpinBox = QtGui.QSpinBox(QSpectrumAnalyzerSettings) + self.sampleRateSpinBox.setObjectName("sampleRateSpinBox") + self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.sampleRateSpinBox) + self.label_2 = QtWidgets.QLabel(QSpectrumAnalyzerSettings) + self.label_2.setObjectName("label_2") + self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_2) + self.waterfallHistorySizeSpinBox = QtWidgets.QSpinBox(QSpectrumAnalyzerSettings) self.waterfallHistorySizeSpinBox.setMinimum(1) self.waterfallHistorySizeSpinBox.setMaximum(10000000) self.waterfallHistorySizeSpinBox.setProperty("value", 100) - self.waterfallHistorySizeSpinBox.setObjectName(_fromUtf8("waterfallHistorySizeSpinBox")) - self.formLayout.setWidget(5, QtGui.QFormLayout.FieldRole, self.waterfallHistorySizeSpinBox) - self.label_6 = QtGui.QLabel(QSpectrumAnalyzerSettings) - self.label_6.setObjectName(_fromUtf8("label_6")) - self.formLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.label_6) - self.horizontalLayout_3 = QtGui.QHBoxLayout() - self.horizontalLayout_3.setObjectName(_fromUtf8("horizontalLayout_3")) - self.paramsEdit = QtGui.QLineEdit(QSpectrumAnalyzerSettings) - self.paramsEdit.setObjectName(_fromUtf8("paramsEdit")) + self.waterfallHistorySizeSpinBox.setObjectName("waterfallHistorySizeSpinBox") + self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.waterfallHistorySizeSpinBox) + self.label_6 = QtWidgets.QLabel(QSpectrumAnalyzerSettings) + self.label_6.setObjectName("label_6") + self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_6) + self.horizontalLayout_3 = QtWidgets.QHBoxLayout() + self.horizontalLayout_3.setObjectName("horizontalLayout_3") + self.paramsEdit = QtWidgets.QLineEdit(QSpectrumAnalyzerSettings) + self.paramsEdit.setObjectName("paramsEdit") self.horizontalLayout_3.addWidget(self.paramsEdit) - self.helpButton = QtGui.QToolButton(QSpectrumAnalyzerSettings) - self.helpButton.setObjectName(_fromUtf8("helpButton")) + self.helpButton = QtWidgets.QToolButton(QSpectrumAnalyzerSettings) + self.helpButton.setObjectName("helpButton") self.horizontalLayout_3.addWidget(self.helpButton) - self.formLayout.setLayout(3, QtGui.QFormLayout.FieldRole, self.horizontalLayout_3) + self.formLayout.setLayout(3, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_3) self.verticalLayout.addLayout(self.formLayout) - spacerItem = QtGui.QSpacerItem(20, 21, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + spacerItem = QtWidgets.QSpacerItem(20, 21, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) self.verticalLayout.addItem(spacerItem) - self.buttonBox = QtGui.QDialogButtonBox(QSpectrumAnalyzerSettings) + self.buttonBox = QtWidgets.QDialogButtonBox(QSpectrumAnalyzerSettings) self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) - self.buttonBox.setObjectName(_fromUtf8("buttonBox")) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok) + self.buttonBox.setObjectName("buttonBox") self.verticalLayout.addWidget(self.buttonBox) self.label_3.setBuddy(self.backendComboBox) self.label.setBuddy(self.executableEdit) @@ -106,8 +92,8 @@ class Ui_QSpectrumAnalyzerSettings(object): self.label_6.setBuddy(self.paramsEdit) self.retranslateUi(QSpectrumAnalyzerSettings) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), QSpectrumAnalyzerSettings.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), QSpectrumAnalyzerSettings.reject) + self.buttonBox.accepted.connect(QSpectrumAnalyzerSettings.accept) + self.buttonBox.rejected.connect(QSpectrumAnalyzerSettings.reject) QtCore.QMetaObject.connectSlotsByName(QSpectrumAnalyzerSettings) QSpectrumAnalyzerSettings.setTabOrder(self.backendComboBox, self.executableEdit) QSpectrumAnalyzerSettings.setTabOrder(self.executableEdit, self.executableButton) @@ -119,19 +105,20 @@ class Ui_QSpectrumAnalyzerSettings(object): QSpectrumAnalyzerSettings.setTabOrder(self.waterfallHistorySizeSpinBox, self.buttonBox) def retranslateUi(self, QSpectrumAnalyzerSettings): - QSpectrumAnalyzerSettings.setWindowTitle(_translate("QSpectrumAnalyzerSettings", "Settings - QSpectrumAnalyzer", None)) - self.label_3.setText(_translate("QSpectrumAnalyzerSettings", "&Backend:", None)) - self.backendComboBox.setItemText(0, _translate("QSpectrumAnalyzerSettings", "soapy_power", None)) - self.backendComboBox.setItemText(1, _translate("QSpectrumAnalyzerSettings", "rx_power", None)) - self.backendComboBox.setItemText(2, _translate("QSpectrumAnalyzerSettings", "rtl_power_fftw", None)) - self.backendComboBox.setItemText(3, _translate("QSpectrumAnalyzerSettings", "rtl_power", None)) - self.backendComboBox.setItemText(4, _translate("QSpectrumAnalyzerSettings", "hackrf_sweep", None)) - self.label.setText(_translate("QSpectrumAnalyzerSettings", "E&xecutable:", None)) - self.executableEdit.setText(_translate("QSpectrumAnalyzerSettings", "soapy_power", None)) - self.executableButton.setText(_translate("QSpectrumAnalyzerSettings", "...", None)) - self.label_5.setText(_translate("QSpectrumAnalyzerSettings", "&Device:", None)) - self.label_4.setText(_translate("QSpectrumAnalyzerSettings", "Sa&mple rate:", None)) - self.label_2.setText(_translate("QSpectrumAnalyzerSettings", "&Waterfall history size:", None)) - self.label_6.setText(_translate("QSpectrumAnalyzerSettings", "Additional ¶meters:", None)) - self.helpButton.setText(_translate("QSpectrumAnalyzerSettings", "?", None)) + _translate = QtCore.QCoreApplication.translate + QSpectrumAnalyzerSettings.setWindowTitle(_translate("QSpectrumAnalyzerSettings", "Settings - QSpectrumAnalyzer")) + self.label_3.setText(_translate("QSpectrumAnalyzerSettings", "&Backend:")) + self.backendComboBox.setItemText(0, _translate("QSpectrumAnalyzerSettings", "soapy_power")) + self.backendComboBox.setItemText(1, _translate("QSpectrumAnalyzerSettings", "rx_power")) + self.backendComboBox.setItemText(2, _translate("QSpectrumAnalyzerSettings", "rtl_power_fftw")) + self.backendComboBox.setItemText(3, _translate("QSpectrumAnalyzerSettings", "rtl_power")) + self.backendComboBox.setItemText(4, _translate("QSpectrumAnalyzerSettings", "hackrf_sweep")) + self.label.setText(_translate("QSpectrumAnalyzerSettings", "E&xecutable:")) + self.executableEdit.setText(_translate("QSpectrumAnalyzerSettings", "soapy_power")) + self.executableButton.setText(_translate("QSpectrumAnalyzerSettings", "...")) + self.label_5.setText(_translate("QSpectrumAnalyzerSettings", "&Device:")) + self.label_4.setText(_translate("QSpectrumAnalyzerSettings", "Sa&mple rate:")) + self.label_2.setText(_translate("QSpectrumAnalyzerSettings", "&Waterfall history size:")) + self.label_6.setText(_translate("QSpectrumAnalyzerSettings", "Additional ¶meters:")) + self.helpButton.setText(_translate("QSpectrumAnalyzerSettings", "?")) diff --git a/qspectrumanalyzer/ui_qspectrumanalyzer_settings_help.py b/qspectrumanalyzer/ui_qspectrumanalyzer_settings_help.py index 122a647..6f383c8 100644 --- a/qspectrumanalyzer/ui_qspectrumanalyzer_settings_help.py +++ b/qspectrumanalyzer/ui_qspectrumanalyzer_settings_help.py @@ -2,49 +2,36 @@ # Form implementation generated from reading ui file 'qspectrumanalyzer/qspectrumanalyzer_settings_help.ui' # -# Created by: PyQt4 UI code generator 4.12 +# Created by: PyQt5 UI code generator 5.7.1 # # WARNING! All changes made in this file will be lost! -from PyQt4 import QtCore, QtGui - -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - def _fromUtf8(s): - return s - -try: - _encoding = QtGui.QApplication.UnicodeUTF8 - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) -except AttributeError: - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) +from Qt import QtCore, QtGui, QtWidgets class Ui_QSpectrumAnalyzerSettingsHelp(object): def setupUi(self, QSpectrumAnalyzerSettingsHelp): - QSpectrumAnalyzerSettingsHelp.setObjectName(_fromUtf8("QSpectrumAnalyzerSettingsHelp")) + QSpectrumAnalyzerSettingsHelp.setObjectName("QSpectrumAnalyzerSettingsHelp") QSpectrumAnalyzerSettingsHelp.resize(1200, 700) - self.verticalLayout = QtGui.QVBoxLayout(QSpectrumAnalyzerSettingsHelp) - self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.helpTextEdit = QtGui.QPlainTextEdit(QSpectrumAnalyzerSettingsHelp) + self.verticalLayout = QtWidgets.QVBoxLayout(QSpectrumAnalyzerSettingsHelp) + self.verticalLayout.setObjectName("verticalLayout") + self.helpTextEdit = QtWidgets.QPlainTextEdit(QSpectrumAnalyzerSettingsHelp) self.helpTextEdit.setUndoRedoEnabled(False) self.helpTextEdit.setTextInteractionFlags(QtCore.Qt.TextSelectableByKeyboard|QtCore.Qt.TextSelectableByMouse) - self.helpTextEdit.setObjectName(_fromUtf8("helpTextEdit")) + self.helpTextEdit.setObjectName("helpTextEdit") self.verticalLayout.addWidget(self.helpTextEdit) - self.buttonBox = QtGui.QDialogButtonBox(QSpectrumAnalyzerSettingsHelp) + self.buttonBox = QtWidgets.QDialogButtonBox(QSpectrumAnalyzerSettingsHelp) self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Close) - self.buttonBox.setObjectName(_fromUtf8("buttonBox")) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Close) + self.buttonBox.setObjectName("buttonBox") self.verticalLayout.addWidget(self.buttonBox) self.retranslateUi(QSpectrumAnalyzerSettingsHelp) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), QSpectrumAnalyzerSettingsHelp.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), QSpectrumAnalyzerSettingsHelp.reject) + self.buttonBox.accepted.connect(QSpectrumAnalyzerSettingsHelp.accept) + self.buttonBox.rejected.connect(QSpectrumAnalyzerSettingsHelp.reject) QtCore.QMetaObject.connectSlotsByName(QSpectrumAnalyzerSettingsHelp) QSpectrumAnalyzerSettingsHelp.setTabOrder(self.helpTextEdit, self.buttonBox) def retranslateUi(self, QSpectrumAnalyzerSettingsHelp): - QSpectrumAnalyzerSettingsHelp.setWindowTitle(_translate("QSpectrumAnalyzerSettingsHelp", "Help - QSpectrumAnalyzer", None)) + _translate = QtCore.QCoreApplication.translate + QSpectrumAnalyzerSettingsHelp.setWindowTitle(_translate("QSpectrumAnalyzerSettingsHelp", "Help - QSpectrumAnalyzer")) diff --git a/qspectrumanalyzer/ui_qspectrumanalyzer_smooth.py b/qspectrumanalyzer/ui_qspectrumanalyzer_smooth.py index ae70575..0f26555 100644 --- a/qspectrumanalyzer/ui_qspectrumanalyzer_smooth.py +++ b/qspectrumanalyzer/ui_qspectrumanalyzer_smooth.py @@ -2,80 +2,67 @@ # Form implementation generated from reading ui file 'qspectrumanalyzer/qspectrumanalyzer_smooth.ui' # -# Created by: PyQt4 UI code generator 4.12 +# Created by: PyQt5 UI code generator 5.7.1 # # WARNING! All changes made in this file will be lost! -from PyQt4 import QtCore, QtGui - -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - def _fromUtf8(s): - return s - -try: - _encoding = QtGui.QApplication.UnicodeUTF8 - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) -except AttributeError: - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) +from Qt import QtCore, QtGui, QtWidgets class Ui_QSpectrumAnalyzerSmooth(object): def setupUi(self, QSpectrumAnalyzerSmooth): - QSpectrumAnalyzerSmooth.setObjectName(_fromUtf8("QSpectrumAnalyzerSmooth")) + QSpectrumAnalyzerSmooth.setObjectName("QSpectrumAnalyzerSmooth") QSpectrumAnalyzerSmooth.resize(250, 130) - self.verticalLayout = QtGui.QVBoxLayout(QSpectrumAnalyzerSmooth) - self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.formLayout = QtGui.QFormLayout() - self.formLayout.setObjectName(_fromUtf8("formLayout")) - self.label = QtGui.QLabel(QSpectrumAnalyzerSmooth) - self.label.setObjectName(_fromUtf8("label")) - self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.label) - self.windowFunctionComboBox = QtGui.QComboBox(QSpectrumAnalyzerSmooth) - self.windowFunctionComboBox.setObjectName(_fromUtf8("windowFunctionComboBox")) - self.windowFunctionComboBox.addItem(_fromUtf8("")) - self.windowFunctionComboBox.addItem(_fromUtf8("")) - self.windowFunctionComboBox.addItem(_fromUtf8("")) - self.windowFunctionComboBox.addItem(_fromUtf8("")) - self.windowFunctionComboBox.addItem(_fromUtf8("")) - self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.windowFunctionComboBox) - self.label_2 = QtGui.QLabel(QSpectrumAnalyzerSmooth) - self.label_2.setObjectName(_fromUtf8("label_2")) - self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.label_2) - self.windowLengthSpinBox = QtGui.QSpinBox(QSpectrumAnalyzerSmooth) + self.verticalLayout = QtWidgets.QVBoxLayout(QSpectrumAnalyzerSmooth) + self.verticalLayout.setObjectName("verticalLayout") + self.formLayout = QtWidgets.QFormLayout() + self.formLayout.setObjectName("formLayout") + self.label = QtWidgets.QLabel(QSpectrumAnalyzerSmooth) + self.label.setObjectName("label") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label) + self.windowFunctionComboBox = QtWidgets.QComboBox(QSpectrumAnalyzerSmooth) + self.windowFunctionComboBox.setObjectName("windowFunctionComboBox") + self.windowFunctionComboBox.addItem("") + self.windowFunctionComboBox.addItem("") + self.windowFunctionComboBox.addItem("") + self.windowFunctionComboBox.addItem("") + self.windowFunctionComboBox.addItem("") + self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.windowFunctionComboBox) + self.label_2 = QtWidgets.QLabel(QSpectrumAnalyzerSmooth) + self.label_2.setObjectName("label_2") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_2) + self.windowLengthSpinBox = QtWidgets.QSpinBox(QSpectrumAnalyzerSmooth) self.windowLengthSpinBox.setMinimum(3) self.windowLengthSpinBox.setMaximum(1001) self.windowLengthSpinBox.setProperty("value", 11) - self.windowLengthSpinBox.setObjectName(_fromUtf8("windowLengthSpinBox")) - self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.windowLengthSpinBox) + self.windowLengthSpinBox.setObjectName("windowLengthSpinBox") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.windowLengthSpinBox) self.verticalLayout.addLayout(self.formLayout) - spacerItem = QtGui.QSpacerItem(20, 1, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + spacerItem = QtWidgets.QSpacerItem(20, 1, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) self.verticalLayout.addItem(spacerItem) - self.buttonBox = QtGui.QDialogButtonBox(QSpectrumAnalyzerSmooth) + self.buttonBox = QtWidgets.QDialogButtonBox(QSpectrumAnalyzerSmooth) self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) - self.buttonBox.setObjectName(_fromUtf8("buttonBox")) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok) + self.buttonBox.setObjectName("buttonBox") self.verticalLayout.addWidget(self.buttonBox) self.label.setBuddy(self.windowFunctionComboBox) self.label_2.setBuddy(self.windowLengthSpinBox) self.retranslateUi(QSpectrumAnalyzerSmooth) self.windowFunctionComboBox.setCurrentIndex(1) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), QSpectrumAnalyzerSmooth.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), QSpectrumAnalyzerSmooth.reject) + self.buttonBox.accepted.connect(QSpectrumAnalyzerSmooth.accept) + self.buttonBox.rejected.connect(QSpectrumAnalyzerSmooth.reject) QtCore.QMetaObject.connectSlotsByName(QSpectrumAnalyzerSmooth) QSpectrumAnalyzerSmooth.setTabOrder(self.windowFunctionComboBox, self.windowLengthSpinBox) QSpectrumAnalyzerSmooth.setTabOrder(self.windowLengthSpinBox, self.buttonBox) def retranslateUi(self, QSpectrumAnalyzerSmooth): - QSpectrumAnalyzerSmooth.setWindowTitle(_translate("QSpectrumAnalyzerSmooth", "Smoothing - QSpectrumAnalyzer", None)) - self.label.setText(_translate("QSpectrumAnalyzerSmooth", "&Window function:", None)) - self.windowFunctionComboBox.setItemText(0, _translate("QSpectrumAnalyzerSmooth", "rectangular", None)) - self.windowFunctionComboBox.setItemText(1, _translate("QSpectrumAnalyzerSmooth", "hanning", None)) - self.windowFunctionComboBox.setItemText(2, _translate("QSpectrumAnalyzerSmooth", "hamming", None)) - self.windowFunctionComboBox.setItemText(3, _translate("QSpectrumAnalyzerSmooth", "bartlett", None)) - self.windowFunctionComboBox.setItemText(4, _translate("QSpectrumAnalyzerSmooth", "blackman", None)) - self.label_2.setText(_translate("QSpectrumAnalyzerSmooth", "Window len>h:", None)) + _translate = QtCore.QCoreApplication.translate + QSpectrumAnalyzerSmooth.setWindowTitle(_translate("QSpectrumAnalyzerSmooth", "Smoothing - QSpectrumAnalyzer")) + self.label.setText(_translate("QSpectrumAnalyzerSmooth", "&Window function:")) + self.windowFunctionComboBox.setItemText(0, _translate("QSpectrumAnalyzerSmooth", "rectangular")) + self.windowFunctionComboBox.setItemText(1, _translate("QSpectrumAnalyzerSmooth", "hanning")) + self.windowFunctionComboBox.setItemText(2, _translate("QSpectrumAnalyzerSmooth", "hamming")) + self.windowFunctionComboBox.setItemText(3, _translate("QSpectrumAnalyzerSmooth", "bartlett")) + self.windowFunctionComboBox.setItemText(4, _translate("QSpectrumAnalyzerSmooth", "blackman")) + self.label_2.setText(_translate("QSpectrumAnalyzerSmooth", "Window len>h:")) diff --git a/qspectrumanalyzer/utils.py b/qspectrumanalyzer/utils.py index 18f67d3..d31c9ba 100644 --- a/qspectrumanalyzer/utils.py +++ b/qspectrumanalyzer/utils.py @@ -1,6 +1,6 @@ import numpy as np -from PyQt4 import QtGui +from Qt import QtGui def smooth(x, window_len=11, window='hanning'): diff --git a/setup-qt.py b/setup-qt.py index 890f12d..fdd0bff 100755 --- a/setup-qt.py +++ b/setup-qt.py @@ -8,15 +8,18 @@ languages = ["cs"] print("Rebuilding PyQt resource files...") for f in glob("{}/*.qrc".format(package)): - os.system("pyrcc4 -o {}/qrc_{}.py {}".format(package, os.path.basename(f[:-4]), f)) + os.system("pyrcc5 -o {}/qrc_{}.py {}".format(package, os.path.basename(f[:-4]), f)) print("Rebuilding PyQt UI files...") for f in glob("{}/*.ui".format(package)): - os.system("pyuic4 -o {}/ui_{}.py {}".format(package, os.path.basename(f[:-3]), f)) + os.system("pyuic5 -o {}/ui_{}.py {}".format(package, os.path.basename(f[:-3]), f)) + +print("Changing compiled UI files from PyQt5 to Qt.py wrapper...") +os.system("sed -i 's/^from PyQt5 import/from Qt import/g' {}/ui_*.py".format(package)) print("Updating translations...") lang_files = " ".join("{}/languages/{}_{}.ts".format(package, package, lang) for lang in languages) -os.system("pylupdate4 {}/*.py -ts {}".format(package, lang_files)) +os.system("pylupdate5 {}/*.py -ts {}".format(package, lang_files)) os.system("lrelease {}/languages/*.ts".format(package)) print("Regenerating .pyc files...") diff --git a/setup.py b/setup.py index a6e9d24..28d9bd5 100755 --- a/setup.py +++ b/setup.py @@ -31,7 +31,8 @@ setup( }, install_requires=[ "soapy_power", - "pyqtgraph" + "pyqtgraph", + "Qt.py" ], classifiers=[ "Development Status :: 4 - Beta",