Type casting in Qt for Python 3.10

This commit is contained in:
2024-02-29 12:09:17 +01:00
parent 425c8125d2
commit e7118162d4

View File

@@ -119,7 +119,7 @@ class GUIFrame(QWidget):
#self.measurement_layout = QHBoxLayout(self.measurement_wgt)
self.measurement_layout = QGridLayout(self.measurement_wgt)
self.measurement_layout.setAlignment(
Qt.AlignmentFlag(Qt.AlignLeft | Qt.AlignTop))
Qt.AlignmentFlag(Qt.AlignLeft|Qt.AlignTop))
self.measurement_layout.setSpacing(50)
self.measurement_tab_wgt = QTabWidget(self.measurement_wgt)
self.measurement_tab_wgt.setMinimumWidth(480)
@@ -604,7 +604,7 @@ class GUIFrame(QWidget):
#self.output_parameters_group_box.setMaximumHeight(400)
self.output_parameters_group_box.setFont(self.font_gui)
self.output_parameters_group_box.setAlignment(
Qt.AlignmentFlag(Qt.AlignTop | Qt.AlignHCenter))
Qt.AlignmentFlag(Qt.AlignTop|Qt.AlignHCenter))
qf = QFrame()
qf.setFixedHeight(35)
@@ -713,7 +713,7 @@ class GUIFrame(QWidget):
wgt.setSingleStep(step)
fm = QFontMetricsF(wgt.font())
param_width = max(fm.width(str(decimal)), fm.width(suggested))
wgt.setMaximumWidth(param_width + 40)
wgt.setMaximumWidth(int(param_width + 40))
wgt.valueChanged.connect(callback)
wgt.setValue(start_val)
wgt.valueChanged.emit(start_val)
@@ -1028,12 +1028,12 @@ class GUIFrame(QWidget):
hbox = QVBoxLayout()
hbox.addWidget(self.post_measurement_save_button())
hbox.setContentsMargins(9, 19, 9, 9)
hbox.setAlignment(Qt.AlignTop | Qt.AlignHCenter)
hbox.setAlignment(Qt.AlignmnetFlag(Qt.AlignTop|Qt.AlignHCenter))
group_box.setContentsMargins(0, 0, 0, 0)
group_box.setFixedWidth(208)
group_box.setMaximumHeight(130)
group_box.setFont(self.font_gui)
group_box.setAlignment(Qt.AlignTop | Qt.AlignHCenter)
group_box.setAlignment((Qt.AlignmnetFlag(Qt.AlignTop|Qt.AlignHCenter))
group_box.setLayout(hbox)
return group_box
@@ -1492,7 +1492,7 @@ class GUIFrame(QWidget):
line.setObjectName("Read")
line.setFixedHeight(24)
line.setText(str(value))
line.setAlignment(Qt.AlignRight | Qt.AlignBottom)
line.setAlignment(Qt.AlignmnetFlag(Qt.AlignRight|Qt.AlignBottom))
line.setStyleSheet("QLabel{text-align: right}")
fm = QFontMetricsF(line.font())
param_width = fm.maxWidth() * (len(str(value))*0.5) + 20
@@ -1551,9 +1551,6 @@ class GUIFrame(QWidget):
line.setFixedHeight(24)
line.setText(str(value))
fm = QFontMetricsF(line.font())
#param_width = fm.width(str(value))
#extra_width = 22 if len(str(value)) < 16 else 26
#line.setFixedWidth(param_width + extra_width)
param_width = fm.maxWidth() * (len(str(value))*0.5) + 20
line.setMaximumWidth(int(param_width))
return line
@@ -1871,9 +1868,6 @@ class GUIFrame(QWidget):
meas_line.setObjectName("Read")
fm = QFontMetricsF(meas_line.font())
#param_width = fm.width(longest_title)
#extra_width = 22 if len(str(value)) < 15 else 28
#meas_line.setFixedWidth(param_width + extra_width)
param_width = fm.maxWidth() * len(longest_title)
meas_line.setMaximumWidth(int(param_width*0.5))
@@ -2049,7 +2043,7 @@ class GUIFrame(QWidget):
ql = QLabel(radiobutton_title[2])
ql.setFont(self.font_pts10)
ql.setFixedHeight(self.widget_height)
ql.setAlignment(Qt.AlignLeft | Qt.AlignVCenter)
ql.setAlignment(Qt.AlignmentFlag(Qt.AlignLeft|Qt.AlignVCenter))
grid.addWidget(ql, 2, 1)
def mon_cb(handle, pvname, pvdata):
@@ -2134,7 +2128,7 @@ class GUIFrame(QWidget):
grid.setContentsMargins(5, 10, 5, 0)
#grid.setContentsMargins(9, 15, 9, 0)
grid.setAlignment(Qt.AlignLeft | Qt.AlignVCenter)
grid.setAlignment(Qt.AlignmentFlag(Qt.AlignLeft|Qt.AlignVCenter))
grid.setVerticalSpacing(2)
grid.setHorizontalSpacing(4)
group_box.setContentsMargins(0, 0, 0, 0)
@@ -2371,7 +2365,7 @@ class GUIFrame(QWidget):
line = QLabel()
line.setText(str(value)) #"{0: 3.1f}".format(value))
line.setFixedHeight(24)
line.setAlignment(Qt.AlignRight | Qt.AlignBottom)
line.setAlignment(Qt.AlignmentFlag(Qt.AlignRight|Qt.AlignBottom))
line.setStyleSheet("QLabel{text-align: right}")
fm = QFontMetricsF(line.font())
param_width = max(fm.width(str(value)), fm.width(suggested))
@@ -2406,7 +2400,7 @@ class GUIFrame(QWidget):
#line.textEdited.connect(line_cb)
line.textChanged.emit(str(value))
line.setAlignment(Qt.AlignRight | Qt.AlignBottom)
line.setAlignment(Qt.AlignmentFlag(Qt.AlignRight|Qt.AlignBottom))
line.setStyleSheet("QLabel{text-align: right}")
try: