Skip to content

Commit 09261e5

Browse files
committed
Enhancement nasa#103 - custom header mechanism
Fix for rebase merge error
1 parent 7754c9f commit 09261e5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Subsystems/tlmGUI/Ui_GenericTelemetryDialog.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def setupUi(self, GenericTelemetryDialog):
4040
self.verticalLayout = QtWidgets.QVBoxLayout(self.layoutWidget)
4141
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
4242
self.verticalLayout.setObjectName("verticalLayout")
43-
self.packetIdLabel = QtWidgets.QLabel(self.widget)
43+
self.packetIdLabel = QtWidgets.QLabel(self.layoutWidget)
4444
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
4545
sizePolicy.setHorizontalStretch(0)
4646
sizePolicy.setVerticalStretch(0)
@@ -50,7 +50,7 @@ def setupUi(self, GenericTelemetryDialog):
5050
self.packetIdLabel.setMaximumSize(QtCore.QSize(16777215, 25))
5151
self.packetIdLabel.setObjectName("packetIdLabel")
5252
self.verticalLayout.addWidget(self.packetIdLabel)
53-
self.packetId = QtWidgets.QLCDNumber(self.widget)
53+
self.packetId = QtWidgets.QLCDNumber(self.layoutWidget)
5454
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum)
5555
sizePolicy.setHorizontalStretch(0)
5656
sizePolicy.setVerticalStretch(0)

0 commit comments

Comments
 (0)