Skip to content

Commit 876a39d

Browse files
lbleier-GSFClbleier-GSFC
committed
Fix nasa#72 - Upgrade PyQt4 to PyQt5
Includes code cleanup/refactoring. Also fixes nasa#71
1 parent 52f706b commit 876a39d

File tree

6 files changed

+173
-3
lines changed

6 files changed

+173
-3
lines changed

‎Subsystems/cmdGui/HTMLDocsParser.py

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# See the License for the specific language governing permissions and
1818
# limitations under the License.
1919
#
20-
2120
import glob
2221
import pickle
2322
import re

‎Subsystems/cmdGui/UdpCommands.py

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545

4646
ROOTDIR = Path(sys.argv[0]).resolve().parent
4747

48-
4948
class SubsystemCommands(QDialog, Ui_GenericCommandDialog):
5049
#
5150
# Init the class

‎Subsystems/tlmGUI/GenericTelemetry.py

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
ROOTDIR = Path(sys.argv[0]).resolve().parent
3636

37-
3837
class SubsystemTelemetry(QDialog, Ui_GenericTelemetryDialog):
3938
#
4039
# Init the class

‎Ui_MainWindow.py

+148
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
# -*- coding: utf-8 -*-
2+
3+
# Form implementation generated from reading ui file '/home/lbleier/cFS/tools/cFS-GroundSystem/MainWindow.ui'
4+
#
5+
# Created by: PyQt5 UI code generator 5.10.1
6+
#
7+
# WARNING! All changes made in this file will be lost!
8+
9+
from PyQt5 import QtCore, QtGui, QtWidgets
10+
11+
class Ui_MainWindow(object):
12+
def setupUi(self, MainWindow):
13+
MainWindow.setObjectName("MainWindow")
14+
MainWindow.setEnabled(True)
15+
MainWindow.resize(452, 265)
16+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
17+
sizePolicy.setHorizontalStretch(24)
18+
sizePolicy.setVerticalStretch(0)
19+
sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth())
20+
MainWindow.setSizePolicy(sizePolicy)
21+
self.centralwidget = QtWidgets.QWidget(MainWindow)
22+
self.centralwidget.setObjectName("centralwidget")
23+
self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget)
24+
self.verticalLayout.setObjectName("verticalLayout")
25+
self.labelHomeTitle = QtWidgets.QLabel(self.centralwidget)
26+
font = QtGui.QFont()
27+
font.setPointSize(22)
28+
font.setBold(False)
29+
font.setWeight(50)
30+
self.labelHomeTitle.setFont(font)
31+
self.labelHomeTitle.setAlignment(QtCore.Qt.AlignCenter)
32+
self.labelHomeTitle.setObjectName("labelHomeTitle")
33+
self.verticalLayout.addWidget(self.labelHomeTitle)
34+
self.line_2 = QtWidgets.QFrame(self.centralwidget)
35+
self.line_2.setFrameShape(QtWidgets.QFrame.HLine)
36+
self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken)
37+
self.line_2.setObjectName("line_2")
38+
self.verticalLayout.addWidget(self.line_2)
39+
self.gridLayout = QtWidgets.QGridLayout()
40+
self.gridLayout.setObjectName("gridLayout")
41+
self.label_3 = QtWidgets.QLabel(self.centralwidget)
42+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
43+
sizePolicy.setHorizontalStretch(0)
44+
sizePolicy.setVerticalStretch(0)
45+
sizePolicy.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth())
46+
self.label_3.setSizePolicy(sizePolicy)
47+
self.label_3.setMinimumSize(QtCore.QSize(141, 0))
48+
self.label_3.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
49+
self.label_3.setObjectName("label_3")
50+
self.gridLayout.addWidget(self.label_3, 0, 0, 1, 1)
51+
self.comboBoxIpAddresses = QtWidgets.QComboBox(self.centralwidget)
52+
self.comboBoxIpAddresses.setMinimumSize(QtCore.QSize(132, 0))
53+
self.comboBoxIpAddresses.setMaximumSize(QtCore.QSize(132, 16777215))
54+
self.comboBoxIpAddresses.setObjectName("comboBoxIpAddresses")
55+
self.comboBoxIpAddresses.addItem("")
56+
self.gridLayout.addWidget(self.comboBoxIpAddresses, 0, 1, 1, 1)
57+
self.label_4 = QtWidgets.QLabel(self.centralwidget)
58+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
59+
sizePolicy.setHorizontalStretch(0)
60+
sizePolicy.setVerticalStretch(0)
61+
sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth())
62+
self.label_4.setSizePolicy(sizePolicy)
63+
self.label_4.setMinimumSize(QtCore.QSize(141, 0))
64+
self.label_4.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
65+
self.label_4.setObjectName("label_4")
66+
self.gridLayout.addWidget(self.label_4, 1, 0, 1, 1)
67+
self.cbHeaderVer = QtWidgets.QComboBox(self.centralwidget)
68+
self.cbHeaderVer.setMinimumSize(QtCore.QSize(132, 0))
69+
self.cbHeaderVer.setMaximumSize(QtCore.QSize(132, 16777215))
70+
self.cbHeaderVer.setObjectName("cbHeaderVer")
71+
self.cbHeaderVer.addItem("")
72+
self.cbHeaderVer.addItem("")
73+
self.cbHeaderVer.addItem("")
74+
self.gridLayout.addWidget(self.cbHeaderVer, 1, 1, 1, 1)
75+
self.sbOffset = QtWidgets.QSpinBox(self.centralwidget)
76+
self.sbOffset.setEnabled(False)
77+
self.sbOffset.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons)
78+
self.sbOffset.setObjectName("sbOffset")
79+
self.gridLayout.addWidget(self.sbOffset, 1, 2, 1, 1)
80+
self.label = QtWidgets.QLabel(self.centralwidget)
81+
self.label.setObjectName("label")
82+
self.gridLayout.addWidget(self.label, 0, 2, 1, 1)
83+
self.verticalLayout.addLayout(self.gridLayout)
84+
self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
85+
self.horizontalLayout_2.setSpacing(32)
86+
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
87+
self.pushButtonStartTlm = QtWidgets.QPushButton(self.centralwidget)
88+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
89+
sizePolicy.setHorizontalStretch(0)
90+
sizePolicy.setVerticalStretch(0)
91+
sizePolicy.setHeightForWidth(self.pushButtonStartTlm.sizePolicy().hasHeightForWidth())
92+
self.pushButtonStartTlm.setSizePolicy(sizePolicy)
93+
self.pushButtonStartTlm.setObjectName("pushButtonStartTlm")
94+
self.horizontalLayout_2.addWidget(self.pushButtonStartTlm)
95+
self.pushButtonStartCmd = QtWidgets.QPushButton(self.centralwidget)
96+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
97+
sizePolicy.setHorizontalStretch(0)
98+
sizePolicy.setVerticalStretch(0)
99+
sizePolicy.setHeightForWidth(self.pushButtonStartCmd.sizePolicy().hasHeightForWidth())
100+
self.pushButtonStartCmd.setSizePolicy(sizePolicy)
101+
self.pushButtonStartCmd.setObjectName("pushButtonStartCmd")
102+
self.horizontalLayout_2.addWidget(self.pushButtonStartCmd)
103+
self.verticalLayout.addLayout(self.horizontalLayout_2)
104+
self.line = QtWidgets.QFrame(self.centralwidget)
105+
self.line.setFrameShape(QtWidgets.QFrame.HLine)
106+
self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
107+
self.line.setObjectName("line")
108+
self.verticalLayout.addWidget(self.line)
109+
self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
110+
self.horizontalLayout_4.setObjectName("horizontalLayout_4")
111+
self.label_5 = QtWidgets.QLabel(self.centralwidget)
112+
font = QtGui.QFont()
113+
font.setPointSize(11)
114+
self.label_5.setFont(font)
115+
self.label_5.setObjectName("label_5")
116+
self.horizontalLayout_4.addWidget(self.label_5)
117+
self.pushButton = QtWidgets.QPushButton(self.centralwidget)
118+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
119+
sizePolicy.setHorizontalStretch(0)
120+
sizePolicy.setVerticalStretch(0)
121+
sizePolicy.setHeightForWidth(self.pushButton.sizePolicy().hasHeightForWidth())
122+
self.pushButton.setSizePolicy(sizePolicy)
123+
self.pushButton.setObjectName("pushButton")
124+
self.horizontalLayout_4.addWidget(self.pushButton)
125+
self.verticalLayout.addLayout(self.horizontalLayout_4)
126+
MainWindow.setCentralWidget(self.centralwidget)
127+
128+
self.retranslateUi(MainWindow)
129+
self.pushButton.clicked.connect(MainWindow.close)
130+
QtCore.QMetaObject.connectSlotsByName(MainWindow)
131+
132+
def retranslateUi(self, MainWindow):
133+
_translate = QtCore.QCoreApplication.translate
134+
MainWindow.setWindowTitle(_translate("MainWindow", "Main Window"))
135+
self.labelHomeTitle.setText(_translate("MainWindow", "CFS Ground System"))
136+
self.label_3.setText(_translate("MainWindow", "Selected IP Address"))
137+
self.comboBoxIpAddresses.setItemText(0, _translate("MainWindow", "All"))
138+
self.label_4.setText(_translate("MainWindow", "Header version"))
139+
self.cbHeaderVer.setItemText(0, _translate("MainWindow", "1"))
140+
self.cbHeaderVer.setItemText(1, _translate("MainWindow", "2"))
141+
self.cbHeaderVer.setItemText(2, _translate("MainWindow", "Custom"))
142+
self.sbOffset.setToolTip(_translate("MainWindow", "<html><head/><body><p>Offset (in bytes) to be *added to* existing offsets listed in tlm/cmd text files</p></body></html>"))
143+
self.label.setText(_translate("MainWindow", "Offset (bytes)"))
144+
self.pushButtonStartTlm.setText(_translate("MainWindow", "Start Telemetry System"))
145+
self.pushButtonStartCmd.setText(_translate("MainWindow", "Start Command System"))
146+
self.label_5.setText(_translate("MainWindow", "*Read Guide-GroundSystem.txt for help"))
147+
self.pushButton.setText(_translate("MainWindow", "Close"))
148+

‎common/__init__.py

Whitespace-only changes.

‎common/shareddata.py

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#
2+
# GSC-18128-1, "Core Flight Executive Version 6.7"
3+
#
4+
# Copyright (c) 2006-2019 United States Government as represented by
5+
# the Administrator of the National Aeronautics and Space Administration.
6+
# All Rights Reserved.
7+
#
8+
# Licensed under the Apache License, Version 2.0 (the "License");
9+
# you may not use this file except in compliance with the License.
10+
# You may obtain a copy of the License at
11+
#
12+
# http://www.apache.org/licenses/LICENSE-2.0
13+
#
14+
# Unless required by applicable law or agreed to in writing, software
15+
# distributed under the License is distributed on an "AS IS" BASIS,
16+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
# See the License for the specific language governing permissions and
18+
# limitations under the License.
19+
20+
# This module contains variables and/or other data that can be shared across
21+
# the main classes. Simply import this module into any class that needs it.
22+
# IMPORTANT: ANY class importing this module can read/write any of the data.
23+
# Use caution when read/writing data here.
24+
25+
offsetVal = 0

0 commit comments

Comments
 (0)