From 09261e5420ba74cdfcf4cebc97d5183012c44cf3 Mon Sep 17 00:00:00 2001 From: Leor Bleier Date: Tue, 16 Jun 2020 13:27:26 -0400 Subject: [PATCH] Enhancement #103 - custom header mechanism Fix for rebase merge error --- Subsystems/tlmGUI/Ui_GenericTelemetryDialog.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Subsystems/tlmGUI/Ui_GenericTelemetryDialog.py b/Subsystems/tlmGUI/Ui_GenericTelemetryDialog.py index 5eb76ca..3937700 100644 --- a/Subsystems/tlmGUI/Ui_GenericTelemetryDialog.py +++ b/Subsystems/tlmGUI/Ui_GenericTelemetryDialog.py @@ -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) @@ -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)