From 681761ca40ad6f6554faca85773e976cc56231ae Mon Sep 17 00:00:00 2001 From: chrin Date: Tue, 27 Feb 2024 15:54:14 +0100 Subject: [PATCH] cast to Qt.AlignmentFlag when setAlignment includeds an OR --- pvwidgets.py | 109 ++++++++++++++++++++++++++------------------------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/pvwidgets.py b/pvwidgets.py index f80eaad..821ac95 100644 --- a/pvwidgets.py +++ b/pvwidgets.py @@ -129,8 +129,8 @@ class CAQLineEdit(QLineEdit, PVGateway): fm = QFontMetricsF(QFont("Sans Serif", 10)) qrect = fm.boundingRect(self.suggested_text) _width_scaling_factor = 1.15 - self.setFixedHeight((fm.lineSpacing()*1.8)) - self.setFixedWidth(((qrect.width()) * _width_scaling_factor)) + self.setFixedHeight(int(fm.lineSpacing()*1.8)) + self.setFixedWidth(int(qrect.width() * _width_scaling_factor)) if self.pv_within_daq_group: self.qt_property_initial_values(qt_object_name=self.PV_DAQ_CA) @@ -204,9 +204,9 @@ class CAQLabel(QLabel, PVGateway): fm = QFontMetricsF(QFont("Sans Serif", 10)) qrect = fm.boundingRect(self.suggested_text) _width_scaling_factor = 1.15 - - self.setFixedHeight((fm.lineSpacing()*1.8)) - self.setFixedWidth((qrect.width() * _width_scaling_factor)) + + self.setFixedHeight(int(fm.lineSpacing()*1.8)) + self.setFixedWidth(int(qrect.width() * _width_scaling_factor)) if self.pv_within_daq_group: self.qt_property_initial_values(qt_object_name=self.PV_DAQ_CA) @@ -468,8 +468,8 @@ class CAQMessageButton(QPushButton, PVGateway): _width_scaling_factor = 1.0 self.setText(self.msg_label) - self.setFixedHeight((fm.lineSpacing()*1.8)) - self.setFixedWidth((qrect.width() * _width_scaling_factor)) + self.setFixedHeight(int(fm.lineSpacing()*1.8)) + self.setFixedWidth(int(qrect.width() * _width_scaling_factor)) self.qt_property_initial_values(qt_object_name=self.PV_CONTROLLER) @@ -575,9 +575,7 @@ class CAQTextEntry(QLineEdit, PVGateway): def configure_widget(self): self.setFocusPolicy(Qt.StrongFocus) - - - + f = QFont("Sans Serif") f.setPixelSize(11) @@ -586,11 +584,9 @@ class CAQTextEntry(QLineEdit, PVGateway): qrect = fm.boundingRect(self.suggested_text) _width_scaling_factor = 1.2 - - - - self.setFixedHeight(18) #(fm.lineSpacing()*1.6)) - self.setFixedWidth((qrect.width()+20) * _width_scaling_factor) + + self.setFixedHeight(int(fm.lineSpacing()*1.8)) + self.setFixedWidth(int(qrect.width()+20 * _width_scaling_factor)) self.qt_property_initial_values(qt_object_name=self.PV_CONTROLLER) @@ -722,8 +718,8 @@ class CAQSpinBox(QSpinBox, PVGateway): qrect = fm.boundingRect(_suggested_text) _width_scaling_factor = 1.0 - self.setFixedHeight((fm.lineSpacing()*1.8)) - self.setFixedWidth(((qrect.width()) * _width_scaling_factor)) + self.setFixedHeight(int(fm.lineSpacing()*1.8)) + self.setFixedWidth(int(qrect.width() * _width_scaling_factor)) self.qt_property_initial_values(qt_object_name=self.PV_CONTROLLER) @@ -943,8 +939,8 @@ class CAQDoubleSpinBox(QDoubleSpinBox, PVGateway): _width_scaling_factor = 1.15 - self.setFixedHeight((fm.lineSpacing()*1.8)) - self.setFixedWidth(((qrect.width()) * _width_scaling_factor)) + self.setFixedHeight(int(fm.lineSpacing()*1.8)) + self.setFixedWidth(int(qrect.width() * _width_scaling_factor)) self.qt_property_initial_values(qt_object_name=self.PV_CONTROLLER) @@ -1254,8 +1250,8 @@ class CAQTableWidget(QTableWidget): self.setItem(_row, val_col_no, QTableWidgetItem(qtwi)) - self.item(_row, val_col_no).setTextAlignment(Qt.AlignRight | - Qt.AlignVCenter) + self.item(_row, val_col_no).setTextAlignment( + Qt.AlignmentFlag(Qt.AlignRight|Qt.AlignVCenter)) _ts_date = _pvd.tsDateAsString _ts_str_len = len(_ts_date) @@ -1396,7 +1392,7 @@ class CAQTableWidget(QTableWidget): self.notify_freq_hz = abs(notify_freq_hz) self.notify_freq_hz_default = self.notify_freq_hz self.notify_milliseconds = 0 if self.notify_freq_hz == 0 else \ - 1000 / self.notify_freq_hz + int(1000 / self.notify_freq_hz) self.notify_unison = bool(notify_unison) and bool(self.notify_freq_hz) @@ -1781,8 +1777,8 @@ class CAQTableWidget(QTableWidget): _f.setPointSize(8) qtwi.setFont(_f) self.setItem(_row, _column_no, qtwi) - self.item(_row, _column_no).setTextAlignment(Qt.AlignRight | - Qt.AlignVCenter) + self.item(_row, _column_no).setTextAlignment( + Qt.AlignmentFlag(Qt.AlignRight|Qt.AlignVCenter)) def set_init_values(self, values): @@ -1801,9 +1797,9 @@ class CAQTableWidget(QTableWidget): _f.setPointSize(8) qtwi.setFont(_f) self.setItem(_row, _column_no, qtwi) - self.item(_row, _column_no).setTextAlignment(Qt.AlignRight | - Qt.AlignVCenter) - + self.item(_row, _column_no).setTextAlignment( + Qt.AlignmentFlag(Qt.AlignRight|Qt.AlignVCenter)) + def update_init_values(self): _start = 0 @@ -1815,8 +1811,7 @@ class CAQTableWidget(QTableWidget): return for _row in range(_start, _end): - - + _handle = self.pv_gateway[_row].handle _value = self.pv_gateway[_row].cafe.getCache(_handle) @@ -1831,9 +1826,10 @@ class CAQTableWidget(QTableWidget): qtwi.setFont(_f) self.setItem(_row, _column_no, qtwi) - self.item(_row, _column_no).setTextAlignment(Qt.AlignRight | - Qt.AlignVCenter) - + self.item(_row, _column_no).setTextAlignment( + Qt.AlignmentFlag(Qt.AlignRight|Qt.AlignVCenter)) + + def configure_widget(self): @@ -1873,15 +1869,15 @@ class CAQTableWidget(QTableWidget): f.setPointSize(8) qtwt.setFont(f) self.setItem(i, _pv_column, qtwt) - self.item(i, _pv_column).setTextAlignment(Qt.AlignHCenter | - Qt.AlignVCenter) + self.item(i, _pv_column).setTextAlignment( + Qt.AlignmentFlag(Qt.AlignHCenter|Qt.AlignVCenter)) else: istart = 0 for i_column in range(istart, self.no_columns-1): self.setItem(i, i_column, QTableWidgetItem(str(""))) - self.item(i, i_column).setTextAlignment(Qt.AlignHCenter | - Qt.AlignVCenter) + self.item(i, i_column).setTextAlignment( + Qt.AlignmentFlag(Qt.AlignHCenter|Qt.AlignVCenter)) self.pv2item_dict[self.pv_gateway[i]] = i cb_item = QTableWidgetItem() @@ -1914,7 +1910,8 @@ class CAQTableWidget(QTableWidget): if 'PV' in self.columns_dict: self.setCellWidget(len(self.pv_gateway), 0, self.init_widget) else: - self.setCellWidget(len(self.pv_gateway), self.columns_dict['Init'], self.init_widget) + self.setCellWidget(len(self.pv_gateway), + self.columns_dict['Init'], self.init_widget) self.restore_widget = QWidget() self.restore_layout = QHBoxLayout(self.restore_widget) @@ -1957,7 +1954,8 @@ class CAQTableWidget(QTableWidget): _standby_layout.setAlignment(Qt.AlignCenter) _standby_layout.setContentsMargins(1, 1, 0, 0) _standby_widget.setLayout(_standby_layout) - self.setCellWidget(len(self.pv_gateway), self.columns_dict['Standby'], _standby_widget) + self.setCellWidget(len(self.pv_gateway), + self.columns_dict['Standby'], _standby_widget) #Do not display no for last row (Reconnect button) @@ -2065,8 +2063,8 @@ class CAQTableWidget(QTableWidget): for i_column in range(istart, self.no_columns-2): self.item(_row, i_column).setForeground(QColor("#000000")) - self.item(_row, i_column).setTextAlignment(Qt.AlignRight | - Qt.AlignVCenter) + self.item(_row, i_column).setTextAlignment( + Qt.AlignmentFlag(Qt.AlignRight|Qt.AlignVCenter)) self.item(_row, self.columns_dict['Value']).setBackground( QColor("#ffffff")) @@ -2111,10 +2109,12 @@ class CAQTableWidget(QTableWidget): qtwi.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled | Qt.ItemIsEditable) #qtwi.setEditTriggers(QAbstractItemView.AllEditTriggers) self.setItem(_row, self.columns_dict['Value'], qtwi) - #self.item(_row, self.columns_dict['Value']).setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled | Qt.ItemIsEditable) - #self.item(_row, self.columns_dict['Value']).setEditTriggers(QAbstractItemView.AllEditTriggers) + #self.item(_row, self.columns_dict['Value']).setFlags( + #Qt.ItemIsSelectable | Qt.ItemIsEnabled | Qt.ItemIsEditable) + #self.item(_row, self.columns_dict['Value']).setEditTriggers( + #QAbstractItemView.AllEditTriggers) self.item(_row, self.columns_dict['Value']).setTextAlignment( - Qt.AlignRight | Qt.AlignVCenter) + Qt.AlignmentFlag(Qt.AlignRight|Qt.AlignVCenter)) if 'Timestamp' in self.columns_dict.keys(): @@ -2200,7 +2200,8 @@ class CAQTableWidget(QTableWidget): QColor(self.pv_gateway[_row].bg_readback)) #self.item(_row, self.columns_dict['Value']).setBackground( # QColor("#ffffe1")) - #self.item(_row, self.columns_dict['Value']).setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled | Qt.ItemIsEditable) + #self.item(_row, self.columns_dict['Value']).setFlags( + #Qt.ItemIsSelectable | Qt.ItemIsEnabled | Qt.ItemIsEditable) if 'Timestamp' in self.columns_dict.keys(): self.item(_row, self.columns_dict['Timestamp']).setBackground( @@ -2585,7 +2586,7 @@ class QResultsWidget: qlabel.setFont(_font) qlabel.setStyleSheet(("QLabel{color:black;" + "margin:0px; padding:2px;}")) - qlabel.setFixedWidth(qrect1.width() * _width_scaling_factor) + qlabel.setFixedWidth(int(qrect1.width() * _width_scaling_factor)) qlabel.setFixedHeight(_widget_height) qle.setFocusPolicy(Qt.NoFocus) @@ -2594,7 +2595,7 @@ class QResultsWidget: "background-color: lightgray;" + "qproperty-readOnly: true;" + "margin:0px; padding:2px;}")) - qle.setFixedWidth(qrect2.width() * _width_scaling_factor_le) + qle.setFixedWidth(int(qrect2.width() * _width_scaling_factor_le)) qle.setFixedHeight(_widget_height) qle.setAlignment(Qt.AlignRight) @@ -2659,13 +2660,13 @@ class QResultsWidget: table.resizeColumnsToContents() table.resizeRowsToContents() - table.setFixedHeight((fm.lineSpacing() * _factor * len( + table.setFixedHeight(int(fm.lineSpacing() * _factor * len( self.table_dict)) + fm.lineSpacing()*2) - table.setFixedWidth(((qrect.width()) * _width_scaling_factor)) + table.setFixedWidth(int(qrect.width() * _width_scaling_factor)) _vbox2.addWidget(table) - _vbox2.setAlignment(Qt.AlignCenter|Qt.AlignTop) + _vbox2.setAlignment(Qt.AlignmentFlag(Qt.AlignCenter|Qt.AlignTop)) _vbox2_widget.setLayout(_vbox2) _vbox.addWidget(_vbox2_widget) @@ -2673,9 +2674,9 @@ class QResultsWidget: self._group_box.setLayout(_vbox) self._group_box.setContentsMargins(20, 20, 20, 20) self._group_box.setAlignment(Qt.AlignTop) - self._group_box.setFixedHeight( - table.height() + (_widget_height*len(self.summary_dict))) - self._group_box.setFixedWidth(table.width() + 20) + self._group_box.setFixedHeight(int( + table.height() + (_widget_height*len(self.summary_dict)))) + self._group_box.setFixedWidth(int(table.width() + 20)) return self._group_box @@ -2709,14 +2710,14 @@ class QResultsTableWidget(): table.setFixedHeight(400) _vbox2.addWidget(table) - _vbox2.setAlignment(Qt.AlignCenter|Qt.AlignTop) + _vbox2.setAlignment(Qt.AlignmentFlag(Qt.AlignCenter|Qt.AlignTop)) _vbox2_widget.setLayout(_vbox2) self._group_box.setLayout(_vbox2) self._group_box.setContentsMargins(20, 20, 20, 20) self._group_box.setAlignment(Qt.AlignTop) - self._group_box.setFixedWidth(table.width() + 20) + self._group_box.setFixedWidth(int(table.width() + 20)) return self._group_box