diff --git a/src/nqrduck_broadband/broadband.py b/src/nqrduck_broadband/broadband.py index a17ae04..dd622ab 100644 --- a/src/nqrduck_broadband/broadband.py +++ b/src/nqrduck_broadband/broadband.py @@ -1,4 +1,4 @@ -from PyQt5.QtCore import pyqtSignal, QObject +from PyQt6.QtCore import pyqtSignal, QObject from nqrduck.module.module import Module from nqrduck_broadband.model import BroadbandModel from nqrduck_broadband.view import BroadbandView diff --git a/src/nqrduck_broadband/controller.py b/src/nqrduck_broadband/controller.py index 75aeebc..1eae73e 100644 --- a/src/nqrduck_broadband/controller.py +++ b/src/nqrduck_broadband/controller.py @@ -1,5 +1,5 @@ import logging -from PyQt5.QtCore import pyqtSlot, pyqtSignal +from PyQt6.QtCore import pyqtSlot, pyqtSignal from nqrduck.module.module_controller import ModuleController logger = logging.getLogger(__name__) diff --git a/src/nqrduck_broadband/model.py b/src/nqrduck_broadband/model.py index 9566cc8..bb5019a 100644 --- a/src/nqrduck_broadband/model.py +++ b/src/nqrduck_broadband/model.py @@ -1,4 +1,4 @@ -from PyQt5.QtCore import pyqtSignal +from PyQt6.QtCore import pyqtSignal from nqrduck.module.module_model import ModuleModel diff --git a/src/nqrduck_broadband/view.py b/src/nqrduck_broadband/view.py index ab1451d..2312099 100644 --- a/src/nqrduck_broadband/view.py +++ b/src/nqrduck_broadband/view.py @@ -1,6 +1,6 @@ import logging -from PyQt5.QtCore import QMetaMethod, pyqtSlot, pyqtSignal -from PyQt5.QtWidgets import QWidget, QMessageBox +from PyQt6.QtCore import QMetaMethod, pyqtSlot, pyqtSignal +from PyQt6.QtWidgets import QWidget, QMessageBox from nqrduck.module.module_view import ModuleView from .widget import Ui_Form diff --git a/src/nqrduck_broadband/widget.py b/src/nqrduck_broadband/widget.py index eaccc28..cea928d 100644 --- a/src/nqrduck_broadband/widget.py +++ b/src/nqrduck_broadband/widget.py @@ -1,39 +1,37 @@ -# -*- coding: utf-8 -*- - # Form implementation generated from reading ui file '../Modules/nqrduck-broadband/src/nqrduck_broadband/resources/broadband_widget.ui' # -# Created by: PyQt5 UI code generator 5.15.9 +# Created by: PyQt6 UI code generator 6.5.1 # -# WARNING: Any manual changes made to this file will be lost when pyuic5 is +# WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. -from PyQt5 import QtCore, QtGui, QtWidgets +from PyQt6 import QtCore, QtGui, QtWidgets class Ui_Form(object): def setupUi(self, Form): Form.setObjectName("Form") Form.resize(1280, 645) - self.verticalLayoutWidget_5 = QtWidgets.QWidget(Form) + self.verticalLayoutWidget_5 = QtWidgets.QWidget(parent=Form) self.verticalLayoutWidget_5.setGeometry(QtCore.QRect(310, 0, 831, 651)) self.verticalLayoutWidget_5.setObjectName("verticalLayoutWidget_5") self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.verticalLayoutWidget_5) self.verticalLayout_5.setContentsMargins(0, 0, 0, 0) self.verticalLayout_5.setObjectName("verticalLayout_5") - self.broadbandPlot = MplWidget(self.verticalLayoutWidget_5) + self.broadbandPlot = MplWidget(parent=self.verticalLayoutWidget_5) self.broadbandPlot.setObjectName("broadbandPlot") self.verticalLayout_5.addWidget(self.broadbandPlot) self.horizontalLayout_5 = QtWidgets.QHBoxLayout() self.horizontalLayout_5.setObjectName("horizontalLayout_5") - self.time_domainPlot = MplWidget(self.verticalLayoutWidget_5) + self.time_domainPlot = MplWidget(parent=self.verticalLayoutWidget_5) self.time_domainPlot.setObjectName("time_domainPlot") self.horizontalLayout_5.addWidget(self.time_domainPlot) - self.frequency_domainPlot = MplWidget(self.verticalLayoutWidget_5) + self.frequency_domainPlot = MplWidget(parent=self.verticalLayoutWidget_5) self.frequency_domainPlot.setObjectName("frequency_domainPlot") self.horizontalLayout_5.addWidget(self.frequency_domainPlot) self.verticalLayout_5.addLayout(self.horizontalLayout_5) - self.verticalLayoutWidget_4 = QtWidgets.QWidget(Form) + self.verticalLayoutWidget_4 = QtWidgets.QWidget(parent=Form) self.verticalLayoutWidget_4.setGeometry(QtCore.QRect(0, 0, 311, 651)) self.verticalLayoutWidget_4.setObjectName("verticalLayoutWidget_4") self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.verticalLayoutWidget_4) @@ -41,119 +39,119 @@ class Ui_Form(object): self.verticalLayout_4.setObjectName("verticalLayout_4") self.verticalLayout = QtWidgets.QVBoxLayout() self.verticalLayout.setObjectName("verticalLayout") - self.label_8 = QtWidgets.QLabel(self.verticalLayoutWidget_4) + self.label_8 = QtWidgets.QLabel(parent=self.verticalLayoutWidget_4) font = QtGui.QFont() font.setPointSize(12) font.setBold(False) font.setItalic(False) font.setWeight(50) self.label_8.setFont(font) - self.label_8.setAlignment(QtCore.Qt.AlignCenter) + self.label_8.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.label_8.setObjectName("label_8") self.verticalLayout.addWidget(self.label_8) self.horizontalLayout = QtWidgets.QHBoxLayout() self.horizontalLayout.setObjectName("horizontalLayout") - self.label = QtWidgets.QLabel(self.verticalLayoutWidget_4) + self.label = QtWidgets.QLabel(parent=self.verticalLayoutWidget_4) self.label.setObjectName("label") self.horizontalLayout.addWidget(self.label) - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout.addItem(spacerItem) - self.start_frequencyField = QtWidgets.QLineEdit(self.verticalLayoutWidget_4) - self.start_frequencyField.setLayoutDirection(QtCore.Qt.LeftToRight) - self.start_frequencyField.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.start_frequencyField = QtWidgets.QLineEdit(parent=self.verticalLayoutWidget_4) + self.start_frequencyField.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight) + self.start_frequencyField.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.start_frequencyField.setObjectName("start_frequencyField") self.horizontalLayout.addWidget(self.start_frequencyField) - spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout.addItem(spacerItem1) - self.label_2 = QtWidgets.QLabel(self.verticalLayoutWidget_4) + self.label_2 = QtWidgets.QLabel(parent=self.verticalLayoutWidget_4) self.label_2.setObjectName("label_2") self.horizontalLayout.addWidget(self.label_2) self.verticalLayout.addLayout(self.horizontalLayout) self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") - self.label_3 = QtWidgets.QLabel(self.verticalLayoutWidget_4) + self.label_3 = QtWidgets.QLabel(parent=self.verticalLayoutWidget_4) self.label_3.setObjectName("label_3") self.horizontalLayout_2.addWidget(self.label_3) - spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_2.addItem(spacerItem2) - self.stop_frequencyField = QtWidgets.QLineEdit(self.verticalLayoutWidget_4) - self.stop_frequencyField.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.stop_frequencyField = QtWidgets.QLineEdit(parent=self.verticalLayoutWidget_4) + self.stop_frequencyField.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.stop_frequencyField.setObjectName("stop_frequencyField") self.horizontalLayout_2.addWidget(self.stop_frequencyField) - spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_2.addItem(spacerItem3) - self.label_4 = QtWidgets.QLabel(self.verticalLayoutWidget_4) + self.label_4 = QtWidgets.QLabel(parent=self.verticalLayoutWidget_4) self.label_4.setObjectName("label_4") self.horizontalLayout_2.addWidget(self.label_4) self.verticalLayout.addLayout(self.horizontalLayout_2) self.horizontalLayout_3 = QtWidgets.QHBoxLayout() self.horizontalLayout_3.setObjectName("horizontalLayout_3") - self.label_5 = QtWidgets.QLabel(self.verticalLayoutWidget_4) + self.label_5 = QtWidgets.QLabel(parent=self.verticalLayoutWidget_4) self.label_5.setObjectName("label_5") self.horizontalLayout_3.addWidget(self.label_5) - spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_3.addItem(spacerItem4) - self.frequency_stepField = QtWidgets.QLineEdit(self.verticalLayoutWidget_4) - self.frequency_stepField.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.frequency_stepField = QtWidgets.QLineEdit(parent=self.verticalLayoutWidget_4) + self.frequency_stepField.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.frequency_stepField.setObjectName("frequency_stepField") self.horizontalLayout_3.addWidget(self.frequency_stepField) - spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_3.addItem(spacerItem5) - self.label_6 = QtWidgets.QLabel(self.verticalLayoutWidget_4) + self.label_6 = QtWidgets.QLabel(parent=self.verticalLayoutWidget_4) self.label_6.setObjectName("label_6") self.horizontalLayout_3.addWidget(self.label_6) self.verticalLayout.addLayout(self.horizontalLayout_3) self.horizontalLayout_4 = QtWidgets.QHBoxLayout() self.horizontalLayout_4.setObjectName("horizontalLayout_4") - self.label_7 = QtWidgets.QLabel(self.verticalLayoutWidget_4) + self.label_7 = QtWidgets.QLabel(parent=self.verticalLayoutWidget_4) self.label_7.setObjectName("label_7") self.horizontalLayout_4.addWidget(self.label_7) - spacerItem6 = QtWidgets.QSpacerItem(80, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem6 = QtWidgets.QSpacerItem(80, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_4.addItem(spacerItem6) - self.averagesField = QtWidgets.QLineEdit(self.verticalLayoutWidget_4) - self.averagesField.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.averagesField = QtWidgets.QLineEdit(parent=self.verticalLayoutWidget_4) + self.averagesField.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.averagesField.setObjectName("averagesField") self.horizontalLayout_4.addWidget(self.averagesField) - spacerItem7 = QtWidgets.QSpacerItem(75, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + spacerItem7 = QtWidgets.QSpacerItem(75, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_4.addItem(spacerItem7) self.verticalLayout.addLayout(self.horizontalLayout_4) - self.start_measurementButton = QtWidgets.QPushButton(self.verticalLayoutWidget_4) + self.start_measurementButton = QtWidgets.QPushButton(parent=self.verticalLayoutWidget_4) self.start_measurementButton.setObjectName("start_measurementButton") self.verticalLayout.addWidget(self.start_measurementButton) self.verticalLayout_4.addLayout(self.verticalLayout) self.verticalLayout_3 = QtWidgets.QVBoxLayout() self.verticalLayout_3.setObjectName("verticalLayout_3") - self.label_10 = QtWidgets.QLabel(self.verticalLayoutWidget_4) + self.label_10 = QtWidgets.QLabel(parent=self.verticalLayoutWidget_4) font = QtGui.QFont() font.setPointSize(12) font.setBold(False) font.setItalic(False) font.setWeight(50) self.label_10.setFont(font) - self.label_10.setAlignment(QtCore.Qt.AlignCenter) + self.label_10.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.label_10.setObjectName("label_10") self.verticalLayout_3.addWidget(self.label_10) - self.load_fileButton = QtWidgets.QPushButton(self.verticalLayoutWidget_4) + self.load_fileButton = QtWidgets.QPushButton(parent=self.verticalLayoutWidget_4) self.load_fileButton.setObjectName("load_fileButton") self.verticalLayout_3.addWidget(self.load_fileButton) - self.file_pathLabel = QtWidgets.QLabel(self.verticalLayoutWidget_4) + self.file_pathLabel = QtWidgets.QLabel(parent=self.verticalLayoutWidget_4) self.file_pathLabel.setText("") self.file_pathLabel.setObjectName("file_pathLabel") self.verticalLayout_3.addWidget(self.file_pathLabel) self.verticalLayout_2 = QtWidgets.QVBoxLayout() self.verticalLayout_2.setObjectName("verticalLayout_2") - self.label_9 = QtWidgets.QLabel(self.verticalLayoutWidget_4) + self.label_9 = QtWidgets.QLabel(parent=self.verticalLayoutWidget_4) font = QtGui.QFont() font.setPointSize(12) self.label_9.setFont(font) - self.label_9.setAlignment(QtCore.Qt.AlignCenter) + self.label_9.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter) self.label_9.setObjectName("label_9") self.verticalLayout_2.addWidget(self.label_9) - self.measurementProgress = QtWidgets.QProgressBar(self.verticalLayoutWidget_4) + self.measurementProgress = QtWidgets.QProgressBar(parent=self.verticalLayoutWidget_4) self.measurementProgress.setProperty("value", 0) self.measurementProgress.setObjectName("measurementProgress") self.verticalLayout_2.addWidget(self.measurementProgress) - self.infoBox = QtWidgets.QScrollArea(self.verticalLayoutWidget_4) + self.infoBox = QtWidgets.QScrollArea(parent=self.verticalLayoutWidget_4) self.infoBox.setWidgetResizable(True) self.infoBox.setObjectName("infoBox") self.scrollAreaWidgetContents = QtWidgets.QWidget() @@ -186,4 +184,5 @@ class Ui_Form(object): self.label_10.setText(_translate("Form", "Sequence Settings:")) self.load_fileButton.setText(_translate("Form", "Load TNMR File")) self.label_9.setText(_translate("Form", "Info Box:")) + from nqrduck.contrib.mplwidget import MplWidget