From 8db78cbdc6a9c4f1ea87fb0a33e4fdaed4d7f906 Mon Sep 17 00:00:00 2001 From: Leor Bleier Date: Tue, 21 Apr 2020 15:44:58 -0400 Subject: [PATCH] WIP Fix #72 - Upgrade PyQt and clean/fix/refactor for python3 --- GroundSystem.py | 66 +- Guide-GroundSystem.txt | 8 +- MainWindow.py | 131 ++-- RoutingService.py | 60 +- Subsystems/Commands-Telemetry.txt | 6 +- Subsystems/cmdGui/CHeaderParser.py | 4 + Subsystems/cmdGui/CommandSystem.py | 527 +------------ Subsystems/cmdGui/HTMLDocsParser.py | 293 ++++---- Subsystems/cmdGui/UdpCommands.py | 127 +--- Subsystems/tlmGUI/EventMessage.py | 2 +- Subsystems/tlmGUI/EventMessageDialog.py | 101 +-- Subsystems/tlmGUI/GenericTelemetryDialog.py | 683 +++++++++-------- Subsystems/tlmGUI/TelemetrySystem.py | 362 ++------- Subsystems/tlmGUI/TelemetrySystemDialog.py | 781 ++++++++++---------- TlmMQRecv.py | 10 +- 15 files changed, 1107 insertions(+), 2054 deletions(-) diff --git a/GroundSystem.py b/GroundSystem.py index 5137fe4..5cfc603 100644 --- a/GroundSystem.py +++ b/GroundSystem.py @@ -19,80 +19,84 @@ # #cFS Ground System Version 2.0.0 # -#!/usr/bin/env python +#!/usr/bin/env python3 # import sys -import os -import socket -import zmq +import subprocess +import shlex -from PyQt4 import QtGui, QtNetwork, QtCore +from PyQt5.QtWidgets import QMainWindow, QApplication, QMessageBox from MainWindow import Ui_MainWindow from RoutingService import RoutingService + # # CFS Ground System: Setup and manage the main window # -class GroundSystem(QtGui.QMainWindow): +class GroundSystem(QMainWindow, Ui_MainWindow): # # Init the class # - def __init__(self, parent=None): - QtGui.QMainWindow.__init__(self) + def __init__(self): + super().__init__() + self.setupUi((self)) + + self.RoutingService = None + self.pushButtonStartTlm.clicked.connect(self.startTlmSystem) + self.pushButtonStartCmd.clicked.connect(self.startCmdSystem) # Init lists self.ipAddressesList = ['All'] self.spacecraftNames = ['All'] - # Init GUI and set callback methods for buttons - self.ui = Ui_MainWindow() - self.ui.setupUi(self) - self.ui.pushButtonStartTlm.clicked.connect(self.startTlmSystem) - self.ui.pushButtonStartCmd.clicked.connect(self.startCmdSystem) - def closeEvent(self, evnt): if self.RoutingService: self.RoutingService.stop() - print ("Stopped routing service") + print("Stopped routing service") - super(GroundSystem, self).closeEvent(evnt) + super().closeEvent(evnt) # Read the selected spacecraft from combo box on GUI def getSelectedSpacecraftAddress(self): - return str(self.ui.comboBoxIpAddresses.currentText()) + return str(self.comboBoxIpAddresses.currentText()) # Returns the name of the selected spacecraft def getSelectedSpacecraftName(self): - return self.spacecraftNames[self.ipAddressesList.index(self.getSelectedSpacecraftAddress())] + return self.spacecraftNames[self.ipAddressesList.index( + self.getSelectedSpacecraftAddress())] # # Display popup with error # - def DisplayErrorMessage(self, message): - print (message) - alert = QtGui.QMessageBox() + @staticmethod + def DisplayErrorMessage(message): + print(message) + alert = QMessageBox() alert.setText(message) - alert.setIcon(QtGui.QMessageBox.Warning) + alert.setIcon(QMessageBox.Warning) alert.exec_() # Start the telemetry system for the selected spacecraft def startTlmSystem(self): selectedSpacecraft = self.getSelectedSpacecraftName() - # Setup the subscription (to let know the telemetry system the messages it will be receiving) + # Setup the subscription (to let know the + # telemetry system the messages it will be receiving) if selectedSpacecraft == 'All': subscription = '--sub=GroundSystem' else: - subscription = '--sub=GroundSystem.' + selectedSpacecraft + '.TelemetryPackets' + subscription = f'--sub=GroundSystem.{selectedSpacecraft}.TelemetryPackets' # Open Telemetry System - system_call = '( cd Subsystems/tlmGUI/ && python3 TelemetrySystem.py ' + subscription + ' ) & ' - os.system(system_call) + system_call = f'python3 Subsystems/tlmGUI/TelemetrySystem.py {subscription}' + args = shlex.split(system_call) + subprocess.Popen(args) # Start command system - def startCmdSystem(self): - os.system('( cd Subsystems/cmdGui/ && python3 CommandSystem.py ) & ') + @staticmethod + def startCmdSystem(): + subprocess.Popen(['python3', 'Subsystems/cmdGui/CommandSystem.py']) # Start FDL-FUL gui system #def startFDLSystem(self): @@ -113,16 +117,17 @@ def updateIpList(self, ip, name): # Start the routing service (see RoutingService.py) def initRoutingService(self): self.RoutingService = RoutingService(self) - self.connect(self.RoutingService, self.RoutingService.signalUpdateIpList, self.updateIpList) + self.RoutingService.signalUpdateIpList.connect(self.updateIpList) self.RoutingService.start() + # # Main # if __name__ == "__main__": # Init app - app = QtGui.QApplication(sys.argv) + app = QApplication(sys.argv) # Init main window MainWindow = GroundSystem() @@ -136,4 +141,3 @@ def initRoutingService(self): # Execute the app sys.exit(app.exec_()) - diff --git a/Guide-GroundSystem.txt b/Guide-GroundSystem.txt index 98f0d28..0884c73 100644 --- a/Guide-GroundSystem.txt +++ b/Guide-GroundSystem.txt @@ -18,13 +18,13 @@ Future enhancements: Before launching the Ground System make sure that: - -> PyQt4 is installed. + -> PyQt5 is installed. -> PyZMQ is installed. -> cmdUtil is compiled. Installing and running cFS Ground System on Ubuntu: - $ sudo apt-get install python3-pyqt4 + $ sudo apt-get install python3-pyqt5 $ sudo apt-get install python3-zmq $ sudo apt-get install libcanberra-gtk-module $ ( cd Subsystems/cmdUtil/ && make ) @@ -160,8 +160,8 @@ Installing and running cFS Ground System on CentOS 6: $ ldconfig $ pip install pyzmq - #### Install pyQT4 #### - $ yum install -y PyQt4 + #### Install pyQT5 #### + $ yum install -y PyQt5 $ yum install -y qt qt-demos qt-designer qt4 qt4-designer diff --git a/MainWindow.py b/MainWindow.py index 432dcca..dea718d 100644 --- a/MainWindow.py +++ b/MainWindow.py @@ -1,144 +1,121 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'MainWindow.ui' +# Form implementation generated from reading ui file '/home/lbleier/cFS/tools/cFS-GroundSystem/MainWindow.ui' # -# Created: Wed Jun 24 09:56:47 2015 -# by: PyQt4 UI code generator 4.11.3 +# Created by: PyQt5 UI code generator 5.12.3 # # WARNING! All changes made in this file will be lost! -from PyQt4 import QtCore, QtGui -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - def _fromUtf8(s): - return s +from PyQt5 import QtCore, QtGui, QtWidgets -try: - _encoding = QtGui.QApplication.UnicodeUTF8 - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) -except AttributeError: - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) class Ui_MainWindow(object): def setupUi(self, MainWindow): - MainWindow.setObjectName(_fromUtf8("MainWindow")) + MainWindow.setObjectName("MainWindow") MainWindow.setEnabled(True) MainWindow.resize(420, 217) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(24) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth()) MainWindow.setSizePolicy(sizePolicy) - self.centralwidget = QtGui.QWidget(MainWindow) - self.centralwidget.setObjectName(_fromUtf8("centralwidget")) - self.verticalLayout = QtGui.QVBoxLayout(self.centralwidget) - self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.labelHomeTittle = QtGui.QLabel(self.centralwidget) + self.centralwidget = QtWidgets.QWidget(MainWindow) + self.centralwidget.setObjectName("centralwidget") + self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget) + self.verticalLayout.setObjectName("verticalLayout") + self.labelHomeTittle = QtWidgets.QLabel(self.centralwidget) font = QtGui.QFont() font.setPointSize(22) font.setBold(False) font.setWeight(50) self.labelHomeTittle.setFont(font) self.labelHomeTittle.setAlignment(QtCore.Qt.AlignCenter) - self.labelHomeTittle.setObjectName(_fromUtf8("labelHomeTittle")) + self.labelHomeTittle.setObjectName("labelHomeTittle") self.verticalLayout.addWidget(self.labelHomeTittle) - self.line_2 = QtGui.QFrame(self.centralwidget) - self.line_2.setFrameShape(QtGui.QFrame.HLine) - self.line_2.setFrameShadow(QtGui.QFrame.Sunken) - self.line_2.setObjectName(_fromUtf8("line_2")) + self.line_2 = QtWidgets.QFrame(self.centralwidget) + self.line_2.setFrameShape(QtWidgets.QFrame.HLine) + self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken) + self.line_2.setObjectName("line_2") self.verticalLayout.addWidget(self.line_2) - self.horizontalLayout = QtGui.QHBoxLayout() - self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout.addItem(spacerItem) - self.label_3 = QtGui.QLabel(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Preferred) + self.label_3 = QtWidgets.QLabel(self.centralwidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth()) self.label_3.setSizePolicy(sizePolicy) self.label_3.setMinimumSize(QtCore.QSize(141, 0)) self.label_3.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) - self.label_3.setObjectName(_fromUtf8("label_3")) + self.label_3.setObjectName("label_3") self.horizontalLayout.addWidget(self.label_3) - self.comboBoxIpAddresses = QtGui.QComboBox(self.centralwidget) + self.comboBoxIpAddresses = QtWidgets.QComboBox(self.centralwidget) self.comboBoxIpAddresses.setMinimumSize(QtCore.QSize(132, 0)) self.comboBoxIpAddresses.setMaximumSize(QtCore.QSize(132, 16777215)) - self.comboBoxIpAddresses.setObjectName(_fromUtf8("comboBoxIpAddresses")) - self.comboBoxIpAddresses.addItem(_fromUtf8("")) + self.comboBoxIpAddresses.setObjectName("comboBoxIpAddresses") + self.comboBoxIpAddresses.addItem("") self.horizontalLayout.addWidget(self.comboBoxIpAddresses) - spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout.addItem(spacerItem1) self.verticalLayout.addLayout(self.horizontalLayout) - self.horizontalLayout_2 = QtGui.QHBoxLayout() + self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2.setSpacing(32) - self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2")) - self.pushButtonStartTlm = QtGui.QPushButton(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.horizontalLayout_2.setObjectName("horizontalLayout_2") + self.pushButtonStartTlm = QtWidgets.QPushButton(self.centralwidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pushButtonStartTlm.sizePolicy().hasHeightForWidth()) self.pushButtonStartTlm.setSizePolicy(sizePolicy) - self.pushButtonStartTlm.setObjectName(_fromUtf8("pushButtonStartTlm")) + self.pushButtonStartTlm.setObjectName("pushButtonStartTlm") self.horizontalLayout_2.addWidget(self.pushButtonStartTlm) - self.pushButtonStartCmd = QtGui.QPushButton(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.pushButtonStartCmd = QtWidgets.QPushButton(self.centralwidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pushButtonStartCmd.sizePolicy().hasHeightForWidth()) self.pushButtonStartCmd.setSizePolicy(sizePolicy) - self.pushButtonStartCmd.setObjectName(_fromUtf8("pushButtonStartCmd")) + self.pushButtonStartCmd.setObjectName("pushButtonStartCmd") self.horizontalLayout_2.addWidget(self.pushButtonStartCmd) self.verticalLayout.addLayout(self.horizontalLayout_2) - self.line = QtGui.QFrame(self.centralwidget) - self.line.setFrameShape(QtGui.QFrame.HLine) - self.line.setFrameShadow(QtGui.QFrame.Sunken) - self.line.setObjectName(_fromUtf8("line")) + self.line = QtWidgets.QFrame(self.centralwidget) + self.line.setFrameShape(QtWidgets.QFrame.HLine) + self.line.setFrameShadow(QtWidgets.QFrame.Sunken) + self.line.setObjectName("line") self.verticalLayout.addWidget(self.line) - self.horizontalLayout_4 = QtGui.QHBoxLayout() - self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4")) - self.label_5 = QtGui.QLabel(self.centralwidget) + self.horizontalLayout_4 = QtWidgets.QHBoxLayout() + self.horizontalLayout_4.setObjectName("horizontalLayout_4") + self.label_5 = QtWidgets.QLabel(self.centralwidget) font = QtGui.QFont() font.setPointSize(11) self.label_5.setFont(font) - self.label_5.setObjectName(_fromUtf8("label_5")) + self.label_5.setObjectName("label_5") self.horizontalLayout_4.addWidget(self.label_5) - self.pushButton = QtGui.QPushButton(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton = QtWidgets.QPushButton(self.centralwidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pushButton.sizePolicy().hasHeightForWidth()) self.pushButton.setSizePolicy(sizePolicy) - self.pushButton.setObjectName(_fromUtf8("pushButton")) + self.pushButton.setObjectName("pushButton") self.horizontalLayout_4.addWidget(self.pushButton) self.verticalLayout.addLayout(self.horizontalLayout_4) MainWindow.setCentralWidget(self.centralwidget) self.retranslateUi(MainWindow) - QtCore.QObject.connect(self.pushButton, QtCore.SIGNAL(_fromUtf8("clicked()")), MainWindow.close) + self.pushButton.clicked.connect(MainWindow.close) QtCore.QMetaObject.connectSlotsByName(MainWindow) def retranslateUi(self, MainWindow): - MainWindow.setWindowTitle(_translate("MainWindow", "Main Window", None)) - self.labelHomeTittle.setText(_translate("MainWindow", "cFS Ground System", None)) - self.label_3.setText(_translate("MainWindow", "Selected IP Address: ", None)) - self.comboBoxIpAddresses.setItemText(0, _translate("MainWindow", "All", None)) - self.pushButtonStartTlm.setText(_translate("MainWindow", "Start Telemetry System", None)) - self.pushButtonStartCmd.setText(_translate("MainWindow", "Start Command System", None)) - self.label_5.setText(_translate("MainWindow", "*Read Guide-GroundSystem.txt for help", None)) - self.pushButton.setText(_translate("MainWindow", "Close", None)) - - -if __name__ == "__main__": - import sys - app = QtGui.QApplication(sys.argv) - MainWindow = QtGui.QMainWindow() - ui = Ui_MainWindow() - ui.setupUi(MainWindow) - MainWindow.show() - sys.exit(app.exec_()) - + _translate = QtCore.QCoreApplication.translate + MainWindow.setWindowTitle(_translate("MainWindow", "Main Window")) + self.labelHomeTittle.setText(_translate("MainWindow", "CFS Ground System")) + self.label_3.setText(_translate("MainWindow", "Selected IP Address: ")) + self.comboBoxIpAddresses.setItemText(0, _translate("MainWindow", "All")) + self.pushButtonStartTlm.setText(_translate("MainWindow", "Start Telemetry System")) + self.pushButtonStartCmd.setText(_translate("MainWindow", "Start Command System")) + self.label_5.setText(_translate("MainWindow", "*Read Guide-GroundSystem.txt for help")) + self.pushButton.setText(_translate("MainWindow", "Close")) diff --git a/RoutingService.py b/RoutingService.py index 34ddfbb..363aa59 100644 --- a/RoutingService.py +++ b/RoutingService.py @@ -17,31 +17,32 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/usr/bin/env python +#!/usr/bin/env python3 # -import sys import os import socket -import zmq - -from PyQt4 import QtGui, QtNetwork, QtCore +import sys from struct import * from time import sleep +import zmq +from PyQt5.QtCore import QThread, pyqtSignal + # Receive port where the CFS TO_Lab app sends the telemetry packets udpRecvPort = 1235 + # # Receive telemetry packets, apply the appropiate header # and publish the message with zeroMQ # -class RoutingService(QtCore.QThread): +class RoutingService(QThread): + # Signal to update the spacecraft combo box (list) on main window GUI + signalUpdateIpList = pyqtSignal(str, bytes, name="changeIpList") def __init__(self, mainWindow): - QtCore.QThread.__init__(self) - # Signal to update the spacecraft combo box (list) on main window GUI - self.signalUpdateIpList = QtCore.SIGNAL("changeIpList") + super().__init__() # Init lists self.ipAddressesList = ["All"] @@ -49,18 +50,19 @@ def __init__(self, mainWindow): self.specialPktId = [] self.specialPktName = [] + self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + # Init zeroMQ - self.context = zmq.Context() + self.context = zmq.Context() self.publisher = self.context.socket(zmq.PUB) self.publisher.bind("ipc:///tmp/GroundSystem") # Run thread def run(self): # Init udp socket - self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) self.sock.bind(('', udpRecvPort)) - print ('Attempting to wait for UDP messages') + print('Attempting to wait for UDP messages') socketErrorCount = 0 while socketErrorCount < 5: @@ -69,7 +71,8 @@ def run(self): while True: try: # Receive message - datagram, host = self.sock.recvfrom(4096) # buffer size is 1024 bytes + datagram, host = self.sock.recvfrom( + 4096) # buffer size is 1024 bytes # Ignore datagram if it is not long enough (doesnt contain tlm header?) if len(datagram) < 6: @@ -81,22 +84,25 @@ def run(self): # # Add Host to the list if not already in list # - if not any(hostIpAddress in s for s in self.ipAddressesList): - hostName = 'Spacecraft' + str(len(self.spacecraftNames)) + if hostIpAddress not in self.ipAddressesList: + hostName = f'Spacecraft {len(self.spacecraftNames)}' my_hostName_as_bytes = str.encode(hostName) - print ("Detected " + hostName + " at " + hostIpAddress) - self.ipAddressesList.append(hostIpAddress); + print(f"Detected", hostName, "at", hostIpAddress) + self.ipAddressesList.append(hostIpAddress) self.spacecraftNames.append(my_hostName_as_bytes) - self.emit(self.signalUpdateIpList, hostIpAddress, my_hostName_as_bytes) + self.signalUpdateIpList.emit(hostIpAddress, + my_hostName_as_bytes) # Forward the message using zeroMQ - name = self.spacecraftNames[self.ipAddressesList.index(hostIpAddress)] + name = self.spacecraftNames[self.ipAddressesList.index( + hostIpAddress)] self.forwardMessage(datagram, name) # Handle errors - except socket.error as v: - print ('Ignored socket error for attempt %s' % socketErrorCount) - socketErrorCount = socketErrorCount + 1 + except socket.error: + print( + f'Ignored socket error for attempt {socketErrorCount}') + socketErrorCount += 1 sleep(1) # Apply header using hostname and packet id and send msg using zeroMQ @@ -104,16 +110,16 @@ def forwardMessage(self, datagram, hostName): # Forward message to channel GroundSystem.. pktId = self.getPktId(datagram) my_decoded_hostName = hostName.decode() - header = "GroundSystem." + my_decoded_hostName + ".TelemetryPackets." + pktId + header = f"GroundSystem.{my_decoded_hostName}.TelemetryPackets.{pktId}" my_header_as_bytes = str.encode(header) self.publisher.send_multipart([my_header_as_bytes, datagram]) #print header - # Read the packet id from the telemetry packet - def getPktId(self, datagram): + @staticmethod + def getPktId(datagram): # Read the telemetry header - streamId, Sequence, Length = unpack(">HHH",datagram[:6]) + streamId, _, _ = unpack(">HHH", datagram[:6]) # Uncomment the next line to debug # print "Packet ID = " , hex(streamId) return hex(streamId) @@ -122,5 +128,3 @@ def getPktId(self, datagram): def stop(self): self.sock.close() self.context.destroy() - - diff --git a/Subsystems/Commands-Telemetry.txt b/Subsystems/Commands-Telemetry.txt index 50faca2..e8a6548 100644 --- a/Subsystems/Commands-Telemetry.txt +++ b/Subsystems/Commands-Telemetry.txt @@ -65,10 +65,10 @@ It provides a list of "command pages" with a list of commands to send to a subsy Start the command system using the Ground System's main window. -The program is written in Python 2.x with the PyQT4 GUI. The dialogs were created -in the QT4 designer program, and converted to python classes using the "pyuic4" +The program is written in Python 3.x with the PyQT5 GUI. The dialogs were created +in the QT designer program, and converted to python classes using the "pyuic5" utility: - pyuic4 -o MyDialog.py MyDialog.ui + pyuic5 -o MyDialog.py MyDialog.ui The list of pages along with the AppID and address for each page is defined in the file "command-pages.txt" diff --git a/Subsystems/cmdGui/CHeaderParser.py b/Subsystems/cmdGui/CHeaderParser.py index a2303ac..12c3cb7 100644 --- a/Subsystems/cmdGui/CHeaderParser.py +++ b/Subsystems/cmdGui/CHeaderParser.py @@ -97,7 +97,11 @@ def getFileList(filename='CHeaderParser-hdr-paths.txt'): # Try to open textfile list of header files try: with open(filename) as textfile: +<<<<<<< HEAD for l in textfile: +======= + for line in textfile: +>>>>>>> beef5f4... WIP Fix #72 - Upgrade PyQt and clean/fix/refactor for python3 # Remove whitespace before and after l = l.strip() if l and not l.startswith("#"): diff --git a/Subsystems/cmdGui/CommandSystem.py b/Subsystems/cmdGui/CommandSystem.py index 8e6d0bb..d8d2981 100644 --- a/Subsystems/cmdGui/CommandSystem.py +++ b/Subsystems/cmdGui/CommandSystem.py @@ -45,144 +45,10 @@ def __init__(self): btn = getattr(self, f"pushButton_{i}") btn.clicked.connect(lambda: self.ProcessButtonGeneric(i)) - # self.pushButton_0.clicked.connect(lambda: self.ProcessButtonGeneric(0)) - # self.pushButton_1.clicked.connect(lambda: self.ProcessButtonGeneric(1)) - # self.pushButton_2.clicked.connect(lambda: self.ProcessButtonGeneric(2)) - # self.pushButton_3.clicked.connect(lambda: self.ProcessButtonGeneric(3)) - # self.pushButton_4.clicked.connect(lambda: self.ProcessButtonGeneric(4)) - # self.pushButton_5.clicked.connect(lambda: self.ProcessButtonGeneric(5)) - # self.pushButton_6.clicked.connect(lambda: self.ProcessButtonGeneric(6)) - # self.pushButton_7.clicked.connect(lambda: self.ProcessButtonGeneric(7)) - # self.pushButton_8.clicked.connect(lambda: self.ProcessButtonGeneric(8)) - # self.pushButton_9.clicked.connect(lambda: self.ProcessButtonGeneric(9)) - # self.pushButton_10.clicked.connect( - # lambda: self.ProcessButtonGeneric(10)) - # self.pushButton_11.clicked.connect( - # lambda: self.ProcessButtonGeneric(11)) - # self.pushButton_12.clicked.connect( - # lambda: self.ProcessButtonGeneric(12)) - # self.pushButton_13.clicked.connect( - # lambda: self.ProcessButtonGeneric(13)) - # self.pushButton_14.clicked.connect( - # lambda: self.ProcessButtonGeneric(14)) - # self.pushButton_15.clicked.connect( - # lambda: self.ProcessButtonGeneric(15)) - # self.pushButton_16.clicked.connect( - # lambda: self.ProcessButtonGeneric(16)) - # self.pushButton_17.clicked.connect( - # lambda: self.ProcessButtonGeneric(17)) - # self.pushButton_18.clicked.connect( - # lambda: self.ProcessButtonGeneric(18)) - # self.pushButton_19.clicked.connect( - # lambda: self.ProcessButtonGeneric(19)) - # self.pushButton_20.clicked.connect( - # lambda: self.ProcessButtonGeneric(20)) - for j in range(22): btn = getattr(self, f"quickButton_{i+1}") btn.clicked.connect(lambda: self.ProcessQuickButton(j)) - # self.quickButton_1.clicked.connect(lambda: self.ProcessQuickButton(0)) - # self.quickButton_2.clicked.connect(lambda: self.ProcessQuickButton(1)) - # self.quickButton_3.clicked.connect(lambda: self.ProcessQuickButton(2)) - # self.quickButton_4.clicked.connect(lambda: self.ProcessQuickButton(3)) - # self.quickButton_5.clicked.connect(lambda: self.ProcessQuickButton(4)) - # self.quickButton_6.clicked.connect(lambda: self.ProcessQuickButton(5)) - # self.quickButton_7.clicked.connect(lambda: self.ProcessQuickButton(6)) - # self.quickButton_8.clicked.connect(lambda: self.ProcessQuickButton(7)) - # self.quickButton_9.clicked.connect(lambda: self.ProcessQuickButton(8)) - # self.quickButton_10.clicked.connect(lambda: self.ProcessQuickButton(9)) - # self.quickButton_11.clicked.connect( - # lambda: self.ProcessQuickButton(10)) - # self.quickButton_12.clicked.connect( - # lambda: self.ProcessQuickButton(11)) - # self.quickButton_13.clicked.connect( - # lambda: self.ProcessQuickButton(12)) - # self.quickButton_14.clicked.connect( - # lambda: self.ProcessQuickButton(13)) - # self.quickButton_15.clicked.connect( - # lambda: self.ProcessQuickButton(14)) - # self.quickButton_16.clicked.connect( - # lambda: self.ProcessQuickButton(15)) - # self.quickButton_17.clicked.connect( - # lambda: self.ProcessQuickButton(16)) - # self.quickButton_18.clicked.connect( - # lambda: self.ProcessQuickButton(17)) - # self.quickButton_19.clicked.connect( - # lambda: self.ProcessQuickButton(18)) - # self.quickButton_20.clicked.connect( - # lambda: self.ProcessQuickButton(19)) - # self.quickButton_21.clicked.connect( - # lambda: self.ProcessQuickButton(20)) - # self.quickButton_22.clicked.connect( - # lambda: self.ProcessQuickButton(21)) - - # - # Display button wrappers - # - # def ProcessButton_0(self): - # self.ProcessButtonGeneric(0) - - # def ProcessButton_1(self): - # self.ProcessButtonGeneric(1) - - # def ProcessButton_2(self): - # self.ProcessButtonGeneric(2) - - # def ProcessButton_3(self): - # self.ProcessButtonGeneric(3) - - # def ProcessButton_4(self): - # self.ProcessButtonGeneric(4) - - # def ProcessButton_5(self): - # self.ProcessButtonGeneric(5) - - # def ProcessButton_6(self): - # self.ProcessButtonGeneric(6) - - # def ProcessButton_7(self): - # self.ProcessButtonGeneric(7) - - # def ProcessButton_8(self): - # self.ProcessButtonGeneric(8) - - # def ProcessButton_9(self): - # self.ProcessButtonGeneric(9) - - # def ProcessButton_10(self): - # self.ProcessButtonGeneric(10) - - # def ProcessButton_11(self): - # self.ProcessButtonGeneric(11) - - # def ProcessButton_12(self): - # self.ProcessButtonGeneric(12) - - # def ProcessButton_13(self): - # self.ProcessButtonGeneric(13) - - # def ProcessButton_14(self): - # self.ProcessButtonGeneric(14) - - # def ProcessButton_15(self): - # self.ProcessButtonGeneric(15) - - # def ProcessButton_16(self): - # self.ProcessButtonGeneric(16) - - # def ProcessButton_17(self): - # self.ProcessButtonGeneric(17) - - # def ProcessButton_18(self): - # self.ProcessButtonGeneric(18) - - # def ProcessButton_19(self): - # self.ProcessButtonGeneric(19) - - # def ProcessButton_20(self): - # self.ProcessButtonGeneric(20) - # # Processes 'Display Page' button # @@ -196,75 +62,6 @@ def ProcessButtonGeneric(self, idx): cmd_args = shlex.split(launch_string) subprocess.Popen(cmd_args) - # - # Quick button wrappers - # - # def QuickButton_1(self): - # self.ProcessQuickButton(0) - - # def QuickButton_2(self): - # self.ProcessQuickButton(1) - - # def QuickButton_3(self): - # self.ProcessQuickButton(2) - - # def QuickButton_4(self): - # self.ProcessQuickButton(3) - - # def QuickButton_5(self): - # self.ProcessQuickButton(4) - - # def QuickButton_6(self): - # self.ProcessQuickButton(5) - - # def QuickButton_7(self): - # self.ProcessQuickButton(6) - - # def QuickButton_8(self): - # self.ProcessQuickButton(7) - - # def QuickButton_9(self): - # self.ProcessQuickButton(8) - - # def QuickButton_10(self): - # self.ProcessQuickButton(9) - - # def QuickButton_11(self): - # self.ProcessQuickButton(10) - - # def QuickButton_12(self): - # self.ProcessQuickButton(11) - - # def QuickButton_13(self): - # self.ProcessQuickButton(12) - - # def QuickButton_14(self): - # self.ProcessQuickButton(13) - - # def QuickButton_15(self): - # self.ProcessQuickButton(14) - - # def QuickButton_16(self): - # self.ProcessQuickButton(15) - - # def QuickButton_17(self): - # self.ProcessQuickButton(16) - - # def QuickButton_18(self): - # self.ProcessQuickButton(17) - - # def QuickButton_19(self): - # self.ProcessQuickButton(18) - - # def QuickButton_20(self): - # self.ProcessQuickButton(19) - - # def QuickButton_21(self): - # self.ProcessQuickButton(20) - - # def QuickButton_22(self): - # self.ProcessQuickButton(21) - # # Determines if command requires parameters # @@ -308,7 +105,7 @@ def ProcessQuickButton(self, idx): # # Set defaults for the arguments # - cmdDefFile = "command-pages.txt" + cmdDefFile = "./Subsystems/cmdGui/command-pages.txt" # # Init the QT application and the telemetry dialog class @@ -324,7 +121,7 @@ def ProcessQuickButton(self, idx): i = 0 - with open(cmdDefFile, 'r') as cmdfile: + with open(cmdDefFile) as cmdfile: reader = csv.reader(cmdfile, skipinitialspace=True) for cmdRow in reader: try: @@ -355,13 +152,13 @@ def ProcessQuickButton(self, idx): # # Read in contents of quick button definition file # - quickDefFile = 'quick-buttons.txt' - subsys, subsysFile, quickCmd, quickCode, quickPktId, quickEndian, quickAddress, quickPort, quickParam, quickIndices = ( - [] for _ in range(10)) + quickDefFile = './Subsystems/cmdGui/quick-buttons.txt' + subsys, subsysFile, quickCmd, quickCode, quickPktId,\ + quickEndian, quickAddress, quickPort, quickParam, \ + quickIndices = ([] for _ in range(10)) - with open(quickDefFile, 'r') as subFile: + with open(quickDefFile) as subFile: reader = csv.reader(subFile) - i = 0 for fileRow in reader: if fileRow[0][0] != '#': subsys.append(fileRow[0]) @@ -373,7 +170,6 @@ def ProcessQuickButton(self, idx): quickAddress.append(fileRow[6].strip()) quickPort.append(fileRow[7].strip()) quickParam.append(fileRow[8].strip()) - i += 1 # # fill the data fields on the page @@ -393,316 +189,9 @@ def ProcessQuickButton(self, idx): quickButton.setText(quickCmd[quickIdx]) except ValueError: pass - quickIndices.append[quickIdx] + quickIndices.append(quickIdx) else: subsysBrowser.setText("(unused)") - # if cmdPageIsValid[0] == True: - # Command.SubsysBrowser_0.setText(cmdPageDesc[0]) - # Command.lineEditPktId_0.setText(hex(cmdPageAppid[0])) - # Command.lineEdit_0.setText(cmdPageAddress[0]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[0]) - # Command.quickButton_1.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_0.setText("(unused)") - - # if cmdPageIsValid[1] == True: - # Command.SubsysBrowser_1.setText(cmdPageDesc[1]) - # Command.lineEditPktId_1.setText(hex(cmdPageAppid[1])) - # Command.lineEdit_1.setText(cmdPageAddress[1]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[1]) - # Command.quickButton_2.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_1.setText("(unused)") - - # if cmdPageIsValid[2] == True: - # Command.SubsysBrowser_2.setText(cmdPageDesc[2]) - # Command.lineEditPktId_2.setText(hex(cmdPageAppid[2])) - # Command.lineEdit_2.setText(cmdPageAddress[2]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[2]) - # Command.quickButton_3.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_2.setText("(unused)") - - # if cmdPageIsValid[3] == True: - # Command.SubsysBrowser_3.setText(cmdPageDesc[3]) - # Command.lineEditPktId_3.setText(hex(cmdPageAppid[3])) - # Command.lineEdit_3.setText(cmdPageAddress[3]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[3]) - # Command.quickButton_4.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_3.setText("(unused)") - - # if cmdPageIsValid[4] == True: - # Command.SubsysBrowser_4.setText(cmdPageDesc[4]) - # Command.lineEditPktId_4.setText(hex(cmdPageAppid[4])) - # Command.lineEdit_4.setText(cmdPageAddress[4]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[4]) - # Command.quickButton_5.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_4.setText("(unused)") - - # if cmdPageIsValid[5] == True: - # Command.SubsysBrowser_5.setText(cmdPageDesc[5]) - # Command.lineEditPktId_5.setText(hex(cmdPageAppid[5])) - # Command.lineEdit_5.setText(cmdPageAddress[5]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[5]) - # Command.quickButton_6.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_5.setText("(unused)") - - # if cmdPageIsValid[6] == True: - # Command.SubsysBrowser_6.setText(cmdPageDesc[6]) - # Command.lineEditPktId_6.setText(hex(cmdPageAppid[6])) - # Command.lineEdit_6.setText(cmdPageAddress[6]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[6]) - # Command.quickButton_7.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_6.setText("(unused)") - - # if cmdPageIsValid[7] == True: - # Command.SubsysBrowser_7.setText(cmdPageDesc[7]) - # Command.lineEditPktId_7.setText(hex(cmdPageAppid[7])) - # Command.lineEdit_7.setText(cmdPageAddress[7]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[7]) - # Command.quickButton_8.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_7.setText("(unused)") - - # if cmdPageIsValid[8] == True: - # Command.SubsysBrowser_8.setText(cmdPageDesc[8]) - # Command.lineEditPktId_8.setText(hex(cmdPageAppid[8])) - # Command.lineEdit_8.setText(cmdPageAddress[8]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[8]) - # Command.quickButton_9.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_8.setText("(unused)") - - # if cmdPageIsValid[9] == True: - # Command.SubsysBrowser_9.setText(cmdPageDesc[9]) - # Command.lineEditPktId_9.setText(hex(cmdPageAppid[9])) - # Command.lineEdit_9.setText(cmdPageAddress[9]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[9]) - # Command.quickButton_10.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_9.setText("(unused)") - - # if cmdPageIsValid[10] == True: - # Command.SubsysBrowser_10.setText(cmdPageDesc[10]) - # Command.lineEditPktId_10.setText(hex(cmdPageAppid[10])) - # Command.lineEdit_10.setText(cmdPageAddress[10]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[10]) - # Command.quickButton_11.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_10.setText("(unused)") - - # if cmdPageIsValid[11] == True: - # Command.SubsysBrowser_11.setText(cmdPageDesc[11]) - # Command.lineEditPktId_11.setText(hex(cmdPageAppid[11])) - # Command.lineEdit_11.setText(cmdPageAddress[11]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[11]) - # Command.quickButton_12.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_11.setText("(unused)") - - # if cmdPageIsValid[12] == True: - # Command.SubsysBrowser_12.setText(cmdPageDesc[12]) - # Command.lineEditPktId_12.setText(hex(cmdPageAppid[12])) - # Command.lineEdit_12.setText(cmdPageAddress[12]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[12]) - # Command.quickButton_13.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_12.setText("(unused)") - - # if cmdPageIsValid[13] == True: - # Command.SubsysBrowser_13.setText(cmdPageDesc[13]) - # Command.lineEditPktId_13.setText(hex(cmdPageAppid[13])) - # Command.lineEdit_13.setText(cmdPageAddress[13]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[13]) - # Command.quickButton_14.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_13.setText("(unused)") - - # if cmdPageIsValid[14] == True: - # Command.SubsysBrowser_14.setText(cmdPageDesc[14]) - # Command.lineEditPktId_14.setText(hex(cmdPageAppid[14])) - # Command.lineEdit_14.setText(cmdPageAddress[14]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[14]) - # Command.quickButton_15.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_14.setText("(unused)") - - # if cmdPageIsValid[15] == True: - # Command.SubsysBrowser_15.setText(cmdPageDesc[15]) - # Command.lineEditPktId_15.setText(hex(cmdPageAppid[15])) - # Command.lineEdit_15.setText(cmdPageAddress[15]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[15]) - # Command.quickButton_16.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_15.setText("(unused)") - - # if cmdPageIsValid[16] == True: - # Command.SubsysBrowser_16.setText(cmdPageDesc[16]) - # Command.lineEditPktId_16.setText(hex(cmdPageAppid[16])) - # Command.lineEdit_16.setText(cmdPageAddress[16]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[16]) - # Command.quickButton_17.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_16.setText("(unused)") - - # if cmdPageIsValid[17] == True: - # Command.SubsysBrowser_17.setText(cmdPageDesc[17]) - # Command.lineEditPktId_17.setText(hex(cmdPageAppid[17])) - # Command.lineEdit_17.setText(cmdPageAddress[17]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[17]) - # Command.quickButton_18.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_17.setText("(unused)") - - # if cmdPageIsValid[18] == True: - # Command.SubsysBrowser_18.setText(cmdPageDesc[18]) - # Command.lineEditPktId_18.setText(hex(cmdPageAppid[18])) - # Command.lineEdit_18.setText(cmdPageAddress[18]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[18]) - # Command.quickButton_19.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_18.setText("(unused)") - - # if cmdPageIsValid[19] == True: - # Command.SubsysBrowser_19.setText(cmdPageDesc[19]) - # Command.lineEditPktId_19.setText(hex(cmdPageAppid[19])) - # Command.lineEdit_19.setText(cmdPageAddress[19]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[19]) - # Command.quickButton_20.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_19.setText("(unused)") - - # if cmdPageIsValid[20] == True: - # Command.SubsysBrowser_20.setText(cmdPageDesc[20]) - # Command.lineEditPktId_20.setText(hex(cmdPageAppid[20])) - # Command.lineEdit_20.setText(cmdPageAddress[20]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[20]) - # Command.quickButton_21.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_20.setText("(unused)") - - # if cmdPageIsValid[21] == True: - # Command.SubsysBrowser_21.setText(cmdPageDesc[21]) - # Command.lineEditPktId_21.setText(hex(cmdPageAppid[21])) - # Command.lineEdit_21.setText(cmdPageAddress[21]) - # quickIdx = -1 - # try: - # quickIdx = subsys.index(cmdPageDesc[21]) - # Command.quickButton_22.setText(quickCmd[quickIdx]) - # except ValueError: - # pass - # quickIndices.append(quickIdx) - # else: - # Command.SubsysBrowser_21.setText("(unused)") # # Display the page diff --git a/Subsystems/cmdGui/HTMLDocsParser.py b/Subsystems/cmdGui/HTMLDocsParser.py index 300c82b..455f4ad 100644 --- a/Subsystems/cmdGui/HTMLDocsParser.py +++ b/Subsystems/cmdGui/HTMLDocsParser.py @@ -19,8 +19,8 @@ # import sys import csv -import getopt -import subprocess +import getopt +import subprocess import shlex import re import glob @@ -29,149 +29,158 @@ from html.parser import HTMLParser from struct import * + class HTMLDocsParser(HTMLParser): - # - # Initializes allData variable - # - def reset(self): - self.allData = [] - HTMLParser.reset(self) - - # - # Appends HTML file content to allData variable - # - def handle_data(self, text): - if text.strip() != '': # excludes new lines - self.allData.append(text.strip()) - - # - # Determines UNIX data type of parameter - # - def findDataTypeNew(self, dataTypeOrig, paramName, paramLen, paramDesc): - if paramLen != '': # assumes all string types have length enclosed in brackets - return '--string' - elif dataTypeOrig == 'uint8' or dataTypeOrig == 'boolean': - return '--byte' - elif dataTypeOrig == 'uint16': - return '--half' - elif dataTypeOrig == 'uint32': - return '--word' - elif dataTypeOrig == 'uint64': - return '--double' - else: - return '' - - # - # Determines character array size for string types - # - def findStringLen(self, keyword): - hdr_files = glob.glob('../../../build/inc/*.h') - hdr_files += glob.glob('../../../build/cpu1/inc/*.h') - hdr_files += glob.glob('../../../build/native/inc/*.h') - hdr_files += glob.glob('../../fsw/cfe-core/src/inc/cfe_*.h') - val = '' - found = False - i = 0 - - while found == False and i < len(hdr_files): - with open(hdr_files[i], 'r') as hdr_obj: - file_lines = hdr_obj.readlines() - j = 0 - while found == False and j < len(file_lines): - if '#define '+keyword in file_lines[j]: - found = True - val = file_lines[j].split()[2] - j += 1 - i += 1 - - return val + # + # Initializes allData variable + # + def reset(self): + self.allData = [] + HTMLParser.reset(self) + + # + # Appends HTML file content to allData variable + # + def handle_data(self, text): + if text.strip() != '': # excludes new lines + self.allData.append(text.strip()) + + # + # Determines UNIX data type of parameter + # + def findDataTypeNew(self, dataTypeOrig, paramLen): + if paramLen != '': # assumes all string types have length enclosed in brackets + return '--string' + if dataTypeOrig in ('uint8', 'boolean'): + return '--byte' + if dataTypeOrig == 'uint16': + return '--half' + if dataTypeOrig == 'uint32': + return '--word' + if dataTypeOrig == 'uint64': + return '--double' + return '' + + # + # Determines character array size for string types + # + def findStringLen(self, keyword): + hdr_files = glob.glob('../../../build/cpu1/inc/*.h') + hdr_files += glob.glob('../../fsw/cfe-core/src/inc/cfe_*.h') + hdr_files += glob.glob('../../fsw/mission_inc/cfe_mission_cfg.h') + val = '' + found = False + i = 0 + + while not found and i < len(hdr_files): + with open(hdr_files[i]) as hdr_obj: + file_lines = hdr_obj.readlines() + j = 0 + while found == False and j < len(file_lines): + if '#define ' + keyword in file_lines[j]: + found = True + val = file_lines[j].split()[2] + j += 1 + i += 1 + + return val if __name__ == '__main__': - # - # Initializes HTMLDocsParser class - # - parser = HTMLDocsParser() - - # - # Searches for and reads in HTML files - # - file_list = glob.glob('../../docs/cFE UsersGuide/Doxygen/struct_c_f_e__*.html') - - for html_file in file_list: # loops through HTML files - with open(html_file) as file_obj: # opens HTML file - reader = file_obj.read() # reads HTML file - parser.feed(reader) # feeds file contents to parser - data = parser.allData - - dataTypesOrig = [] # uint8, uint16, uint32, char, boolean - paramNames = [] # parameter name - paramLen = [] # original parameter length - paramDesc = [] # parameter description - dataTypesNew = [] # --string, --byte, --half, --word, --double - stringLen = [] # evaluated parameter length - - try: - i = data.index("Data Fields") + 1 - j = data.index("Detailed Description") - while i < j: # iterates through lines between Data Fields and Detailed Description - - # skips header parameters - if 'Header' in data[i+1] or 'Hdr' in data[i+1]: - i += 1 - while 'uint' not in data[i] and 'char' not in data[i] and i < j: - i += 1 - - else: - dataTypesOrig.append(data[i]) # stores data type - i += 1 - paramNames.append(data[i]) # stores parameter name - i += 1 - param_len = '' - if '[' in data[i]: - param_len = data[i] # stores string length if provided - i += 1 - paramLen.append(param_len) - desc_string = '' - while 'uint' not in data[i] and 'char' not in data[i] and i < j: - desc_string = desc_string + ' ' + data[i] - i += 1 - paramDesc.append(desc_string.lstrip()) # stores parameter description - - # determines new data type of parameter - dataTypeNew = parser.findDataTypeNew(dataTypesOrig[-1], paramNames[-1], paramLen[-1], paramDesc[-1]) - dataTypesNew.append(dataTypeNew) - - # finds size of character array if type --string - keyword = '' - if dataTypeNew == '--string': - keyword = re.sub('\[|\]|\(|\)','',paramLen[-1]) # removes brackets - while keyword.isdigit() == False: - keyword = parser.findStringLen(keyword) - keyword = re.sub('\[|\]|\(|\)','',keyword) - if keyword == '0': - keyword = input(paramLen[-1]+' not found. Please enter value manually: ') - stringLen.append(keyword) - - - print ("DATA TYPES:", dataTypesOrig) - print ("PARAM NAMES: ", paramNames) - print ("PARAM STRING LEN:", paramLen) - print ("PARAM DESC: ", paramDesc) - print ("UNIX DATA TYPES:", dataTypesNew) - print ("STRING LENGTH:", stringLen, "\n") - - except ValueError: - print ("Data Fields not found in HTML file") - - # write data to a file - file_split = re.split('/|\.', html_file) - pickle_file = 'ParameterFiles/'+file_split[-2] - with open(pickle_file,'wb') as pickle_obj: - pickle.dump([dataTypesOrig, paramNames, paramLen, paramDesc, dataTypesNew, stringLen], pickle_obj) - - # resets data list for next HTML file - parser.allData = [] - + # + # Initializes HTMLDocsParser class + # + parser = HTMLDocsParser() + + # + # Searches for and reads in HTML files + # + file_list = glob.glob( + '../../docs/cFE UsersGuide/Doxygen/struct_c_f_e__*.html') + + for html_file in file_list: # loops through HTML files + with open(html_file) as file_obj: # opens HTML file + reader = file_obj.read() # reads HTML file + parser.feed(reader) # feeds file contents to parser + data = parser.allData + + dataTypesOrig = [] # uint8, uint16, uint32, char, boolean + paramNames = [] # parameter name + paramLen = [] # original parameter length + paramDesc = [] # parameter description + dataTypesNew = [] # --string, --byte, --half, --word, --double + stringLen = [] # evaluated parameter length + + try: + i = data.index("Data Fields") + 1 + j = data.index("Detailed Description") + while i < j: # iterates through lines between Data Fields and Detailed Description + + # skips header parameters + if 'Header' in data[i + 1] or 'Hdr' in data[i + 1]: + i += 1 + while 'uint' not in data[i] and 'char' not in data[ + i] and i < j: + i += 1 + + else: + dataTypesOrig.append(data[i]) # stores data type + i += 1 + paramNames.append(data[i]) # stores parameter name + i += 1 + param_len = '' + if '[' in data[i]: + param_len = data[ + i] # stores string length if provided + i += 1 + paramLen.append(param_len) + desc_string = '' + while 'uint' not in data[i] and 'char' not in data[ + i] and i < j: + desc_string = desc_string + ' ' + data[i] + i += 1 + paramDesc.append(desc_string.lstrip() + ) # stores parameter description + + # determines new data type of parameter + dataTypeNew = parser.findDataTypeNew( + dataTypesOrig[-1], paramLen[-1]) + dataTypesNew.append(dataTypeNew) + + # finds size of character array if type --string + keyword = '' + if dataTypeNew == '--string': + keyword = re.sub('\[|\]|\(|\)', '', + paramLen[-1]) # removes brackets + while keyword.isdigit() == False: + keyword = parser.findStringLen(keyword) + keyword = re.sub('\[|\]|\(|\)', '', keyword) + if keyword == '0': + keyword = input( + paramLen[-1] + + ' not found. Please enter value manually: ') + stringLen.append(keyword) + + print("DATA TYPES:", dataTypesOrig) + print("PARAM NAMES: ", paramNames) + print("PARAM STRING LEN:", paramLen) + print("PARAM DESC: ", paramDesc) + print("UNIX DATA TYPES:", dataTypesNew) + print("STRING LENGTH:", stringLen, "\n") + + except ValueError: + print("Data Fields not found in HTML file") + + # write data to a file + file_split = re.split('/|\.', html_file) + pickle_file = 'ParameterFiles/' + file_split[-2] + with open(pickle_file, 'wb') as pickle_obj: + pickle.dump([ + dataTypesOrig, paramNames, paramLen, paramDesc, + dataTypesNew, stringLen + ], pickle_obj) + + # resets data list for next HTML file + parser.allData = [] diff --git a/Subsystems/cmdGui/UdpCommands.py b/Subsystems/cmdGui/UdpCommands.py index dd50eac..6e78ca5 100644 --- a/Subsystems/cmdGui/UdpCommands.py +++ b/Subsystems/cmdGui/UdpCommands.py @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/usr/bin/env python +#!/usr/bin/env python3 # # UdpCommands.py -- This is a class that creates a simple command dialog and # sends commands using the cmdUtil UDP C program. @@ -292,131 +292,6 @@ def usage(): else: itemLabelTextBrowser.setText("(unused)") - # if cmdItemIsValid[0]: - # Commands.itemLabelTextBrowser_1.setText(cmdDesc[0]) - # else: - # Commands.itemLabelTextBrowser_1.setText("(unused)") - - # if cmdItemIsValid[1]: - # Commands.itemLabelTextBrowser_2.setText(cmdDesc[1]) - # else: - # Commands.itemLabelTextBrowser_2.setText("(unused)") - - # if cmdItemIsValid[2]: - # Commands.itemLabelTextBrowser_3.setText(cmdDesc[2]) - # else: - # Commands.itemLabelTextBrowser_3.setText("(unused)") - - # if cmdItemIsValid[3]: - # Commands.itemLabelTextBrowser_4.setText(cmdDesc[3]) - # else: - # Commands.itemLabelTextBrowser_4.setText("(unused)") - - # if cmdItemIsValid[4]: - # Commands.itemLabelTextBrowser_5.setText(cmdDesc[4]) - # else: - # Commands.itemLabelTextBrowser_5.setText("(unused)") - - # if cmdItemIsValid[5]: - # Commands.itemLabelTextBrowser_6.setText(cmdDesc[5]) - # else: - # Commands.itemLabelTextBrowser_6.setText("(unused)") - - # if cmdItemIsValid[6]: - # Commands.itemLabelTextBrowser_7.setText(cmdDesc[6]) - # else: - # Commands.itemLabelTextBrowser_7.setText("(unused)") - - # if cmdItemIsValid[7]: - # Commands.itemLabelTextBrowser_8.setText(cmdDesc[7]) - # else: - # Commands.itemLabelTextBrowser_8.setText("(unused)") - - # if cmdItemIsValid[8]: - # Commands.itemLabelTextBrowser_9.setText(cmdDesc[8]) - # else: - # Commands.itemLabelTextBrowser_9.setText("(unused)") - - # if cmdItemIsValid[9]: - # Commands.itemLabelTextBrowser_10.setText(cmdDesc[9]) - # else: - # Commands.itemLabelTextBrowser_10.setText("(unused)") - - # if cmdItemIsValid[10]: - # Commands.itemLabelTextBrowser_11.setText(cmdDesc[10]) - # else: - # Commands.itemLabelTextBrowser_11.setText("(unused)") - - # if cmdItemIsValid[11]: - # Commands.itemLabelTextBrowser_12.setText(cmdDesc[11]) - # else: - # Commands.itemLabelTextBrowser_12.setText("(unused)") - - # if cmdItemIsValid[12]: - # Commands.itemLabelTextBrowser_13.setText(cmdDesc[12]) - # else: - # Commands.itemLabelTextBrowser_13.setText("(unused)") - - # if cmdItemIsValid[13]: - # Commands.itemLabelTextBrowser_14.setText(cmdDesc[13]) - # else: - # Commands.itemLabelTextBrowser_14.setText("(unused)") - - # if cmdItemIsValid[14]: - # Commands.itemLabelTextBrowser_15.setText(cmdDesc[14]) - # else: - # Commands.itemLabelTextBrowser_15.setText("(unused)") - - # if cmdItemIsValid[15]: - # Commands.itemLabelTextBrowser_16.setText(cmdDesc[15]) - # else: - # Commands.itemLabelTextBrowser_16.setText("(unused)") - - # if cmdItemIsValid[16]: - # Commands.itemLabelTextBrowser_17.setText(cmdDesc[16]) - # else: - # Commands.itemLabelTextBrowser_17.setText("(unused)") - - # if cmdItemIsValid[17]: - # Commands.itemLabelTextBrowser_18.setText(cmdDesc[17]) - # else: - # Commands.itemLabelTextBrowser_18.setText("(unused)") - - # if cmdItemIsValid[18]: - # Commands.itemLabelTextBrowser_19.setText(cmdDesc[18]) - # else: - # Commands.itemLabelTextBrowser_19.setText("(unused)") - - # if cmdItemIsValid[19]: - # Commands.itemLabelTextBrowser_20.setText(cmdDesc[19]) - # else: - # Commands.itemLabelTextBrowser_20.setText("(unused)") - - # if cmdItemIsValid[20]: - # Commands.itemLabelTextBrowser_21.setText(cmdDesc[20]) - # else: - # Commands.itemLabelTextBrowser_21.setText("(unused)") - - # if cmdItemIsValid[21]: - # Commands.itemLabelTextBrowser_22.setText(cmdDesc[21]) - # else: - # Commands.itemLabelTextBrowser_22.setText("(unused)") - - # if cmdItemIsValid[22]: - # Commands.itemLabelTextBrowser_23.setText(cmdDesc[22]) - # else: - # Commands.itemLabelTextBrowser_23.setText("(unused)") - - # if cmdItemIsValid[23]: - # Commands.itemLabelTextBrowser_24.setText(cmdDesc[23]) - # else: - # Commands.itemLabelTextBrowser_24.setText("(unused)") - - # if cmdItemIsValid[24]: - # Commands.itemLabelTextBrowser_25.setText(cmdDesc[24]) - # else: - # Commands.itemLabelTextBrowser_25.setText("(unused)") - # # Display the page # diff --git a/Subsystems/tlmGUI/EventMessage.py b/Subsystems/tlmGUI/EventMessage.py index 02ead53..2534ff0 100644 --- a/Subsystems/tlmGUI/EventMessage.py +++ b/Subsystems/tlmGUI/EventMessage.py @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/usr/bin/env python +#!/usr/bin/env python3 # # EVS Events page # diff --git a/Subsystems/tlmGUI/EventMessageDialog.py b/Subsystems/tlmGUI/EventMessageDialog.py index 45a9834..f845fa5 100644 --- a/Subsystems/tlmGUI/EventMessageDialog.py +++ b/Subsystems/tlmGUI/EventMessageDialog.py @@ -1,38 +1,25 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'EventMessageDialog.ui' +# Form implementation generated from reading ui file '/home/lbleier/cFS/tools/cFS-GroundSystem/Subsystems/tlmGUI/EventMessageDialog.ui' # -# Created: Thu Mar 26 11:45:17 2015 -# by: PyQt4 UI code generator 4.11.3 +# Created by: PyQt5 UI code generator 5.12.3 # # WARNING! All changes made in this file will be lost! -from PyQt4 import QtCore, QtGui -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - def _fromUtf8(s): - return s +from PyQt5 import QtCore, QtGui, QtWidgets -try: - _encoding = QtGui.QApplication.UnicodeUTF8 - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) -except AttributeError: - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) class Ui_EventMessageDialog(object): def setupUi(self, EventMessageDialog): - EventMessageDialog.setObjectName(_fromUtf8("EventMessageDialog")) + EventMessageDialog.setObjectName("EventMessageDialog") EventMessageDialog.resize(591, 277) - self.verticalLayout = QtGui.QVBoxLayout(EventMessageDialog) - self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.horizontalLayout = QtGui.QHBoxLayout() - self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - self.label_2 = QtGui.QLabel(EventMessageDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + self.verticalLayout = QtWidgets.QVBoxLayout(EventMessageDialog) + self.verticalLayout.setObjectName("verticalLayout") + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + self.label_2 = QtWidgets.QLabel(EventMessageDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth()) @@ -40,39 +27,39 @@ def setupUi(self, EventMessageDialog): self.label_2.setMinimumSize(QtCore.QSize(91, 17)) self.label_2.setMaximumSize(QtCore.QSize(91, 17)) self.label_2.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) - self.label_2.setObjectName(_fromUtf8("label_2")) + self.label_2.setObjectName("label_2") self.horizontalLayout.addWidget(self.label_2) - self.sequenceCount = QtGui.QTextBrowser(EventMessageDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.sequenceCount = QtWidgets.QTextBrowser(EventMessageDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.sequenceCount.sizePolicy().hasHeightForWidth()) self.sequenceCount.setSizePolicy(sizePolicy) self.sequenceCount.setMinimumSize(QtCore.QSize(81, 31)) self.sequenceCount.setMaximumSize(QtCore.QSize(81, 31)) - self.sequenceCount.setObjectName(_fromUtf8("sequenceCount")) + self.sequenceCount.setObjectName("sequenceCount") self.horizontalLayout.addWidget(self.sequenceCount) - spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout.addItem(spacerItem) - self.line = QtGui.QFrame(EventMessageDialog) - self.line.setFrameShape(QtGui.QFrame.VLine) - self.line.setFrameShadow(QtGui.QFrame.Sunken) - self.line.setObjectName(_fromUtf8("line")) + self.line = QtWidgets.QFrame(EventMessageDialog) + self.line.setFrameShape(QtWidgets.QFrame.VLine) + self.line.setFrameShadow(QtWidgets.QFrame.Sunken) + self.line.setObjectName("line") self.horizontalLayout.addWidget(self.line) - self.label = QtGui.QLabel(EventMessageDialog) - self.label.setObjectName(_fromUtf8("label")) + self.label = QtWidgets.QLabel(EventMessageDialog) + self.label.setObjectName("label") self.horizontalLayout.addWidget(self.label) - self.line_2 = QtGui.QFrame(EventMessageDialog) - self.line_2.setFrameShape(QtGui.QFrame.VLine) - self.line_2.setFrameShadow(QtGui.QFrame.Sunken) - self.line_2.setObjectName(_fromUtf8("line_2")) + self.line_2 = QtWidgets.QFrame(EventMessageDialog) + self.line_2.setFrameShape(QtWidgets.QFrame.VLine) + self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken) + self.line_2.setObjectName("line_2") self.horizontalLayout.addWidget(self.line_2) - spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout.addItem(spacerItem1) - spacerItem2 = QtGui.QSpacerItem(81, 31, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum) + spacerItem2 = QtWidgets.QSpacerItem(81, 31, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout.addItem(spacerItem2) - self.buttonBox = QtGui.QDialogButtonBox(EventMessageDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.buttonBox = QtWidgets.QDialogButtonBox(EventMessageDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.buttonBox.sizePolicy().hasHeightForWidth()) @@ -80,31 +67,21 @@ def setupUi(self, EventMessageDialog): self.buttonBox.setMinimumSize(QtCore.QSize(91, 32)) self.buttonBox.setMaximumSize(QtCore.QSize(91, 32)) self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Close) - self.buttonBox.setObjectName(_fromUtf8("buttonBox")) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Close) + self.buttonBox.setObjectName("buttonBox") self.horizontalLayout.addWidget(self.buttonBox) self.verticalLayout.addLayout(self.horizontalLayout) - self.eventOutput = QtGui.QTextBrowser(EventMessageDialog) - self.eventOutput.setObjectName(_fromUtf8("eventOutput")) + self.eventOutput = QtWidgets.QTextBrowser(EventMessageDialog) + self.eventOutput.setObjectName("eventOutput") self.verticalLayout.addWidget(self.eventOutput) self.retranslateUi(EventMessageDialog) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), EventMessageDialog.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), EventMessageDialog.reject) + self.buttonBox.accepted.connect(EventMessageDialog.accept) + self.buttonBox.rejected.connect(EventMessageDialog.reject) QtCore.QMetaObject.connectSlotsByName(EventMessageDialog) def retranslateUi(self, EventMessageDialog): - EventMessageDialog.setWindowTitle(_translate("EventMessageDialog", "Event Messages", None)) - self.label_2.setText(_translate("EventMessageDialog", "Packet Count", None)) - self.label.setText(_translate("EventMessageDialog", "Events", None)) - - -if __name__ == "__main__": - import sys - app = QtGui.QApplication(sys.argv) - EventMessageDialog = QtGui.QDialog() - ui = Ui_EventMessageDialog() - ui.setupUi(EventMessageDialog) - EventMessageDialog.show() - sys.exit(app.exec_()) - + _translate = QtCore.QCoreApplication.translate + EventMessageDialog.setWindowTitle(_translate("EventMessageDialog", "Event Messages")) + self.label_2.setText(_translate("EventMessageDialog", "Packet Count")) + self.label.setText(_translate("EventMessageDialog", "Events")) diff --git a/Subsystems/tlmGUI/GenericTelemetryDialog.py b/Subsystems/tlmGUI/GenericTelemetryDialog.py index 0c6be4d..f51fd3c 100644 --- a/Subsystems/tlmGUI/GenericTelemetryDialog.py +++ b/Subsystems/tlmGUI/GenericTelemetryDialog.py @@ -1,128 +1,115 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'GenericTelemetryDialog.ui' +# Form implementation generated from reading ui file '/home/lbleier/cFS/tools/cFS-GroundSystem/Subsystems/tlmGUI/GenericTelemetryDialog.ui' # -# Created: Thu Jun 25 09:52:44 2015 -# by: PyQt4 UI code generator 4.11.3 +# Created by: PyQt5 UI code generator 5.12.3 # # WARNING! All changes made in this file will be lost! -from PyQt4 import QtCore, QtGui -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - def _fromUtf8(s): - return s +from PyQt5 import QtCore, QtGui, QtWidgets -try: - _encoding = QtGui.QApplication.UnicodeUTF8 - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) -except AttributeError: - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) class Ui_GenericTelemetryDialog(object): def setupUi(self, GenericTelemetryDialog): - GenericTelemetryDialog.setObjectName(_fromUtf8("GenericTelemetryDialog")) + GenericTelemetryDialog.setObjectName("GenericTelemetryDialog") GenericTelemetryDialog.setWindowModality(QtCore.Qt.NonModal) GenericTelemetryDialog.resize(750, 434) font = QtGui.QFont() font.setPointSize(13) GenericTelemetryDialog.setFont(font) - self.verticalLayout_8 = QtGui.QVBoxLayout(GenericTelemetryDialog) - self.verticalLayout_8.setObjectName(_fromUtf8("verticalLayout_8")) - self.horizontalLayout_2 = QtGui.QHBoxLayout() - self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2")) - self.verticalLayout = QtGui.QVBoxLayout() - self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.subSystemTelemetryPageLabel = QtGui.QLabel(GenericTelemetryDialog) - self.subSystemTelemetryPageLabel.setObjectName(_fromUtf8("subSystemTelemetryPageLabel")) + self.verticalLayout_8 = QtWidgets.QVBoxLayout(GenericTelemetryDialog) + self.verticalLayout_8.setObjectName("verticalLayout_8") + self.horizontalLayout_2 = QtWidgets.QHBoxLayout() + self.horizontalLayout_2.setObjectName("horizontalLayout_2") + self.verticalLayout = QtWidgets.QVBoxLayout() + self.verticalLayout.setObjectName("verticalLayout") + self.subSystemTelemetryPageLabel = QtWidgets.QLabel(GenericTelemetryDialog) + self.subSystemTelemetryPageLabel.setObjectName("subSystemTelemetryPageLabel") self.verticalLayout.addWidget(self.subSystemTelemetryPageLabel) - self.horizontalLayout = QtGui.QHBoxLayout() - self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - self.subSystemTextBrowser = QtGui.QTextBrowser(GenericTelemetryDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + self.subSystemTextBrowser = QtWidgets.QTextBrowser(GenericTelemetryDialog) + 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(141, 31)) self.subSystemTextBrowser.setMaximumSize(QtCore.QSize(141, 31)) - self.subSystemTextBrowser.setObjectName(_fromUtf8("subSystemTextBrowser")) + self.subSystemTextBrowser.setObjectName("subSystemTextBrowser") self.horizontalLayout.addWidget(self.subSystemTextBrowser) self.verticalLayout.addLayout(self.horizontalLayout) self.horizontalLayout_2.addLayout(self.verticalLayout) - self.verticalLayout_2 = QtGui.QVBoxLayout() - self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2")) - self.packetIdLabel = QtGui.QLabel(GenericTelemetryDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.verticalLayout_2 = QtWidgets.QVBoxLayout() + self.verticalLayout_2.setObjectName("verticalLayout_2") + self.packetIdLabel = QtWidgets.QLabel(GenericTelemetryDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.packetIdLabel.sizePolicy().hasHeightForWidth()) self.packetIdLabel.setSizePolicy(sizePolicy) self.packetIdLabel.setMinimumSize(QtCore.QSize(0, 13)) self.packetIdLabel.setMaximumSize(QtCore.QSize(16777215, 13)) - self.packetIdLabel.setObjectName(_fromUtf8("packetIdLabel")) + self.packetIdLabel.setObjectName("packetIdLabel") self.verticalLayout_2.addWidget(self.packetIdLabel) - self.packetId = QtGui.QLCDNumber(GenericTelemetryDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum) + self.packetId = QtWidgets.QLCDNumber(GenericTelemetryDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.packetId.sizePolicy().hasHeightForWidth()) self.packetId.setSizePolicy(sizePolicy) - self.packetId.setObjectName(_fromUtf8("packetId")) + self.packetId.setObjectName("packetId") self.verticalLayout_2.addWidget(self.packetId) self.horizontalLayout_2.addLayout(self.verticalLayout_2) - spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_2.addItem(spacerItem) - self.verticalLayout_3 = QtGui.QVBoxLayout() - self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3")) - self.label_5 = QtGui.QLabel(GenericTelemetryDialog) - self.label_5.setObjectName(_fromUtf8("label_5")) + self.verticalLayout_3 = QtWidgets.QVBoxLayout() + self.verticalLayout_3.setObjectName("verticalLayout_3") + self.label_5 = QtWidgets.QLabel(GenericTelemetryDialog) + self.label_5.setObjectName("label_5") self.verticalLayout_3.addWidget(self.label_5) - self.sequenceCount = QtGui.QTextBrowser(GenericTelemetryDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.sequenceCount = QtWidgets.QTextBrowser(GenericTelemetryDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.sequenceCount.sizePolicy().hasHeightForWidth()) self.sequenceCount.setSizePolicy(sizePolicy) self.sequenceCount.setMinimumSize(QtCore.QSize(101, 31)) self.sequenceCount.setMaximumSize(QtCore.QSize(101, 31)) - self.sequenceCount.setObjectName(_fromUtf8("sequenceCount")) + self.sequenceCount.setObjectName("sequenceCount") self.verticalLayout_3.addWidget(self.sequenceCount) self.horizontalLayout_2.addLayout(self.verticalLayout_3) - spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_2.addItem(spacerItem1) - spacerItem2 = QtGui.QSpacerItem(146, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum) + spacerItem2 = QtWidgets.QSpacerItem(146, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_2.addItem(spacerItem2) - self.buttonBox = QtGui.QDialogButtonBox(GenericTelemetryDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.buttonBox = QtWidgets.QDialogButtonBox(GenericTelemetryDialog) + 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.setFocusPolicy(QtCore.Qt.NoFocus) self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Close) - self.buttonBox.setObjectName(_fromUtf8("buttonBox")) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Close) + self.buttonBox.setObjectName("buttonBox") self.horizontalLayout_2.addWidget(self.buttonBox) self.verticalLayout_8.addLayout(self.horizontalLayout_2) - self.horizontalLayout_4 = QtGui.QHBoxLayout() - self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4")) - self.label = QtGui.QLabel(GenericTelemetryDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_4 = QtWidgets.QHBoxLayout() + self.horizontalLayout_4.setObjectName("horizontalLayout_4") + self.label = QtWidgets.QLabel(GenericTelemetryDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth()) self.label.setSizePolicy(sizePolicy) self.label.setMinimumSize(QtCore.QSize(161, 17)) self.label.setAlignment(QtCore.Qt.AlignCenter) - self.label.setObjectName(_fromUtf8("label")) + self.label.setObjectName("label") self.horizontalLayout_4.addWidget(self.label) - self.label_2 = QtGui.QLabel(GenericTelemetryDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.label_2 = QtWidgets.QLabel(GenericTelemetryDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth()) @@ -130,25 +117,25 @@ def setupUi(self, GenericTelemetryDialog): self.label_2.setMinimumSize(QtCore.QSize(151, 0)) self.label_2.setMaximumSize(QtCore.QSize(151, 16777215)) self.label_2.setAlignment(QtCore.Qt.AlignCenter) - self.label_2.setObjectName(_fromUtf8("label_2")) + self.label_2.setObjectName("label_2") self.horizontalLayout_4.addWidget(self.label_2) - self.line_2 = QtGui.QFrame(GenericTelemetryDialog) - self.line_2.setFrameShape(QtGui.QFrame.VLine) - self.line_2.setFrameShadow(QtGui.QFrame.Sunken) - self.line_2.setObjectName(_fromUtf8("line_2")) + self.line_2 = QtWidgets.QFrame(GenericTelemetryDialog) + self.line_2.setFrameShape(QtWidgets.QFrame.VLine) + self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken) + self.line_2.setObjectName("line_2") self.horizontalLayout_4.addWidget(self.line_2) - self.label_4 = QtGui.QLabel(GenericTelemetryDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.label_4 = QtWidgets.QLabel(GenericTelemetryDialog) + 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(161, 17)) self.label_4.setAlignment(QtCore.Qt.AlignCenter) - self.label_4.setObjectName(_fromUtf8("label_4")) + self.label_4.setObjectName("label_4") self.horizontalLayout_4.addWidget(self.label_4) - self.label_3 = QtGui.QLabel(GenericTelemetryDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.label_3 = QtWidgets.QLabel(GenericTelemetryDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth()) @@ -156,870 +143,860 @@ def setupUi(self, GenericTelemetryDialog): self.label_3.setMinimumSize(QtCore.QSize(151, 0)) self.label_3.setMaximumSize(QtCore.QSize(151, 16777215)) self.label_3.setAlignment(QtCore.Qt.AlignCenter) - self.label_3.setObjectName(_fromUtf8("label_3")) + self.label_3.setObjectName("label_3") self.horizontalLayout_4.addWidget(self.label_3) - spacerItem3 = QtGui.QSpacerItem(0, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum) + spacerItem3 = QtWidgets.QSpacerItem(0, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_4.addItem(spacerItem3) self.verticalLayout_8.addLayout(self.horizontalLayout_4) - self.scrollArea = QtGui.QScrollArea(GenericTelemetryDialog) + self.scrollArea = QtWidgets.QScrollArea(GenericTelemetryDialog) self.scrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) self.scrollArea.setWidgetResizable(True) - self.scrollArea.setObjectName(_fromUtf8("scrollArea")) - self.scrollAreaWidgetContents = QtGui.QWidget() + self.scrollArea.setObjectName("scrollArea") + self.scrollAreaWidgetContents = QtWidgets.QWidget() self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 709, 1000)) self.scrollAreaWidgetContents.setMinimumSize(QtCore.QSize(0, 1000)) - self.scrollAreaWidgetContents.setObjectName(_fromUtf8("scrollAreaWidgetContents")) - self.horizontalLayout_3 = QtGui.QHBoxLayout(self.scrollAreaWidgetContents) - self.horizontalLayout_3.setObjectName(_fromUtf8("horizontalLayout_3")) - self.verticalLayout_4 = QtGui.QVBoxLayout() - self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4")) - self.itemLabelTextBrowser_1 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents") + self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.scrollAreaWidgetContents) + self.horizontalLayout_3.setObjectName("horizontalLayout_3") + self.verticalLayout_4 = QtWidgets.QVBoxLayout() + self.verticalLayout_4.setObjectName("verticalLayout_4") + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_1.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_1.setObjectName(_fromUtf8("itemLabelTextBrowser_1")) + self.itemLabelTextBrowser_1.setObjectName("itemLabelTextBrowser_1") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_1) - self.itemLabelTextBrowser_2 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_2.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_2.setObjectName(_fromUtf8("itemLabelTextBrowser_2")) + self.itemLabelTextBrowser_2.setObjectName("itemLabelTextBrowser_2") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_2) - self.itemLabelTextBrowser_3 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_3.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_3.setObjectName(_fromUtf8("itemLabelTextBrowser_3")) + self.itemLabelTextBrowser_3.setObjectName("itemLabelTextBrowser_3") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_3) - self.itemLabelTextBrowser_4 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_4.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_4.setObjectName(_fromUtf8("itemLabelTextBrowser_4")) + self.itemLabelTextBrowser_4.setObjectName("itemLabelTextBrowser_4") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_4) - self.itemLabelTextBrowser_5 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_5.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_5.setObjectName(_fromUtf8("itemLabelTextBrowser_5")) + self.itemLabelTextBrowser_5.setObjectName("itemLabelTextBrowser_5") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_5) - self.itemLabelTextBrowser_6 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_6.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_6.setObjectName(_fromUtf8("itemLabelTextBrowser_6")) + self.itemLabelTextBrowser_6.setObjectName("itemLabelTextBrowser_6") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_6) - self.itemLabelTextBrowser_7 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_7.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_7.setObjectName(_fromUtf8("itemLabelTextBrowser_7")) + self.itemLabelTextBrowser_7.setObjectName("itemLabelTextBrowser_7") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_7) - self.itemLabelTextBrowser_8 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_8.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_8.setObjectName(_fromUtf8("itemLabelTextBrowser_8")) + self.itemLabelTextBrowser_8.setObjectName("itemLabelTextBrowser_8") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_8) - self.itemLabelTextBrowser_9 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_9.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_9.setObjectName(_fromUtf8("itemLabelTextBrowser_9")) + self.itemLabelTextBrowser_9.setObjectName("itemLabelTextBrowser_9") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_9) - self.itemLabelTextBrowser_10 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_10.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_10.setObjectName(_fromUtf8("itemLabelTextBrowser_10")) + self.itemLabelTextBrowser_10.setObjectName("itemLabelTextBrowser_10") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_10) - self.itemLabelTextBrowser_11 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_11.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_11.setObjectName(_fromUtf8("itemLabelTextBrowser_11")) + self.itemLabelTextBrowser_11.setObjectName("itemLabelTextBrowser_11") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_11) - self.itemLabelTextBrowser_12 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_12.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_12.setObjectName(_fromUtf8("itemLabelTextBrowser_12")) + self.itemLabelTextBrowser_12.setObjectName("itemLabelTextBrowser_12") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_12) - self.itemLabelTextBrowser_13 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_13.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_13.setObjectName(_fromUtf8("itemLabelTextBrowser_13")) + self.itemLabelTextBrowser_13.setObjectName("itemLabelTextBrowser_13") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_13) - self.itemLabelTextBrowser_14 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_14.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_14.setObjectName(_fromUtf8("itemLabelTextBrowser_14")) + self.itemLabelTextBrowser_14.setObjectName("itemLabelTextBrowser_14") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_14) - self.itemLabelTextBrowser_15 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_15.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_15.setObjectName(_fromUtf8("itemLabelTextBrowser_15")) + self.itemLabelTextBrowser_15.setObjectName("itemLabelTextBrowser_15") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_15) - self.itemLabelTextBrowser_16 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_16.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_16.setObjectName(_fromUtf8("itemLabelTextBrowser_16")) + self.itemLabelTextBrowser_16.setObjectName("itemLabelTextBrowser_16") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_16) - self.itemLabelTextBrowser_17 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_17.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_17.setObjectName(_fromUtf8("itemLabelTextBrowser_17")) + self.itemLabelTextBrowser_17.setObjectName("itemLabelTextBrowser_17") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_17) - self.itemLabelTextBrowser_18 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_18.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_18.setObjectName(_fromUtf8("itemLabelTextBrowser_18")) + self.itemLabelTextBrowser_18.setObjectName("itemLabelTextBrowser_18") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_18) - self.itemLabelTextBrowser_19 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_19.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_19.setObjectName(_fromUtf8("itemLabelTextBrowser_19")) + self.itemLabelTextBrowser_19.setObjectName("itemLabelTextBrowser_19") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_19) - self.itemLabelTextBrowser_20 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_20.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_20.setObjectName(_fromUtf8("itemLabelTextBrowser_20")) + self.itemLabelTextBrowser_20.setObjectName("itemLabelTextBrowser_20") self.verticalLayout_4.addWidget(self.itemLabelTextBrowser_20) self.horizontalLayout_3.addLayout(self.verticalLayout_4) - self.verticalLayout_5 = QtGui.QVBoxLayout() - self.verticalLayout_5.setObjectName(_fromUtf8("verticalLayout_5")) - self.itemValueTextBrowser_1 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.verticalLayout_5 = QtWidgets.QVBoxLayout() + self.verticalLayout_5.setObjectName("verticalLayout_5") + self.itemValueTextBrowser_1 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_1.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_1.setSizePolicy(sizePolicy) self.itemValueTextBrowser_1.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_1.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_1.setObjectName(_fromUtf8("itemValueTextBrowser_1")) + self.itemValueTextBrowser_1.setObjectName("itemValueTextBrowser_1") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_1) - self.itemValueTextBrowser_2 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_2 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_2.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_2.setSizePolicy(sizePolicy) self.itemValueTextBrowser_2.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_2.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_2.setObjectName(_fromUtf8("itemValueTextBrowser_2")) + self.itemValueTextBrowser_2.setObjectName("itemValueTextBrowser_2") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_2) - self.itemValueTextBrowser_3 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_3 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_3.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_3.setSizePolicy(sizePolicy) self.itemValueTextBrowser_3.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_3.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_3.setObjectName(_fromUtf8("itemValueTextBrowser_3")) + self.itemValueTextBrowser_3.setObjectName("itemValueTextBrowser_3") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_3) - self.itemValueTextBrowser_4 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_4 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_4.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_4.setSizePolicy(sizePolicy) self.itemValueTextBrowser_4.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_4.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_4.setObjectName(_fromUtf8("itemValueTextBrowser_4")) + self.itemValueTextBrowser_4.setObjectName("itemValueTextBrowser_4") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_4) - self.itemValueTextBrowser_5 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_5 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_5.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_5.setSizePolicy(sizePolicy) self.itemValueTextBrowser_5.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_5.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_5.setObjectName(_fromUtf8("itemValueTextBrowser_5")) + self.itemValueTextBrowser_5.setObjectName("itemValueTextBrowser_5") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_5) - self.itemValueTextBrowser_6 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_6 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_6.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_6.setSizePolicy(sizePolicy) self.itemValueTextBrowser_6.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_6.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_6.setObjectName(_fromUtf8("itemValueTextBrowser_6")) + self.itemValueTextBrowser_6.setObjectName("itemValueTextBrowser_6") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_6) - self.itemValueTextBrowser_7 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_7 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_7.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_7.setSizePolicy(sizePolicy) self.itemValueTextBrowser_7.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_7.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_7.setObjectName(_fromUtf8("itemValueTextBrowser_7")) + self.itemValueTextBrowser_7.setObjectName("itemValueTextBrowser_7") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_7) - self.itemValueTextBrowser_8 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_8 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_8.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_8.setSizePolicy(sizePolicy) self.itemValueTextBrowser_8.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_8.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_8.setObjectName(_fromUtf8("itemValueTextBrowser_8")) + self.itemValueTextBrowser_8.setObjectName("itemValueTextBrowser_8") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_8) - self.itemValueTextBrowser_9 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_9 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_9.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_9.setSizePolicy(sizePolicy) self.itemValueTextBrowser_9.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_9.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_9.setObjectName(_fromUtf8("itemValueTextBrowser_9")) + self.itemValueTextBrowser_9.setObjectName("itemValueTextBrowser_9") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_9) - self.itemValueTextBrowser_10 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_10 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_10.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_10.setSizePolicy(sizePolicy) self.itemValueTextBrowser_10.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_10.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_10.setObjectName(_fromUtf8("itemValueTextBrowser_10")) + self.itemValueTextBrowser_10.setObjectName("itemValueTextBrowser_10") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_10) - self.itemValueTextBrowser_11 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_11 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_11.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_11.setSizePolicy(sizePolicy) self.itemValueTextBrowser_11.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_11.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_11.setObjectName(_fromUtf8("itemValueTextBrowser_11")) + self.itemValueTextBrowser_11.setObjectName("itemValueTextBrowser_11") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_11) - self.itemValueTextBrowser_12 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_12 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_12.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_12.setSizePolicy(sizePolicy) self.itemValueTextBrowser_12.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_12.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_12.setObjectName(_fromUtf8("itemValueTextBrowser_12")) + self.itemValueTextBrowser_12.setObjectName("itemValueTextBrowser_12") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_12) - self.itemValueTextBrowser_13 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_13 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_13.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_13.setSizePolicy(sizePolicy) self.itemValueTextBrowser_13.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_13.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_13.setObjectName(_fromUtf8("itemValueTextBrowser_13")) + self.itemValueTextBrowser_13.setObjectName("itemValueTextBrowser_13") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_13) - self.itemValueTextBrowser_14 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_14 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_14.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_14.setSizePolicy(sizePolicy) self.itemValueTextBrowser_14.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_14.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_14.setObjectName(_fromUtf8("itemValueTextBrowser_14")) + self.itemValueTextBrowser_14.setObjectName("itemValueTextBrowser_14") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_14) - self.itemValueTextBrowser_15 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_15 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_15.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_15.setSizePolicy(sizePolicy) self.itemValueTextBrowser_15.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_15.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_15.setObjectName(_fromUtf8("itemValueTextBrowser_15")) + self.itemValueTextBrowser_15.setObjectName("itemValueTextBrowser_15") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_15) - self.itemValueTextBrowser_16 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_16 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_16.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_16.setSizePolicy(sizePolicy) self.itemValueTextBrowser_16.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_16.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_16.setObjectName(_fromUtf8("itemValueTextBrowser_16")) + self.itemValueTextBrowser_16.setObjectName("itemValueTextBrowser_16") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_16) - self.itemValueTextBrowser_17 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_17 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_17.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_17.setSizePolicy(sizePolicy) self.itemValueTextBrowser_17.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_17.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_17.setObjectName(_fromUtf8("itemValueTextBrowser_17")) + self.itemValueTextBrowser_17.setObjectName("itemValueTextBrowser_17") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_17) - self.itemValueTextBrowser_18 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_18 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_18.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_18.setSizePolicy(sizePolicy) self.itemValueTextBrowser_18.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_18.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_18.setObjectName(_fromUtf8("itemValueTextBrowser_18")) + self.itemValueTextBrowser_18.setObjectName("itemValueTextBrowser_18") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_18) - self.itemValueTextBrowser_19 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_19 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_19.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_19.setSizePolicy(sizePolicy) self.itemValueTextBrowser_19.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_19.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_19.setObjectName(_fromUtf8("itemValueTextBrowser_19")) + self.itemValueTextBrowser_19.setObjectName("itemValueTextBrowser_19") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_19) - self.itemValueTextBrowser_20 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_20 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_20.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_20.setSizePolicy(sizePolicy) self.itemValueTextBrowser_20.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_20.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_20.setObjectName(_fromUtf8("itemValueTextBrowser_20")) + self.itemValueTextBrowser_20.setObjectName("itemValueTextBrowser_20") self.verticalLayout_5.addWidget(self.itemValueTextBrowser_20) self.horizontalLayout_3.addLayout(self.verticalLayout_5) - self.line = QtGui.QFrame(self.scrollAreaWidgetContents) - self.line.setFrameShape(QtGui.QFrame.VLine) - self.line.setFrameShadow(QtGui.QFrame.Sunken) - self.line.setObjectName(_fromUtf8("line")) + self.line = QtWidgets.QFrame(self.scrollAreaWidgetContents) + self.line.setFrameShape(QtWidgets.QFrame.VLine) + self.line.setFrameShadow(QtWidgets.QFrame.Sunken) + self.line.setObjectName("line") self.horizontalLayout_3.addWidget(self.line) - self.verticalLayout_6 = QtGui.QVBoxLayout() - self.verticalLayout_6.setObjectName(_fromUtf8("verticalLayout_6")) - self.itemLabelTextBrowser_21 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.verticalLayout_6 = QtWidgets.QVBoxLayout() + self.verticalLayout_6.setObjectName("verticalLayout_6") + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_21.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_21.setObjectName(_fromUtf8("itemLabelTextBrowser_21")) + self.itemLabelTextBrowser_21.setObjectName("itemLabelTextBrowser_21") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_21) - self.itemLabelTextBrowser_22 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_22.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_22.setObjectName(_fromUtf8("itemLabelTextBrowser_22")) + self.itemLabelTextBrowser_22.setObjectName("itemLabelTextBrowser_22") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_22) - self.itemLabelTextBrowser_23 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_23.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_23.setObjectName(_fromUtf8("itemLabelTextBrowser_23")) + self.itemLabelTextBrowser_23.setObjectName("itemLabelTextBrowser_23") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_23) - self.itemLabelTextBrowser_24 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_24.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_24.setObjectName(_fromUtf8("itemLabelTextBrowser_24")) + self.itemLabelTextBrowser_24.setObjectName("itemLabelTextBrowser_24") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_24) - self.itemLabelTextBrowser_25 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_25.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_25.setObjectName(_fromUtf8("itemLabelTextBrowser_25")) + self.itemLabelTextBrowser_25.setObjectName("itemLabelTextBrowser_25") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_25) - self.itemLabelTextBrowser_26 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemLabelTextBrowser_26 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_26.sizePolicy().hasHeightForWidth()) self.itemLabelTextBrowser_26.setSizePolicy(sizePolicy) self.itemLabelTextBrowser_26.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_26.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_26.setObjectName(_fromUtf8("itemLabelTextBrowser_26")) + self.itemLabelTextBrowser_26.setObjectName("itemLabelTextBrowser_26") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_26) - self.itemLabelTextBrowser_27 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemLabelTextBrowser_27 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_27.sizePolicy().hasHeightForWidth()) self.itemLabelTextBrowser_27.setSizePolicy(sizePolicy) self.itemLabelTextBrowser_27.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_27.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_27.setObjectName(_fromUtf8("itemLabelTextBrowser_27")) + self.itemLabelTextBrowser_27.setObjectName("itemLabelTextBrowser_27") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_27) - self.itemLabelTextBrowser_28 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemLabelTextBrowser_28 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_28.sizePolicy().hasHeightForWidth()) self.itemLabelTextBrowser_28.setSizePolicy(sizePolicy) self.itemLabelTextBrowser_28.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_28.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_28.setObjectName(_fromUtf8("itemLabelTextBrowser_28")) + self.itemLabelTextBrowser_28.setObjectName("itemLabelTextBrowser_28") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_28) - self.itemLabelTextBrowser_29 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemLabelTextBrowser_29 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_29.sizePolicy().hasHeightForWidth()) self.itemLabelTextBrowser_29.setSizePolicy(sizePolicy) self.itemLabelTextBrowser_29.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_29.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_29.setObjectName(_fromUtf8("itemLabelTextBrowser_29")) + self.itemLabelTextBrowser_29.setObjectName("itemLabelTextBrowser_29") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_29) - self.itemLabelTextBrowser_30 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemLabelTextBrowser_30 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_30.sizePolicy().hasHeightForWidth()) self.itemLabelTextBrowser_30.setSizePolicy(sizePolicy) self.itemLabelTextBrowser_30.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_30.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_30.setObjectName(_fromUtf8("itemLabelTextBrowser_30")) + self.itemLabelTextBrowser_30.setObjectName("itemLabelTextBrowser_30") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_30) - self.itemLabelTextBrowser_31 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemLabelTextBrowser_31 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_31.sizePolicy().hasHeightForWidth()) self.itemLabelTextBrowser_31.setSizePolicy(sizePolicy) self.itemLabelTextBrowser_31.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_31.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_31.setObjectName(_fromUtf8("itemLabelTextBrowser_31")) + self.itemLabelTextBrowser_31.setObjectName("itemLabelTextBrowser_31") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_31) - self.itemLabelTextBrowser_32 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemLabelTextBrowser_32 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_32.sizePolicy().hasHeightForWidth()) self.itemLabelTextBrowser_32.setSizePolicy(sizePolicy) self.itemLabelTextBrowser_32.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_32.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_32.setObjectName(_fromUtf8("itemLabelTextBrowser_32")) + self.itemLabelTextBrowser_32.setObjectName("itemLabelTextBrowser_32") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_32) - self.itemLabelTextBrowser_33 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemLabelTextBrowser_33 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_33.sizePolicy().hasHeightForWidth()) self.itemLabelTextBrowser_33.setSizePolicy(sizePolicy) self.itemLabelTextBrowser_33.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_33.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_33.setObjectName(_fromUtf8("itemLabelTextBrowser_33")) + self.itemLabelTextBrowser_33.setObjectName("itemLabelTextBrowser_33") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_33) - self.itemLabelTextBrowser_34 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemLabelTextBrowser_34 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_34.sizePolicy().hasHeightForWidth()) self.itemLabelTextBrowser_34.setSizePolicy(sizePolicy) self.itemLabelTextBrowser_34.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_34.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_34.setObjectName(_fromUtf8("itemLabelTextBrowser_34")) + self.itemLabelTextBrowser_34.setObjectName("itemLabelTextBrowser_34") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_34) - self.itemLabelTextBrowser_35 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemLabelTextBrowser_35 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_35.sizePolicy().hasHeightForWidth()) self.itemLabelTextBrowser_35.setSizePolicy(sizePolicy) self.itemLabelTextBrowser_35.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_35.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_35.setObjectName(_fromUtf8("itemLabelTextBrowser_35")) + self.itemLabelTextBrowser_35.setObjectName("itemLabelTextBrowser_35") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_35) - self.itemLabelTextBrowser_36 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemLabelTextBrowser_36 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_36.sizePolicy().hasHeightForWidth()) self.itemLabelTextBrowser_36.setSizePolicy(sizePolicy) self.itemLabelTextBrowser_36.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_36.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_36.setObjectName(_fromUtf8("itemLabelTextBrowser_36")) + self.itemLabelTextBrowser_36.setObjectName("itemLabelTextBrowser_36") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_36) - self.itemLabelTextBrowser_37 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemLabelTextBrowser_37 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_37.sizePolicy().hasHeightForWidth()) self.itemLabelTextBrowser_37.setSizePolicy(sizePolicy) self.itemLabelTextBrowser_37.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_37.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_37.setObjectName(_fromUtf8("itemLabelTextBrowser_37")) + self.itemLabelTextBrowser_37.setObjectName("itemLabelTextBrowser_37") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_37) - self.itemLabelTextBrowser_38 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemLabelTextBrowser_38 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_38.sizePolicy().hasHeightForWidth()) self.itemLabelTextBrowser_38.setSizePolicy(sizePolicy) self.itemLabelTextBrowser_38.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_38.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_38.setObjectName(_fromUtf8("itemLabelTextBrowser_38")) + self.itemLabelTextBrowser_38.setObjectName("itemLabelTextBrowser_38") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_38) - self.itemLabelTextBrowser_39 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemLabelTextBrowser_39 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_39.sizePolicy().hasHeightForWidth()) self.itemLabelTextBrowser_39.setSizePolicy(sizePolicy) self.itemLabelTextBrowser_39.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_39.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_39.setObjectName(_fromUtf8("itemLabelTextBrowser_39")) + self.itemLabelTextBrowser_39.setObjectName("itemLabelTextBrowser_39") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_39) - self.itemLabelTextBrowser_40 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemLabelTextBrowser_40 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemLabelTextBrowser_40.sizePolicy().hasHeightForWidth()) self.itemLabelTextBrowser_40.setSizePolicy(sizePolicy) self.itemLabelTextBrowser_40.setMinimumSize(QtCore.QSize(161, 31)) self.itemLabelTextBrowser_40.setMaximumSize(QtCore.QSize(161, 31)) - self.itemLabelTextBrowser_40.setObjectName(_fromUtf8("itemLabelTextBrowser_40")) + self.itemLabelTextBrowser_40.setObjectName("itemLabelTextBrowser_40") self.verticalLayout_6.addWidget(self.itemLabelTextBrowser_40) self.horizontalLayout_3.addLayout(self.verticalLayout_6) - self.verticalLayout_7 = QtGui.QVBoxLayout() - self.verticalLayout_7.setObjectName(_fromUtf8("verticalLayout_7")) - self.itemValueTextBrowser_21 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.verticalLayout_7 = QtWidgets.QVBoxLayout() + self.verticalLayout_7.setObjectName("verticalLayout_7") + self.itemValueTextBrowser_21 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_21.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_21.setSizePolicy(sizePolicy) self.itemValueTextBrowser_21.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_21.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_21.setObjectName(_fromUtf8("itemValueTextBrowser_21")) + self.itemValueTextBrowser_21.setObjectName("itemValueTextBrowser_21") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_21) - self.itemValueTextBrowser_22 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_22 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_22.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_22.setSizePolicy(sizePolicy) self.itemValueTextBrowser_22.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_22.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_22.setObjectName(_fromUtf8("itemValueTextBrowser_22")) + self.itemValueTextBrowser_22.setObjectName("itemValueTextBrowser_22") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_22) - self.itemValueTextBrowser_23 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_23 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_23.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_23.setSizePolicy(sizePolicy) self.itemValueTextBrowser_23.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_23.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_23.setObjectName(_fromUtf8("itemValueTextBrowser_23")) + self.itemValueTextBrowser_23.setObjectName("itemValueTextBrowser_23") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_23) - self.itemValueTextBrowser_24 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_24 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_24.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_24.setSizePolicy(sizePolicy) self.itemValueTextBrowser_24.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_24.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_24.setObjectName(_fromUtf8("itemValueTextBrowser_24")) + self.itemValueTextBrowser_24.setObjectName("itemValueTextBrowser_24") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_24) - self.itemValueTextBrowser_25 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_25 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_25.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_25.setSizePolicy(sizePolicy) self.itemValueTextBrowser_25.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_25.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_25.setObjectName(_fromUtf8("itemValueTextBrowser_25")) + self.itemValueTextBrowser_25.setObjectName("itemValueTextBrowser_25") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_25) - self.itemValueTextBrowser_26 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_26 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_26.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_26.setSizePolicy(sizePolicy) self.itemValueTextBrowser_26.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_26.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_26.setObjectName(_fromUtf8("itemValueTextBrowser_26")) + self.itemValueTextBrowser_26.setObjectName("itemValueTextBrowser_26") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_26) - self.itemValueTextBrowser_27 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_27 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_27.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_27.setSizePolicy(sizePolicy) self.itemValueTextBrowser_27.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_27.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_27.setObjectName(_fromUtf8("itemValueTextBrowser_27")) + self.itemValueTextBrowser_27.setObjectName("itemValueTextBrowser_27") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_27) - self.itemValueTextBrowser_28 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_28 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_28.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_28.setSizePolicy(sizePolicy) self.itemValueTextBrowser_28.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_28.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_28.setObjectName(_fromUtf8("itemValueTextBrowser_28")) + self.itemValueTextBrowser_28.setObjectName("itemValueTextBrowser_28") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_28) - self.itemValueTextBrowser_29 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_29 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_29.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_29.setSizePolicy(sizePolicy) self.itemValueTextBrowser_29.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_29.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_29.setObjectName(_fromUtf8("itemValueTextBrowser_29")) + self.itemValueTextBrowser_29.setObjectName("itemValueTextBrowser_29") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_29) - self.itemValueTextBrowser_30 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_30 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_30.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_30.setSizePolicy(sizePolicy) self.itemValueTextBrowser_30.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_30.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_30.setObjectName(_fromUtf8("itemValueTextBrowser_30")) + self.itemValueTextBrowser_30.setObjectName("itemValueTextBrowser_30") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_30) - self.itemValueTextBrowser_31 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_31 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_31.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_31.setSizePolicy(sizePolicy) self.itemValueTextBrowser_31.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_31.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_31.setObjectName(_fromUtf8("itemValueTextBrowser_31")) + self.itemValueTextBrowser_31.setObjectName("itemValueTextBrowser_31") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_31) - self.itemValueTextBrowser_32 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_32 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_32.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_32.setSizePolicy(sizePolicy) self.itemValueTextBrowser_32.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_32.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_32.setObjectName(_fromUtf8("itemValueTextBrowser_32")) + self.itemValueTextBrowser_32.setObjectName("itemValueTextBrowser_32") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_32) - self.itemValueTextBrowser_33 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_33 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_33.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_33.setSizePolicy(sizePolicy) self.itemValueTextBrowser_33.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_33.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_33.setObjectName(_fromUtf8("itemValueTextBrowser_33")) + self.itemValueTextBrowser_33.setObjectName("itemValueTextBrowser_33") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_33) - self.itemValueTextBrowser_34 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_34 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_34.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_34.setSizePolicy(sizePolicy) self.itemValueTextBrowser_34.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_34.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_34.setObjectName(_fromUtf8("itemValueTextBrowser_34")) + self.itemValueTextBrowser_34.setObjectName("itemValueTextBrowser_34") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_34) - self.itemValueTextBrowser_35 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_35 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_35.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_35.setSizePolicy(sizePolicy) self.itemValueTextBrowser_35.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_35.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_35.setObjectName(_fromUtf8("itemValueTextBrowser_35")) + self.itemValueTextBrowser_35.setObjectName("itemValueTextBrowser_35") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_35) - self.itemValueTextBrowser_36 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_36 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_36.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_36.setSizePolicy(sizePolicy) self.itemValueTextBrowser_36.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_36.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_36.setObjectName(_fromUtf8("itemValueTextBrowser_36")) + self.itemValueTextBrowser_36.setObjectName("itemValueTextBrowser_36") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_36) - self.itemValueTextBrowser_37 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_37 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_37.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_37.setSizePolicy(sizePolicy) self.itemValueTextBrowser_37.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_37.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_37.setObjectName(_fromUtf8("itemValueTextBrowser_37")) + self.itemValueTextBrowser_37.setObjectName("itemValueTextBrowser_37") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_37) - self.itemValueTextBrowser_38 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_38 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_38.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_38.setSizePolicy(sizePolicy) self.itemValueTextBrowser_38.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_38.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_38.setObjectName(_fromUtf8("itemValueTextBrowser_38")) + self.itemValueTextBrowser_38.setObjectName("itemValueTextBrowser_38") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_38) - self.itemValueTextBrowser_39 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_39 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_39.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_39.setSizePolicy(sizePolicy) self.itemValueTextBrowser_39.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_39.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_39.setObjectName(_fromUtf8("itemValueTextBrowser_39")) + self.itemValueTextBrowser_39.setObjectName("itemValueTextBrowser_39") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_39) - self.itemValueTextBrowser_40 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.itemValueTextBrowser_40 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.itemValueTextBrowser_40.sizePolicy().hasHeightForWidth()) self.itemValueTextBrowser_40.setSizePolicy(sizePolicy) self.itemValueTextBrowser_40.setMinimumSize(QtCore.QSize(151, 31)) self.itemValueTextBrowser_40.setMaximumSize(QtCore.QSize(151, 31)) - self.itemValueTextBrowser_40.setObjectName(_fromUtf8("itemValueTextBrowser_40")) + self.itemValueTextBrowser_40.setObjectName("itemValueTextBrowser_40") self.verticalLayout_7.addWidget(self.itemValueTextBrowser_40) self.horizontalLayout_3.addLayout(self.verticalLayout_7) self.scrollArea.setWidget(self.scrollAreaWidgetContents) self.verticalLayout_8.addWidget(self.scrollArea) - self.label_6 = QtGui.QLabel(GenericTelemetryDialog) + self.label_6 = QtWidgets.QLabel(GenericTelemetryDialog) font = QtGui.QFont() font.setPointSize(12) self.label_6.setFont(font) - self.label_6.setObjectName(_fromUtf8("label_6")) + self.label_6.setObjectName("label_6") self.verticalLayout_8.addWidget(self.label_6) self.retranslateUi(GenericTelemetryDialog) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), GenericTelemetryDialog.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), GenericTelemetryDialog.reject) + self.buttonBox.accepted.connect(GenericTelemetryDialog.accept) + self.buttonBox.rejected.connect(GenericTelemetryDialog.reject) QtCore.QMetaObject.connectSlotsByName(GenericTelemetryDialog) def retranslateUi(self, GenericTelemetryDialog): - GenericTelemetryDialog.setWindowTitle(_translate("GenericTelemetryDialog", "Telemetry Page", None)) - self.subSystemTelemetryPageLabel.setText(_translate("GenericTelemetryDialog", "Subsystem Telemetry Page", None)) - self.packetIdLabel.setText(_translate("GenericTelemetryDialog", "Packet ID", None)) - self.label_5.setText(_translate("GenericTelemetryDialog", "Sequence Count", None)) - self.label.setText(_translate("GenericTelemetryDialog", "Telemetry Point Label", None)) - self.label_2.setText(_translate("GenericTelemetryDialog", "Telemetry Point Value", None)) - self.label_4.setText(_translate("GenericTelemetryDialog", "Telemetry Point Label", None)) - self.label_3.setText(_translate("GenericTelemetryDialog", "Telemetry Point Value", None)) - self.label_6.setText(_translate("GenericTelemetryDialog", "*No packets? Remember to select the IP address of your spacecraft in the Main Window.", None)) - - -if __name__ == "__main__": - import sys - app = QtGui.QApplication(sys.argv) - GenericTelemetryDialog = QtGui.QDialog() - ui = Ui_GenericTelemetryDialog() - ui.setupUi(GenericTelemetryDialog) - GenericTelemetryDialog.show() - sys.exit(app.exec_()) - + _translate = QtCore.QCoreApplication.translate + GenericTelemetryDialog.setWindowTitle(_translate("GenericTelemetryDialog", "Telemetry Page")) + self.subSystemTelemetryPageLabel.setText(_translate("GenericTelemetryDialog", "Subsystem Telemetry Page")) + self.packetIdLabel.setText(_translate("GenericTelemetryDialog", "Packet ID")) + self.label_5.setText(_translate("GenericTelemetryDialog", "Sequence Count")) + self.label.setText(_translate("GenericTelemetryDialog", "Telemetry Point Label")) + self.label_2.setText(_translate("GenericTelemetryDialog", "Telemetry Point Value")) + self.label_4.setText(_translate("GenericTelemetryDialog", "Telemetry Point Label")) + self.label_3.setText(_translate("GenericTelemetryDialog", "Telemetry Point Value")) + self.label_6.setText(_translate("GenericTelemetryDialog", "*No packets? Remember to select the IP address of your spacecraft in the Main Window.")) diff --git a/Subsystems/tlmGUI/TelemetrySystem.py b/Subsystems/tlmGUI/TelemetrySystem.py index 399b7c9..e84be9c 100644 --- a/Subsystems/tlmGUI/TelemetrySystem.py +++ b/Subsystems/tlmGUI/TelemetrySystem.py @@ -17,19 +17,20 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/usr/bin/env python +#!/usr/bin/env python3 # -import sys import csv -import subprocess import getopt import shlex +import subprocess +import sys +from struct import unpack + import zmq +from PyQt5.QtCore import QThread, pyqtSignal +from PyQt5.QtWidgets import QApplication, QDialog -from PyQt5.QtWidgets import QDialog, QApplication -from PyQt5.QtCore import QThread from TelemetrySystemDialog import Ui_TelemetrySystemDialog -from struct import unpack class TelemetrySystem(QDialog, Ui_TelemetrySystemDialog): @@ -45,8 +46,10 @@ def __init__(self): self.setWindowTitle('Telemetry System Main Page') self.move(0, 100) + self.subscription = None + for k in range(21): - pushButton = getattr(self, f"pushButton_{i}") + pushButton = getattr(self, f"pushButton_{k}") pushButton.clicked.connect(lambda: self.ProcessButtonGeneric(k)) # @@ -67,94 +70,27 @@ def dumpPacket(self, packetData): appIdString += f"{ord(packetData[1]):02X}" appId = (ord(packetData[0]) << 8) + (ord(packetData[1])) print("\n-----------------------------------------------") - print("\nPacket: App ID = ", hex(appId)) - print("\nPacket Data: ", self.strToHex(packetData)) - - # - # Button press methods - # - # def ProcessButton_0(self): - # self.ProcessButtonGeneric(0) - - # def ProcessButton_1(self): - # self.ProcessButtonGeneric(1) - - # def ProcessButton_2(self): - # self.ProcessButtonGeneric(2) - - # def ProcessButton_3(self): - # self.ProcessButtonGeneric(3) - - # def ProcessButton_4(self): - # self.ProcessButtonGeneric(4) - - # def ProcessButton_5(self): - # self.ProcessButtonGeneric(5) - - # def ProcessButton_6(self): - # self.ProcessButtonGeneric(6) - - # def ProcessButton_7(self): - # self.ProcessButtonGeneric(7) - - # def ProcessButton_8(self): - # self.ProcessButtonGeneric(8) - - # def ProcessButton_9(self): - # self.ProcessButtonGeneric(9) - - # def ProcessButton_10(self): - # self.ProcessButtonGeneric(10) - - # def ProcessButton_11(self): - # self.ProcessButtonGeneric(11) - - # def ProcessButton_12(self): - # self.ProcessButtonGeneric(12) - - # def ProcessButton_13(self): - # self.ProcessButtonGeneric(13) - - # def ProcessButton_14(self): - # self.ProcessButtonGeneric(14) - - # def ProcessButton_15(self): - # self.ProcessButtonGeneric(15) - - # def ProcessButton_16(self): - # self.ProcessButtonGeneric(16) - - # def ProcessButton_17(self): - # self.ProcessButtonGeneric(17) - - # def ProcessButton_18(self): - # self.ProcessButtonGeneric(18) - - # def ProcessButton_19(self): - # self.ProcessButtonGeneric(19) - - # def ProcessButton_20(self): - # self.ProcessButtonGeneric(20) + print("\nPacket: App ID =", hex(appId)) + print("\nPacket Data:", self.strToHex(packetData)) def ProcessButtonGeneric(self, idx): tempSub = f"{self.subscription}.{hex(tlmPageAppid[idx])}" if tlmPageIsValid[idx]: # need to extract data from fields, then start page with right params - launch_string = 'python3 ' + tlmClass[ - idx] + ' --title=\"' + tlmPageDesc[idx] + '\" --appid=' + hex( - tlmPageAppid[idx]) + ' --port=' + str( - tlmPagePort[idx]) + ' --file=' + tlmPageDefFile[ - idx] + ' --endian=' + endian + ' --sub=' + tempSub + launch_string = ( + f'python3 {tlmClass[idx]} ' + f'--title=\"{tlmPageDesc[idx]}\" --appid={hex(tlmPageAppid[idx])} ' + f'--port={tlmPagePort[idx]} --file={tlmPageDefFile[idx]} ' + f'--endian={endian} --sub={tempSub}') cmd_args = shlex.split(launch_string) subprocess.Popen(cmd_args) # Start the telemetry receiver (see TlmReceiver class) def initTlmReceiver(self, subscription): - self.setWindowTitle('Telemetry System page for: ' + subscription) + self.setWindowTitle(f'Telemetry System page for: {subscription}') self.subscription = subscription self.thread = TlmReceiver(self, subscription) - self.connect(self.thread, self.thread.signalTlmDatagram, - self.processPendingDatagrams) + self.thread.signalTlmDatagram.connect(self.processPendingDatagrams) self.thread.start() # @@ -168,18 +104,18 @@ def processPendingDatagrams(self, datagram): def strToHex(aString): hexStr = "" for x in aString: - hexStr = hexStr + "%02X " % ord(x) + hexStr += f'{ord(x):02X}' return hexStr # # Dump the telemetry packet # def dumpPacket(packetData): - appIdString = "%02X" % ord(packetData[0]) - appIdString = appIdString + "%02X" % ord(packetData[1]) + appIdString = f"{ord(packetData[0]):02X}" + appIdString = f"{appIdString}{ord(packetData[1]):02X}" appId = (ord(packetData[0]) << 8) + (ord(packetData[1])) - print("\nPacket: App ID = ", hex(appId)) - print("\nPacket Data: ", strToHex(packetData)) + print("\nPacket: App ID =", hex(appId)) + print("\nPacket Data:", strToHex(packetData)) print("\n-----------------------------------------------") # @@ -191,74 +127,37 @@ def dumpPacket(packetData): # # Decode the packet and forward it to the correct port (if there is one) # - streamId, Sequence, Length = unpack(">HHH", datagram[:6]) + streamId, _, _ = unpack(">HHH", datagram[:6]) # Uncomment the next two lines to debug # print "Packet ID = " , hex(streamId) # dumpPacket(datagram) - for i in range(0, 21): + for i in range(21): if streamId == tlmPageAppid[i]: - send_host = "127.0.0.1" - send_port = tlmPagePort[i] - # sendSocket = socket(AF_INET,SOCK_DGRAM) - # sendSocket.sendto(datagram, (send_host,send_port)) + # send_host = "127.0.0.1" + # send_port = tlmPagePort[i] + # sendSocket = socket(AF_INET,SOCK_DGRAM) + # sendSocket.sendto(datagram, (send_host,send_port)) - tlmPageCount[i] = tlmPageCount[i] + 1 + tlmPageCount[i] += 1 # # I wish I knew a better way to update the count field in the GUI # Maybe store a pointer to the field in the gui # - if i == 0: - self.countBrowser_0.setText(str(tlmPageCount[0])) - elif i == 1: - self.countBrowser_1.setText(str(tlmPageCount[1])) - elif i == 2: - self.countBrowser_2.setText(str(tlmPageCount[2])) - elif i == 3: - self.countBrowser_3.setText(str(tlmPageCount[3])) - elif i == 4: - self.countBrowser_4.setText(str(tlmPageCount[4])) - elif i == 5: - self.countBrowser_5.setText(str(tlmPageCount[5])) - elif i == 6: - self.countBrowser_6.setText(str(tlmPageCount[6])) - elif i == 7: - self.countBrowser_7.setText(str(tlmPageCount[7])) - elif i == 8: - self.countBrowser_8.setText(str(tlmPageCount[8])) - elif i == 9: - self.countBrowser_9.setText(str(tlmPageCount[9])) - elif i == 10: - self.countBrowser_10.setText(str(tlmPageCount[10])) - elif i == 11: - self.countBrowser_11.setText(str(tlmPageCount[11])) - elif i == 12: - self.countBrowser_12.setText(str(tlmPageCount[12])) - elif i == 13: - self.countBrowser_13.setText(str(tlmPageCount[13])) - elif i == 14: - self.countBrowser_14.setText(str(tlmPageCount[14])) - elif i == 15: - self.countBrowser_16.setText(str(tlmPageCount[15])) - elif i == 16: - self.countBrowser_17.setText(str(tlmPageCount[16])) - elif i == 17: - self.countBrowser_18.setText(str(tlmPageCount[17])) - elif i == 18: - self.countBrowser_19.setText(str(tlmPageCount[18])) - elif i == 19: - self.countBrowser_20.setText(str(tlmPageCount[19])) - elif i == 20: - self.countBrowser_21.setText(str(tlmPageCount[20])) + if i < 15: + countBrowseri = getattr(self, f"countBrowser_{i}") + else: + countBrowseri = getattr(self, f"countBrowser_{i+1}") + countBrowseri.setText(str(tlmPageCount[i])) # Subscribes and receives zeroMQ messages -class TlmReceiver(QtCore.QThread): - def __init__(self, mainWindow, subscription): - QtCore.QThread.__init__(self) +class TlmReceiver(QThread): + # Setup signal to communicate with front-end GUI + signalTlmDatagram = pyqtSignal(object, name="TlmDatagram") - # Setup signal to communicate with front-end GUI - self.signalTlmDatagram = QtCore.SIGNAL("TlmDatagram") + def __init__(self, mainWindow, subscription): + super().__init__() # Init zeroMQ self.context = zmq.Context() @@ -269,9 +168,9 @@ def __init__(self, mainWindow, subscription): def run(self): while True: # Receive and read envelope with address - [address, datagram] = self.subscriber.recv_multipart() + address, datagram = self.subscriber.recv_multipart() # Send signal with received packet to front-end/GUI - self.emit(self.signalTlmDatagram, datagram) + self.signalTlmDatagram.emit(datagram) # @@ -282,13 +181,13 @@ def run(self): # # Init the QT application and the telemetry dialog class # - app = QtGui.QApplication(sys.argv) + app = QApplication(sys.argv) Telem = TelemetrySystem() # # Set defaults for the arguments # - tlmDefFile = "telemetry-pages.txt" + tlmDefFile = "./Subsystems/tlmGUI/telemetry-pages.txt" endian = "L" subscription = "" @@ -307,20 +206,15 @@ def run(self): if len(subscription) == 0: subscription = "GroundSystem" - print('Telemetry System started. Subscribed to ' + subscription) + print('Telemetry System started. Subscribed to', subscription) # # Read in the contents of the telemetry packet defintion # - tlmPageIsValid = [] - tlmPageDesc = [] - tlmClass = [] - tlmPagePort = [] - tlmPageAppid = [] - tlmPageCount = [] - tlmPageDefFile = [] + tlmPageIsValid, tlmPageDesc, tlmClass, tlmPagePort,\ + tlmPageAppid, tlmPageCount, tlmPageDefFile = ([] for _ in range(7)) i = 0 - with open(tlmDefFile, 'r') as tlmfile: + with open(tlmDefFile) as tlmfile: reader = csv.reader(tlmfile, skipinitialspace=True) for row in reader: if row[0][0] != '#': @@ -331,7 +225,7 @@ def run(self): tlmPageAppid.append(int(row[2], 16)) tlmPageDefFile.append(row[3]) tlmPageCount.append(0) - i = i + 1 + i += 1 # # Mark the remaining values ad invalid # @@ -342,152 +236,16 @@ def run(self): # # fill the data fields on the page # - if tlmPageIsValid[0] == True: - Telem.ui.SubsysBrowser_0.setText(tlmPageDesc[0]) - Telem.ui.pktidBrowser_0.setText(hex(tlmPageAppid[0])) - Telem.ui.countBrowser_0.setText(str(tlmPageCount[0])) - else: - Telem.ui.SubsysBrowser_0.setText("(unused)") - - if tlmPageIsValid[1] == True: - Telem.ui.SubsysBrowser_1.setText(tlmPageDesc[1]) - Telem.ui.pktidBrowser_1.setText(hex(tlmPageAppid[1])) - Telem.ui.countBrowser_1.setText(str(tlmPageCount[1])) - else: - Telem.ui.SubsysBrowser_1.setText("(unused)") - - if tlmPageIsValid[2] == True: - Telem.ui.SubsysBrowser_2.setText(tlmPageDesc[2]) - Telem.ui.pktidBrowser_2.setText(hex(tlmPageAppid[2])) - Telem.ui.countBrowser_2.setText(str(tlmPageCount[2])) - else: - Telem.ui.SubsysBrowser_2.setText("(unused)") - - if tlmPageIsValid[3] == True: - Telem.ui.SubsysBrowser_3.setText(tlmPageDesc[3]) - Telem.ui.pktidBrowser_3.setText(hex(tlmPageAppid[3])) - Telem.ui.countBrowser_3.setText(str(tlmPageCount[3])) - else: - Telem.ui.SubsysBrowser_3.setText("(unused)") - - if tlmPageIsValid[4] == True: - Telem.ui.SubsysBrowser_4.setText(tlmPageDesc[4]) - Telem.ui.pktidBrowser_4.setText(hex(tlmPageAppid[4])) - Telem.ui.countBrowser_4.setText(str(tlmPageCount[4])) - else: - Telem.ui.SubsysBrowser_4.setText("(unused)") - - if tlmPageIsValid[5] == True: - Telem.ui.SubsysBrowser_5.setText(tlmPageDesc[5]) - Telem.ui.pktidBrowser_5.setText(hex(tlmPageAppid[5])) - Telem.ui.countBrowser_5.setText(str(tlmPageCount[5])) - else: - Telem.ui.SubsysBrowser_5.setText("(unused)") - - if tlmPageIsValid[6] == True: - Telem.ui.SubsysBrowser_6.setText(tlmPageDesc[6]) - Telem.ui.pktidBrowser_6.setText(hex(tlmPageAppid[6])) - Telem.ui.countBrowser_6.setText(str(tlmPageCount[6])) - else: - Telem.ui.SubsysBrowser_6.setText("(unused)") - - if tlmPageIsValid[7] == True: - Telem.ui.SubsysBrowser_7.setText(tlmPageDesc[7]) - Telem.ui.pktidBrowser_7.setText(hex(tlmPageAppid[7])) - Telem.ui.countBrowser_7.setText(str(tlmPageCount[7])) - else: - Telem.ui.SubsysBrowser_7.setText("(unused)") - - if tlmPageIsValid[8] == True: - Telem.ui.SubsysBrowser_8.setText(tlmPageDesc[8]) - Telem.ui.pktidBrowser_8.setText(hex(tlmPageAppid[8])) - Telem.ui.countBrowser_8.setText(str(tlmPageCount[8])) - else: - Telem.ui.SubsysBrowser_8.setText("(unused)") - - if tlmPageIsValid[9] == True: - Telem.ui.SubsysBrowser_9.setText(tlmPageDesc[9]) - Telem.ui.pktidBrowser_9.setText(hex(tlmPageAppid[9])) - Telem.ui.countBrowser_9.setText(str(tlmPageCount[9])) - else: - Telem.ui.SubsysBrowser_9.setText("(unused)") - - if tlmPageIsValid[10] == True: - Telem.ui.SubsysBrowser_10.setText(tlmPageDesc[10]) - Telem.ui.pktidBrowser_10.setText(hex(tlmPageAppid[10])) - Telem.ui.countBrowser_10.setText(str(tlmPageCount[10])) - else: - Telem.ui.SubsysBrowser_10.setText("(unused)") - - if tlmPageIsValid[11] == True: - Telem.ui.SubsysBrowser_11.setText(tlmPageDesc[11]) - Telem.ui.pktidBrowser_11.setText(hex(tlmPageAppid[11])) - Telem.ui.countBrowser_11.setText(str(tlmPageCount[11])) - else: - Telem.ui.SubsysBrowser_11.setText("(unused)") - - if tlmPageIsValid[12] == True: - Telem.ui.SubsysBrowser_12.setText(tlmPageDesc[12]) - Telem.ui.pktidBrowser_12.setText(hex(tlmPageAppid[12])) - Telem.ui.countBrowser_12.setText(str(tlmPageCount[12])) - else: - Telem.ui.SubsysBrowser_12.setText("(unused)") - - if tlmPageIsValid[13] == True: - Telem.ui.SubsysBrowser_13.setText(tlmPageDesc[13]) - Telem.ui.pktidBrowser_13.setText(hex(tlmPageAppid[13])) - Telem.ui.countBrowser_13.setText(str(tlmPageCount[13])) - else: - Telem.ui.SubsysBrowser_13.setText("(unused)") - - if tlmPageIsValid[14] == True: - Telem.ui.SubsysBrowser_14.setText(tlmPageDesc[14]) - Telem.ui.pktidBrowser_14.setText(hex(tlmPageAppid[14])) - Telem.ui.countBrowser_14.setText(str(tlmPageCount[14])) - else: - Telem.ui.SubsysBrowser_14.setText("(unused)") - - if tlmPageIsValid[15] == True: - Telem.ui.SubsysBrowser_15.setText(tlmPageDesc[15]) - Telem.ui.pktidBrowser_15.setText(hex(tlmPageAppid[15])) - Telem.ui.countBrowser_15.setText(str(tlmPageCount[15])) - else: - Telem.ui.SubsysBrowser_15.setText("(unused)") - - if tlmPageIsValid[16] == True: - Telem.ui.SubsysBrowser_16.setText(tlmPageDesc[16]) - Telem.ui.pktidBrowser_16.setText(hex(tlmPageAppid[16])) - Telem.ui.countBrowser_16.setText(str(tlmPageCount[16])) - else: - Telem.ui.SubsysBrowser_16.setText("(unused)") - - if tlmPageIsValid[17] == True: - Telem.ui.SubsysBrowser_17.setText(tlmPageDesc[17]) - Telem.ui.pktidBrowser_17.setText(hex(tlmPageAppid[17])) - Telem.ui.countBrowser_17.setText(str(tlmPageCount[17])) - else: - Telem.ui.SubsysBrowser_17.setText("(unused)") - - if tlmPageIsValid[18] == True: - Telem.ui.SubsysBrowser_18.setText(tlmPageDesc[18]) - Telem.ui.pktidBrowser_18.setText(hex(tlmPageAppid[18])) - Telem.ui.countBrowser_18.setText(str(tlmPageCount[18])) - else: - Telem.ui.SubsysBrowser_18.setText("(unused)") - - if tlmPageIsValid[19] == True: - Telem.ui.SubsysBrowser_19.setText(tlmPageDesc[19]) - Telem.ui.pktidBrowser_19.setText(hex(tlmPageAppid[19])) - Telem.ui.countBrowser_19.setText(str(tlmPageCount[19])) - else: - Telem.ui.SubsysBrowser_19.setText("(unused)") - - if tlmPageIsValid[20] == True: - Telem.ui.SubsysBrowser_20.setText(tlmPageDesc[20]) - Telem.ui.pktidBrowser_20.setText(hex(tlmPageAppid[20])) - Telem.ui.countBrowser_20.setText(str(tlmPageCount[20])) - else: - Telem.ui.SubsysBrowser_20.setText("(unused)") + for i in range(21): + subsysBrowser = getattr(Telem, f"SubsysBrowser_{i}") + if tlmPageIsValid[i]: + pktidBrowser = getattr(Telem, f"pktidBrowser_{i}") + countBrowser = getattr(Telem, f"countBrowser_{i}") + subsysBrowser.setText(tlmPageDesc[i]) + pktidBrowser.setText(hex(tlmPageAppid[i])) + countBrowser.setText(str(tlmPageCount[0])) + else: + subsysBrowser.setText("(unused)") # # Display the page diff --git a/Subsystems/tlmGUI/TelemetrySystemDialog.py b/Subsystems/tlmGUI/TelemetrySystemDialog.py index 8f6ff0f..5b50ae5 100644 --- a/Subsystems/tlmGUI/TelemetrySystemDialog.py +++ b/Subsystems/tlmGUI/TelemetrySystemDialog.py @@ -1,1085 +1,1062 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'TelemetrySystemDialog.ui' +# Form implementation generated from reading ui file '/home/lbleier/cFS/tools/cFS-GroundSystem/Subsystems/tlmGUI/TelemetrySystemDialog.ui' # -# Created: Wed Mar 25 14:24:26 2015 -# by: PyQt4 UI code generator 4.11.3 +# Created by: PyQt5 UI code generator 5.12.3 # # WARNING! All changes made in this file will be lost! -from PyQt4 import QtCore, QtGui -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - def _fromUtf8(s): - return s +from PyQt5 import QtCore, QtGui, QtWidgets -try: - _encoding = QtGui.QApplication.UnicodeUTF8 - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) -except AttributeError: - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) class Ui_TelemetrySystemDialog(object): def setupUi(self, TelemetrySystemDialog): - TelemetrySystemDialog.setObjectName(_fromUtf8("TelemetrySystemDialog")) + TelemetrySystemDialog.setObjectName("TelemetrySystemDialog") TelemetrySystemDialog.resize(515, 600) - self.verticalLayout = QtGui.QVBoxLayout(TelemetrySystemDialog) - self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.horizontalLayout = QtGui.QHBoxLayout() - self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.verticalLayout = QtWidgets.QVBoxLayout(TelemetrySystemDialog) + self.verticalLayout.setObjectName("verticalLayout") + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout.addItem(spacerItem) - self.label = QtGui.QLabel(TelemetrySystemDialog) - self.label.setObjectName(_fromUtf8("label")) + self.label = QtWidgets.QLabel(TelemetrySystemDialog) + self.label.setObjectName("label") self.horizontalLayout.addWidget(self.label) - spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout.addItem(spacerItem1) self.verticalLayout.addLayout(self.horizontalLayout) - self.horizontalLayout_3 = QtGui.QHBoxLayout() - self.horizontalLayout_3.setSizeConstraint(QtGui.QLayout.SetNoConstraint) - self.horizontalLayout_3.setObjectName(_fromUtf8("horizontalLayout_3")) - spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_3 = QtWidgets.QHBoxLayout() + self.horizontalLayout_3.setSizeConstraint(QtWidgets.QLayout.SetNoConstraint) + self.horizontalLayout_3.setObjectName("horizontalLayout_3") + spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_3.addItem(spacerItem2) - spacerItem3 = QtGui.QSpacerItem(80, 32, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum) + spacerItem3 = QtWidgets.QSpacerItem(80, 32, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_3.addItem(spacerItem3) - self.horizontalLayout_2 = QtGui.QHBoxLayout() - self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2")) - spacerItem4 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_2 = QtWidgets.QHBoxLayout() + self.horizontalLayout_2.setObjectName("horizontalLayout_2") + spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_2.addItem(spacerItem4) - self.label_6 = QtGui.QLabel(TelemetrySystemDialog) - self.label_6.setObjectName(_fromUtf8("label_6")) + self.label_6 = QtWidgets.QLabel(TelemetrySystemDialog) + self.label_6.setObjectName("label_6") self.horizontalLayout_2.addWidget(self.label_6) - self.sequenceCount = QtGui.QTextBrowser(TelemetrySystemDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.sequenceCount = QtWidgets.QTextBrowser(TelemetrySystemDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.sequenceCount.sizePolicy().hasHeightForWidth()) self.sequenceCount.setSizePolicy(sizePolicy) self.sequenceCount.setMinimumSize(QtCore.QSize(130, 30)) self.sequenceCount.setMaximumSize(QtCore.QSize(130, 30)) - self.sequenceCount.setObjectName(_fromUtf8("sequenceCount")) + self.sequenceCount.setObjectName("sequenceCount") self.horizontalLayout_2.addWidget(self.sequenceCount) - spacerItem5 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_2.addItem(spacerItem5) self.horizontalLayout_3.addLayout(self.horizontalLayout_2) - spacerItem6 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_3.addItem(spacerItem6) - self.buttonBox = QtGui.QDialogButtonBox(TelemetrySystemDialog) + self.buttonBox = QtWidgets.QDialogButtonBox(TelemetrySystemDialog) self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Close) - self.buttonBox.setObjectName(_fromUtf8("buttonBox")) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Close) + self.buttonBox.setObjectName("buttonBox") self.horizontalLayout_3.addWidget(self.buttonBox) self.verticalLayout.addLayout(self.horizontalLayout_3) - self.horizontalLayout_4 = QtGui.QHBoxLayout() - self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4")) - spacerItem7 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_4 = QtWidgets.QHBoxLayout() + self.horizontalLayout_4.setObjectName("horizontalLayout_4") + spacerItem7 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_4.addItem(spacerItem7) - self.label_2 = QtGui.QLabel(TelemetrySystemDialog) - self.label_2.setObjectName(_fromUtf8("label_2")) + self.label_2 = QtWidgets.QLabel(TelemetrySystemDialog) + self.label_2.setObjectName("label_2") self.horizontalLayout_4.addWidget(self.label_2) - spacerItem8 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_4.addItem(spacerItem8) self.verticalLayout.addLayout(self.horizontalLayout_4) - self.scrollArea = QtGui.QScrollArea(TelemetrySystemDialog) + self.scrollArea = QtWidgets.QScrollArea(TelemetrySystemDialog) self.scrollArea.setMinimumSize(QtCore.QSize(0, 0)) self.scrollArea.setBaseSize(QtCore.QSize(0, 800)) self.scrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) self.scrollArea.setWidgetResizable(True) - self.scrollArea.setObjectName(_fromUtf8("scrollArea")) - self.scrollAreaWidgetContents = QtGui.QWidget() + self.scrollArea.setObjectName("scrollArea") + self.scrollAreaWidgetContents = QtWidgets.QWidget() self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 474, 1000)) self.scrollAreaWidgetContents.setMinimumSize(QtCore.QSize(0, 1000)) - self.scrollAreaWidgetContents.setObjectName(_fromUtf8("scrollAreaWidgetContents")) - self.verticalLayout_2 = QtGui.QVBoxLayout(self.scrollAreaWidgetContents) + self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents") + self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents) self.verticalLayout_2.setSpacing(0) - self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2")) - self.horizontalLayout_5 = QtGui.QHBoxLayout() - self.horizontalLayout_5.setObjectName(_fromUtf8("horizontalLayout_5")) - self.label_3 = QtGui.QLabel(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.verticalLayout_2.setObjectName("verticalLayout_2") + self.horizontalLayout_5 = QtWidgets.QHBoxLayout() + self.horizontalLayout_5.setObjectName("horizontalLayout_5") + 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(141, 31)) self.label_3.setMaximumSize(QtCore.QSize(141, 31)) - self.label_3.setObjectName(_fromUtf8("label_3")) + self.label_3.setObjectName("label_3") self.horizontalLayout_5.addWidget(self.label_3) - self.label_4 = QtGui.QLabel(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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(_fromUtf8("label_4")) + self.label_4.setObjectName("label_4") self.horizontalLayout_5.addWidget(self.label_4) - self.label_5 = QtGui.QLabel(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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(91, 31)) self.label_5.setMaximumSize(QtCore.QSize(91, 31)) - self.label_5.setObjectName(_fromUtf8("label_5")) + self.label_5.setObjectName("label_5") self.horizontalLayout_5.addWidget(self.label_5) - spacerItem9 = QtGui.QSpacerItem(101, 27, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum) + spacerItem9 = QtWidgets.QSpacerItem(101, 27, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum) self.horizontalLayout_5.addItem(spacerItem9) self.verticalLayout_2.addLayout(self.horizontalLayout_5) - self.horizontalLayout_6 = QtGui.QHBoxLayout() - self.horizontalLayout_6.setObjectName(_fromUtf8("horizontalLayout_6")) - self.SubsysBrowser_0 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_6 = QtWidgets.QHBoxLayout() + self.horizontalLayout_6.setObjectName("horizontalLayout_6") + 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(141, 31)) self.SubsysBrowser_0.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_0.setObjectName(_fromUtf8("SubsysBrowser_0")) + self.SubsysBrowser_0.setObjectName("SubsysBrowser_0") self.horizontalLayout_6.addWidget(self.SubsysBrowser_0) - self.pktidBrowser_0 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_0 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_0.sizePolicy().hasHeightForWidth()) self.pktidBrowser_0.setSizePolicy(sizePolicy) self.pktidBrowser_0.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_0.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_0.setObjectName(_fromUtf8("pktidBrowser_0")) + self.pktidBrowser_0.setObjectName("pktidBrowser_0") self.horizontalLayout_6.addWidget(self.pktidBrowser_0) - self.countBrowser_0 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_0 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_0.sizePolicy().hasHeightForWidth()) self.countBrowser_0.setSizePolicy(sizePolicy) self.countBrowser_0.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_0.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_0.setObjectName(_fromUtf8("countBrowser_0")) + self.countBrowser_0.setObjectName("countBrowser_0") self.horizontalLayout_6.addWidget(self.countBrowser_0) - self.pushButton_0 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton_0 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + 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, 27)) self.pushButton_0.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_0.setObjectName(_fromUtf8("pushButton_0")) + self.pushButton_0.setObjectName("pushButton_0") self.horizontalLayout_6.addWidget(self.pushButton_0) self.verticalLayout_2.addLayout(self.horizontalLayout_6) - self.horizontalLayout_7 = QtGui.QHBoxLayout() - self.horizontalLayout_7.setObjectName(_fromUtf8("horizontalLayout_7")) - self.SubsysBrowser_1 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_7 = QtWidgets.QHBoxLayout() + self.horizontalLayout_7.setObjectName("horizontalLayout_7") + self.SubsysBrowser_1 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + 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(141, 31)) self.SubsysBrowser_1.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_1.setObjectName(_fromUtf8("SubsysBrowser_1")) + self.SubsysBrowser_1.setObjectName("SubsysBrowser_1") self.horizontalLayout_7.addWidget(self.SubsysBrowser_1) - self.pktidBrowser_1 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_1 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_1.sizePolicy().hasHeightForWidth()) self.pktidBrowser_1.setSizePolicy(sizePolicy) self.pktidBrowser_1.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_1.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_1.setObjectName(_fromUtf8("pktidBrowser_1")) + self.pktidBrowser_1.setObjectName("pktidBrowser_1") self.horizontalLayout_7.addWidget(self.pktidBrowser_1) - self.countBrowser_1 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_1 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_1.sizePolicy().hasHeightForWidth()) self.countBrowser_1.setSizePolicy(sizePolicy) self.countBrowser_1.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_1.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_1.setObjectName(_fromUtf8("countBrowser_1")) + self.countBrowser_1.setObjectName("countBrowser_1") self.horizontalLayout_7.addWidget(self.countBrowser_1) - self.pushButton_1 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton_1 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + 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, 27)) self.pushButton_1.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_1.setObjectName(_fromUtf8("pushButton_1")) + self.pushButton_1.setObjectName("pushButton_1") self.horizontalLayout_7.addWidget(self.pushButton_1) self.verticalLayout_2.addLayout(self.horizontalLayout_7) - self.horizontalLayout_8 = QtGui.QHBoxLayout() - self.horizontalLayout_8.setObjectName(_fromUtf8("horizontalLayout_8")) - self.SubsysBrowser_2 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_8 = QtWidgets.QHBoxLayout() + self.horizontalLayout_8.setObjectName("horizontalLayout_8") + self.SubsysBrowser_2 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + 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(141, 31)) self.SubsysBrowser_2.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_2.setObjectName(_fromUtf8("SubsysBrowser_2")) + self.SubsysBrowser_2.setObjectName("SubsysBrowser_2") self.horizontalLayout_8.addWidget(self.SubsysBrowser_2) - self.pktidBrowser_2 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_2 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_2.sizePolicy().hasHeightForWidth()) self.pktidBrowser_2.setSizePolicy(sizePolicy) self.pktidBrowser_2.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_2.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_2.setObjectName(_fromUtf8("pktidBrowser_2")) + self.pktidBrowser_2.setObjectName("pktidBrowser_2") self.horizontalLayout_8.addWidget(self.pktidBrowser_2) - self.countBrowser_2 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_2 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_2.sizePolicy().hasHeightForWidth()) self.countBrowser_2.setSizePolicy(sizePolicy) self.countBrowser_2.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_2.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_2.setObjectName(_fromUtf8("countBrowser_2")) + self.countBrowser_2.setObjectName("countBrowser_2") self.horizontalLayout_8.addWidget(self.countBrowser_2) - self.pushButton_2 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton_2 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + 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, 27)) self.pushButton_2.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_2.setObjectName(_fromUtf8("pushButton_2")) + self.pushButton_2.setObjectName("pushButton_2") self.horizontalLayout_8.addWidget(self.pushButton_2) self.verticalLayout_2.addLayout(self.horizontalLayout_8) - self.horizontalLayout_9 = QtGui.QHBoxLayout() - self.horizontalLayout_9.setObjectName(_fromUtf8("horizontalLayout_9")) - self.SubsysBrowser_3 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_9 = QtWidgets.QHBoxLayout() + self.horizontalLayout_9.setObjectName("horizontalLayout_9") + self.SubsysBrowser_3 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + 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) self.SubsysBrowser_3.setMinimumSize(QtCore.QSize(141, 31)) self.SubsysBrowser_3.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_3.setObjectName(_fromUtf8("SubsysBrowser_3")) + self.SubsysBrowser_3.setObjectName("SubsysBrowser_3") self.horizontalLayout_9.addWidget(self.SubsysBrowser_3) - self.pktidBrowser_3 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_3 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_3.sizePolicy().hasHeightForWidth()) self.pktidBrowser_3.setSizePolicy(sizePolicy) self.pktidBrowser_3.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_3.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_3.setObjectName(_fromUtf8("pktidBrowser_3")) + self.pktidBrowser_3.setObjectName("pktidBrowser_3") self.horizontalLayout_9.addWidget(self.pktidBrowser_3) - self.countBrowser_3 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_3 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_3.sizePolicy().hasHeightForWidth()) self.countBrowser_3.setSizePolicy(sizePolicy) self.countBrowser_3.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_3.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_3.setObjectName(_fromUtf8("countBrowser_3")) + self.countBrowser_3.setObjectName("countBrowser_3") self.horizontalLayout_9.addWidget(self.countBrowser_3) - self.pushButton_3 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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, 27)) self.pushButton_3.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_3.setObjectName(_fromUtf8("pushButton_3")) + self.pushButton_3.setObjectName("pushButton_3") self.horizontalLayout_9.addWidget(self.pushButton_3) self.verticalLayout_2.addLayout(self.horizontalLayout_9) - self.horizontalLayout_10 = QtGui.QHBoxLayout() - self.horizontalLayout_10.setObjectName(_fromUtf8("horizontalLayout_10")) - self.SubsysBrowser_4 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_10 = QtWidgets.QHBoxLayout() + self.horizontalLayout_10.setObjectName("horizontalLayout_10") + self.SubsysBrowser_4 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + 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) self.SubsysBrowser_4.setMinimumSize(QtCore.QSize(141, 31)) self.SubsysBrowser_4.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_4.setObjectName(_fromUtf8("SubsysBrowser_4")) + self.SubsysBrowser_4.setObjectName("SubsysBrowser_4") self.horizontalLayout_10.addWidget(self.SubsysBrowser_4) - self.pktidBrowser_4 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_4 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_4.sizePolicy().hasHeightForWidth()) self.pktidBrowser_4.setSizePolicy(sizePolicy) self.pktidBrowser_4.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_4.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_4.setObjectName(_fromUtf8("pktidBrowser_4")) + self.pktidBrowser_4.setObjectName("pktidBrowser_4") self.horizontalLayout_10.addWidget(self.pktidBrowser_4) - self.countBrowser_4 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_4 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_4.sizePolicy().hasHeightForWidth()) self.countBrowser_4.setSizePolicy(sizePolicy) self.countBrowser_4.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_4.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_4.setObjectName(_fromUtf8("countBrowser_4")) + self.countBrowser_4.setObjectName("countBrowser_4") self.horizontalLayout_10.addWidget(self.countBrowser_4) - self.pushButton_4 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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, 27)) self.pushButton_4.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_4.setObjectName(_fromUtf8("pushButton_4")) + self.pushButton_4.setObjectName("pushButton_4") self.horizontalLayout_10.addWidget(self.pushButton_4) self.verticalLayout_2.addLayout(self.horizontalLayout_10) - self.horizontalLayout_11 = QtGui.QHBoxLayout() - self.horizontalLayout_11.setObjectName(_fromUtf8("horizontalLayout_11")) - self.SubsysBrowser_5 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_11 = QtWidgets.QHBoxLayout() + self.horizontalLayout_11.setObjectName("horizontalLayout_11") + 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(141, 31)) self.SubsysBrowser_5.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_5.setObjectName(_fromUtf8("SubsysBrowser_5")) + self.SubsysBrowser_5.setObjectName("SubsysBrowser_5") self.horizontalLayout_11.addWidget(self.SubsysBrowser_5) - self.pktidBrowser_5 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_5 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_5.sizePolicy().hasHeightForWidth()) self.pktidBrowser_5.setSizePolicy(sizePolicy) self.pktidBrowser_5.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_5.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_5.setObjectName(_fromUtf8("pktidBrowser_5")) + self.pktidBrowser_5.setObjectName("pktidBrowser_5") self.horizontalLayout_11.addWidget(self.pktidBrowser_5) - self.countBrowser_5 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_5 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_5.sizePolicy().hasHeightForWidth()) self.countBrowser_5.setSizePolicy(sizePolicy) self.countBrowser_5.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_5.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_5.setObjectName(_fromUtf8("countBrowser_5")) + self.countBrowser_5.setObjectName("countBrowser_5") self.horizontalLayout_11.addWidget(self.countBrowser_5) - self.pushButton_5 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton_5 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + 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, 27)) self.pushButton_5.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_5.setObjectName(_fromUtf8("pushButton_5")) + self.pushButton_5.setObjectName("pushButton_5") self.horizontalLayout_11.addWidget(self.pushButton_5) self.verticalLayout_2.addLayout(self.horizontalLayout_11) - self.horizontalLayout_12 = QtGui.QHBoxLayout() - self.horizontalLayout_12.setObjectName(_fromUtf8("horizontalLayout_12")) - self.SubsysBrowser_6 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_12 = QtWidgets.QHBoxLayout() + self.horizontalLayout_12.setObjectName("horizontalLayout_12") + self.SubsysBrowser_6 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + 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(141, 31)) self.SubsysBrowser_6.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_6.setObjectName(_fromUtf8("SubsysBrowser_6")) + self.SubsysBrowser_6.setObjectName("SubsysBrowser_6") self.horizontalLayout_12.addWidget(self.SubsysBrowser_6) - self.pktidBrowser_6 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_6 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_6.sizePolicy().hasHeightForWidth()) self.pktidBrowser_6.setSizePolicy(sizePolicy) self.pktidBrowser_6.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_6.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_6.setObjectName(_fromUtf8("pktidBrowser_6")) + self.pktidBrowser_6.setObjectName("pktidBrowser_6") self.horizontalLayout_12.addWidget(self.pktidBrowser_6) - self.countBrowser_6 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_6 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_6.sizePolicy().hasHeightForWidth()) self.countBrowser_6.setSizePolicy(sizePolicy) self.countBrowser_6.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_6.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_6.setObjectName(_fromUtf8("countBrowser_6")) + self.countBrowser_6.setObjectName("countBrowser_6") self.horizontalLayout_12.addWidget(self.countBrowser_6) - self.pushButton_6 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton_6 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + 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, 27)) self.pushButton_6.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_6.setObjectName(_fromUtf8("pushButton_6")) + self.pushButton_6.setObjectName("pushButton_6") self.horizontalLayout_12.addWidget(self.pushButton_6) self.verticalLayout_2.addLayout(self.horizontalLayout_12) - self.horizontalLayout_13 = QtGui.QHBoxLayout() - self.horizontalLayout_13.setObjectName(_fromUtf8("horizontalLayout_13")) - self.SubsysBrowser_7 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_13 = QtWidgets.QHBoxLayout() + self.horizontalLayout_13.setObjectName("horizontalLayout_13") + self.SubsysBrowser_7 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + 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(141, 31)) self.SubsysBrowser_7.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_7.setObjectName(_fromUtf8("SubsysBrowser_7")) + self.SubsysBrowser_7.setObjectName("SubsysBrowser_7") self.horizontalLayout_13.addWidget(self.SubsysBrowser_7) - self.pktidBrowser_7 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_7 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_7.sizePolicy().hasHeightForWidth()) self.pktidBrowser_7.setSizePolicy(sizePolicy) self.pktidBrowser_7.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_7.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_7.setObjectName(_fromUtf8("pktidBrowser_7")) + self.pktidBrowser_7.setObjectName("pktidBrowser_7") self.horizontalLayout_13.addWidget(self.pktidBrowser_7) - self.countBrowser_7 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_7 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_7.sizePolicy().hasHeightForWidth()) self.countBrowser_7.setSizePolicy(sizePolicy) self.countBrowser_7.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_7.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_7.setObjectName(_fromUtf8("countBrowser_7")) + self.countBrowser_7.setObjectName("countBrowser_7") self.horizontalLayout_13.addWidget(self.countBrowser_7) - self.pushButton_7 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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, 27)) self.pushButton_7.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_7.setObjectName(_fromUtf8("pushButton_7")) + self.pushButton_7.setObjectName("pushButton_7") self.horizontalLayout_13.addWidget(self.pushButton_7) self.verticalLayout_2.addLayout(self.horizontalLayout_13) - self.horizontalLayout_14 = QtGui.QHBoxLayout() - self.horizontalLayout_14.setObjectName(_fromUtf8("horizontalLayout_14")) - self.SubsysBrowser_8 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_14 = QtWidgets.QHBoxLayout() + self.horizontalLayout_14.setObjectName("horizontalLayout_14") + 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(141, 31)) self.SubsysBrowser_8.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_8.setObjectName(_fromUtf8("SubsysBrowser_8")) + self.SubsysBrowser_8.setObjectName("SubsysBrowser_8") self.horizontalLayout_14.addWidget(self.SubsysBrowser_8) - self.pktidBrowser_8 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_8 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_8.sizePolicy().hasHeightForWidth()) self.pktidBrowser_8.setSizePolicy(sizePolicy) self.pktidBrowser_8.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_8.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_8.setObjectName(_fromUtf8("pktidBrowser_8")) + self.pktidBrowser_8.setObjectName("pktidBrowser_8") self.horizontalLayout_14.addWidget(self.pktidBrowser_8) - self.countBrowser_8 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_8 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_8.sizePolicy().hasHeightForWidth()) self.countBrowser_8.setSizePolicy(sizePolicy) self.countBrowser_8.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_8.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_8.setObjectName(_fromUtf8("countBrowser_8")) + self.countBrowser_8.setObjectName("countBrowser_8") self.horizontalLayout_14.addWidget(self.countBrowser_8) - self.pushButton_8 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton_8 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + 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, 27)) self.pushButton_8.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_8.setObjectName(_fromUtf8("pushButton_8")) + self.pushButton_8.setObjectName("pushButton_8") self.horizontalLayout_14.addWidget(self.pushButton_8) self.verticalLayout_2.addLayout(self.horizontalLayout_14) - self.horizontalLayout_15 = QtGui.QHBoxLayout() - self.horizontalLayout_15.setObjectName(_fromUtf8("horizontalLayout_15")) - self.SubsysBrowser_9 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_15 = QtWidgets.QHBoxLayout() + self.horizontalLayout_15.setObjectName("horizontalLayout_15") + self.SubsysBrowser_9 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + 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(141, 31)) self.SubsysBrowser_9.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_9.setObjectName(_fromUtf8("SubsysBrowser_9")) + self.SubsysBrowser_9.setObjectName("SubsysBrowser_9") self.horizontalLayout_15.addWidget(self.SubsysBrowser_9) - self.pktidBrowser_9 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_9 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_9.sizePolicy().hasHeightForWidth()) self.pktidBrowser_9.setSizePolicy(sizePolicy) self.pktidBrowser_9.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_9.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_9.setObjectName(_fromUtf8("pktidBrowser_9")) + self.pktidBrowser_9.setObjectName("pktidBrowser_9") self.horizontalLayout_15.addWidget(self.pktidBrowser_9) - self.countBrowser_9 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_9 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_9.sizePolicy().hasHeightForWidth()) self.countBrowser_9.setSizePolicy(sizePolicy) self.countBrowser_9.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_9.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_9.setObjectName(_fromUtf8("countBrowser_9")) + self.countBrowser_9.setObjectName("countBrowser_9") self.horizontalLayout_15.addWidget(self.countBrowser_9) - self.pushButton_9 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton_9 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pushButton_9.sizePolicy().hasHeightForWidth()) self.pushButton_9.setSizePolicy(sizePolicy) self.pushButton_9.setMinimumSize(QtCore.QSize(101, 27)) self.pushButton_9.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_9.setObjectName(_fromUtf8("pushButton_9")) + self.pushButton_9.setObjectName("pushButton_9") self.horizontalLayout_15.addWidget(self.pushButton_9) self.verticalLayout_2.addLayout(self.horizontalLayout_15) - self.horizontalLayout_16 = QtGui.QHBoxLayout() - self.horizontalLayout_16.setObjectName(_fromUtf8("horizontalLayout_16")) - self.SubsysBrowser_10 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_16 = QtWidgets.QHBoxLayout() + self.horizontalLayout_16.setObjectName("horizontalLayout_16") + 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(141, 31)) self.SubsysBrowser_10.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_10.setObjectName(_fromUtf8("SubsysBrowser_10")) + self.SubsysBrowser_10.setObjectName("SubsysBrowser_10") self.horizontalLayout_16.addWidget(self.SubsysBrowser_10) - self.pktidBrowser_10 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_10 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_10.sizePolicy().hasHeightForWidth()) self.pktidBrowser_10.setSizePolicy(sizePolicy) self.pktidBrowser_10.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_10.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_10.setObjectName(_fromUtf8("pktidBrowser_10")) + self.pktidBrowser_10.setObjectName("pktidBrowser_10") self.horizontalLayout_16.addWidget(self.pktidBrowser_10) - self.countBrowser_10 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_10 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_10.sizePolicy().hasHeightForWidth()) self.countBrowser_10.setSizePolicy(sizePolicy) self.countBrowser_10.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_10.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_10.setObjectName(_fromUtf8("countBrowser_10")) + self.countBrowser_10.setObjectName("countBrowser_10") self.horizontalLayout_16.addWidget(self.countBrowser_10) - self.pushButton_10 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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, 27)) self.pushButton_10.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_10.setObjectName(_fromUtf8("pushButton_10")) + self.pushButton_10.setObjectName("pushButton_10") self.horizontalLayout_16.addWidget(self.pushButton_10) self.verticalLayout_2.addLayout(self.horizontalLayout_16) - self.horizontalLayout_17 = QtGui.QHBoxLayout() - self.horizontalLayout_17.setObjectName(_fromUtf8("horizontalLayout_17")) - self.SubsysBrowser_11 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_17 = QtWidgets.QHBoxLayout() + self.horizontalLayout_17.setObjectName("horizontalLayout_17") + 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(141, 31)) self.SubsysBrowser_11.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_11.setObjectName(_fromUtf8("SubsysBrowser_11")) + self.SubsysBrowser_11.setObjectName("SubsysBrowser_11") self.horizontalLayout_17.addWidget(self.SubsysBrowser_11) - self.pktidBrowser_11 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_11 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_11.sizePolicy().hasHeightForWidth()) self.pktidBrowser_11.setSizePolicy(sizePolicy) self.pktidBrowser_11.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_11.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_11.setObjectName(_fromUtf8("pktidBrowser_11")) + self.pktidBrowser_11.setObjectName("pktidBrowser_11") self.horizontalLayout_17.addWidget(self.pktidBrowser_11) - self.countBrowser_11 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_11 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_11.sizePolicy().hasHeightForWidth()) self.countBrowser_11.setSizePolicy(sizePolicy) self.countBrowser_11.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_11.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_11.setObjectName(_fromUtf8("countBrowser_11")) + self.countBrowser_11.setObjectName("countBrowser_11") self.horizontalLayout_17.addWidget(self.countBrowser_11) - self.pushButton_11 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton_11 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + 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, 27)) self.pushButton_11.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_11.setObjectName(_fromUtf8("pushButton_11")) + self.pushButton_11.setObjectName("pushButton_11") self.horizontalLayout_17.addWidget(self.pushButton_11) self.verticalLayout_2.addLayout(self.horizontalLayout_17) - self.horizontalLayout_18 = QtGui.QHBoxLayout() - self.horizontalLayout_18.setObjectName(_fromUtf8("horizontalLayout_18")) - self.SubsysBrowser_12 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_18 = QtWidgets.QHBoxLayout() + self.horizontalLayout_18.setObjectName("horizontalLayout_18") + self.SubsysBrowser_12 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + 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(141, 31)) self.SubsysBrowser_12.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_12.setObjectName(_fromUtf8("SubsysBrowser_12")) + self.SubsysBrowser_12.setObjectName("SubsysBrowser_12") self.horizontalLayout_18.addWidget(self.SubsysBrowser_12) - self.pktidBrowser_12 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_12 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_12.sizePolicy().hasHeightForWidth()) self.pktidBrowser_12.setSizePolicy(sizePolicy) self.pktidBrowser_12.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_12.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_12.setObjectName(_fromUtf8("pktidBrowser_12")) + self.pktidBrowser_12.setObjectName("pktidBrowser_12") self.horizontalLayout_18.addWidget(self.pktidBrowser_12) - self.countBrowser_12 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_12 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_12.sizePolicy().hasHeightForWidth()) self.countBrowser_12.setSizePolicy(sizePolicy) self.countBrowser_12.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_12.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_12.setObjectName(_fromUtf8("countBrowser_12")) + self.countBrowser_12.setObjectName("countBrowser_12") self.horizontalLayout_18.addWidget(self.countBrowser_12) - self.pushButton_12 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton_12 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pushButton_12.sizePolicy().hasHeightForWidth()) self.pushButton_12.setSizePolicy(sizePolicy) self.pushButton_12.setMinimumSize(QtCore.QSize(101, 27)) self.pushButton_12.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_12.setObjectName(_fromUtf8("pushButton_12")) + self.pushButton_12.setObjectName("pushButton_12") self.horizontalLayout_18.addWidget(self.pushButton_12) self.verticalLayout_2.addLayout(self.horizontalLayout_18) - self.horizontalLayout_19 = QtGui.QHBoxLayout() - self.horizontalLayout_19.setObjectName(_fromUtf8("horizontalLayout_19")) - self.SubsysBrowser_13 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_19 = QtWidgets.QHBoxLayout() + self.horizontalLayout_19.setObjectName("horizontalLayout_19") + 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.SubsysBrowser_13.setMinimumSize(QtCore.QSize(141, 31)) self.SubsysBrowser_13.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_13.setObjectName(_fromUtf8("SubsysBrowser_13")) + self.SubsysBrowser_13.setObjectName("SubsysBrowser_13") self.horizontalLayout_19.addWidget(self.SubsysBrowser_13) - self.pktidBrowser_13 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_13 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_13.sizePolicy().hasHeightForWidth()) self.pktidBrowser_13.setSizePolicy(sizePolicy) self.pktidBrowser_13.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_13.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_13.setObjectName(_fromUtf8("pktidBrowser_13")) + self.pktidBrowser_13.setObjectName("pktidBrowser_13") self.horizontalLayout_19.addWidget(self.pktidBrowser_13) - self.countBrowser_13 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_13 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_13.sizePolicy().hasHeightForWidth()) self.countBrowser_13.setSizePolicy(sizePolicy) self.countBrowser_13.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_13.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_13.setObjectName(_fromUtf8("countBrowser_13")) + self.countBrowser_13.setObjectName("countBrowser_13") self.horizontalLayout_19.addWidget(self.countBrowser_13) - self.pushButton_13 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton_13 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pushButton_13.sizePolicy().hasHeightForWidth()) self.pushButton_13.setSizePolicy(sizePolicy) self.pushButton_13.setMinimumSize(QtCore.QSize(101, 27)) self.pushButton_13.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_13.setObjectName(_fromUtf8("pushButton_13")) + self.pushButton_13.setObjectName("pushButton_13") self.horizontalLayout_19.addWidget(self.pushButton_13) self.verticalLayout_2.addLayout(self.horizontalLayout_19) - self.horizontalLayout_20 = QtGui.QHBoxLayout() - self.horizontalLayout_20.setObjectName(_fromUtf8("horizontalLayout_20")) - self.SubsysBrowser_14 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_20 = QtWidgets.QHBoxLayout() + self.horizontalLayout_20.setObjectName("horizontalLayout_20") + self.SubsysBrowser_14 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + 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(141, 31)) self.SubsysBrowser_14.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_14.setObjectName(_fromUtf8("SubsysBrowser_14")) + self.SubsysBrowser_14.setObjectName("SubsysBrowser_14") self.horizontalLayout_20.addWidget(self.SubsysBrowser_14) - self.pktidBrowser_14 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_14 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_14.sizePolicy().hasHeightForWidth()) self.pktidBrowser_14.setSizePolicy(sizePolicy) self.pktidBrowser_14.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_14.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_14.setObjectName(_fromUtf8("pktidBrowser_14")) + self.pktidBrowser_14.setObjectName("pktidBrowser_14") self.horizontalLayout_20.addWidget(self.pktidBrowser_14) - self.countBrowser_14 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_14 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_14.sizePolicy().hasHeightForWidth()) self.countBrowser_14.setSizePolicy(sizePolicy) self.countBrowser_14.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_14.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_14.setObjectName(_fromUtf8("countBrowser_14")) + self.countBrowser_14.setObjectName("countBrowser_14") self.horizontalLayout_20.addWidget(self.countBrowser_14) - self.pushButton_14 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton_14 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + 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, 27)) self.pushButton_14.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_14.setObjectName(_fromUtf8("pushButton_14")) + self.pushButton_14.setObjectName("pushButton_14") self.horizontalLayout_20.addWidget(self.pushButton_14) self.verticalLayout_2.addLayout(self.horizontalLayout_20) - self.horizontalLayout_21 = QtGui.QHBoxLayout() - self.horizontalLayout_21.setObjectName(_fromUtf8("horizontalLayout_21")) - self.SubsysBrowser_15 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_21 = QtWidgets.QHBoxLayout() + self.horizontalLayout_21.setObjectName("horizontalLayout_21") + self.SubsysBrowser_15 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + 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(141, 31)) self.SubsysBrowser_15.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_15.setObjectName(_fromUtf8("SubsysBrowser_15")) + self.SubsysBrowser_15.setObjectName("SubsysBrowser_15") self.horizontalLayout_21.addWidget(self.SubsysBrowser_15) - self.pktidBrowser_15 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_15 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_15.sizePolicy().hasHeightForWidth()) self.pktidBrowser_15.setSizePolicy(sizePolicy) self.pktidBrowser_15.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_15.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_15.setObjectName(_fromUtf8("pktidBrowser_15")) + self.pktidBrowser_15.setObjectName("pktidBrowser_15") self.horizontalLayout_21.addWidget(self.pktidBrowser_15) - self.countBrowser_15 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_15 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_15.sizePolicy().hasHeightForWidth()) self.countBrowser_15.setSizePolicy(sizePolicy) self.countBrowser_15.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_15.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_15.setObjectName(_fromUtf8("countBrowser_15")) + self.countBrowser_15.setObjectName("countBrowser_15") self.horizontalLayout_21.addWidget(self.countBrowser_15) - self.pushButton_15 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton_15 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + 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, 27)) self.pushButton_15.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_15.setObjectName(_fromUtf8("pushButton_15")) + self.pushButton_15.setObjectName("pushButton_15") self.horizontalLayout_21.addWidget(self.pushButton_15) self.verticalLayout_2.addLayout(self.horizontalLayout_21) - self.horizontalLayout_22 = QtGui.QHBoxLayout() - self.horizontalLayout_22.setObjectName(_fromUtf8("horizontalLayout_22")) - self.SubsysBrowser_16 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_22 = QtWidgets.QHBoxLayout() + self.horizontalLayout_22.setObjectName("horizontalLayout_22") + self.SubsysBrowser_16 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + 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(141, 31)) self.SubsysBrowser_16.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_16.setObjectName(_fromUtf8("SubsysBrowser_16")) + self.SubsysBrowser_16.setObjectName("SubsysBrowser_16") self.horizontalLayout_22.addWidget(self.SubsysBrowser_16) - self.pktidBrowser_16 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_16 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_16.sizePolicy().hasHeightForWidth()) self.pktidBrowser_16.setSizePolicy(sizePolicy) self.pktidBrowser_16.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_16.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_16.setObjectName(_fromUtf8("pktidBrowser_16")) + self.pktidBrowser_16.setObjectName("pktidBrowser_16") self.horizontalLayout_22.addWidget(self.pktidBrowser_16) - self.countBrowser_16 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_16 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_16.sizePolicy().hasHeightForWidth()) self.countBrowser_16.setSizePolicy(sizePolicy) self.countBrowser_16.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_16.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_16.setObjectName(_fromUtf8("countBrowser_16")) + self.countBrowser_16.setObjectName("countBrowser_16") self.horizontalLayout_22.addWidget(self.countBrowser_16) - self.pushButton_16 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton_16 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + 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, 27)) self.pushButton_16.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_16.setObjectName(_fromUtf8("pushButton_16")) + self.pushButton_16.setObjectName("pushButton_16") self.horizontalLayout_22.addWidget(self.pushButton_16) self.verticalLayout_2.addLayout(self.horizontalLayout_22) - self.horizontalLayout_23 = QtGui.QHBoxLayout() - self.horizontalLayout_23.setObjectName(_fromUtf8("horizontalLayout_23")) - self.SubsysBrowser_17 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_23 = QtWidgets.QHBoxLayout() + self.horizontalLayout_23.setObjectName("horizontalLayout_23") + self.SubsysBrowser_17 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + 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) self.SubsysBrowser_17.setMinimumSize(QtCore.QSize(141, 31)) self.SubsysBrowser_17.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_17.setObjectName(_fromUtf8("SubsysBrowser_17")) + self.SubsysBrowser_17.setObjectName("SubsysBrowser_17") self.horizontalLayout_23.addWidget(self.SubsysBrowser_17) - self.pktidBrowser_17 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_17 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_17.sizePolicy().hasHeightForWidth()) self.pktidBrowser_17.setSizePolicy(sizePolicy) self.pktidBrowser_17.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_17.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_17.setObjectName(_fromUtf8("pktidBrowser_17")) + self.pktidBrowser_17.setObjectName("pktidBrowser_17") self.horizontalLayout_23.addWidget(self.pktidBrowser_17) - self.countBrowser_17 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_17 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_17.sizePolicy().hasHeightForWidth()) self.countBrowser_17.setSizePolicy(sizePolicy) self.countBrowser_17.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_17.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_17.setObjectName(_fromUtf8("countBrowser_17")) + self.countBrowser_17.setObjectName("countBrowser_17") self.horizontalLayout_23.addWidget(self.countBrowser_17) - self.pushButton_17 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton_17 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pushButton_17.sizePolicy().hasHeightForWidth()) self.pushButton_17.setSizePolicy(sizePolicy) self.pushButton_17.setMinimumSize(QtCore.QSize(101, 27)) self.pushButton_17.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_17.setObjectName(_fromUtf8("pushButton_17")) + self.pushButton_17.setObjectName("pushButton_17") self.horizontalLayout_23.addWidget(self.pushButton_17) self.verticalLayout_2.addLayout(self.horizontalLayout_23) - self.horizontalLayout_24 = QtGui.QHBoxLayout() - self.horizontalLayout_24.setObjectName(_fromUtf8("horizontalLayout_24")) - self.SubsysBrowser_18 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_24 = QtWidgets.QHBoxLayout() + self.horizontalLayout_24.setObjectName("horizontalLayout_24") + 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(141, 31)) self.SubsysBrowser_18.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_18.setObjectName(_fromUtf8("SubsysBrowser_18")) + self.SubsysBrowser_18.setObjectName("SubsysBrowser_18") self.horizontalLayout_24.addWidget(self.SubsysBrowser_18) - self.pktidBrowser_18 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_18 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_18.sizePolicy().hasHeightForWidth()) self.pktidBrowser_18.setSizePolicy(sizePolicy) self.pktidBrowser_18.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_18.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_18.setObjectName(_fromUtf8("pktidBrowser_18")) + self.pktidBrowser_18.setObjectName("pktidBrowser_18") self.horizontalLayout_24.addWidget(self.pktidBrowser_18) - self.countBrowser_18 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_18 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_18.sizePolicy().hasHeightForWidth()) self.countBrowser_18.setSizePolicy(sizePolicy) self.countBrowser_18.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_18.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_18.setObjectName(_fromUtf8("countBrowser_18")) + self.countBrowser_18.setObjectName("countBrowser_18") self.horizontalLayout_24.addWidget(self.countBrowser_18) - self.pushButton_18 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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, 27)) self.pushButton_18.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_18.setObjectName(_fromUtf8("pushButton_18")) + self.pushButton_18.setObjectName("pushButton_18") self.horizontalLayout_24.addWidget(self.pushButton_18) self.verticalLayout_2.addLayout(self.horizontalLayout_24) - self.horizontalLayout_25 = QtGui.QHBoxLayout() - self.horizontalLayout_25.setObjectName(_fromUtf8("horizontalLayout_25")) - self.SubsysBrowser_19 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_25 = QtWidgets.QHBoxLayout() + self.horizontalLayout_25.setObjectName("horizontalLayout_25") + 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(141, 31)) self.SubsysBrowser_19.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_19.setObjectName(_fromUtf8("SubsysBrowser_19")) + self.SubsysBrowser_19.setObjectName("SubsysBrowser_19") self.horizontalLayout_25.addWidget(self.SubsysBrowser_19) - self.pktidBrowser_19 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_19 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_19.sizePolicy().hasHeightForWidth()) self.pktidBrowser_19.setSizePolicy(sizePolicy) self.pktidBrowser_19.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_19.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_19.setObjectName(_fromUtf8("pktidBrowser_19")) + self.pktidBrowser_19.setObjectName("pktidBrowser_19") self.horizontalLayout_25.addWidget(self.pktidBrowser_19) - self.countBrowser_19 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_19 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_19.sizePolicy().hasHeightForWidth()) self.countBrowser_19.setSizePolicy(sizePolicy) self.countBrowser_19.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_19.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_19.setObjectName(_fromUtf8("countBrowser_19")) + self.countBrowser_19.setObjectName("countBrowser_19") self.horizontalLayout_25.addWidget(self.countBrowser_19) - self.pushButton_19 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + 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, 27)) self.pushButton_19.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_19.setObjectName(_fromUtf8("pushButton_19")) + self.pushButton_19.setObjectName("pushButton_19") self.horizontalLayout_25.addWidget(self.pushButton_19) self.verticalLayout_2.addLayout(self.horizontalLayout_25) - self.horizontalLayout_26 = QtGui.QHBoxLayout() - self.horizontalLayout_26.setObjectName(_fromUtf8("horizontalLayout_26")) - self.SubsysBrowser_20 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_26 = QtWidgets.QHBoxLayout() + self.horizontalLayout_26.setObjectName("horizontalLayout_26") + 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.SubsysBrowser_20.setMinimumSize(QtCore.QSize(141, 31)) self.SubsysBrowser_20.setMaximumSize(QtCore.QSize(141, 31)) - self.SubsysBrowser_20.setObjectName(_fromUtf8("SubsysBrowser_20")) + self.SubsysBrowser_20.setObjectName("SubsysBrowser_20") self.horizontalLayout_26.addWidget(self.SubsysBrowser_20) - self.pktidBrowser_20 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pktidBrowser_20 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pktidBrowser_20.sizePolicy().hasHeightForWidth()) self.pktidBrowser_20.setSizePolicy(sizePolicy) self.pktidBrowser_20.setMinimumSize(QtCore.QSize(81, 31)) self.pktidBrowser_20.setMaximumSize(QtCore.QSize(81, 31)) - self.pktidBrowser_20.setObjectName(_fromUtf8("pktidBrowser_20")) + self.pktidBrowser_20.setObjectName("pktidBrowser_20") self.horizontalLayout_26.addWidget(self.pktidBrowser_20) - self.countBrowser_20 = QtGui.QTextBrowser(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.countBrowser_20 = QtWidgets.QTextBrowser(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.countBrowser_20.sizePolicy().hasHeightForWidth()) self.countBrowser_20.setSizePolicy(sizePolicy) self.countBrowser_20.setMinimumSize(QtCore.QSize(91, 31)) self.countBrowser_20.setMaximumSize(QtCore.QSize(91, 31)) - self.countBrowser_20.setObjectName(_fromUtf8("countBrowser_20")) + self.countBrowser_20.setObjectName("countBrowser_20") self.horizontalLayout_26.addWidget(self.countBrowser_20) - self.pushButton_20 = QtGui.QPushButton(self.scrollAreaWidgetContents) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.pushButton_20 = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.pushButton_20.sizePolicy().hasHeightForWidth()) self.pushButton_20.setSizePolicy(sizePolicy) self.pushButton_20.setMinimumSize(QtCore.QSize(101, 27)) self.pushButton_20.setMaximumSize(QtCore.QSize(101, 27)) - self.pushButton_20.setObjectName(_fromUtf8("pushButton_20")) + self.pushButton_20.setObjectName("pushButton_20") self.horizontalLayout_26.addWidget(self.pushButton_20) self.verticalLayout_2.addLayout(self.horizontalLayout_26) self.scrollArea.setWidget(self.scrollAreaWidgetContents) self.verticalLayout.addWidget(self.scrollArea) self.retranslateUi(TelemetrySystemDialog) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), TelemetrySystemDialog.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), TelemetrySystemDialog.reject) + self.buttonBox.accepted.connect(TelemetrySystemDialog.accept) + self.buttonBox.rejected.connect(TelemetrySystemDialog.reject) QtCore.QMetaObject.connectSlotsByName(TelemetrySystemDialog) def retranslateUi(self, TelemetrySystemDialog): - TelemetrySystemDialog.setWindowTitle(_translate("TelemetrySystemDialog", "Dialog", None)) - self.label.setText(_translate("TelemetrySystemDialog", "cFE/CFS Subsystem Telemetry", None)) - self.label_6.setText(_translate("TelemetrySystemDialog", "Packets Received", None)) - self.label_2.setText(_translate("TelemetrySystemDialog", "Available Pages", None)) - self.label_3.setText(_translate("TelemetrySystemDialog", "Subsystem/Page", None)) - self.label_4.setText(_translate("TelemetrySystemDialog", "Packet ID", None)) - self.label_5.setText(_translate("TelemetrySystemDialog", "Packet Count", None)) - self.pushButton_0.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_1.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_2.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_3.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_4.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_5.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_6.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_7.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_8.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_9.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_10.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_11.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_12.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_13.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_14.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_15.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_16.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_17.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_18.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_19.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - self.pushButton_20.setText(_translate("TelemetrySystemDialog", "Display Page", None)) - - -if __name__ == "__main__": - import sys - app = QtGui.QApplication(sys.argv) - TelemetrySystemDialog = QtGui.QDialog() - ui = Ui_TelemetrySystemDialog() - ui.setupUi(TelemetrySystemDialog) - TelemetrySystemDialog.show() - sys.exit(app.exec_()) - + _translate = QtCore.QCoreApplication.translate + TelemetrySystemDialog.setWindowTitle(_translate("TelemetrySystemDialog", "Dialog")) + self.label.setText(_translate("TelemetrySystemDialog", "cFE/CFS Subsystem Telemetry")) + self.label_6.setText(_translate("TelemetrySystemDialog", "Packets Received")) + self.label_2.setText(_translate("TelemetrySystemDialog", "Available Pages")) + self.label_3.setText(_translate("TelemetrySystemDialog", "Subsystem/Page")) + self.label_4.setText(_translate("TelemetrySystemDialog", "Packet ID")) + self.label_5.setText(_translate("TelemetrySystemDialog", "Packet Count")) + self.pushButton_0.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_1.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_2.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_3.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_4.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_5.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_6.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_7.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_8.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_9.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_10.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_11.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_12.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_13.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_14.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_15.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_16.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_17.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_18.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_19.setText(_translate("TelemetrySystemDialog", "Display Page")) + self.pushButton_20.setText(_translate("TelemetrySystemDialog", "Display Page")) diff --git a/TlmMQRecv.py b/TlmMQRecv.py index fd3ffaf..1c2211f 100644 --- a/TlmMQRecv.py +++ b/TlmMQRecv.py @@ -17,10 +17,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/usr/bin/env python +#!/usr/bin/env python3 # import zmq + + # # Receive zeroMQ messages (used for debugging only - not used by CFS Ground System) # @@ -28,15 +30,15 @@ def main(): """ main method """ # Prepare our context and publisher - context = zmq.Context() + context = zmq.Context() subscriber = context.socket(zmq.SUB) subscriber.connect("ipc:///tmp/GroundSystem") subscriber.setsockopt(zmq.SUBSCRIBE, b"GroundSystem") while True: # Read envelope with address - [address, contents] = subscriber.recv_multipart() - print("[%s] %s" % (address, contents)) + address, contents = subscriber.recv_multipart() + print(f"[{address}] {contents}") # We never get here but clean up anyhow subscriber.close()