Skip to content

Commit

Permalink
Enhancement nasa#103 - custom header mechanism
Browse files Browse the repository at this point in the history
Fix for rebase merge error
  • Loading branch information
lbleier-GSFC committed Jun 16, 2020
1 parent 7754c9f commit 09261e5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Subsystems/tlmGUI/Ui_GenericTelemetryDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def setupUi(self, GenericTelemetryDialog):
self.verticalLayout = QtWidgets.QVBoxLayout(self.layoutWidget)
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
self.verticalLayout.setObjectName("verticalLayout")
self.packetIdLabel = QtWidgets.QLabel(self.widget)
self.packetIdLabel = QtWidgets.QLabel(self.layoutWidget)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
Expand All @@ -50,7 +50,7 @@ def setupUi(self, GenericTelemetryDialog):
self.packetIdLabel.setMaximumSize(QtCore.QSize(16777215, 25))
self.packetIdLabel.setObjectName("packetIdLabel")
self.verticalLayout.addWidget(self.packetIdLabel)
self.packetId = QtWidgets.QLCDNumber(self.widget)
self.packetId = QtWidgets.QLCDNumber(self.layoutWidget)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
Expand Down

0 comments on commit 09261e5

Please sign in to comment.