From 425c8125d25f191e04db6d00dbd19188535b2101 Mon Sep 17 00:00:00 2001 From: chrin Date: Thu, 29 Feb 2024 11:56:09 +0100 Subject: [PATCH] Type casting in Qt for Python 3.10 --- guiframe.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/guiframe.py b/guiframe.py index 59c0e42..015ed05 100644 --- a/guiframe.py +++ b/guiframe.py @@ -522,11 +522,11 @@ class GUIFrame(QWidget): vbox.addLayout(self.create_analysis_wgt()) vbox.setContentsMargins(9, 19, 9, 9) vbox.setSpacing(5) - vbox.setAlignment(Qt.AlignTop | Qt.AlignHCenter) + vbox.setAlignment(Qt.AlignmentFlag(Qt.AlignTop|Qt.AlignHCenter)) group_box.setMaximumWidth(_width) group_box.setMinimumHeight(_height) group_box.setFont(self.font_gui) - group_box.setAlignment(Qt.AlignTop | Qt.AlignHCenter) + group_box.setAlignment(Qt.AlignmentFlag(Qt.AlignTop|Qt.AlignHCenter)) group_box.setLayout(vbox) return group_box @@ -538,7 +538,8 @@ class GUIFrame(QWidget): self.optics_group.setMaximumWidth(208) self.optics_group.setMaximumHeight(220) self.optics_group.setFont(self.font_gui) - self.optics_group.setAlignment(Qt.AlignTop | Qt.AlignHCenter) + self.optics_group.setAlignment( + Qt.AlignmentFlag(Qt.AlignTop|Qt.AlignHCenter)) self.optics_group.setAlignment(Qt.AlignCenter) self.optics_group.setLayout(self.create_optics_layout()) self.optics_group.table = None @@ -557,7 +558,7 @@ class GUIFrame(QWidget): self.output_parameters_group_box.setObjectName("OUTER") vbox = QVBoxLayout() vbox.setContentsMargins(9, 19, 9, 9) - vbox.setAlignment(Qt.AlignTop | Qt.AlignHCenter) + vbox.setAlignment(Qt.AlignmentFlag(Qt.AlignTop|Qt.AlignHCenter)) keys = self.settings.data["Results"].keys() max_str_len = 4 for key in keys: @@ -625,12 +626,12 @@ class GUIFrame(QWidget): group_box.setObjectName("OUTER") hbox = QVBoxLayout() hbox.setContentsMargins(9, 19, 9, 9) - hbox.setAlignment(Qt.AlignTop | Qt.AlignHCenter) + hbox.setAlignment(Qt.AlignmentFlag(Qt.AlignTop|Qt.AlignHCenter)) group_box.setContentsMargins(0, 0, 0, 0) group_box.setMinimumWidth(200) group_box.setMaximumHeight(400) group_box.setFont(self.font_gui) - group_box.setAlignment(Qt.AlignmentFlag(Qt.AlignTop | Qt.AlignHCenter)) + group_box.setAlignment(Qt.AlignmentFlag(Qt.AlignTop|Qt.AlignHCenter)) group_box.setLayout(hbox) return group_box @@ -747,7 +748,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(cb) wgt.setValue(start_val) wgt.valueChanged.emit(start_val) @@ -791,7 +792,7 @@ class GUIFrame(QWidget): fm = QFontMetricsF(wgt.font()) param_width = max(fm.width(str(value_for_width)), fm.width(suggested)) - wgt.setFixedWidth(param_width + 50) + wgt.setFixedWidth(int(param_width + 50)) self.line_sender_dict[key] = wgt @@ -816,12 +817,13 @@ class GUIFrame(QWidget): self.save_all_wgt = self.save_all_group() - grid = QVBoxLayout() if 'V' in self.orientation_procedure.upper() else QHBoxLayout() + grid = QVBoxLayout() if 'V' in self.orientation_procedure.upper() \ + else QHBoxLayout() grid.addWidget(self.start_wgt) grid.addWidget(self.abort_wgt) grid.addWidget(self.save_all_wgt) - grid.setAlignment(Qt.AlignmentFlag(Qt.AlignLeft | Qt.AlignTop)) + grid.setAlignment(Qt.AlignmentFlag(Qt.AlignLeft|Qt.AlignTop)) return grid