From a60cc548c094e64b2d9882b6988ffe440c3dc1d5 Mon Sep 17 00:00:00 2001 From: Leor Bleier Date: Mon, 4 May 2020 17:14:55 -0400 Subject: [PATCH] (WIP) Fixes #72, upgrade PyQt4 to PyQt5 and implement other fixes as needed --- RoutingService.py | 4 +- Subsystems/cmdGui/CommandSystemDialog.py | 1621 +++--- Subsystems/cmdGui/CommandSystemDialog.ui | 5766 ++++++++++---------- Subsystems/cmdGui/GenericCommandDialog.py | 219 +- Subsystems/cmdGui/GenericCommandDialog.ui | 289 +- Subsystems/cmdGui/Parameter.py | 2 +- Subsystems/cmdGui/ParameterDialog.py | 194 +- Subsystems/cmdGui/ParameterDialog.ui | 415 +- Subsystems/tlmGUI/EventMessage.py | 2 +- Subsystems/tlmGUI/GenericTelemetry.py | 2 +- Subsystems/tlmGUI/TelemetrySystem.py | 1 - Subsystems/tlmGUI/TelemetrySystemDialog.ui | 2 +- 12 files changed, 4015 insertions(+), 4502 deletions(-) diff --git a/RoutingService.py b/RoutingService.py index 2372b67..061e3cd 100644 --- a/RoutingService.py +++ b/RoutingService.py @@ -83,7 +83,9 @@ def run(self): # Add Host to the list if not already in list # if hostIpAddress not in self.ipAddressesList: - hostName = f'Spacecraft {len(self.spacecraftNames)}' + ## MAKE SURE THERE'S NO SPACE BETWEEN "Spacecraft" + ## AND THE FIRST CURLY BRACE!!! + hostName = f'Spacecraft{len(self.spacecraftNames)}' my_hostName_as_bytes = hostName.encode() print("Detected", hostName, "at", hostIpAddress) self.ipAddressesList.append(hostIpAddress) diff --git a/Subsystems/cmdGui/CommandSystemDialog.py b/Subsystems/cmdGui/CommandSystemDialog.py index 96ac953..0445337 100644 --- a/Subsystems/cmdGui/CommandSystemDialog.py +++ b/Subsystems/cmdGui/CommandSystemDialog.py @@ -11,342 +11,279 @@ class Ui_CommandSystemDialog(object): def setupUi(self, CommandSystemDialog): CommandSystemDialog.setObjectName("CommandSystemDialog") - CommandSystemDialog.setWindowModality(QtCore.Qt.NonModal) - CommandSystemDialog.setEnabled(True) - CommandSystemDialog.resize(709, 581) - self.verticalLayout = QtWidgets.QVBoxLayout(CommandSystemDialog) - self.verticalLayout.setSpacing(0) - self.verticalLayout.setObjectName("verticalLayout") - self.horizontalLayout = QtWidgets.QHBoxLayout() + CommandSystemDialog.resize(772, 1020) + self.layoutWidget_2 = QtWidgets.QWidget(CommandSystemDialog) + self.layoutWidget_2.setGeometry(QtCore.QRect(80, 20, 621, 25)) + self.layoutWidget_2.setObjectName("layoutWidget_2") + self.horizontalLayout = QtWidgets.QHBoxLayout(self.layoutWidget_2) + self.horizontalLayout.setContentsMargins(0, 0, 0, 0) self.horizontalLayout.setObjectName("horizontalLayout") spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout.addItem(spacerItem) - self.label = QtWidgets.QLabel(CommandSystemDialog) + self.label = QtWidgets.QLabel(self.layoutWidget_2) self.label.setObjectName("label") self.horizontalLayout.addWidget(self.label) spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout.addItem(spacerItem1) - self.verticalLayout.addLayout(self.horizontalLayout) - self.horizontalLayout_2 = QtWidgets.QHBoxLayout() + self.layoutWidget_3 = QtWidgets.QWidget(CommandSystemDialog) + self.layoutWidget_3.setGeometry(QtCore.QRect(80, 60, 621, 33)) + self.layoutWidget_3.setObjectName("layoutWidget_3") + self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.layoutWidget_3) + self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0) self.horizontalLayout_2.setObjectName("horizontalLayout_2") spacerItem2 = QtWidgets.QSpacerItem(90, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_2.addItem(spacerItem2) spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_2.addItem(spacerItem3) - self.label_2 = QtWidgets.QLabel(CommandSystemDialog) + self.label_2 = QtWidgets.QLabel(self.layoutWidget_3) self.label_2.setObjectName("label_2") self.horizontalLayout_2.addWidget(self.label_2) spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_2.addItem(spacerItem4) - self.buttonBox = QtWidgets.QDialogButtonBox(CommandSystemDialog) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.buttonBox.sizePolicy().hasHeightForWidth()) - self.buttonBox.setSizePolicy(sizePolicy) - self.buttonBox.setMinimumSize(QtCore.QSize(90, 0)) - self.buttonBox.setMaximumSize(QtCore.QSize(90, 16777215)) - self.buttonBox.setFocusPolicy(QtCore.Qt.NoFocus) - self.buttonBox.setOrientation(QtCore.Qt.Horizontal) + self.buttonBox = QtWidgets.QDialogButtonBox(self.layoutWidget_3) + self.buttonBox.setOrientation(QtCore.Qt.Vertical) self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Close) + self.buttonBox.setCenterButtons(True) self.buttonBox.setObjectName("buttonBox") self.horizontalLayout_2.addWidget(self.buttonBox) - self.verticalLayout.addLayout(self.horizontalLayout_2) - self.scrollArea = QtWidgets.QScrollArea(CommandSystemDialog) - self.scrollArea.setMinimumSize(QtCore.QSize(0, 0)) - self.scrollArea.setBaseSize(QtCore.QSize(0, 800)) - self.scrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) - self.scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) - self.scrollArea.setWidgetResizable(True) - self.scrollArea.setObjectName("scrollArea") - self.scrollAreaWidgetContents = QtWidgets.QWidget() - self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 675, 1000)) - self.scrollAreaWidgetContents.setMinimumSize(QtCore.QSize(0, 1000)) - self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents") - self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents) - self.verticalLayout_2.setObjectName("verticalLayout_2") - self.verticalLayout_4 = QtWidgets.QVBoxLayout() - self.verticalLayout_4.setObjectName("verticalLayout_4") - self.horizontalLayout_6 = QtWidgets.QHBoxLayout() - self.horizontalLayout_6.setObjectName("horizontalLayout_6") - self.label_3 = QtWidgets.QLabel(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth()) - self.label_3.setSizePolicy(sizePolicy) - self.label_3.setMinimumSize(QtCore.QSize(201, 31)) - self.label_3.setMaximumSize(QtCore.QSize(201, 31)) - self.label_3.setObjectName("label_3") - self.horizontalLayout_6.addWidget(self.label_3) - self.label_4 = QtWidgets.QLabel(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth()) - self.label_4.setSizePolicy(sizePolicy) - self.label_4.setMinimumSize(QtCore.QSize(81, 31)) - self.label_4.setMaximumSize(QtCore.QSize(81, 31)) - self.label_4.setObjectName("label_4") - self.horizontalLayout_6.addWidget(self.label_4) - self.label_5 = QtWidgets.QLabel(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.label_5.sizePolicy().hasHeightForWidth()) - self.label_5.setSizePolicy(sizePolicy) - self.label_5.setMinimumSize(QtCore.QSize(81, 31)) - self.label_5.setMaximumSize(QtCore.QSize(81, 31)) - self.label_5.setObjectName("label_5") - self.horizontalLayout_6.addWidget(self.label_5) - spacerItem5 = QtWidgets.QSpacerItem(101, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_6.addItem(spacerItem5) - spacerItem6 = QtWidgets.QSpacerItem(121, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_6.addItem(spacerItem6) - self.verticalLayout_4.addLayout(self.horizontalLayout_6) - self.horizontalLayout_3 = QtWidgets.QHBoxLayout() - self.horizontalLayout_3.setObjectName("horizontalLayout_3") - self.SubsysBrowser_0 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_0.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_0.setSizePolicy(sizePolicy) - self.SubsysBrowser_0.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_0.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_0.setObjectName("SubsysBrowser_0") - self.horizontalLayout_3.addWidget(self.SubsysBrowser_0) - self.lineEditPktId_0 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + self.layoutWidget = QtWidgets.QWidget(CommandSystemDialog) + self.layoutWidget.setGeometry(QtCore.QRect(70, 120, 630, 857)) + self.layoutWidget.setObjectName("layoutWidget") + self.gridLayout = QtWidgets.QGridLayout(self.layoutWidget) + self.gridLayout.setContentsMargins(0, 0, 0, 0) + self.gridLayout.setObjectName("gridLayout") + self.quickButton_3 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_0.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_0.setSizePolicy(sizePolicy) - self.lineEditPktId_0.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_0.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_0.setObjectName("lineEditPktId_0") - self.horizontalLayout_3.addWidget(self.lineEditPktId_0) - self.lineEdit_0 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEdit_0.sizePolicy().hasHeightForWidth()) - self.lineEdit_0.setSizePolicy(sizePolicy) - self.lineEdit_0.setMinimumSize(QtCore.QSize(100, 31)) - self.lineEdit_0.setMaximumSize(QtCore.QSize(100, 31)) - self.lineEdit_0.setObjectName("lineEdit_0") - self.horizontalLayout_3.addWidget(self.lineEdit_0) - self.pushButton_0 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.quickButton_3.sizePolicy().hasHeightForWidth()) + self.quickButton_3.setSizePolicy(sizePolicy) + self.quickButton_3.setMinimumSize(QtCore.QSize(121, 0)) + self.quickButton_3.setMaximumSize(QtCore.QSize(121, 16777215)) + self.quickButton_3.setText("") + self.quickButton_3.setObjectName("quickButton_3") + self.gridLayout.addWidget(self.quickButton_3, 3, 4, 1, 1) + self.SubsysBrowser_6 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_6.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_6.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_6.setReadOnly(True) + self.SubsysBrowser_6.setObjectName("SubsysBrowser_6") + self.gridLayout.addWidget(self.SubsysBrowser_6, 7, 0, 1, 1) + self.quickButton_4 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_0.sizePolicy().hasHeightForWidth()) - self.pushButton_0.setSizePolicy(sizePolicy) - self.pushButton_0.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_0.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_0.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_0.setObjectName("pushButton_0") - self.horizontalLayout_3.addWidget(self.pushButton_0) - self.quickButton_1 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.quickButton_4.sizePolicy().hasHeightForWidth()) + self.quickButton_4.setSizePolicy(sizePolicy) + self.quickButton_4.setMinimumSize(QtCore.QSize(121, 0)) + self.quickButton_4.setMaximumSize(QtCore.QSize(121, 16777215)) + self.quickButton_4.setText("") + self.quickButton_4.setObjectName("quickButton_4") + self.gridLayout.addWidget(self.quickButton_4, 4, 4, 1, 1) + self.SubsysBrowser_18 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_18.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_18.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_18.setReadOnly(True) + self.SubsysBrowser_18.setObjectName("SubsysBrowser_18") + self.gridLayout.addWidget(self.SubsysBrowser_18, 19, 0, 1, 1) + self.lineEditPktId_18 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.quickButton_1.sizePolicy().hasHeightForWidth()) - self.quickButton_1.setSizePolicy(sizePolicy) - self.quickButton_1.setMinimumSize(QtCore.QSize(121, 0)) - self.quickButton_1.setMaximumSize(QtCore.QSize(121, 16777215)) - self.quickButton_1.setText("") - self.quickButton_1.setObjectName("quickButton_1") - self.horizontalLayout_3.addWidget(self.quickButton_1) - self.verticalLayout_4.addLayout(self.horizontalLayout_3) - self.horizontalLayout_4 = QtWidgets.QHBoxLayout() - self.horizontalLayout_4.setObjectName("horizontalLayout_4") - self.SubsysBrowser_1 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEditPktId_18.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_18.setSizePolicy(sizePolicy) + self.lineEditPktId_18.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_18.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_18.setObjectName("lineEditPktId_18") + self.gridLayout.addWidget(self.lineEditPktId_18, 19, 1, 1, 1) + self.lineEdit_18 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_1.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_1.setSizePolicy(sizePolicy) - self.SubsysBrowser_1.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_1.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_1.setObjectName("SubsysBrowser_1") - self.horizontalLayout_4.addWidget(self.SubsysBrowser_1) - self.lineEditPktId_1 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEdit_18.sizePolicy().hasHeightForWidth()) + self.lineEdit_18.setSizePolicy(sizePolicy) + self.lineEdit_18.setMinimumSize(QtCore.QSize(100, 31)) + self.lineEdit_18.setMaximumSize(QtCore.QSize(100, 31)) + self.lineEdit_18.setObjectName("lineEdit_18") + self.gridLayout.addWidget(self.lineEdit_18, 19, 2, 1, 1) + self.pushButton_18 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_1.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_1.setSizePolicy(sizePolicy) - self.lineEditPktId_1.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_1.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_1.setObjectName("lineEditPktId_1") - self.horizontalLayout_4.addWidget(self.lineEditPktId_1) - self.lineEdit_1 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.pushButton_18.sizePolicy().hasHeightForWidth()) + self.pushButton_18.setSizePolicy(sizePolicy) + self.pushButton_18.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_18.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_18.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_18.setObjectName("pushButton_18") + self.gridLayout.addWidget(self.pushButton_18, 19, 3, 1, 1) + self.quickButton_19 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEdit_1.sizePolicy().hasHeightForWidth()) - self.lineEdit_1.setSizePolicy(sizePolicy) - self.lineEdit_1.setMinimumSize(QtCore.QSize(100, 31)) - self.lineEdit_1.setMaximumSize(QtCore.QSize(100, 31)) - self.lineEdit_1.setObjectName("lineEdit_1") - self.horizontalLayout_4.addWidget(self.lineEdit_1) - self.pushButton_1 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.quickButton_19.sizePolicy().hasHeightForWidth()) + self.quickButton_19.setSizePolicy(sizePolicy) + self.quickButton_19.setMinimumSize(QtCore.QSize(121, 32)) + self.quickButton_19.setMaximumSize(QtCore.QSize(121, 32)) + self.quickButton_19.setText("") + self.quickButton_19.setObjectName("quickButton_19") + self.gridLayout.addWidget(self.quickButton_19, 19, 4, 1, 1) + self.SubsysBrowser_19 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_19.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_19.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_19.setReadOnly(True) + self.SubsysBrowser_19.setObjectName("SubsysBrowser_19") + self.gridLayout.addWidget(self.SubsysBrowser_19, 20, 0, 1, 1) + self.lineEditPktId_19 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_1.sizePolicy().hasHeightForWidth()) - self.pushButton_1.setSizePolicy(sizePolicy) - self.pushButton_1.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_1.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_1.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_1.setObjectName("pushButton_1") - self.horizontalLayout_4.addWidget(self.pushButton_1) - self.quickButton_2 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEditPktId_19.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_19.setSizePolicy(sizePolicy) + self.lineEditPktId_19.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_19.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_19.setObjectName("lineEditPktId_19") + self.gridLayout.addWidget(self.lineEditPktId_19, 20, 1, 1, 1) + self.lineEdit_19 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.quickButton_2.sizePolicy().hasHeightForWidth()) - self.quickButton_2.setSizePolicy(sizePolicy) - self.quickButton_2.setMinimumSize(QtCore.QSize(121, 0)) - self.quickButton_2.setMaximumSize(QtCore.QSize(121, 16777215)) - self.quickButton_2.setText("") - self.quickButton_2.setObjectName("quickButton_2") - self.horizontalLayout_4.addWidget(self.quickButton_2) - self.verticalLayout_4.addLayout(self.horizontalLayout_4) - self.horizontalLayout_5 = QtWidgets.QHBoxLayout() - self.horizontalLayout_5.setObjectName("horizontalLayout_5") - self.SubsysBrowser_2 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEdit_19.sizePolicy().hasHeightForWidth()) + self.lineEdit_19.setSizePolicy(sizePolicy) + self.lineEdit_19.setMinimumSize(QtCore.QSize(100, 31)) + self.lineEdit_19.setMaximumSize(QtCore.QSize(100, 31)) + self.lineEdit_19.setObjectName("lineEdit_19") + self.gridLayout.addWidget(self.lineEdit_19, 20, 2, 1, 1) + self.pushButton_19 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_2.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_2.setSizePolicy(sizePolicy) - self.SubsysBrowser_2.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_2.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_2.setObjectName("SubsysBrowser_2") - self.horizontalLayout_5.addWidget(self.SubsysBrowser_2) - self.lineEditPktId_2 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.pushButton_19.sizePolicy().hasHeightForWidth()) + self.pushButton_19.setSizePolicy(sizePolicy) + self.pushButton_19.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_19.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_19.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_19.setObjectName("pushButton_19") + self.gridLayout.addWidget(self.pushButton_19, 20, 3, 1, 1) + self.SubsysBrowser_16 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_16.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_16.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_16.setReadOnly(True) + self.SubsysBrowser_16.setObjectName("SubsysBrowser_16") + self.gridLayout.addWidget(self.SubsysBrowser_16, 17, 0, 1, 1) + self.lineEditPktId_16 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_2.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_2.setSizePolicy(sizePolicy) - self.lineEditPktId_2.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_2.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_2.setObjectName("lineEditPktId_2") - self.horizontalLayout_5.addWidget(self.lineEditPktId_2) - self.lineEdit_2 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEditPktId_16.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_16.setSizePolicy(sizePolicy) + self.lineEditPktId_16.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_16.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_16.setObjectName("lineEditPktId_16") + self.gridLayout.addWidget(self.lineEditPktId_16, 17, 1, 1, 1) + self.lineEdit_16 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEdit_2.sizePolicy().hasHeightForWidth()) - self.lineEdit_2.setSizePolicy(sizePolicy) - self.lineEdit_2.setMinimumSize(QtCore.QSize(100, 31)) - self.lineEdit_2.setMaximumSize(QtCore.QSize(100, 31)) - self.lineEdit_2.setObjectName("lineEdit_2") - self.horizontalLayout_5.addWidget(self.lineEdit_2) - self.pushButton_2 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEdit_16.sizePolicy().hasHeightForWidth()) + self.lineEdit_16.setSizePolicy(sizePolicy) + self.lineEdit_16.setMinimumSize(QtCore.QSize(100, 31)) + self.lineEdit_16.setMaximumSize(QtCore.QSize(100, 31)) + self.lineEdit_16.setObjectName("lineEdit_16") + self.gridLayout.addWidget(self.lineEdit_16, 17, 2, 1, 1) + self.pushButton_16 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_2.sizePolicy().hasHeightForWidth()) - self.pushButton_2.setSizePolicy(sizePolicy) - self.pushButton_2.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_2.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_2.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_2.setObjectName("pushButton_2") - self.horizontalLayout_5.addWidget(self.pushButton_2) - self.quickButton_3 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.pushButton_16.sizePolicy().hasHeightForWidth()) + self.pushButton_16.setSizePolicy(sizePolicy) + self.pushButton_16.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_16.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_16.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_16.setObjectName("pushButton_16") + self.gridLayout.addWidget(self.pushButton_16, 17, 3, 1, 1) + self.quickButton_17 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.quickButton_3.sizePolicy().hasHeightForWidth()) - self.quickButton_3.setSizePolicy(sizePolicy) - self.quickButton_3.setMinimumSize(QtCore.QSize(121, 0)) - self.quickButton_3.setMaximumSize(QtCore.QSize(121, 16777215)) - self.quickButton_3.setText("") - self.quickButton_3.setObjectName("quickButton_3") - self.horizontalLayout_5.addWidget(self.quickButton_3) - self.verticalLayout_4.addLayout(self.horizontalLayout_5) - self.horizontalLayout_7 = QtWidgets.QHBoxLayout() - self.horizontalLayout_7.setObjectName("horizontalLayout_7") - self.SubsysBrowser_3 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.quickButton_17.sizePolicy().hasHeightForWidth()) + self.quickButton_17.setSizePolicy(sizePolicy) + self.quickButton_17.setMinimumSize(QtCore.QSize(121, 32)) + self.quickButton_17.setMaximumSize(QtCore.QSize(121, 32)) + self.quickButton_17.setText("") + self.quickButton_17.setObjectName("quickButton_17") + self.gridLayout.addWidget(self.quickButton_17, 17, 4, 1, 1) + self.quickButton_9 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_3.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_3.setSizePolicy(sizePolicy) + sizePolicy.setHeightForWidth(self.quickButton_9.sizePolicy().hasHeightForWidth()) + self.quickButton_9.setSizePolicy(sizePolicy) + self.quickButton_9.setMinimumSize(QtCore.QSize(121, 0)) + self.quickButton_9.setMaximumSize(QtCore.QSize(121, 16777215)) + self.quickButton_9.setText("") + self.quickButton_9.setObjectName("quickButton_9") + self.gridLayout.addWidget(self.quickButton_9, 9, 4, 1, 1) + self.SubsysBrowser_9 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_9.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_9.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_9.setReadOnly(True) + self.SubsysBrowser_9.setObjectName("SubsysBrowser_9") + self.gridLayout.addWidget(self.SubsysBrowser_9, 10, 0, 1, 1) + self.SubsysBrowser_3 = QtWidgets.QLineEdit(self.layoutWidget) self.SubsysBrowser_3.setMinimumSize(QtCore.QSize(201, 31)) self.SubsysBrowser_3.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_3.setReadOnly(True) self.SubsysBrowser_3.setObjectName("SubsysBrowser_3") - self.horizontalLayout_7.addWidget(self.SubsysBrowser_3) - self.lineEditPktId_3 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.SubsysBrowser_3, 4, 0, 1, 1) + self.pushButton_5 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_3.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_3.setSizePolicy(sizePolicy) - self.lineEditPktId_3.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_3.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_3.setObjectName("lineEditPktId_3") - self.horizontalLayout_7.addWidget(self.lineEditPktId_3) - self.lineEdit_3 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEdit_3.sizePolicy().hasHeightForWidth()) - self.lineEdit_3.setSizePolicy(sizePolicy) - self.lineEdit_3.setMinimumSize(QtCore.QSize(100, 31)) - self.lineEdit_3.setMaximumSize(QtCore.QSize(100, 31)) - self.lineEdit_3.setObjectName("lineEdit_3") - self.horizontalLayout_7.addWidget(self.lineEdit_3) - self.pushButton_3 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_3.sizePolicy().hasHeightForWidth()) - self.pushButton_3.setSizePolicy(sizePolicy) - self.pushButton_3.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_3.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_3.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_3.setObjectName("pushButton_3") - self.horizontalLayout_7.addWidget(self.pushButton_3) - self.quickButton_4 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.pushButton_5.sizePolicy().hasHeightForWidth()) + self.pushButton_5.setSizePolicy(sizePolicy) + self.pushButton_5.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_5.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_5.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_5.setObjectName("pushButton_5") + self.gridLayout.addWidget(self.pushButton_5, 6, 3, 1, 1) + self.lineEditPktId_4 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.quickButton_4.sizePolicy().hasHeightForWidth()) - self.quickButton_4.setSizePolicy(sizePolicy) - self.quickButton_4.setMinimumSize(QtCore.QSize(121, 0)) - self.quickButton_4.setMaximumSize(QtCore.QSize(121, 16777215)) - self.quickButton_4.setText("") - self.quickButton_4.setObjectName("quickButton_4") - self.horizontalLayout_7.addWidget(self.quickButton_4) - self.verticalLayout_4.addLayout(self.horizontalLayout_7) - self.horizontalLayout_8 = QtWidgets.QHBoxLayout() - self.horizontalLayout_8.setObjectName("horizontalLayout_8") - self.SubsysBrowser_4 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEditPktId_4.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_4.setSizePolicy(sizePolicy) + self.lineEditPktId_4.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_4.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_4.setObjectName("lineEditPktId_4") + self.gridLayout.addWidget(self.lineEditPktId_4, 5, 1, 1, 1) + self.label_4 = QtWidgets.QLabel(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_4.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_4.setSizePolicy(sizePolicy) + sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth()) + self.label_4.setSizePolicy(sizePolicy) + self.label_4.setMinimumSize(QtCore.QSize(81, 31)) + self.label_4.setMaximumSize(QtCore.QSize(81, 31)) + self.label_4.setObjectName("label_4") + self.gridLayout.addWidget(self.label_4, 0, 1, 1, 1) + self.SubsysBrowser_4 = QtWidgets.QLineEdit(self.layoutWidget) self.SubsysBrowser_4.setMinimumSize(QtCore.QSize(201, 31)) self.SubsysBrowser_4.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_4.setReadOnly(True) self.SubsysBrowser_4.setObjectName("SubsysBrowser_4") - self.horizontalLayout_8.addWidget(self.SubsysBrowser_4) - self.lineEditPktId_4 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.SubsysBrowser_4, 5, 0, 1, 1) + self.lineEdit_5 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_4.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_4.setSizePolicy(sizePolicy) - self.lineEditPktId_4.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_4.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_4.setObjectName("lineEditPktId_4") - self.horizontalLayout_8.addWidget(self.lineEditPktId_4) - self.lineEdit_4 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEdit_5.sizePolicy().hasHeightForWidth()) + self.lineEdit_5.setSizePolicy(sizePolicy) + self.lineEdit_5.setMinimumSize(QtCore.QSize(100, 31)) + self.lineEdit_5.setMaximumSize(QtCore.QSize(100, 31)) + self.lineEdit_5.setObjectName("lineEdit_5") + self.gridLayout.addWidget(self.lineEdit_5, 6, 2, 1, 1) + self.lineEdit_4 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -355,153 +292,138 @@ def setupUi(self, CommandSystemDialog): self.lineEdit_4.setMinimumSize(QtCore.QSize(100, 31)) self.lineEdit_4.setMaximumSize(QtCore.QSize(100, 31)) self.lineEdit_4.setObjectName("lineEdit_4") - self.horizontalLayout_8.addWidget(self.lineEdit_4) - self.pushButton_4 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_4.sizePolicy().hasHeightForWidth()) - self.pushButton_4.setSizePolicy(sizePolicy) - self.pushButton_4.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_4.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_4.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_4.setObjectName("pushButton_4") - self.horizontalLayout_8.addWidget(self.pushButton_4) - self.quickButton_5 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.lineEdit_4, 5, 2, 1, 1) + self.pushButton_3 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.quickButton_5.sizePolicy().hasHeightForWidth()) - self.quickButton_5.setSizePolicy(sizePolicy) - self.quickButton_5.setMinimumSize(QtCore.QSize(121, 0)) - self.quickButton_5.setMaximumSize(QtCore.QSize(121, 16777215)) - self.quickButton_5.setText("") - self.quickButton_5.setObjectName("quickButton_5") - self.horizontalLayout_8.addWidget(self.quickButton_5) - self.verticalLayout_4.addLayout(self.horizontalLayout_8) - self.horizontalLayout_9 = QtWidgets.QHBoxLayout() - self.horizontalLayout_9.setObjectName("horizontalLayout_9") - self.SubsysBrowser_5 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_5.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_5.setSizePolicy(sizePolicy) - self.SubsysBrowser_5.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_5.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_5.setObjectName("SubsysBrowser_5") - self.horizontalLayout_9.addWidget(self.SubsysBrowser_5) - self.lineEditPktId_5 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_5.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_5.setSizePolicy(sizePolicy) - self.lineEditPktId_5.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_5.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_5.setObjectName("lineEditPktId_5") - self.horizontalLayout_9.addWidget(self.lineEditPktId_5) - self.lineEdit_5 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.pushButton_3.sizePolicy().hasHeightForWidth()) + self.pushButton_3.setSizePolicy(sizePolicy) + self.pushButton_3.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_3.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_3.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_3.setObjectName("pushButton_3") + self.gridLayout.addWidget(self.pushButton_3, 4, 3, 1, 1) + self.lineEdit_11 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEdit_5.sizePolicy().hasHeightForWidth()) - self.lineEdit_5.setSizePolicy(sizePolicy) - self.lineEdit_5.setMinimumSize(QtCore.QSize(100, 31)) - self.lineEdit_5.setMaximumSize(QtCore.QSize(100, 31)) - self.lineEdit_5.setObjectName("lineEdit_5") - self.horizontalLayout_9.addWidget(self.lineEdit_5) - self.pushButton_5 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEdit_11.sizePolicy().hasHeightForWidth()) + self.lineEdit_11.setSizePolicy(sizePolicy) + self.lineEdit_11.setMinimumSize(QtCore.QSize(100, 31)) + self.lineEdit_11.setMaximumSize(QtCore.QSize(100, 31)) + self.lineEdit_11.setObjectName("lineEdit_11") + self.gridLayout.addWidget(self.lineEdit_11, 12, 2, 1, 1) + self.pushButton_11 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_5.sizePolicy().hasHeightForWidth()) - self.pushButton_5.setSizePolicy(sizePolicy) - self.pushButton_5.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_5.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_5.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_5.setObjectName("pushButton_5") - self.horizontalLayout_9.addWidget(self.pushButton_5) - self.quickButton_6 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.pushButton_11.sizePolicy().hasHeightForWidth()) + self.pushButton_11.setSizePolicy(sizePolicy) + self.pushButton_11.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_11.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_11.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_11.setObjectName("pushButton_11") + self.gridLayout.addWidget(self.pushButton_11, 12, 3, 1, 1) + self.quickButton_12 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.quickButton_6.sizePolicy().hasHeightForWidth()) - self.quickButton_6.setSizePolicy(sizePolicy) - self.quickButton_6.setMinimumSize(QtCore.QSize(121, 0)) - self.quickButton_6.setMaximumSize(QtCore.QSize(121, 16777215)) - self.quickButton_6.setText("") - self.quickButton_6.setObjectName("quickButton_6") - self.horizontalLayout_9.addWidget(self.quickButton_6) - self.verticalLayout_4.addLayout(self.horizontalLayout_9) - self.horizontalLayout_10 = QtWidgets.QHBoxLayout() - self.horizontalLayout_10.setObjectName("horizontalLayout_10") - self.SubsysBrowser_6 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.quickButton_12.sizePolicy().hasHeightForWidth()) + self.quickButton_12.setSizePolicy(sizePolicy) + self.quickButton_12.setMinimumSize(QtCore.QSize(121, 0)) + self.quickButton_12.setMaximumSize(QtCore.QSize(121, 16777215)) + self.quickButton_12.setText("") + self.quickButton_12.setObjectName("quickButton_12") + self.gridLayout.addWidget(self.quickButton_12, 12, 4, 1, 1) + self.SubsysBrowser_12 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_12.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_12.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_12.setReadOnly(True) + self.SubsysBrowser_12.setObjectName("SubsysBrowser_12") + self.gridLayout.addWidget(self.SubsysBrowser_12, 13, 0, 1, 1) + self.quickButton_2 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_6.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_6.setSizePolicy(sizePolicy) - self.SubsysBrowser_6.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_6.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_6.setObjectName("SubsysBrowser_6") - self.horizontalLayout_10.addWidget(self.SubsysBrowser_6) - self.lineEditPktId_6 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.quickButton_2.sizePolicy().hasHeightForWidth()) + self.quickButton_2.setSizePolicy(sizePolicy) + self.quickButton_2.setMinimumSize(QtCore.QSize(121, 0)) + self.quickButton_2.setMaximumSize(QtCore.QSize(121, 16777215)) + self.quickButton_2.setText("") + self.quickButton_2.setObjectName("quickButton_2") + self.gridLayout.addWidget(self.quickButton_2, 2, 4, 1, 1) + self.SubsysBrowser_2 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_2.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_2.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_2.setReadOnly(True) + self.SubsysBrowser_2.setObjectName("SubsysBrowser_2") + self.gridLayout.addWidget(self.SubsysBrowser_2, 3, 0, 1, 1) + self.SubsysBrowser_0 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_0.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_0.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_0.setReadOnly(True) + self.SubsysBrowser_0.setObjectName("SubsysBrowser_0") + self.gridLayout.addWidget(self.SubsysBrowser_0, 1, 0, 1, 1) + self.pushButton_10 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_6.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_6.setSizePolicy(sizePolicy) - self.lineEditPktId_6.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_6.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_6.setObjectName("lineEditPktId_6") - self.horizontalLayout_10.addWidget(self.lineEditPktId_6) - self.lineEdit_6 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.pushButton_10.sizePolicy().hasHeightForWidth()) + self.pushButton_10.setSizePolicy(sizePolicy) + self.pushButton_10.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_10.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_10.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_10.setObjectName("pushButton_10") + self.gridLayout.addWidget(self.pushButton_10, 11, 3, 1, 1) + self.quickButton_11 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEdit_6.sizePolicy().hasHeightForWidth()) - self.lineEdit_6.setSizePolicy(sizePolicy) - self.lineEdit_6.setMinimumSize(QtCore.QSize(100, 31)) - self.lineEdit_6.setMaximumSize(QtCore.QSize(100, 31)) - self.lineEdit_6.setObjectName("lineEdit_6") - self.horizontalLayout_10.addWidget(self.lineEdit_6) - self.pushButton_6 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.quickButton_11.sizePolicy().hasHeightForWidth()) + self.quickButton_11.setSizePolicy(sizePolicy) + self.quickButton_11.setMinimumSize(QtCore.QSize(121, 0)) + self.quickButton_11.setMaximumSize(QtCore.QSize(121, 16777215)) + self.quickButton_11.setText("") + self.quickButton_11.setObjectName("quickButton_11") + self.gridLayout.addWidget(self.quickButton_11, 11, 4, 1, 1) + self.SubsysBrowser_11 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_11.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_11.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_11.setReadOnly(True) + self.SubsysBrowser_11.setObjectName("SubsysBrowser_11") + self.gridLayout.addWidget(self.SubsysBrowser_11, 12, 0, 1, 1) + self.lineEditPktId_11 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_6.sizePolicy().hasHeightForWidth()) - self.pushButton_6.setSizePolicy(sizePolicy) - self.pushButton_6.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_6.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_6.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_6.setObjectName("pushButton_6") - self.horizontalLayout_10.addWidget(self.pushButton_6) - self.quickButton_7 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEditPktId_11.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_11.setSizePolicy(sizePolicy) + self.lineEditPktId_11.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_11.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_11.setObjectName("lineEditPktId_11") + self.gridLayout.addWidget(self.lineEditPktId_11, 12, 1, 1, 1) + self.lineEditPktId_12 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.quickButton_7.sizePolicy().hasHeightForWidth()) - self.quickButton_7.setSizePolicy(sizePolicy) - self.quickButton_7.setMinimumSize(QtCore.QSize(121, 0)) - self.quickButton_7.setMaximumSize(QtCore.QSize(121, 16777215)) - self.quickButton_7.setText("") - self.quickButton_7.setObjectName("quickButton_7") - self.horizontalLayout_10.addWidget(self.quickButton_7) - self.verticalLayout_4.addLayout(self.horizontalLayout_10) - self.horizontalLayout_11 = QtWidgets.QHBoxLayout() - self.horizontalLayout_11.setObjectName("horizontalLayout_11") - self.SubsysBrowser_7 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEditPktId_12.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_12.setSizePolicy(sizePolicy) + self.lineEditPktId_12.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_12.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_12.setObjectName("lineEditPktId_12") + self.gridLayout.addWidget(self.lineEditPktId_12, 13, 1, 1, 1) + self.lineEdit_0 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_7.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_7.setSizePolicy(sizePolicy) - self.SubsysBrowser_7.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_7.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_7.setObjectName("SubsysBrowser_7") - self.horizontalLayout_11.addWidget(self.SubsysBrowser_7) - self.lineEditPktId_7 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEdit_0.sizePolicy().hasHeightForWidth()) + self.lineEdit_0.setSizePolicy(sizePolicy) + self.lineEdit_0.setMinimumSize(QtCore.QSize(100, 31)) + self.lineEdit_0.setMaximumSize(QtCore.QSize(100, 31)) + self.lineEdit_0.setObjectName("lineEdit_0") + self.gridLayout.addWidget(self.lineEdit_0, 1, 2, 1, 1) + self.lineEditPktId_7 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -510,8 +432,8 @@ def setupUi(self, CommandSystemDialog): self.lineEditPktId_7.setMinimumSize(QtCore.QSize(81, 31)) self.lineEditPktId_7.setMaximumSize(QtCore.QSize(81, 31)) self.lineEditPktId_7.setObjectName("lineEditPktId_7") - self.horizontalLayout_11.addWidget(self.lineEditPktId_7) - self.lineEdit_7 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.lineEditPktId_7, 8, 1, 1, 1) + self.lineEdit_7 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -520,118 +442,109 @@ def setupUi(self, CommandSystemDialog): self.lineEdit_7.setMinimumSize(QtCore.QSize(100, 31)) self.lineEdit_7.setMaximumSize(QtCore.QSize(100, 31)) self.lineEdit_7.setObjectName("lineEdit_7") - self.horizontalLayout_11.addWidget(self.lineEdit_7) - self.pushButton_7 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_7.sizePolicy().hasHeightForWidth()) - self.pushButton_7.setSizePolicy(sizePolicy) - self.pushButton_7.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_7.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_7.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_7.setObjectName("pushButton_7") - self.horizontalLayout_11.addWidget(self.pushButton_7) - self.quickButton_8 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.lineEdit_7, 8, 2, 1, 1) + self.lineEditPktId_0 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.quickButton_8.sizePolicy().hasHeightForWidth()) - self.quickButton_8.setSizePolicy(sizePolicy) - self.quickButton_8.setMinimumSize(QtCore.QSize(121, 0)) - self.quickButton_8.setMaximumSize(QtCore.QSize(121, 16777215)) - self.quickButton_8.setText("") - self.quickButton_8.setObjectName("quickButton_8") - self.horizontalLayout_11.addWidget(self.quickButton_8) - self.verticalLayout_4.addLayout(self.horizontalLayout_11) - self.horizontalLayout_12 = QtWidgets.QHBoxLayout() - self.horizontalLayout_12.setObjectName("horizontalLayout_12") - self.SubsysBrowser_8 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_8.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_8.setSizePolicy(sizePolicy) - self.SubsysBrowser_8.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_8.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_8.setObjectName("SubsysBrowser_8") - self.horizontalLayout_12.addWidget(self.SubsysBrowser_8) - self.lineEditPktId_8 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEditPktId_0.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_0.setSizePolicy(sizePolicy) + self.lineEditPktId_0.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_0.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_0.setObjectName("lineEditPktId_0") + self.gridLayout.addWidget(self.lineEditPktId_0, 1, 1, 1, 1) + self.pushButton_2 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_8.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_8.setSizePolicy(sizePolicy) - self.lineEditPktId_8.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_8.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_8.setObjectName("lineEditPktId_8") - self.horizontalLayout_12.addWidget(self.lineEditPktId_8) - self.lineEdit_8 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.pushButton_2.sizePolicy().hasHeightForWidth()) + self.pushButton_2.setSizePolicy(sizePolicy) + self.pushButton_2.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_2.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_2.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_2.setObjectName("pushButton_2") + self.gridLayout.addWidget(self.pushButton_2, 3, 3, 1, 1) + self.label_5 = QtWidgets.QLabel(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEdit_8.sizePolicy().hasHeightForWidth()) - self.lineEdit_8.setSizePolicy(sizePolicy) - self.lineEdit_8.setMinimumSize(QtCore.QSize(100, 31)) - self.lineEdit_8.setMaximumSize(QtCore.QSize(100, 31)) - self.lineEdit_8.setObjectName("lineEdit_8") - self.horizontalLayout_12.addWidget(self.lineEdit_8) - self.pushButton_8 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.label_5.sizePolicy().hasHeightForWidth()) + self.label_5.setSizePolicy(sizePolicy) + self.label_5.setMinimumSize(QtCore.QSize(81, 31)) + self.label_5.setMaximumSize(QtCore.QSize(81, 31)) + self.label_5.setObjectName("label_5") + self.gridLayout.addWidget(self.label_5, 0, 2, 1, 1) + self.pushButton_1 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_8.sizePolicy().hasHeightForWidth()) - self.pushButton_8.setSizePolicy(sizePolicy) - self.pushButton_8.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_8.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_8.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_8.setObjectName("pushButton_8") - self.horizontalLayout_12.addWidget(self.pushButton_8) - self.quickButton_9 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.pushButton_1.sizePolicy().hasHeightForWidth()) + self.pushButton_1.setSizePolicy(sizePolicy) + self.pushButton_1.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_1.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_1.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_1.setObjectName("pushButton_1") + self.gridLayout.addWidget(self.pushButton_1, 2, 3, 1, 1) + self.SubsysBrowser_1 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_1.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_1.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_1.setReadOnly(True) + self.SubsysBrowser_1.setObjectName("SubsysBrowser_1") + self.gridLayout.addWidget(self.SubsysBrowser_1, 2, 0, 1, 1) + self.pushButton_7 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.quickButton_9.sizePolicy().hasHeightForWidth()) - self.quickButton_9.setSizePolicy(sizePolicy) - self.quickButton_9.setMinimumSize(QtCore.QSize(121, 0)) - self.quickButton_9.setMaximumSize(QtCore.QSize(121, 16777215)) - self.quickButton_9.setText("") - self.quickButton_9.setObjectName("quickButton_9") - self.horizontalLayout_12.addWidget(self.quickButton_9) - self.verticalLayout_4.addLayout(self.horizontalLayout_12) - self.horizontalLayout_13 = QtWidgets.QHBoxLayout() - self.horizontalLayout_13.setObjectName("horizontalLayout_13") - self.SubsysBrowser_9 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.pushButton_7.sizePolicy().hasHeightForWidth()) + self.pushButton_7.setSizePolicy(sizePolicy) + self.pushButton_7.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_7.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_7.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_7.setObjectName("pushButton_7") + self.gridLayout.addWidget(self.pushButton_7, 8, 3, 1, 1) + self.quickButton_8 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_9.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_9.setSizePolicy(sizePolicy) - self.SubsysBrowser_9.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_9.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_9.setObjectName("SubsysBrowser_9") - self.horizontalLayout_13.addWidget(self.SubsysBrowser_9) - self.lineEditPktId_9 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.quickButton_8.sizePolicy().hasHeightForWidth()) + self.quickButton_8.setSizePolicy(sizePolicy) + self.quickButton_8.setMinimumSize(QtCore.QSize(121, 0)) + self.quickButton_8.setMaximumSize(QtCore.QSize(121, 16777215)) + self.quickButton_8.setText("") + self.quickButton_8.setObjectName("quickButton_8") + self.gridLayout.addWidget(self.quickButton_8, 8, 4, 1, 1) + self.lineEditPktId_2 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_9.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_9.setSizePolicy(sizePolicy) - self.lineEditPktId_9.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_9.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_9.setObjectName("lineEditPktId_9") - self.horizontalLayout_13.addWidget(self.lineEditPktId_9) - self.lineEdit_9 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEditPktId_2.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_2.setSizePolicy(sizePolicy) + self.lineEditPktId_2.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_2.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_2.setObjectName("lineEditPktId_2") + self.gridLayout.addWidget(self.lineEditPktId_2, 3, 1, 1, 1) + self.lineEditPktId_5 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEdit_9.sizePolicy().hasHeightForWidth()) - self.lineEdit_9.setSizePolicy(sizePolicy) - self.lineEdit_9.setMinimumSize(QtCore.QSize(100, 31)) - self.lineEdit_9.setMaximumSize(QtCore.QSize(100, 31)) - self.lineEdit_9.setObjectName("lineEdit_9") - self.horizontalLayout_13.addWidget(self.lineEdit_9) - self.pushButton_9 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEditPktId_5.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_5.setSizePolicy(sizePolicy) + self.lineEditPktId_5.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_5.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_5.setObjectName("lineEditPktId_5") + self.gridLayout.addWidget(self.lineEditPktId_5, 6, 1, 1, 1) + self.pushButton_6 = QtWidgets.QPushButton(self.layoutWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.pushButton_6.sizePolicy().hasHeightForWidth()) + self.pushButton_6.setSizePolicy(sizePolicy) + self.pushButton_6.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_6.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_6.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_6.setObjectName("pushButton_6") + self.gridLayout.addWidget(self.pushButton_6, 7, 3, 1, 1) + self.pushButton_9 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -641,8 +554,8 @@ def setupUi(self, CommandSystemDialog): self.pushButton_9.setMaximumSize(QtCore.QSize(101, 31)) self.pushButton_9.setFocusPolicy(QtCore.Qt.NoFocus) self.pushButton_9.setObjectName("pushButton_9") - self.horizontalLayout_13.addWidget(self.pushButton_9) - self.quickButton_10 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.pushButton_9, 10, 3, 1, 1) + self.quickButton_10 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -652,141 +565,67 @@ def setupUi(self, CommandSystemDialog): self.quickButton_10.setMaximumSize(QtCore.QSize(121, 16777215)) self.quickButton_10.setText("") self.quickButton_10.setObjectName("quickButton_10") - self.horizontalLayout_13.addWidget(self.quickButton_10) - self.verticalLayout_4.addLayout(self.horizontalLayout_13) - self.horizontalLayout_14 = QtWidgets.QHBoxLayout() - self.horizontalLayout_14.setObjectName("horizontalLayout_14") - self.SubsysBrowser_10 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_10.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_10.setSizePolicy(sizePolicy) - self.SubsysBrowser_10.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_10.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_10.setObjectName("SubsysBrowser_10") - self.horizontalLayout_14.addWidget(self.SubsysBrowser_10) - self.lineEditPktId_10 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_10.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_10.setSizePolicy(sizePolicy) - self.lineEditPktId_10.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_10.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_10.setObjectName("lineEditPktId_10") - self.horizontalLayout_14.addWidget(self.lineEditPktId_10) - self.lineEdit_10 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEdit_10.sizePolicy().hasHeightForWidth()) - self.lineEdit_10.setSizePolicy(sizePolicy) - self.lineEdit_10.setMinimumSize(QtCore.QSize(100, 31)) - self.lineEdit_10.setMaximumSize(QtCore.QSize(100, 31)) - self.lineEdit_10.setObjectName("lineEdit_10") - self.horizontalLayout_14.addWidget(self.lineEdit_10) - self.pushButton_10 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_10.sizePolicy().hasHeightForWidth()) - self.pushButton_10.setSizePolicy(sizePolicy) - self.pushButton_10.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_10.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_10.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_10.setObjectName("pushButton_10") - self.horizontalLayout_14.addWidget(self.pushButton_10) - self.quickButton_11 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.quickButton_11.sizePolicy().hasHeightForWidth()) - self.quickButton_11.setSizePolicy(sizePolicy) - self.quickButton_11.setMinimumSize(QtCore.QSize(121, 0)) - self.quickButton_11.setMaximumSize(QtCore.QSize(121, 16777215)) - self.quickButton_11.setText("") - self.quickButton_11.setObjectName("quickButton_11") - self.horizontalLayout_14.addWidget(self.quickButton_11) - self.verticalLayout_4.addLayout(self.horizontalLayout_14) - self.horizontalLayout_15 = QtWidgets.QHBoxLayout() - self.horizontalLayout_15.setObjectName("horizontalLayout_15") - self.SubsysBrowser_11 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_11.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_11.setSizePolicy(sizePolicy) - self.SubsysBrowser_11.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_11.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_11.setObjectName("SubsysBrowser_11") - self.horizontalLayout_15.addWidget(self.SubsysBrowser_11) - self.lineEditPktId_11 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_11.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_11.setSizePolicy(sizePolicy) - self.lineEditPktId_11.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_11.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_11.setObjectName("lineEditPktId_11") - self.horizontalLayout_15.addWidget(self.lineEditPktId_11) - self.lineEdit_11 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.quickButton_10, 10, 4, 1, 1) + self.SubsysBrowser_15 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_15.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_15.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_15.setReadOnly(True) + self.SubsysBrowser_15.setObjectName("SubsysBrowser_15") + self.gridLayout.addWidget(self.SubsysBrowser_15, 16, 0, 1, 1) + self.lineEditPktId_15 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEdit_11.sizePolicy().hasHeightForWidth()) - self.lineEdit_11.setSizePolicy(sizePolicy) - self.lineEdit_11.setMinimumSize(QtCore.QSize(100, 31)) - self.lineEdit_11.setMaximumSize(QtCore.QSize(100, 31)) - self.lineEdit_11.setObjectName("lineEdit_11") - self.horizontalLayout_15.addWidget(self.lineEdit_11) - self.pushButton_11 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEditPktId_15.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_15.setSizePolicy(sizePolicy) + self.lineEditPktId_15.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_15.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_15.setObjectName("lineEditPktId_15") + self.gridLayout.addWidget(self.lineEditPktId_15, 16, 1, 1, 1) + self.lineEdit_15 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_11.sizePolicy().hasHeightForWidth()) - self.pushButton_11.setSizePolicy(sizePolicy) - self.pushButton_11.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_11.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_11.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_11.setObjectName("pushButton_11") - self.horizontalLayout_15.addWidget(self.pushButton_11) - self.quickButton_12 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEdit_15.sizePolicy().hasHeightForWidth()) + self.lineEdit_15.setSizePolicy(sizePolicy) + self.lineEdit_15.setMinimumSize(QtCore.QSize(100, 31)) + self.lineEdit_15.setMaximumSize(QtCore.QSize(100, 31)) + self.lineEdit_15.setObjectName("lineEdit_15") + self.gridLayout.addWidget(self.lineEdit_15, 16, 2, 1, 1) + self.pushButton_15 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.quickButton_12.sizePolicy().hasHeightForWidth()) - self.quickButton_12.setSizePolicy(sizePolicy) - self.quickButton_12.setMinimumSize(QtCore.QSize(121, 0)) - self.quickButton_12.setMaximumSize(QtCore.QSize(121, 16777215)) - self.quickButton_12.setText("") - self.quickButton_12.setObjectName("quickButton_12") - self.horizontalLayout_15.addWidget(self.quickButton_12) - self.verticalLayout_4.addLayout(self.horizontalLayout_15) - self.horizontalLayout_16 = QtWidgets.QHBoxLayout() - self.horizontalLayout_16.setObjectName("horizontalLayout_16") - self.SubsysBrowser_12 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.pushButton_15.sizePolicy().hasHeightForWidth()) + self.pushButton_15.setSizePolicy(sizePolicy) + self.pushButton_15.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_15.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_15.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_15.setObjectName("pushButton_15") + self.gridLayout.addWidget(self.pushButton_15, 16, 3, 1, 1) + self.quickButton_16 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_12.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_12.setSizePolicy(sizePolicy) - self.SubsysBrowser_12.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_12.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_12.setObjectName("SubsysBrowser_12") - self.horizontalLayout_16.addWidget(self.SubsysBrowser_12) - self.lineEditPktId_12 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.quickButton_16.sizePolicy().hasHeightForWidth()) + self.quickButton_16.setSizePolicy(sizePolicy) + self.quickButton_16.setMinimumSize(QtCore.QSize(121, 32)) + self.quickButton_16.setMaximumSize(QtCore.QSize(121, 32)) + self.quickButton_16.setText("") + self.quickButton_16.setObjectName("quickButton_16") + self.gridLayout.addWidget(self.quickButton_16, 16, 4, 1, 1) + self.quickButton_6 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_12.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_12.setSizePolicy(sizePolicy) - self.lineEditPktId_12.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_12.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_12.setObjectName("lineEditPktId_12") - self.horizontalLayout_16.addWidget(self.lineEditPktId_12) - self.lineEdit_12 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.quickButton_6.sizePolicy().hasHeightForWidth()) + self.quickButton_6.setSizePolicy(sizePolicy) + self.quickButton_6.setMinimumSize(QtCore.QSize(121, 0)) + self.quickButton_6.setMaximumSize(QtCore.QSize(121, 16777215)) + self.quickButton_6.setText("") + self.quickButton_6.setObjectName("quickButton_6") + self.gridLayout.addWidget(self.quickButton_6, 6, 4, 1, 1) + self.lineEdit_12 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -795,8 +634,8 @@ def setupUi(self, CommandSystemDialog): self.lineEdit_12.setMinimumSize(QtCore.QSize(100, 31)) self.lineEdit_12.setMaximumSize(QtCore.QSize(100, 31)) self.lineEdit_12.setObjectName("lineEdit_12") - self.horizontalLayout_16.addWidget(self.lineEdit_12) - self.pushButton_12 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.lineEdit_12, 13, 2, 1, 1) + self.pushButton_12 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -806,8 +645,8 @@ def setupUi(self, CommandSystemDialog): self.pushButton_12.setMaximumSize(QtCore.QSize(101, 31)) self.pushButton_12.setFocusPolicy(QtCore.Qt.NoFocus) self.pushButton_12.setObjectName("pushButton_12") - self.horizontalLayout_16.addWidget(self.pushButton_12) - self.quickButton_13 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.pushButton_12, 13, 3, 1, 1) + self.quickButton_13 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -817,21 +656,78 @@ def setupUi(self, CommandSystemDialog): self.quickButton_13.setMaximumSize(QtCore.QSize(121, 32)) self.quickButton_13.setText("") self.quickButton_13.setObjectName("quickButton_13") - self.horizontalLayout_16.addWidget(self.quickButton_13) - self.verticalLayout_4.addLayout(self.horizontalLayout_16) - self.horizontalLayout_17 = QtWidgets.QHBoxLayout() - self.horizontalLayout_17.setObjectName("horizontalLayout_17") - self.SubsysBrowser_13 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_13.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_13.setSizePolicy(sizePolicy) + self.gridLayout.addWidget(self.quickButton_13, 13, 4, 1, 1) + self.SubsysBrowser_13 = QtWidgets.QLineEdit(self.layoutWidget) self.SubsysBrowser_13.setMinimumSize(QtCore.QSize(201, 31)) self.SubsysBrowser_13.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_13.setReadOnly(True) self.SubsysBrowser_13.setObjectName("SubsysBrowser_13") - self.horizontalLayout_17.addWidget(self.SubsysBrowser_13) - self.lineEditPktId_13 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.SubsysBrowser_13, 14, 0, 1, 1) + self.SubsysBrowser_14 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_14.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_14.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_14.setReadOnly(True) + self.SubsysBrowser_14.setObjectName("SubsysBrowser_14") + self.gridLayout.addWidget(self.SubsysBrowser_14, 15, 0, 1, 1) + self.lineEditPktId_14 = QtWidgets.QLineEdit(self.layoutWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lineEditPktId_14.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_14.setSizePolicy(sizePolicy) + self.lineEditPktId_14.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_14.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_14.setObjectName("lineEditPktId_14") + self.gridLayout.addWidget(self.lineEditPktId_14, 15, 1, 1, 1) + self.lineEdit_14 = QtWidgets.QLineEdit(self.layoutWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lineEdit_14.sizePolicy().hasHeightForWidth()) + self.lineEdit_14.setSizePolicy(sizePolicy) + self.lineEdit_14.setMinimumSize(QtCore.QSize(100, 31)) + self.lineEdit_14.setMaximumSize(QtCore.QSize(100, 31)) + self.lineEdit_14.setObjectName("lineEdit_14") + self.gridLayout.addWidget(self.lineEdit_14, 15, 2, 1, 1) + self.pushButton_14 = QtWidgets.QPushButton(self.layoutWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.pushButton_14.sizePolicy().hasHeightForWidth()) + self.pushButton_14.setSizePolicy(sizePolicy) + self.pushButton_14.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_14.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_14.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_14.setObjectName("pushButton_14") + self.gridLayout.addWidget(self.pushButton_14, 15, 3, 1, 1) + self.quickButton_15 = QtWidgets.QPushButton(self.layoutWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.quickButton_15.sizePolicy().hasHeightForWidth()) + self.quickButton_15.setSizePolicy(sizePolicy) + self.quickButton_15.setMinimumSize(QtCore.QSize(121, 32)) + self.quickButton_15.setMaximumSize(QtCore.QSize(121, 32)) + self.quickButton_15.setText("") + self.quickButton_15.setObjectName("quickButton_15") + self.gridLayout.addWidget(self.quickButton_15, 15, 4, 1, 1) + self.SubsysBrowser_8 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_8.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_8.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_8.setReadOnly(True) + self.SubsysBrowser_8.setObjectName("SubsysBrowser_8") + self.gridLayout.addWidget(self.SubsysBrowser_8, 9, 0, 1, 1) + self.lineEditPktId_8 = QtWidgets.QLineEdit(self.layoutWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lineEditPktId_8.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_8.setSizePolicy(sizePolicy) + self.lineEditPktId_8.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_8.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_8.setObjectName("lineEditPktId_8") + self.gridLayout.addWidget(self.lineEditPktId_8, 9, 1, 1, 1) + self.lineEditPktId_13 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -840,8 +736,8 @@ def setupUi(self, CommandSystemDialog): self.lineEditPktId_13.setMinimumSize(QtCore.QSize(81, 31)) self.lineEditPktId_13.setMaximumSize(QtCore.QSize(81, 31)) self.lineEditPktId_13.setObjectName("lineEditPktId_13") - self.horizontalLayout_17.addWidget(self.lineEditPktId_13) - self.lineEdit_13 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.lineEditPktId_13, 14, 1, 1, 1) + self.lineEdit_13 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -850,8 +746,8 @@ def setupUi(self, CommandSystemDialog): self.lineEdit_13.setMinimumSize(QtCore.QSize(100, 31)) self.lineEdit_13.setMaximumSize(QtCore.QSize(100, 31)) self.lineEdit_13.setObjectName("lineEdit_13") - self.horizontalLayout_17.addWidget(self.lineEdit_13) - self.pushButton_13 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.lineEdit_13, 14, 2, 1, 1) + self.pushButton_13 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -861,8 +757,8 @@ def setupUi(self, CommandSystemDialog): self.pushButton_13.setMaximumSize(QtCore.QSize(101, 31)) self.pushButton_13.setFocusPolicy(QtCore.Qt.NoFocus) self.pushButton_13.setObjectName("pushButton_13") - self.horizontalLayout_17.addWidget(self.pushButton_13) - self.quickButton_14 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.pushButton_13, 14, 3, 1, 1) + self.quickButton_14 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -872,186 +768,207 @@ def setupUi(self, CommandSystemDialog): self.quickButton_14.setMaximumSize(QtCore.QSize(121, 32)) self.quickButton_14.setText("") self.quickButton_14.setObjectName("quickButton_14") - self.horizontalLayout_17.addWidget(self.quickButton_14) - self.verticalLayout_4.addLayout(self.horizontalLayout_17) - self.horizontalLayout_18 = QtWidgets.QHBoxLayout() - self.horizontalLayout_18.setObjectName("horizontalLayout_18") - self.SubsysBrowser_14 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.quickButton_14, 14, 4, 1, 1) + self.pushButton_4 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_14.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_14.setSizePolicy(sizePolicy) - self.SubsysBrowser_14.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_14.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_14.setObjectName("SubsysBrowser_14") - self.horizontalLayout_18.addWidget(self.SubsysBrowser_14) - self.lineEditPktId_14 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.pushButton_4.sizePolicy().hasHeightForWidth()) + self.pushButton_4.setSizePolicy(sizePolicy) + self.pushButton_4.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_4.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_4.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_4.setObjectName("pushButton_4") + self.gridLayout.addWidget(self.pushButton_4, 5, 3, 1, 1) + self.lineEdit_3 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_14.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_14.setSizePolicy(sizePolicy) - self.lineEditPktId_14.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_14.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_14.setObjectName("lineEditPktId_14") - self.horizontalLayout_18.addWidget(self.lineEditPktId_14) - self.lineEdit_14 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEdit_3.sizePolicy().hasHeightForWidth()) + self.lineEdit_3.setSizePolicy(sizePolicy) + self.lineEdit_3.setMinimumSize(QtCore.QSize(100, 31)) + self.lineEdit_3.setMaximumSize(QtCore.QSize(100, 31)) + self.lineEdit_3.setObjectName("lineEdit_3") + self.gridLayout.addWidget(self.lineEdit_3, 4, 2, 1, 1) + self.SubsysBrowser_7 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_7.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_7.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_7.setReadOnly(True) + self.SubsysBrowser_7.setObjectName("SubsysBrowser_7") + self.gridLayout.addWidget(self.SubsysBrowser_7, 8, 0, 1, 1) + self.pushButton_0 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEdit_14.sizePolicy().hasHeightForWidth()) - self.lineEdit_14.setSizePolicy(sizePolicy) - self.lineEdit_14.setMinimumSize(QtCore.QSize(100, 31)) - self.lineEdit_14.setMaximumSize(QtCore.QSize(100, 31)) - self.lineEdit_14.setObjectName("lineEdit_14") - self.horizontalLayout_18.addWidget(self.lineEdit_14) - self.pushButton_14 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.pushButton_0.sizePolicy().hasHeightForWidth()) + self.pushButton_0.setSizePolicy(sizePolicy) + self.pushButton_0.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_0.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_0.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_0.setObjectName("pushButton_0") + self.gridLayout.addWidget(self.pushButton_0, 1, 3, 1, 1) + self.lineEditPktId_6 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_14.sizePolicy().hasHeightForWidth()) - self.pushButton_14.setSizePolicy(sizePolicy) - self.pushButton_14.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_14.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_14.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_14.setObjectName("pushButton_14") - self.horizontalLayout_18.addWidget(self.pushButton_14) - self.quickButton_15 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEditPktId_6.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_6.setSizePolicy(sizePolicy) + self.lineEditPktId_6.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_6.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_6.setObjectName("lineEditPktId_6") + self.gridLayout.addWidget(self.lineEditPktId_6, 7, 1, 1, 1) + self.SubsysBrowser_10 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_10.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_10.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_10.setReadOnly(True) + self.SubsysBrowser_10.setObjectName("SubsysBrowser_10") + self.gridLayout.addWidget(self.SubsysBrowser_10, 11, 0, 1, 1) + self.lineEditPktId_10 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.quickButton_15.sizePolicy().hasHeightForWidth()) - self.quickButton_15.setSizePolicy(sizePolicy) - self.quickButton_15.setMinimumSize(QtCore.QSize(121, 32)) - self.quickButton_15.setMaximumSize(QtCore.QSize(121, 32)) - self.quickButton_15.setText("") - self.quickButton_15.setObjectName("quickButton_15") - self.horizontalLayout_18.addWidget(self.quickButton_15) - self.verticalLayout_4.addLayout(self.horizontalLayout_18) - self.horizontalLayout_19 = QtWidgets.QHBoxLayout() - self.horizontalLayout_19.setObjectName("horizontalLayout_19") - self.SubsysBrowser_15 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEditPktId_10.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_10.setSizePolicy(sizePolicy) + self.lineEditPktId_10.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_10.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_10.setObjectName("lineEditPktId_10") + self.gridLayout.addWidget(self.lineEditPktId_10, 11, 1, 1, 1) + self.lineEdit_10 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_15.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_15.setSizePolicy(sizePolicy) - self.SubsysBrowser_15.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_15.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_15.setObjectName("SubsysBrowser_15") - self.horizontalLayout_19.addWidget(self.SubsysBrowser_15) - self.lineEditPktId_15 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEdit_10.sizePolicy().hasHeightForWidth()) + self.lineEdit_10.setSizePolicy(sizePolicy) + self.lineEdit_10.setMinimumSize(QtCore.QSize(100, 31)) + self.lineEdit_10.setMaximumSize(QtCore.QSize(100, 31)) + self.lineEdit_10.setObjectName("lineEdit_10") + self.gridLayout.addWidget(self.lineEdit_10, 11, 2, 1, 1) + self.lineEdit_2 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_15.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_15.setSizePolicy(sizePolicy) - self.lineEditPktId_15.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_15.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_15.setObjectName("lineEditPktId_15") - self.horizontalLayout_19.addWidget(self.lineEditPktId_15) - self.lineEdit_15 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEdit_2.sizePolicy().hasHeightForWidth()) + self.lineEdit_2.setSizePolicy(sizePolicy) + self.lineEdit_2.setMinimumSize(QtCore.QSize(100, 31)) + self.lineEdit_2.setMaximumSize(QtCore.QSize(100, 31)) + self.lineEdit_2.setObjectName("lineEdit_2") + self.gridLayout.addWidget(self.lineEdit_2, 3, 2, 1, 1) + self.SubsysBrowser_5 = QtWidgets.QLineEdit(self.layoutWidget) + self.SubsysBrowser_5.setMinimumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_5.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_5.setReadOnly(True) + self.SubsysBrowser_5.setObjectName("SubsysBrowser_5") + self.gridLayout.addWidget(self.SubsysBrowser_5, 6, 0, 1, 1) + self.lineEditPktId_3 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEdit_15.sizePolicy().hasHeightForWidth()) - self.lineEdit_15.setSizePolicy(sizePolicy) - self.lineEdit_15.setMinimumSize(QtCore.QSize(100, 31)) - self.lineEdit_15.setMaximumSize(QtCore.QSize(100, 31)) - self.lineEdit_15.setObjectName("lineEdit_15") - self.horizontalLayout_19.addWidget(self.lineEdit_15) - self.pushButton_15 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEditPktId_3.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_3.setSizePolicy(sizePolicy) + self.lineEditPktId_3.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_3.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_3.setObjectName("lineEditPktId_3") + self.gridLayout.addWidget(self.lineEditPktId_3, 4, 1, 1, 1) + self.lineEdit_1 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_15.sizePolicy().hasHeightForWidth()) - self.pushButton_15.setSizePolicy(sizePolicy) - self.pushButton_15.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_15.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_15.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_15.setObjectName("pushButton_15") - self.horizontalLayout_19.addWidget(self.pushButton_15) - self.quickButton_16 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEdit_1.sizePolicy().hasHeightForWidth()) + self.lineEdit_1.setSizePolicy(sizePolicy) + self.lineEdit_1.setMinimumSize(QtCore.QSize(100, 31)) + self.lineEdit_1.setMaximumSize(QtCore.QSize(100, 31)) + self.lineEdit_1.setObjectName("lineEdit_1") + self.gridLayout.addWidget(self.lineEdit_1, 2, 2, 1, 1) + self.lineEdit_8 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.quickButton_16.sizePolicy().hasHeightForWidth()) - self.quickButton_16.setSizePolicy(sizePolicy) - self.quickButton_16.setMinimumSize(QtCore.QSize(121, 32)) - self.quickButton_16.setMaximumSize(QtCore.QSize(121, 32)) - self.quickButton_16.setText("") - self.quickButton_16.setObjectName("quickButton_16") - self.horizontalLayout_19.addWidget(self.quickButton_16) - self.verticalLayout_4.addLayout(self.horizontalLayout_19) - self.horizontalLayout_20 = QtWidgets.QHBoxLayout() - self.horizontalLayout_20.setObjectName("horizontalLayout_20") - self.SubsysBrowser_16 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEdit_8.sizePolicy().hasHeightForWidth()) + self.lineEdit_8.setSizePolicy(sizePolicy) + self.lineEdit_8.setMinimumSize(QtCore.QSize(100, 31)) + self.lineEdit_8.setMaximumSize(QtCore.QSize(100, 31)) + self.lineEdit_8.setObjectName("lineEdit_8") + self.gridLayout.addWidget(self.lineEdit_8, 9, 2, 1, 1) + self.pushButton_8 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_16.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_16.setSizePolicy(sizePolicy) - self.SubsysBrowser_16.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_16.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_16.setObjectName("SubsysBrowser_16") - self.horizontalLayout_20.addWidget(self.SubsysBrowser_16) - self.lineEditPktId_16 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.pushButton_8.sizePolicy().hasHeightForWidth()) + self.pushButton_8.setSizePolicy(sizePolicy) + self.pushButton_8.setMinimumSize(QtCore.QSize(101, 31)) + self.pushButton_8.setMaximumSize(QtCore.QSize(101, 31)) + self.pushButton_8.setFocusPolicy(QtCore.Qt.NoFocus) + self.pushButton_8.setObjectName("pushButton_8") + self.gridLayout.addWidget(self.pushButton_8, 9, 3, 1, 1) + self.lineEditPktId_1 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_16.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_16.setSizePolicy(sizePolicy) - self.lineEditPktId_16.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_16.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_16.setObjectName("lineEditPktId_16") - self.horizontalLayout_20.addWidget(self.lineEditPktId_16) - self.lineEdit_16 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEditPktId_1.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_1.setSizePolicy(sizePolicy) + self.lineEditPktId_1.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_1.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_1.setObjectName("lineEditPktId_1") + self.gridLayout.addWidget(self.lineEditPktId_1, 2, 1, 1, 1) + self.lineEdit_6 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEdit_16.sizePolicy().hasHeightForWidth()) - self.lineEdit_16.setSizePolicy(sizePolicy) - self.lineEdit_16.setMinimumSize(QtCore.QSize(100, 31)) - self.lineEdit_16.setMaximumSize(QtCore.QSize(100, 31)) - self.lineEdit_16.setObjectName("lineEdit_16") - self.horizontalLayout_20.addWidget(self.lineEdit_16) - self.pushButton_16 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEdit_6.sizePolicy().hasHeightForWidth()) + self.lineEdit_6.setSizePolicy(sizePolicy) + self.lineEdit_6.setMinimumSize(QtCore.QSize(100, 31)) + self.lineEdit_6.setMaximumSize(QtCore.QSize(100, 31)) + self.lineEdit_6.setObjectName("lineEdit_6") + self.gridLayout.addWidget(self.lineEdit_6, 7, 2, 1, 1) + self.lineEditPktId_9 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_16.sizePolicy().hasHeightForWidth()) - self.pushButton_16.setSizePolicy(sizePolicy) - self.pushButton_16.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_16.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_16.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_16.setObjectName("pushButton_16") - self.horizontalLayout_20.addWidget(self.pushButton_16) - self.quickButton_17 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEditPktId_9.sizePolicy().hasHeightForWidth()) + self.lineEditPktId_9.setSizePolicy(sizePolicy) + self.lineEditPktId_9.setMinimumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_9.setMaximumSize(QtCore.QSize(81, 31)) + self.lineEditPktId_9.setObjectName("lineEditPktId_9") + self.gridLayout.addWidget(self.lineEditPktId_9, 10, 1, 1, 1) + self.lineEdit_9 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.quickButton_17.sizePolicy().hasHeightForWidth()) - self.quickButton_17.setSizePolicy(sizePolicy) - self.quickButton_17.setMinimumSize(QtCore.QSize(121, 32)) - self.quickButton_17.setMaximumSize(QtCore.QSize(121, 32)) - self.quickButton_17.setText("") - self.quickButton_17.setObjectName("quickButton_17") - self.horizontalLayout_20.addWidget(self.quickButton_17) - self.verticalLayout_4.addLayout(self.horizontalLayout_20) - self.horizontalLayout_21 = QtWidgets.QHBoxLayout() - self.horizontalLayout_21.setObjectName("horizontalLayout_21") - self.SubsysBrowser_17 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy.setHeightForWidth(self.lineEdit_9.sizePolicy().hasHeightForWidth()) + self.lineEdit_9.setSizePolicy(sizePolicy) + self.lineEdit_9.setMinimumSize(QtCore.QSize(100, 31)) + self.lineEdit_9.setMaximumSize(QtCore.QSize(100, 31)) + self.lineEdit_9.setObjectName("lineEdit_9") + self.gridLayout.addWidget(self.lineEdit_9, 10, 2, 1, 1) + self.quickButton_7 = QtWidgets.QPushButton(self.layoutWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.quickButton_7.sizePolicy().hasHeightForWidth()) + self.quickButton_7.setSizePolicy(sizePolicy) + self.quickButton_7.setMinimumSize(QtCore.QSize(121, 0)) + self.quickButton_7.setMaximumSize(QtCore.QSize(121, 16777215)) + self.quickButton_7.setText("") + self.quickButton_7.setObjectName("quickButton_7") + self.gridLayout.addWidget(self.quickButton_7, 7, 4, 1, 1) + self.quickButton_5 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_17.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_17.setSizePolicy(sizePolicy) + sizePolicy.setHeightForWidth(self.quickButton_5.sizePolicy().hasHeightForWidth()) + self.quickButton_5.setSizePolicy(sizePolicy) + self.quickButton_5.setMinimumSize(QtCore.QSize(121, 0)) + self.quickButton_5.setMaximumSize(QtCore.QSize(121, 16777215)) + self.quickButton_5.setText("") + self.quickButton_5.setObjectName("quickButton_5") + self.gridLayout.addWidget(self.quickButton_5, 5, 4, 1, 1) + self.SubsysBrowser_17 = QtWidgets.QLineEdit(self.layoutWidget) self.SubsysBrowser_17.setMinimumSize(QtCore.QSize(201, 31)) self.SubsysBrowser_17.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_17.setReadOnly(True) self.SubsysBrowser_17.setObjectName("SubsysBrowser_17") - self.horizontalLayout_21.addWidget(self.SubsysBrowser_17) - self.lineEditPktId_17 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.SubsysBrowser_17, 18, 0, 1, 1) + self.lineEditPktId_17 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -1060,8 +977,8 @@ def setupUi(self, CommandSystemDialog): self.lineEditPktId_17.setMinimumSize(QtCore.QSize(81, 31)) self.lineEditPktId_17.setMaximumSize(QtCore.QSize(81, 31)) self.lineEditPktId_17.setObjectName("lineEditPktId_17") - self.horizontalLayout_21.addWidget(self.lineEditPktId_17) - self.lineEdit_17 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.lineEditPktId_17, 18, 1, 1, 1) + self.lineEdit_17 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -1070,8 +987,8 @@ def setupUi(self, CommandSystemDialog): self.lineEdit_17.setMinimumSize(QtCore.QSize(100, 31)) self.lineEdit_17.setMaximumSize(QtCore.QSize(100, 31)) self.lineEdit_17.setObjectName("lineEdit_17") - self.horizontalLayout_21.addWidget(self.lineEdit_17) - self.pushButton_17 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.lineEdit_17, 18, 2, 1, 1) + self.pushButton_17 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -1081,8 +998,8 @@ def setupUi(self, CommandSystemDialog): self.pushButton_17.setMaximumSize(QtCore.QSize(101, 31)) self.pushButton_17.setFocusPolicy(QtCore.Qt.NoFocus) self.pushButton_17.setObjectName("pushButton_17") - self.horizontalLayout_21.addWidget(self.pushButton_17) - self.quickButton_18 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.pushButton_17, 18, 3, 1, 1) + self.quickButton_18 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -1092,107 +1009,8 @@ def setupUi(self, CommandSystemDialog): self.quickButton_18.setMaximumSize(QtCore.QSize(121, 32)) self.quickButton_18.setText("") self.quickButton_18.setObjectName("quickButton_18") - self.horizontalLayout_21.addWidget(self.quickButton_18) - self.verticalLayout_4.addLayout(self.horizontalLayout_21) - self.horizontalLayout_22 = QtWidgets.QHBoxLayout() - self.horizontalLayout_22.setObjectName("horizontalLayout_22") - self.SubsysBrowser_18 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_18.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_18.setSizePolicy(sizePolicy) - self.SubsysBrowser_18.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_18.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_18.setObjectName("SubsysBrowser_18") - self.horizontalLayout_22.addWidget(self.SubsysBrowser_18) - self.lineEditPktId_18 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_18.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_18.setSizePolicy(sizePolicy) - self.lineEditPktId_18.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_18.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_18.setObjectName("lineEditPktId_18") - self.horizontalLayout_22.addWidget(self.lineEditPktId_18) - self.lineEdit_18 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEdit_18.sizePolicy().hasHeightForWidth()) - self.lineEdit_18.setSizePolicy(sizePolicy) - self.lineEdit_18.setMinimumSize(QtCore.QSize(100, 31)) - self.lineEdit_18.setMaximumSize(QtCore.QSize(100, 31)) - self.lineEdit_18.setObjectName("lineEdit_18") - self.horizontalLayout_22.addWidget(self.lineEdit_18) - self.pushButton_18 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_18.sizePolicy().hasHeightForWidth()) - self.pushButton_18.setSizePolicy(sizePolicy) - self.pushButton_18.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_18.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_18.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_18.setObjectName("pushButton_18") - self.horizontalLayout_22.addWidget(self.pushButton_18) - self.quickButton_19 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.quickButton_19.sizePolicy().hasHeightForWidth()) - self.quickButton_19.setSizePolicy(sizePolicy) - self.quickButton_19.setMinimumSize(QtCore.QSize(121, 32)) - self.quickButton_19.setMaximumSize(QtCore.QSize(121, 32)) - self.quickButton_19.setText("") - self.quickButton_19.setObjectName("quickButton_19") - self.horizontalLayout_22.addWidget(self.quickButton_19) - self.verticalLayout_4.addLayout(self.horizontalLayout_22) - self.horizontalLayout_23 = QtWidgets.QHBoxLayout() - self.horizontalLayout_23.setObjectName("horizontalLayout_23") - self.SubsysBrowser_19 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_19.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_19.setSizePolicy(sizePolicy) - self.SubsysBrowser_19.setMinimumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_19.setMaximumSize(QtCore.QSize(201, 31)) - self.SubsysBrowser_19.setObjectName("SubsysBrowser_19") - self.horizontalLayout_23.addWidget(self.SubsysBrowser_19) - self.lineEditPktId_19 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEditPktId_19.sizePolicy().hasHeightForWidth()) - self.lineEditPktId_19.setSizePolicy(sizePolicy) - self.lineEditPktId_19.setMinimumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_19.setMaximumSize(QtCore.QSize(81, 31)) - self.lineEditPktId_19.setObjectName("lineEditPktId_19") - self.horizontalLayout_23.addWidget(self.lineEditPktId_19) - self.lineEdit_19 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lineEdit_19.sizePolicy().hasHeightForWidth()) - self.lineEdit_19.setSizePolicy(sizePolicy) - self.lineEdit_19.setMinimumSize(QtCore.QSize(100, 31)) - self.lineEdit_19.setMaximumSize(QtCore.QSize(100, 31)) - self.lineEdit_19.setObjectName("lineEdit_19") - self.horizontalLayout_23.addWidget(self.lineEdit_19) - self.pushButton_19 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pushButton_19.sizePolicy().hasHeightForWidth()) - self.pushButton_19.setSizePolicy(sizePolicy) - self.pushButton_19.setMinimumSize(QtCore.QSize(101, 31)) - self.pushButton_19.setMaximumSize(QtCore.QSize(101, 31)) - self.pushButton_19.setFocusPolicy(QtCore.Qt.NoFocus) - self.pushButton_19.setObjectName("pushButton_19") - self.horizontalLayout_23.addWidget(self.pushButton_19) - self.quickButton_20 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.quickButton_18, 18, 4, 1, 1) + self.quickButton_20 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -1202,21 +1020,14 @@ def setupUi(self, CommandSystemDialog): self.quickButton_20.setMaximumSize(QtCore.QSize(121, 32)) self.quickButton_20.setText("") self.quickButton_20.setObjectName("quickButton_20") - self.horizontalLayout_23.addWidget(self.quickButton_20) - self.verticalLayout_4.addLayout(self.horizontalLayout_23) - self.horizontalLayout_24 = QtWidgets.QHBoxLayout() - self.horizontalLayout_24.setObjectName("horizontalLayout_24") - self.SubsysBrowser_20 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_20.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_20.setSizePolicy(sizePolicy) + self.gridLayout.addWidget(self.quickButton_20, 20, 4, 1, 1) + self.SubsysBrowser_20 = QtWidgets.QLineEdit(self.layoutWidget) self.SubsysBrowser_20.setMinimumSize(QtCore.QSize(201, 31)) self.SubsysBrowser_20.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_20.setReadOnly(True) self.SubsysBrowser_20.setObjectName("SubsysBrowser_20") - self.horizontalLayout_24.addWidget(self.SubsysBrowser_20) - self.lineEditPktId_20 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.SubsysBrowser_20, 21, 0, 1, 1) + self.lineEditPktId_20 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -1225,8 +1036,8 @@ def setupUi(self, CommandSystemDialog): self.lineEditPktId_20.setMinimumSize(QtCore.QSize(81, 31)) self.lineEditPktId_20.setMaximumSize(QtCore.QSize(81, 31)) self.lineEditPktId_20.setObjectName("lineEditPktId_20") - self.horizontalLayout_24.addWidget(self.lineEditPktId_20) - self.lineEdit_20 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.lineEditPktId_20, 21, 1, 1, 1) + self.lineEdit_20 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -1235,8 +1046,8 @@ def setupUi(self, CommandSystemDialog): self.lineEdit_20.setMinimumSize(QtCore.QSize(100, 31)) self.lineEdit_20.setMaximumSize(QtCore.QSize(100, 31)) self.lineEdit_20.setObjectName("lineEdit_20") - self.horizontalLayout_24.addWidget(self.lineEdit_20) - self.pushButton_20 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.lineEdit_20, 21, 2, 1, 1) + self.pushButton_20 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -1246,8 +1057,8 @@ def setupUi(self, CommandSystemDialog): self.pushButton_20.setMaximumSize(QtCore.QSize(101, 31)) self.pushButton_20.setFocusPolicy(QtCore.Qt.NoFocus) self.pushButton_20.setObjectName("pushButton_20") - self.horizontalLayout_24.addWidget(self.pushButton_20) - self.quickButton_21 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.pushButton_20, 21, 3, 1, 1) + self.quickButton_21 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -1257,21 +1068,14 @@ def setupUi(self, CommandSystemDialog): self.quickButton_21.setMaximumSize(QtCore.QSize(121, 32)) self.quickButton_21.setText("") self.quickButton_21.setObjectName("quickButton_21") - self.horizontalLayout_24.addWidget(self.quickButton_21) - self.verticalLayout_4.addLayout(self.horizontalLayout_24) - self.horizontalLayout_25 = QtWidgets.QHBoxLayout() - self.horizontalLayout_25.setObjectName("horizontalLayout_25") - self.SubsysBrowser_21 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.SubsysBrowser_21.sizePolicy().hasHeightForWidth()) - self.SubsysBrowser_21.setSizePolicy(sizePolicy) + self.gridLayout.addWidget(self.quickButton_21, 21, 4, 1, 1) + self.SubsysBrowser_21 = QtWidgets.QLineEdit(self.layoutWidget) self.SubsysBrowser_21.setMinimumSize(QtCore.QSize(201, 31)) self.SubsysBrowser_21.setMaximumSize(QtCore.QSize(201, 31)) + self.SubsysBrowser_21.setReadOnly(True) self.SubsysBrowser_21.setObjectName("SubsysBrowser_21") - self.horizontalLayout_25.addWidget(self.SubsysBrowser_21) - self.lineEditPktId_21 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.SubsysBrowser_21, 22, 0, 1, 1) + self.lineEditPktId_21 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -1280,8 +1084,8 @@ def setupUi(self, CommandSystemDialog): self.lineEditPktId_21.setMinimumSize(QtCore.QSize(81, 31)) self.lineEditPktId_21.setMaximumSize(QtCore.QSize(81, 31)) self.lineEditPktId_21.setObjectName("lineEditPktId_21") - self.horizontalLayout_25.addWidget(self.lineEditPktId_21) - self.lineEdit_21 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.lineEditPktId_21, 22, 1, 1, 1) + self.lineEdit_21 = QtWidgets.QLineEdit(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -1290,8 +1094,8 @@ def setupUi(self, CommandSystemDialog): self.lineEdit_21.setMinimumSize(QtCore.QSize(100, 31)) self.lineEdit_21.setMaximumSize(QtCore.QSize(100, 31)) self.lineEdit_21.setObjectName("lineEdit_21") - self.horizontalLayout_25.addWidget(self.lineEdit_21) - self.pushButton_21 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.lineEdit_21, 22, 2, 1, 1) + self.pushButton_21 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -1301,8 +1105,8 @@ def setupUi(self, CommandSystemDialog): self.pushButton_21.setMaximumSize(QtCore.QSize(101, 31)) self.pushButton_21.setFocusPolicy(QtCore.Qt.NoFocus) self.pushButton_21.setObjectName("pushButton_21") - self.horizontalLayout_25.addWidget(self.pushButton_21) - self.quickButton_22 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + self.gridLayout.addWidget(self.pushButton_21, 22, 3, 1, 1) + self.quickButton_22 = QtWidgets.QPushButton(self.layoutWidget) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -1312,11 +1116,28 @@ def setupUi(self, CommandSystemDialog): self.quickButton_22.setMaximumSize(QtCore.QSize(121, 32)) self.quickButton_22.setText("") self.quickButton_22.setObjectName("quickButton_22") - self.horizontalLayout_25.addWidget(self.quickButton_22) - self.verticalLayout_4.addLayout(self.horizontalLayout_25) - self.verticalLayout_2.addLayout(self.verticalLayout_4) - self.scrollArea.setWidget(self.scrollAreaWidgetContents) - self.verticalLayout.addWidget(self.scrollArea) + self.gridLayout.addWidget(self.quickButton_22, 22, 4, 1, 1) + self.quickButton_1 = QtWidgets.QPushButton(self.layoutWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.quickButton_1.sizePolicy().hasHeightForWidth()) + self.quickButton_1.setSizePolicy(sizePolicy) + self.quickButton_1.setMinimumSize(QtCore.QSize(121, 0)) + self.quickButton_1.setMaximumSize(QtCore.QSize(121, 16777215)) + self.quickButton_1.setText("") + self.quickButton_1.setObjectName("quickButton_1") + self.gridLayout.addWidget(self.quickButton_1, 1, 4, 1, 1) + self.label_3 = QtWidgets.QLabel(self.layoutWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth()) + self.label_3.setSizePolicy(sizePolicy) + self.label_3.setMinimumSize(QtCore.QSize(201, 31)) + self.label_3.setMaximumSize(QtCore.QSize(201, 31)) + self.label_3.setObjectName("label_3") + self.gridLayout.addWidget(self.label_3, 0, 0, 1, 1) self.retranslateUi(CommandSystemDialog) self.buttonBox.clicked['QAbstractButton*'].connect(CommandSystemDialog.close) @@ -1327,29 +1148,29 @@ def retranslateUi(self, CommandSystemDialog): CommandSystemDialog.setWindowTitle(_translate("CommandSystemDialog", "Command System Main Page")) self.label.setText(_translate("CommandSystemDialog", "cFE/CFS Subsystem Commands")) self.label_2.setText(_translate("CommandSystemDialog", "Available Pages")) - self.label_3.setText(_translate("CommandSystemDialog", "Subsystem/Page")) + self.pushButton_18.setText(_translate("CommandSystemDialog", "Display Page")) + self.pushButton_19.setText(_translate("CommandSystemDialog", "Display Page")) + self.pushButton_16.setText(_translate("CommandSystemDialog", "Display Page")) + self.pushButton_5.setText(_translate("CommandSystemDialog", "Display Page")) self.label_4.setText(_translate("CommandSystemDialog", "Packet ID")) + self.pushButton_3.setText(_translate("CommandSystemDialog", "Display Page")) + self.pushButton_11.setText(_translate("CommandSystemDialog", "Display Page")) + self.pushButton_10.setText(_translate("CommandSystemDialog", "Display Page")) + self.pushButton_2.setText(_translate("CommandSystemDialog", "Display Page")) self.label_5.setText(_translate("CommandSystemDialog", "Send To")) - self.pushButton_0.setText(_translate("CommandSystemDialog", "Display Page")) self.pushButton_1.setText(_translate("CommandSystemDialog", "Display Page")) - self.pushButton_2.setText(_translate("CommandSystemDialog", "Display Page")) - self.pushButton_3.setText(_translate("CommandSystemDialog", "Display Page")) - self.pushButton_4.setText(_translate("CommandSystemDialog", "Display Page")) - self.pushButton_5.setText(_translate("CommandSystemDialog", "Display Page")) - self.pushButton_6.setText(_translate("CommandSystemDialog", "Display Page")) self.pushButton_7.setText(_translate("CommandSystemDialog", "Display Page")) - self.pushButton_8.setText(_translate("CommandSystemDialog", "Display Page")) + self.pushButton_6.setText(_translate("CommandSystemDialog", "Display Page")) self.pushButton_9.setText(_translate("CommandSystemDialog", "Display Page")) - self.pushButton_10.setText(_translate("CommandSystemDialog", "Display Page")) - self.pushButton_11.setText(_translate("CommandSystemDialog", "Display Page")) + self.pushButton_15.setText(_translate("CommandSystemDialog", "Display Page")) self.pushButton_12.setText(_translate("CommandSystemDialog", "Display Page")) - self.pushButton_13.setText(_translate("CommandSystemDialog", "Display Page")) self.pushButton_14.setText(_translate("CommandSystemDialog", "Display Page")) - self.pushButton_15.setText(_translate("CommandSystemDialog", "Display Page")) - self.pushButton_16.setText(_translate("CommandSystemDialog", "Display Page")) + self.pushButton_13.setText(_translate("CommandSystemDialog", "Display Page")) + self.pushButton_4.setText(_translate("CommandSystemDialog", "Display Page")) + self.pushButton_0.setText(_translate("CommandSystemDialog", "Display Page")) + self.pushButton_8.setText(_translate("CommandSystemDialog", "Display Page")) self.pushButton_17.setText(_translate("CommandSystemDialog", "Display Page")) - self.pushButton_18.setText(_translate("CommandSystemDialog", "Display Page")) - self.pushButton_19.setText(_translate("CommandSystemDialog", "Display Page")) self.pushButton_20.setText(_translate("CommandSystemDialog", "Display Page")) self.pushButton_21.setText(_translate("CommandSystemDialog", "Display Page")) + self.label_3.setText(_translate("CommandSystemDialog", "Subsystem/Page")) diff --git a/Subsystems/cmdGui/CommandSystemDialog.ui b/Subsystems/cmdGui/CommandSystemDialog.ui index 64fb50f..f0c4e0c 100644 --- a/Subsystems/cmdGui/CommandSystemDialog.ui +++ b/Subsystems/cmdGui/CommandSystemDialog.ui @@ -1,3014 +1,2776 @@ CommandSystemDialog - - - Qt::NonModal - - - true - + 0 0 - 709 - 581 + 772 + 1020 Command System Main Page - - - 0 + + + + 80 + 20 + 621 + 25 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + cFE/CFS Subsystem Commands + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 80 + 60 + 621 + 33 + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 90 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Available Pages + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Vertical + + + QDialogButtonBox::Close + + + true + + + + + + + + + 70 + 120 + 630 + 857 + - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - cFE/CFS Subsystem Commands - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 90 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Available Pages - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 90 - 0 - - - - - 90 - 16777215 - - - - Qt::NoFocus - - - Qt::Horizontal - - - QDialogButtonBox::Close - - - - - - - - - - 0 - 0 - - - - - 0 - 800 - - - - Qt::ScrollBarAlwaysOn - - - Qt::ScrollBarAsNeeded - - - true - - - - - 0 - 0 - 675 - 1000 - - - - - 0 - 1000 - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - Subsystem/Page - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - Packet ID - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - Send To - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 101 - 20 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 121 - 20 - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 0 - - - - - 121 - 16777215 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 0 - - - - - 121 - 16777215 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 0 - - - - - 121 - 16777215 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 0 - - - - - 121 - 16777215 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 0 - - - - - 121 - 16777215 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 0 - - - - - 121 - 16777215 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 0 - - - - - 121 - 16777215 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 0 - - - - - 121 - 16777215 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 0 - - - - - 121 - 16777215 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 0 - - - - - 121 - 16777215 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 0 - - - - - 121 - 16777215 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 0 - - - - - 121 - 16777215 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 32 - - - - - 121 - 32 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 32 - - - - - 121 - 32 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 32 - - - - - 121 - 32 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 32 - - - - - 121 - 32 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 32 - - - - - 121 - 32 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 32 - - - - - 121 - 32 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 32 - - - - - 121 - 32 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 32 - - - - - 121 - 32 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 32 - - - - - 121 - 32 - - - - - - - - - - - - - - - - 0 - 0 - - - - - 201 - 31 - - - - - 201 - 31 - - - - - - - - - 0 - 0 - - - - - 81 - 31 - - - - - 81 - 31 - - - - - - - - - 0 - 0 - - - - - 100 - 31 - - - - - 100 - 31 - - - - - - - - - 0 - 0 - - - - - 101 - 31 - - - - - 101 - 31 - - - - Qt::NoFocus - - - Display Page - - - - - - - - 0 - 0 - - - - - 121 - 32 - - - - - 121 - 32 - - - - - - - - - - - - - - - - + + + + + + 0 + 0 + + + + + 121 + 0 + + + + + 121 + 16777215 + + + + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 121 + 0 + + + + + 121 + 16777215 + + + + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 121 + 32 + + + + + 121 + 32 + + + + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 121 + 32 + + + + + 121 + 32 + + + + + + + + + + + + 0 + 0 + + + + + 121 + 0 + + + + + 121 + 16777215 + + + + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + Packet ID + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 121 + 0 + + + + + 121 + 16777215 + + + + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 121 + 0 + + + + + 121 + 16777215 + + + + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 121 + 0 + + + + + 121 + 16777215 + + + + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + Send To + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 121 + 0 + + + + + 121 + 16777215 + + + + + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 121 + 0 + + + + + 121 + 16777215 + + + + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 121 + 32 + + + + + 121 + 32 + + + + + + + + + + + + 0 + 0 + + + + + 121 + 0 + + + + + 121 + 16777215 + + + + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 121 + 32 + + + + + 121 + 32 + + + + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 121 + 32 + + + + + 121 + 32 + + + + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 121 + 32 + + + + + 121 + 32 + + + + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 121 + 0 + + + + + 121 + 16777215 + + + + + + + + + + + + 0 + 0 + + + + + 121 + 0 + + + + + 121 + 16777215 + + + + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 121 + 32 + + + + + 121 + 32 + + + + + + + + + + + + 0 + 0 + + + + + 121 + 32 + + + + + 121 + 32 + + + + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 121 + 32 + + + + + 121 + 32 + + + + + + + + + + + + 201 + 31 + + + + + 201 + 31 + + + + true + + + + + + + + 0 + 0 + + + + + 81 + 31 + + + + + 81 + 31 + + + + + + + + + 0 + 0 + + + + + 100 + 31 + + + + + 100 + 31 + + + + + + + + + 0 + 0 + + + + + 101 + 31 + + + + + 101 + 31 + + + + Qt::NoFocus + + + Display Page + + + + + + + + 0 + 0 + + + + + 121 + 32 + + + + + 121 + 32 + + + + + + + + + + + + 0 + 0 + + + + + 121 + 0 + + + + + 121 + 16777215 + + + + + + + + + + + + 0 + 0 + + + + + 201 + 31 + + + + + 201 + 31 + + + + Subsystem/Page + + + + + @@ -3019,12 +2781,12 @@ close() - 683 - 70 + 740 + 55 - 393 - 300 + 410 + 555 diff --git a/Subsystems/cmdGui/GenericCommandDialog.py b/Subsystems/cmdGui/GenericCommandDialog.py index 25cc53d..c958369 100644 --- a/Subsystems/cmdGui/GenericCommandDialog.py +++ b/Subsystems/cmdGui/GenericCommandDialog.py @@ -11,7 +11,7 @@ class Ui_GenericCommandDialog(object): def setupUi(self, GenericCommandDialog): GenericCommandDialog.setObjectName("GenericCommandDialog") - GenericCommandDialog.resize(549, 504) + GenericCommandDialog.resize(549, 1058) self.verticalLayout_6 = QtWidgets.QVBoxLayout(GenericCommandDialog) self.verticalLayout_6.setObjectName("verticalLayout_6") self.verticalLayout_4 = QtWidgets.QVBoxLayout() @@ -24,16 +24,11 @@ def setupUi(self, GenericCommandDialog): self.subSystemCommandPageLabel.setAlignment(QtCore.Qt.AlignCenter) self.subSystemCommandPageLabel.setObjectName("subSystemCommandPageLabel") self.verticalLayout.addWidget(self.subSystemCommandPageLabel) - self.subSystemTextBrowser = QtWidgets.QTextBrowser(GenericCommandDialog) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.subSystemTextBrowser.sizePolicy().hasHeightForWidth()) - self.subSystemTextBrowser.setSizePolicy(sizePolicy) - self.subSystemTextBrowser.setMinimumSize(QtCore.QSize(159, 31)) - self.subSystemTextBrowser.setMaximumSize(QtCore.QSize(300, 31)) - self.subSystemTextBrowser.setObjectName("subSystemTextBrowser") - self.verticalLayout.addWidget(self.subSystemTextBrowser) + self.lineEdit = QtWidgets.QLineEdit(GenericCommandDialog) + self.lineEdit.setMinimumSize(QtCore.QSize(159, 31)) + self.lineEdit.setMaximumSize(QtCore.QSize(300, 31)) + self.lineEdit.setObjectName("lineEdit") + self.verticalLayout.addWidget(self.lineEdit) self.horizontalLayout.addLayout(self.verticalLayout) self.verticalLayout_2 = QtWidgets.QVBoxLayout() self.verticalLayout_2.setObjectName("verticalLayout_2") @@ -86,21 +81,17 @@ def setupUi(self, GenericCommandDialog): self.scrollArea.setWidgetResizable(True) self.scrollArea.setObjectName("scrollArea") self.scrollAreaWidgetContents = QtWidgets.QWidget() - self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 508, 1000)) + self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, -63, 515, 1000)) self.scrollAreaWidgetContents.setMinimumSize(QtCore.QSize(0, 1000)) self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents") self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents) self.verticalLayout_5.setObjectName("verticalLayout_5") self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") - self.itemLabelTextBrowser_1 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_1.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_1.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_1 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_1.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_1.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_1.setReadOnly(True) self.itemLabelTextBrowser_1.setObjectName("itemLabelTextBrowser_1") self.horizontalLayout_2.addWidget(self.itemLabelTextBrowser_1) self.SendButton_1 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -116,14 +107,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_2) self.horizontalLayout_3 = QtWidgets.QHBoxLayout() self.horizontalLayout_3.setObjectName("horizontalLayout_3") - self.itemLabelTextBrowser_2 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_2.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_2.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_2 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_2.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_2.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_2.setReadOnly(True) self.itemLabelTextBrowser_2.setObjectName("itemLabelTextBrowser_2") self.horizontalLayout_3.addWidget(self.itemLabelTextBrowser_2) self.SendButton_2 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -139,14 +126,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_3) self.horizontalLayout_4 = QtWidgets.QHBoxLayout() self.horizontalLayout_4.setObjectName("horizontalLayout_4") - self.itemLabelTextBrowser_3 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_3.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_3.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_3 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_3.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_3.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_3.setReadOnly(True) self.itemLabelTextBrowser_3.setObjectName("itemLabelTextBrowser_3") self.horizontalLayout_4.addWidget(self.itemLabelTextBrowser_3) self.SendButton_3 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -162,14 +145,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_4) self.horizontalLayout_5 = QtWidgets.QHBoxLayout() self.horizontalLayout_5.setObjectName("horizontalLayout_5") - self.itemLabelTextBrowser_4 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_4.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_4.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_4 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_4.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_4.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_4.setReadOnly(True) self.itemLabelTextBrowser_4.setObjectName("itemLabelTextBrowser_4") self.horizontalLayout_5.addWidget(self.itemLabelTextBrowser_4) self.SendButton_4 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -185,14 +164,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_5) self.horizontalLayout_6 = QtWidgets.QHBoxLayout() self.horizontalLayout_6.setObjectName("horizontalLayout_6") - self.itemLabelTextBrowser_5 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_5.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_5.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_5 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_5.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_5.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_5.setReadOnly(True) self.itemLabelTextBrowser_5.setObjectName("itemLabelTextBrowser_5") self.horizontalLayout_6.addWidget(self.itemLabelTextBrowser_5) self.SendButton_5 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -208,14 +183,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_6) self.horizontalLayout_7 = QtWidgets.QHBoxLayout() self.horizontalLayout_7.setObjectName("horizontalLayout_7") - self.itemLabelTextBrowser_6 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_6.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_6.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_6 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_6.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_6.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_6.setReadOnly(True) self.itemLabelTextBrowser_6.setObjectName("itemLabelTextBrowser_6") self.horizontalLayout_7.addWidget(self.itemLabelTextBrowser_6) self.SendButton_6 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -231,14 +202,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_7) self.horizontalLayout_8 = QtWidgets.QHBoxLayout() self.horizontalLayout_8.setObjectName("horizontalLayout_8") - self.itemLabelTextBrowser_7 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_7.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_7.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_7 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_7.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_7.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_7.setReadOnly(True) self.itemLabelTextBrowser_7.setObjectName("itemLabelTextBrowser_7") self.horizontalLayout_8.addWidget(self.itemLabelTextBrowser_7) self.SendButton_7 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -254,14 +221,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_8) self.horizontalLayout_9 = QtWidgets.QHBoxLayout() self.horizontalLayout_9.setObjectName("horizontalLayout_9") - self.itemLabelTextBrowser_8 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_8.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_8.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_8 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_8.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_8.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_8.setReadOnly(True) self.itemLabelTextBrowser_8.setObjectName("itemLabelTextBrowser_8") self.horizontalLayout_9.addWidget(self.itemLabelTextBrowser_8) self.SendButton_8 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -277,14 +240,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_9) self.horizontalLayout_10 = QtWidgets.QHBoxLayout() self.horizontalLayout_10.setObjectName("horizontalLayout_10") - self.itemLabelTextBrowser_9 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_9.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_9.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_9 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_9.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_9.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_9.setReadOnly(True) self.itemLabelTextBrowser_9.setObjectName("itemLabelTextBrowser_9") self.horizontalLayout_10.addWidget(self.itemLabelTextBrowser_9) self.SendButton_9 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -300,14 +259,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_10) self.horizontalLayout_11 = QtWidgets.QHBoxLayout() self.horizontalLayout_11.setObjectName("horizontalLayout_11") - self.itemLabelTextBrowser_10 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_10.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_10.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_10 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_10.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_10.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_10.setReadOnly(True) self.itemLabelTextBrowser_10.setObjectName("itemLabelTextBrowser_10") self.horizontalLayout_11.addWidget(self.itemLabelTextBrowser_10) self.SendButton_10 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -323,14 +278,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_11) self.horizontalLayout_12 = QtWidgets.QHBoxLayout() self.horizontalLayout_12.setObjectName("horizontalLayout_12") - self.itemLabelTextBrowser_11 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_11.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_11.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_11 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_11.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_11.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_11.setReadOnly(True) self.itemLabelTextBrowser_11.setObjectName("itemLabelTextBrowser_11") self.horizontalLayout_12.addWidget(self.itemLabelTextBrowser_11) self.SendButton_11 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -346,14 +297,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_12) self.horizontalLayout_13 = QtWidgets.QHBoxLayout() self.horizontalLayout_13.setObjectName("horizontalLayout_13") - self.itemLabelTextBrowser_12 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_12.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_12.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_12 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_12.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_12.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_12.setReadOnly(True) self.itemLabelTextBrowser_12.setObjectName("itemLabelTextBrowser_12") self.horizontalLayout_13.addWidget(self.itemLabelTextBrowser_12) self.SendButton_12 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -369,14 +316,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_13) self.horizontalLayout_14 = QtWidgets.QHBoxLayout() self.horizontalLayout_14.setObjectName("horizontalLayout_14") - self.itemLabelTextBrowser_13 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_13.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_13.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_13 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_13.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_13.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_13.setReadOnly(True) self.itemLabelTextBrowser_13.setObjectName("itemLabelTextBrowser_13") self.horizontalLayout_14.addWidget(self.itemLabelTextBrowser_13) self.SendButton_13 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -392,14 +335,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_14) self.horizontalLayout_15 = QtWidgets.QHBoxLayout() self.horizontalLayout_15.setObjectName("horizontalLayout_15") - self.itemLabelTextBrowser_14 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_14.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_14.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_14 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_14.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_14.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_14.setReadOnly(True) self.itemLabelTextBrowser_14.setObjectName("itemLabelTextBrowser_14") self.horizontalLayout_15.addWidget(self.itemLabelTextBrowser_14) self.SendButton_14 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -415,14 +354,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_15) self.horizontalLayout_16 = QtWidgets.QHBoxLayout() self.horizontalLayout_16.setObjectName("horizontalLayout_16") - self.itemLabelTextBrowser_15 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_15.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_15.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_15 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_15.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_15.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_15.setReadOnly(True) self.itemLabelTextBrowser_15.setObjectName("itemLabelTextBrowser_15") self.horizontalLayout_16.addWidget(self.itemLabelTextBrowser_15) self.SendButton_15 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -438,14 +373,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_16) self.horizontalLayout_17 = QtWidgets.QHBoxLayout() self.horizontalLayout_17.setObjectName("horizontalLayout_17") - self.itemLabelTextBrowser_16 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_16.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_16.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_16 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_16.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_16.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_16.setReadOnly(True) self.itemLabelTextBrowser_16.setObjectName("itemLabelTextBrowser_16") self.horizontalLayout_17.addWidget(self.itemLabelTextBrowser_16) self.SendButton_16 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -461,14 +392,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_17) self.horizontalLayout_18 = QtWidgets.QHBoxLayout() self.horizontalLayout_18.setObjectName("horizontalLayout_18") - self.itemLabelTextBrowser_17 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_17.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_17.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_17 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_17.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_17.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_17.setReadOnly(True) self.itemLabelTextBrowser_17.setObjectName("itemLabelTextBrowser_17") self.horizontalLayout_18.addWidget(self.itemLabelTextBrowser_17) self.SendButton_17 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -484,14 +411,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_18) self.horizontalLayout_19 = QtWidgets.QHBoxLayout() self.horizontalLayout_19.setObjectName("horizontalLayout_19") - self.itemLabelTextBrowser_18 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_18.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_18.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_18 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_18.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_18.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_18.setReadOnly(True) self.itemLabelTextBrowser_18.setObjectName("itemLabelTextBrowser_18") self.horizontalLayout_19.addWidget(self.itemLabelTextBrowser_18) self.SendButton_18 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -507,14 +430,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_19) self.horizontalLayout_20 = QtWidgets.QHBoxLayout() self.horizontalLayout_20.setObjectName("horizontalLayout_20") - self.itemLabelTextBrowser_19 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_19.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_19.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_19 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_19.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_19.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_19.setReadOnly(True) self.itemLabelTextBrowser_19.setObjectName("itemLabelTextBrowser_19") self.horizontalLayout_20.addWidget(self.itemLabelTextBrowser_19) self.SendButton_19 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -530,14 +449,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_20) self.horizontalLayout_21 = QtWidgets.QHBoxLayout() self.horizontalLayout_21.setObjectName("horizontalLayout_21") - self.itemLabelTextBrowser_20 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_20.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_20.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_20 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_20.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_20.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_20.setReadOnly(True) self.itemLabelTextBrowser_20.setObjectName("itemLabelTextBrowser_20") self.horizontalLayout_21.addWidget(self.itemLabelTextBrowser_20) self.SendButton_20 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -553,14 +468,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_21) self.horizontalLayout_22 = QtWidgets.QHBoxLayout() self.horizontalLayout_22.setObjectName("horizontalLayout_22") - self.itemLabelTextBrowser_21 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_21.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_21.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_21 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_21.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_21.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_21.setReadOnly(True) self.itemLabelTextBrowser_21.setObjectName("itemLabelTextBrowser_21") self.horizontalLayout_22.addWidget(self.itemLabelTextBrowser_21) self.SendButton_21 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -576,14 +487,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_22) self.horizontalLayout_23 = QtWidgets.QHBoxLayout() self.horizontalLayout_23.setObjectName("horizontalLayout_23") - self.itemLabelTextBrowser_22 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_22.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_22.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_22 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_22.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_22.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_22.setReadOnly(True) self.itemLabelTextBrowser_22.setObjectName("itemLabelTextBrowser_22") self.horizontalLayout_23.addWidget(self.itemLabelTextBrowser_22) self.SendButton_22 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -599,14 +506,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_23) self.horizontalLayout_24 = QtWidgets.QHBoxLayout() self.horizontalLayout_24.setObjectName("horizontalLayout_24") - self.itemLabelTextBrowser_23 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_23.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_23.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_23 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_23.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_23.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_23.setReadOnly(True) self.itemLabelTextBrowser_23.setObjectName("itemLabelTextBrowser_23") self.horizontalLayout_24.addWidget(self.itemLabelTextBrowser_23) self.SendButton_23 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -622,14 +525,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_24) self.horizontalLayout_25 = QtWidgets.QHBoxLayout() self.horizontalLayout_25.setObjectName("horizontalLayout_25") - self.itemLabelTextBrowser_24 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_24.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_24.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_24 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_24.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_24.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_24.setReadOnly(True) self.itemLabelTextBrowser_24.setObjectName("itemLabelTextBrowser_24") self.horizontalLayout_25.addWidget(self.itemLabelTextBrowser_24) self.SendButton_24 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) @@ -645,14 +544,10 @@ def setupUi(self, GenericCommandDialog): self.verticalLayout_5.addLayout(self.horizontalLayout_25) self.horizontalLayout_26 = QtWidgets.QHBoxLayout() self.horizontalLayout_26.setObjectName("horizontalLayout_26") - self.itemLabelTextBrowser_25 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_25.sizePolicy().hasHeightForWidth()) - self.itemLabelTextBrowser_25.setSizePolicy(sizePolicy) + self.itemLabelTextBrowser_25 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents) self.itemLabelTextBrowser_25.setMinimumSize(QtCore.QSize(391, 31)) self.itemLabelTextBrowser_25.setMaximumSize(QtCore.QSize(1234, 31)) + self.itemLabelTextBrowser_25.setReadOnly(True) self.itemLabelTextBrowser_25.setObjectName("itemLabelTextBrowser_25") self.horizontalLayout_26.addWidget(self.itemLabelTextBrowser_25) self.SendButton_25 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) diff --git a/Subsystems/cmdGui/GenericCommandDialog.ui b/Subsystems/cmdGui/GenericCommandDialog.ui index f2fbd9a..f90479f 100644 --- a/Subsystems/cmdGui/GenericCommandDialog.ui +++ b/Subsystems/cmdGui/GenericCommandDialog.ui @@ -7,7 +7,7 @@ 0 0 549 - 504 + 1058 @@ -31,13 +31,7 @@ - - - - 0 - 0 - - + 159 @@ -171,8 +165,8 @@ 0 - 0 - 508 + -63 + 515 1000 @@ -186,13 +180,7 @@ - - - - 0 - 0 - - + 391 @@ -205,6 +193,9 @@ 31 + + true + @@ -237,13 +228,7 @@ - - - - 0 - 0 - - + 391 @@ -256,6 +241,9 @@ 31 + + true + @@ -288,13 +276,7 @@ - - - - 0 - 0 - - + 391 @@ -307,6 +289,9 @@ 31 + + true + @@ -339,13 +324,7 @@ - - - - 0 - 0 - - + 391 @@ -358,6 +337,9 @@ 31 + + true + @@ -390,13 +372,7 @@ - - - - 0 - 0 - - + 391 @@ -409,6 +385,9 @@ 31 + + true + @@ -441,13 +420,7 @@ - - - - 0 - 0 - - + 391 @@ -460,6 +433,9 @@ 31 + + true + @@ -492,13 +468,7 @@ - - - - 0 - 0 - - + 391 @@ -511,6 +481,9 @@ 31 + + true + @@ -543,13 +516,7 @@ - - - - 0 - 0 - - + 391 @@ -562,6 +529,9 @@ 31 + + true + @@ -594,13 +564,7 @@ - - - - 0 - 0 - - + 391 @@ -613,6 +577,9 @@ 31 + + true + @@ -645,13 +612,7 @@ - - - - 0 - 0 - - + 391 @@ -664,6 +625,9 @@ 31 + + true + @@ -696,13 +660,7 @@ - - - - 0 - 0 - - + 391 @@ -715,6 +673,9 @@ 31 + + true + @@ -747,13 +708,7 @@ - - - - 0 - 0 - - + 391 @@ -766,6 +721,9 @@ 31 + + true + @@ -798,13 +756,7 @@ - - - - 0 - 0 - - + 391 @@ -817,6 +769,9 @@ 31 + + true + @@ -849,13 +804,7 @@ - - - - 0 - 0 - - + 391 @@ -868,6 +817,9 @@ 31 + + true + @@ -900,13 +852,7 @@ - - - - 0 - 0 - - + 391 @@ -919,6 +865,9 @@ 31 + + true + @@ -951,13 +900,7 @@ - - - - 0 - 0 - - + 391 @@ -970,6 +913,9 @@ 31 + + true + @@ -1002,13 +948,7 @@ - - - - 0 - 0 - - + 391 @@ -1021,6 +961,9 @@ 31 + + true + @@ -1053,13 +996,7 @@ - - - - 0 - 0 - - + 391 @@ -1072,6 +1009,9 @@ 31 + + true + @@ -1104,13 +1044,7 @@ - - - - 0 - 0 - - + 391 @@ -1123,6 +1057,9 @@ 31 + + true + @@ -1155,13 +1092,7 @@ - - - - 0 - 0 - - + 391 @@ -1174,6 +1105,9 @@ 31 + + true + @@ -1206,13 +1140,7 @@ - - - - 0 - 0 - - + 391 @@ -1225,6 +1153,9 @@ 31 + + true + @@ -1257,13 +1188,7 @@ - - - - 0 - 0 - - + 391 @@ -1276,6 +1201,9 @@ 31 + + true + @@ -1308,13 +1236,7 @@ - - - - 0 - 0 - - + 391 @@ -1327,6 +1249,9 @@ 31 + + true + @@ -1359,13 +1284,7 @@ - - - - 0 - 0 - - + 391 @@ -1378,6 +1297,9 @@ 31 + + true + @@ -1410,13 +1332,7 @@ - - - - 0 - 0 - - + 391 @@ -1429,6 +1345,9 @@ 31 + + true + diff --git a/Subsystems/cmdGui/Parameter.py b/Subsystems/cmdGui/Parameter.py index 86071ff..6778075 100644 --- a/Subsystems/cmdGui/Parameter.py +++ b/Subsystems/cmdGui/Parameter.py @@ -52,7 +52,7 @@ def ProcessSendButton(self): input_list = [] for j in range(1, 11): inputStr = getattr(self, f"input_{j}") - input_list.append(inputStr.toPlainText().strip()) + input_list.append(inputStr.text().strip()) k = 0 param_list = [] diff --git a/Subsystems/cmdGui/ParameterDialog.py b/Subsystems/cmdGui/ParameterDialog.py index e75fce5..3644c4e 100644 --- a/Subsystems/cmdGui/ParameterDialog.py +++ b/Subsystems/cmdGui/ParameterDialog.py @@ -12,9 +12,9 @@ class Ui_Dialog(object): def setupUi(self, Dialog): Dialog.setObjectName("Dialog") Dialog.setEnabled(True) - Dialog.resize(786, 466) + Dialog.resize(786, 534) self.label_title = QtWidgets.QLabel(Dialog) - self.label_title.setGeometry(QtCore.QRect(330, 70, 91, 31)) + self.label_title.setGeometry(QtCore.QRect(330, 120, 91, 31)) font = QtGui.QFont() font.setFamily("Sans Serif") font.setPointSize(10) @@ -22,58 +22,53 @@ def setupUi(self, Dialog): self.label_title.setAlignment(QtCore.Qt.AlignCenter) self.label_title.setObjectName("label_title") self.label_instructions = QtWidgets.QLabel(Dialog) - self.label_instructions.setGeometry(QtCore.QRect(120, 90, 551, 31)) + self.label_instructions.setGeometry(QtCore.QRect(120, 140, 551, 31)) self.label_instructions.setAlignment(QtCore.Qt.AlignCenter) self.label_instructions.setObjectName("label_instructions") self.buttonBox = QtWidgets.QDialogButtonBox(Dialog) - self.buttonBox.setGeometry(QtCore.QRect(670, 430, 101, 31)) + self.buttonBox.setGeometry(QtCore.QRect(670, 490, 101, 31)) self.buttonBox.setLayoutDirection(QtCore.Qt.LeftToRight) self.buttonBox.setOrientation(QtCore.Qt.Horizontal) self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Close) self.buttonBox.setCenterButtons(True) self.buttonBox.setObjectName("buttonBox") self.status_box = QtWidgets.QTextBrowser(Dialog) - self.status_box.setGeometry(QtCore.QRect(480, 30, 201, 41)) + self.status_box.setGeometry(QtCore.QRect(480, 40, 201, 41)) self.status_box.setAutoFillBackground(False) self.status_box.setObjectName("status_box") self.label_param_title_2 = QtWidgets.QLabel(Dialog) - self.label_param_title_2.setGeometry(QtCore.QRect(480, 10, 51, 21)) - font = QtGui.QFont() - font.setFamily("Sans Serif") - font.setPointSize(10) - self.label_param_title_2.setFont(font) + self.label_param_title_2.setGeometry(QtCore.QRect(480, 10, 61, 21)) self.label_param_title_2.setObjectName("label_param_title_2") self.SendButton_1 = QtWidgets.QPushButton(Dialog) - self.SendButton_1.setGeometry(QtCore.QRect(690, 40, 71, 27)) + self.SendButton_1.setGeometry(QtCore.QRect(690, 47, 71, 27)) + self.SendButton_1.setAutoDefault(False) + self.SendButton_1.setDefault(True) self.SendButton_1.setObjectName("SendButton_1") self.label_5 = QtWidgets.QLabel(Dialog) self.label_5.setGeometry(QtCore.QRect(260, 10, 81, 20)) self.label_5.setObjectName("label_5") self.subSystemCommandPageLabel = QtWidgets.QLabel(Dialog) - self.subSystemCommandPageLabel.setGeometry(QtCore.QRect(30, 10, 91, 17)) + self.subSystemCommandPageLabel.setGeometry(QtCore.QRect(30, 10, 91, 24)) self.subSystemCommandPageLabel.setObjectName("subSystemCommandPageLabel") self.subSystemTextBrowser = QtWidgets.QTextBrowser(Dialog) - self.subSystemTextBrowser.setGeometry(QtCore.QRect(30, 30, 221, 41)) + self.subSystemTextBrowser.setGeometry(QtCore.QRect(30, 40, 221, 41)) self.subSystemTextBrowser.setObjectName("subSystemTextBrowser") self.commandAddressTextBrowser = QtWidgets.QTextBrowser(Dialog) - self.commandAddressTextBrowser.setGeometry(QtCore.QRect(260, 30, 211, 41)) + self.commandAddressTextBrowser.setGeometry(QtCore.QRect(260, 40, 211, 41)) self.commandAddressTextBrowser.setObjectName("commandAddressTextBrowser") self.scrollArea_2 = QtWidgets.QScrollArea(Dialog) - self.scrollArea_2.setGeometry(QtCore.QRect(20, 120, 741, 301)) + self.scrollArea_2.setGeometry(QtCore.QRect(20, 180, 741, 301)) self.scrollArea_2.setMinimumSize(QtCore.QSize(0, 0)) self.scrollArea_2.setBaseSize(QtCore.QSize(0, 500)) - self.scrollArea_2.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) - self.scrollArea_2.setWidgetResizable(True) self.scrollArea_2.setObjectName("scrollArea_2") self.scrollAreaWidgetContents_2 = QtWidgets.QWidget() - self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 724, 1000)) + self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 725, 1000)) self.scrollAreaWidgetContents_2.setMinimumSize(QtCore.QSize(0, 1000)) self.scrollAreaWidgetContents_2.setObjectName("scrollAreaWidgetContents_2") - self.input_2 = QtWidgets.QTextEdit(self.scrollAreaWidgetContents_2) - self.input_2.setGeometry(QtCore.QRect(440, 80, 271, 41)) - self.input_2.setObjectName("input_2") self.descrip_1 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) self.descrip_1.setGeometry(QtCore.QRect(150, 30, 281, 41)) + self.descrip_1.setMinimumSize(QtCore.QSize(281, 41)) + self.descrip_1.setMaximumSize(QtCore.QSize(300, 41)) font = QtGui.QFont() font.setPointSize(8) self.descrip_1.setFont(font) @@ -85,9 +80,6 @@ def setupUi(self, Dialog): font.setPointSize(10) self.label_input_title_2.setFont(font) self.label_input_title_2.setObjectName("label_input_title_2") - self.input_5 = QtWidgets.QTextEdit(self.scrollAreaWidgetContents_2) - self.input_5.setGeometry(QtCore.QRect(440, 230, 271, 41)) - self.input_5.setObjectName("input_5") self.label_param_title_3 = QtWidgets.QLabel(self.scrollAreaWidgetContents_2) self.label_param_title_3.setGeometry(QtCore.QRect(10, 10, 111, 21)) font = QtGui.QFont() @@ -102,33 +94,6 @@ def setupUi(self, Dialog): font.setPointSize(10) self.label_descrip_2.setFont(font) self.label_descrip_2.setObjectName("label_descrip_2") - self.input_1 = QtWidgets.QTextEdit(self.scrollAreaWidgetContents_2) - self.input_1.setGeometry(QtCore.QRect(440, 30, 271, 41)) - self.input_1.setObjectName("input_1") - self.paramName_1 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) - self.paramName_1.setGeometry(QtCore.QRect(10, 30, 131, 41)) - self.paramName_1.setObjectName("paramName_1") - self.input_3 = QtWidgets.QTextEdit(self.scrollAreaWidgetContents_2) - self.input_3.setGeometry(QtCore.QRect(440, 130, 271, 41)) - self.input_3.setObjectName("input_3") - self.input_4 = QtWidgets.QTextEdit(self.scrollAreaWidgetContents_2) - self.input_4.setGeometry(QtCore.QRect(440, 180, 271, 41)) - self.input_4.setObjectName("input_4") - self.input_6 = QtWidgets.QTextEdit(self.scrollAreaWidgetContents_2) - self.input_6.setGeometry(QtCore.QRect(440, 280, 271, 41)) - self.input_6.setObjectName("input_6") - self.input_7 = QtWidgets.QTextEdit(self.scrollAreaWidgetContents_2) - self.input_7.setGeometry(QtCore.QRect(440, 330, 271, 41)) - self.input_7.setObjectName("input_7") - self.input_8 = QtWidgets.QTextEdit(self.scrollAreaWidgetContents_2) - self.input_8.setGeometry(QtCore.QRect(440, 380, 271, 41)) - self.input_8.setObjectName("input_8") - self.input_9 = QtWidgets.QTextEdit(self.scrollAreaWidgetContents_2) - self.input_9.setGeometry(QtCore.QRect(440, 430, 271, 41)) - self.input_9.setObjectName("input_9") - self.paramName_2 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) - self.paramName_2.setGeometry(QtCore.QRect(10, 80, 131, 41)) - self.paramName_2.setObjectName("paramName_2") self.descrip_2 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) self.descrip_2.setGeometry(QtCore.QRect(150, 80, 281, 41)) font = QtGui.QFont() @@ -141,12 +106,6 @@ def setupUi(self, Dialog): font.setPointSize(8) self.descrip_3.setFont(font) self.descrip_3.setObjectName("descrip_3") - self.paramName_3 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) - self.paramName_3.setGeometry(QtCore.QRect(10, 130, 131, 41)) - self.paramName_3.setObjectName("paramName_3") - self.paramName_4 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) - self.paramName_4.setGeometry(QtCore.QRect(10, 180, 131, 41)) - self.paramName_4.setObjectName("paramName_4") self.descrip_4 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) self.descrip_4.setGeometry(QtCore.QRect(150, 180, 281, 41)) font = QtGui.QFont() @@ -159,39 +118,24 @@ def setupUi(self, Dialog): font.setPointSize(8) self.descrip_5.setFont(font) self.descrip_5.setObjectName("descrip_5") - self.paramName_5 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) - self.paramName_5.setGeometry(QtCore.QRect(10, 230, 131, 41)) - self.paramName_5.setObjectName("paramName_5") self.descrip_6 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) self.descrip_6.setGeometry(QtCore.QRect(150, 280, 281, 41)) font = QtGui.QFont() font.setPointSize(8) self.descrip_6.setFont(font) self.descrip_6.setObjectName("descrip_6") - self.paramName_6 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) - self.paramName_6.setGeometry(QtCore.QRect(10, 280, 131, 41)) - self.paramName_6.setObjectName("paramName_6") self.descrip_7 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) self.descrip_7.setGeometry(QtCore.QRect(150, 330, 281, 41)) font = QtGui.QFont() font.setPointSize(8) self.descrip_7.setFont(font) self.descrip_7.setObjectName("descrip_7") - self.paramName_7 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) - self.paramName_7.setGeometry(QtCore.QRect(10, 330, 131, 41)) - self.paramName_7.setObjectName("paramName_7") - self.paramName_8 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) - self.paramName_8.setGeometry(QtCore.QRect(10, 380, 131, 41)) - self.paramName_8.setObjectName("paramName_8") self.descrip_8 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) self.descrip_8.setGeometry(QtCore.QRect(150, 380, 281, 41)) font = QtGui.QFont() font.setPointSize(8) self.descrip_8.setFont(font) self.descrip_8.setObjectName("descrip_8") - self.paramName_9 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) - self.paramName_9.setGeometry(QtCore.QRect(10, 430, 131, 41)) - self.paramName_9.setObjectName("paramName_9") self.descrip_9 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) self.descrip_9.setGeometry(QtCore.QRect(150, 430, 281, 41)) font = QtGui.QFont() @@ -204,17 +148,115 @@ def setupUi(self, Dialog): font.setPointSize(8) self.descrip_10.setFont(font) self.descrip_10.setObjectName("descrip_10") - self.paramName_10 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents_2) - self.paramName_10.setGeometry(QtCore.QRect(10, 480, 131, 41)) - self.paramName_10.setObjectName("paramName_10") - self.input_10 = QtWidgets.QTextEdit(self.scrollAreaWidgetContents_2) + self.input_1 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.input_1.setGeometry(QtCore.QRect(440, 30, 271, 41)) + self.input_1.setObjectName("input_1") + self.input_2 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.input_2.setGeometry(QtCore.QRect(440, 80, 271, 41)) + self.input_2.setObjectName("input_2") + self.input_3 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.input_3.setGeometry(QtCore.QRect(440, 130, 271, 41)) + self.input_3.setObjectName("input_3") + self.input_4 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.input_4.setGeometry(QtCore.QRect(440, 180, 271, 41)) + self.input_4.setObjectName("input_4") + self.input_5 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.input_5.setGeometry(QtCore.QRect(440, 230, 271, 41)) + self.input_5.setObjectName("input_5") + self.input_6 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.input_6.setGeometry(QtCore.QRect(440, 280, 271, 41)) + self.input_6.setObjectName("input_6") + self.input_7 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.input_7.setGeometry(QtCore.QRect(440, 330, 271, 41)) + self.input_7.setObjectName("input_7") + self.input_8 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.input_8.setGeometry(QtCore.QRect(440, 380, 271, 41)) + self.input_8.setObjectName("input_8") + self.input_9 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.input_9.setGeometry(QtCore.QRect(440, 430, 271, 41)) + self.input_9.setObjectName("input_9") + self.input_10 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) self.input_10.setGeometry(QtCore.QRect(440, 480, 271, 41)) self.input_10.setObjectName("input_10") + self.paramName_1 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.paramName_1.setGeometry(QtCore.QRect(10, 30, 131, 41)) + self.paramName_1.setReadOnly(True) + self.paramName_1.setObjectName("paramName_1") + self.paramName_2 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.paramName_2.setGeometry(QtCore.QRect(10, 80, 131, 41)) + self.paramName_2.setReadOnly(True) + self.paramName_2.setObjectName("paramName_2") + self.paramName_3 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.paramName_3.setGeometry(QtCore.QRect(10, 130, 131, 41)) + self.paramName_3.setReadOnly(True) + self.paramName_3.setObjectName("paramName_3") + self.paramName_4 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.paramName_4.setGeometry(QtCore.QRect(10, 180, 131, 41)) + self.paramName_4.setReadOnly(True) + self.paramName_4.setObjectName("paramName_4") + self.paramName_5 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.paramName_5.setGeometry(QtCore.QRect(10, 230, 131, 41)) + self.paramName_5.setReadOnly(True) + self.paramName_5.setObjectName("paramName_5") + self.paramName_6 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.paramName_6.setGeometry(QtCore.QRect(10, 280, 131, 41)) + self.paramName_6.setReadOnly(True) + self.paramName_6.setObjectName("paramName_6") + self.paramName_7 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.paramName_7.setGeometry(QtCore.QRect(10, 330, 131, 41)) + self.paramName_7.setReadOnly(True) + self.paramName_7.setObjectName("paramName_7") + self.paramName_8 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.paramName_8.setGeometry(QtCore.QRect(10, 380, 131, 41)) + self.paramName_8.setReadOnly(True) + self.paramName_8.setObjectName("paramName_8") + self.paramName_9 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.paramName_9.setGeometry(QtCore.QRect(10, 430, 131, 41)) + self.paramName_9.setReadOnly(True) + self.paramName_9.setObjectName("paramName_9") + self.paramName_10 = QtWidgets.QLineEdit(self.scrollAreaWidgetContents_2) + self.paramName_10.setGeometry(QtCore.QRect(10, 480, 131, 41)) + self.paramName_10.setReadOnly(True) + self.paramName_10.setObjectName("paramName_10") self.scrollArea_2.setWidget(self.scrollAreaWidgetContents_2) self.retranslateUi(Dialog) self.buttonBox.clicked['QAbstractButton*'].connect(Dialog.close) QtCore.QMetaObject.connectSlotsByName(Dialog) + Dialog.setTabOrder(self.input_1, self.input_2) + Dialog.setTabOrder(self.input_2, self.input_3) + Dialog.setTabOrder(self.input_3, self.input_4) + Dialog.setTabOrder(self.input_4, self.input_5) + Dialog.setTabOrder(self.input_5, self.input_6) + Dialog.setTabOrder(self.input_6, self.input_7) + Dialog.setTabOrder(self.input_7, self.input_8) + Dialog.setTabOrder(self.input_8, self.input_9) + Dialog.setTabOrder(self.input_9, self.input_10) + Dialog.setTabOrder(self.input_10, self.descrip_4) + Dialog.setTabOrder(self.descrip_4, self.descrip_5) + Dialog.setTabOrder(self.descrip_5, self.descrip_2) + Dialog.setTabOrder(self.descrip_2, self.descrip_6) + Dialog.setTabOrder(self.descrip_6, self.descrip_7) + Dialog.setTabOrder(self.descrip_7, self.descrip_8) + Dialog.setTabOrder(self.descrip_8, self.descrip_9) + Dialog.setTabOrder(self.descrip_9, self.descrip_10) + Dialog.setTabOrder(self.descrip_10, self.status_box) + Dialog.setTabOrder(self.status_box, self.SendButton_1) + Dialog.setTabOrder(self.SendButton_1, self.subSystemTextBrowser) + Dialog.setTabOrder(self.subSystemTextBrowser, self.commandAddressTextBrowser) + Dialog.setTabOrder(self.commandAddressTextBrowser, self.scrollArea_2) + Dialog.setTabOrder(self.scrollArea_2, self.descrip_1) + Dialog.setTabOrder(self.descrip_1, self.descrip_3) + Dialog.setTabOrder(self.descrip_3, self.paramName_1) + Dialog.setTabOrder(self.paramName_1, self.paramName_2) + Dialog.setTabOrder(self.paramName_2, self.paramName_3) + Dialog.setTabOrder(self.paramName_3, self.paramName_4) + Dialog.setTabOrder(self.paramName_4, self.paramName_5) + Dialog.setTabOrder(self.paramName_5, self.paramName_6) + Dialog.setTabOrder(self.paramName_6, self.paramName_7) + Dialog.setTabOrder(self.paramName_7, self.paramName_8) + Dialog.setTabOrder(self.paramName_8, self.paramName_9) + Dialog.setTabOrder(self.paramName_9, self.paramName_10) def retranslateUi(self, Dialog): _translate = QtCore.QCoreApplication.translate diff --git a/Subsystems/cmdGui/ParameterDialog.ui b/Subsystems/cmdGui/ParameterDialog.ui index c269c2e..3998ce8 100644 --- a/Subsystems/cmdGui/ParameterDialog.ui +++ b/Subsystems/cmdGui/ParameterDialog.ui @@ -10,7 +10,7 @@ 0 0 786 - 466 + 534 @@ -20,7 +20,7 @@ 330 - 70 + 120 91 31 @@ -42,7 +42,7 @@ 120 - 90 + 140 551 31 @@ -58,7 +58,7 @@ 670 - 430 + 490 101 31 @@ -80,7 +80,7 @@ 480 - 30 + 40 201 41 @@ -94,16 +94,10 @@ 480 10 - 51 + 61 21 - - - Sans Serif - 10 - - Status: @@ -112,7 +106,7 @@ 690 - 40 + 47 71 27 @@ -120,6 +114,12 @@ Send + + false + + + true + @@ -140,7 +140,7 @@ 30 10 91 - 17 + 24 @@ -151,7 +151,7 @@ 30 - 30 + 40 221 41 @@ -161,7 +161,7 @@ 260 - 30 + 40 211 41 @@ -171,7 +171,7 @@ 20 - 120 + 180 741 301 @@ -188,18 +188,12 @@ 500 - - Qt::ScrollBarAlwaysOn - - - true - 0 0 - 724 + 725 1000 @@ -209,16 +203,6 @@ 1000 - - - - 440 - 80 - 271 - 41 - - - @@ -228,6 +212,18 @@ 41 + + + 281 + 41 + + + + + 300 + 41 + + 8 @@ -253,16 +249,6 @@ Input - - - - 440 - 230 - 271 - 41 - - - @@ -301,101 +287,131 @@ Description - + - 440 - 30 - 271 + 150 + 80 + 281 41 + + + 8 + + - + - 10 - 30 - 131 + 150 + 130 + 281 41 + + + 8 + + - + - 440 - 130 - 271 + 150 + 180 + 281 41 + + + 8 + + - + - 440 - 180 - 271 + 150 + 230 + 281 41 + + + 8 + + - + - 440 + 150 280 - 271 + 281 41 + + + 8 + + - + - 440 + 150 330 - 271 + 281 41 + + + 8 + + - + - 440 + 150 380 - 271 + 281 41 + + + 8 + + - + - 440 + 150 430 - 271 + 281 41 - - - - - 10 - 80 - 131 - 41 - + + + 8 + - + 150 - 80 + 480 281 41 @@ -406,219 +422,276 @@ - + - 150 - 130 - 281 + 440 + 30 + 271 41 - - - 8 - + + + + + 440 + 80 + 271 + 41 + - + - 10 + 440 130 - 131 + 271 41 - + - 10 + 440 180 - 131 + 271 41 - + - 150 - 180 - 281 + 440 + 230 + 271 41 - - - 8 - - - + - 150 - 230 - 281 + 440 + 280 + 271 41 - - - 8 - + + + + + 440 + 330 + 271 + 41 + - + - 10 - 230 - 131 + 440 + 380 + 271 41 - + - 150 - 280 - 281 + 440 + 430 + 271 41 - - - 8 - + + + + + 440 + 480 + 271 + 41 + - + 10 - 280 + 30 131 41 + + true + - + - 150 - 330 - 281 + 10 + 80 + 131 41 - - - 8 - + + true - + 10 - 330 + 130 131 41 + + true + - + 10 - 380 + 180 131 41 + + true + - + - 150 - 380 - 281 + 10 + 230 + 131 41 - - - 8 - + + true - + 10 - 430 + 280 131 41 + + true + - + - 150 - 430 - 281 + 10 + 330 + 131 41 - - - 8 - + + true - + - 150 - 480 - 281 + 10 + 380 + 131 41 - - - 8 - + + true - + 10 - 480 + 430 131 41 + + true + - + - 440 + 10 480 - 271 + 131 41 + + true + + + input_1 + input_2 + input_3 + input_4 + input_5 + input_6 + input_7 + input_8 + input_9 + input_10 + descrip_4 + descrip_5 + descrip_2 + descrip_6 + descrip_7 + descrip_8 + descrip_9 + descrip_10 + status_box + SendButton_1 + subSystemTextBrowser + commandAddressTextBrowser + scrollArea_2 + descrip_1 + descrip_3 + paramName_1 + paramName_2 + paramName_3 + paramName_4 + paramName_5 + paramName_6 + paramName_7 + paramName_8 + paramName_9 + paramName_10 + diff --git a/Subsystems/tlmGUI/EventMessage.py b/Subsystems/tlmGUI/EventMessage.py index 85c4727..0932e48 100644 --- a/Subsystems/tlmGUI/EventMessage.py +++ b/Subsystems/tlmGUI/EventMessage.py @@ -138,7 +138,7 @@ def __init__(self, subscr, aid): self.context = zmq.Context() self.subscriber = self.context.socket(zmq.SUB) self.subscriber.connect("ipc:///tmp/GroundSystem") - subscriptionString = f"{subscr}.Spacecraft1.TelemetryPackets.{self.appId}" + subscriptionString = f"{subscr}.Spacecraft1.TelemetryPackets.{appId}" self.subscriber.setsockopt_string(zmq.SUBSCRIBE, subscriptionString) def run(self): diff --git a/Subsystems/tlmGUI/GenericTelemetry.py b/Subsystems/tlmGUI/GenericTelemetry.py index 21d4323..a314ba7 100644 --- a/Subsystems/tlmGUI/GenericTelemetry.py +++ b/Subsystems/tlmGUI/GenericTelemetry.py @@ -24,7 +24,7 @@ import getopt import sys from pathlib import Path -from struct import unpack +from struct import unpack, error import zmq from PyQt5.QtCore import QThread, pyqtSignal diff --git a/Subsystems/tlmGUI/TelemetrySystem.py b/Subsystems/tlmGUI/TelemetrySystem.py index 394132a..0d5bb72 100644 --- a/Subsystems/tlmGUI/TelemetrySystem.py +++ b/Subsystems/tlmGUI/TelemetrySystem.py @@ -145,7 +145,6 @@ class TSTlmReceiver(QThread): def __init__(self, subscr): super().__init__() - # Init zeroMQ context = zmq.Context() self.subscriber = context.socket(zmq.SUB) diff --git a/Subsystems/tlmGUI/TelemetrySystemDialog.ui b/Subsystems/tlmGUI/TelemetrySystemDialog.ui index 7e41cf4..52d2ac4 100644 --- a/Subsystems/tlmGUI/TelemetrySystemDialog.ui +++ b/Subsystems/tlmGUI/TelemetrySystemDialog.ui @@ -7,7 +7,7 @@ 0 0 605 - 1018 + 794