Compare commits
35 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c0dd0c6038 | |||
| 0f62863828 | |||
| ab8534c62a | |||
| 9852226d3b | |||
| 434679d9ce | |||
| f229ba2059 | |||
| c06bc4f58e | |||
| 3e5255c55e | |||
| 8ae83b2ea6 | |||
| 49be032511 | |||
| 4b5f911c10 | |||
| 727b48e1c6 | |||
| d997517dc1 | |||
| 68e8da943e | |||
| bf08fbe488 | |||
| f335663b55 | |||
| 9829be0bcd | |||
| 14400488a3 | |||
| 76528ed3c0 | |||
| 9beed3ff90 | |||
| 53a0f6495d | |||
| fee2e64bb3 | |||
| 15394066ed | |||
| 0441a79305 | |||
| 2f0e9aefee | |||
| d148f6777f | |||
| c95afc03b5 | |||
| a830a1a44b | |||
| 952cff5002 | |||
| 681761ca40 | |||
| 20b6749ed4 | |||
| fa33a4479d | |||
| 54b332f69d | |||
| 0ff5ca7b49 | |||
| 76a6f28136 |
@@ -113,7 +113,7 @@ class PVGateway(QWidget):
|
||||
1000 / self.notify_freq_hz
|
||||
|
||||
self.notify_unison = bool(notify_unison) and bool(self.notify_freq_hz)
|
||||
|
||||
|
||||
self.parent = parent
|
||||
self.settings = self.parent.settings
|
||||
|
||||
@@ -634,7 +634,7 @@ class PVGateway(QWidget):
|
||||
DAQ may be in BS mode, but channels within DAQ stream that
|
||||
are not BS enabled will be flagged as CA Mode, i.e., CARead
|
||||
'''
|
||||
|
||||
|
||||
_current_qt_dynamic_property = self.qt_dynamic_property_get()
|
||||
|
||||
alarm_severity = daq_pvd.alarmSeverity
|
||||
@@ -708,7 +708,7 @@ class PVGateway(QWidget):
|
||||
|
||||
|
||||
def receive_monitor_dbr_time(self, pvdata, alarm_severity):
|
||||
print("called from gateway", self.pv_name, alarm_severity)
|
||||
print("called from gateway", self.pv_name, alarm_severity, flush=True)
|
||||
pvdata.show()
|
||||
|
||||
def receive_monitor_update(self, value, status, alarm_severity):
|
||||
@@ -765,6 +765,7 @@ class PVGateway(QWidget):
|
||||
'''Callback function to be invoked on change of pv value.
|
||||
cafe.getCache and cafe.set operations permitted within callback.
|
||||
'''
|
||||
|
||||
self.mutex.lock()
|
||||
|
||||
pv_name = pvname
|
||||
@@ -999,7 +1000,6 @@ class PVGateway(QWidget):
|
||||
self._qt_readback_color_mode()
|
||||
#self.setStatusTip(self.status_tip)
|
||||
|
||||
|
||||
elif self.qt_object_name == self.PV_CONTROLLER:
|
||||
if self.color_mode == self.ACT_ON_BEAM:
|
||||
#self.setStatusTip("PV setting acts directly on beam")
|
||||
@@ -1008,7 +1008,6 @@ class PVGateway(QWidget):
|
||||
self.color_mode = self.NOT_ACT_ON_BEAM
|
||||
#self.setStatusTip("PV setting does not influence beam")
|
||||
|
||||
|
||||
#self._qt_property_selected =
|
||||
self._qt_dynamic_property_set(self.color_mode)
|
||||
|
||||
|
||||
1696
pvgateway.py-
1696
pvgateway.py-
File diff suppressed because it is too large
Load Diff
1910
pvgateway.py:2.9
1910
pvgateway.py:2.9
File diff suppressed because it is too large
Load Diff
280
pvwidgets.py
280
pvwidgets.py
@@ -43,7 +43,7 @@ class QTaggedLineEdit(QWidget):
|
||||
self.line_edit.setFixedHeight(24)
|
||||
font = QFont("sans serif", 16)
|
||||
fm = QFontMetricsF(font)
|
||||
self.line_edit.setMaximumWidth(fm.width(self.parameter)+20)
|
||||
self.line_edit.setMaximumWidth(int(fm.width(self.parameter)+20))
|
||||
self.label.setBuddy(self.line_edit)
|
||||
layout = QBoxLayout(
|
||||
QBoxLayout.LeftToRight if position == "LEFT" else \
|
||||
@@ -129,9 +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)
|
||||
@@ -205,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)
|
||||
@@ -469,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)
|
||||
|
||||
@@ -540,12 +539,14 @@ class CAQTextEntry(QLineEdit, PVGateway):
|
||||
trigger_monitor = Signal(object, int)
|
||||
trigger_connect = Signal(int, str, int)
|
||||
|
||||
def __init__(self, parent=None, pv_name: str = "", monitor_callback=None,
|
||||
def __init__(self, parent=None, pv_name: str="", monitor_callback=None,
|
||||
pv_within_daq_group: bool = False, color_mode=None,
|
||||
show_units=False, prefix: str = "", suffix: str = ""):
|
||||
show_units=False, prefix: str="", suffix: str="",
|
||||
precision: int=0):
|
||||
super().__init__(parent, pv_name, monitor_callback, pv_within_daq_group,
|
||||
color_mode, show_units, prefix, suffix,
|
||||
connect_callback=self.py_connect_callback)
|
||||
connect_callback=self.py_connect_callback,
|
||||
precision=precision)
|
||||
|
||||
self.is_initialize_complete() #waits a fraction of a second
|
||||
|
||||
@@ -565,8 +566,18 @@ class CAQTextEntry(QLineEdit, PVGateway):
|
||||
@Slot(int, int, int)
|
||||
@Slot(float, int, int)
|
||||
def receive_monitor_update(self, value, status, alarm_severity):
|
||||
#print ("FONT-1", self.font().pixelSize(), value)
|
||||
#print ("FONT-1", self.font().pointSize(), value)
|
||||
#self.setFont(QFont("Sans Serif", 8))
|
||||
#QLineEdit.setFont(self, QFont("Sans Serif", 8))
|
||||
#self.font().setPixelSize(12)
|
||||
#QLineEdit.font().setPixelSize(8)
|
||||
|
||||
PVGateway.receive_monitor_update(self, value, status, alarm_severity)
|
||||
|
||||
#self.font().setPixelSize(12)
|
||||
#print ("FONT-3", self.font().pixelSize(), value)
|
||||
#print ("FONT-3", self.font().pointSize(), value)
|
||||
|
||||
@Slot(int, str, int)
|
||||
def receive_connect_update(self, handle: int, pv_name: str, status: int):
|
||||
'''Triggered by connect signal'''
|
||||
@@ -574,14 +585,20 @@ class CAQTextEntry(QLineEdit, PVGateway):
|
||||
|
||||
def configure_widget(self):
|
||||
self.setFocusPolicy(Qt.StrongFocus)
|
||||
|
||||
fm = QFontMetricsF(QFont("Sans Serif", 12))
|
||||
#self.setFont(QFont("Sans Serif", 12))
|
||||
#QLineEdit.setFont(self, QFont("Sans Serif", 8))
|
||||
#f = QFont("Sans Serif")
|
||||
#f.setPixelSize(11)
|
||||
#self.setFont(f)
|
||||
#fm = QFontMetricsF(f)
|
||||
#As for CAQLabel
|
||||
QLineEdit.setFont(self, QFont("Sans Serif", 12))
|
||||
fm = QFontMetricsF(QFont("Sans Serif", 9))
|
||||
qrect = fm.boundingRect(self.suggested_text)
|
||||
|
||||
_width_scaling_factor = 1.15
|
||||
|
||||
self.setFixedHeight((fm.lineSpacing()*1.8))
|
||||
self.setFixedWidth(((qrect.width()+10) * _width_scaling_factor))
|
||||
_width_scaling_factor = 1.2
|
||||
|
||||
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)
|
||||
|
||||
@@ -599,7 +616,7 @@ class CAQTextEntry(QLineEdit, PVGateway):
|
||||
else:
|
||||
valStr = ("{: .%sf}" % self.precision)
|
||||
strText = valStr.format(round(val, self.precision))
|
||||
print(strText, " precision ", self.precision)
|
||||
#print(strText, " precision ", self.precision)
|
||||
self.setText(strText)
|
||||
else:
|
||||
#Do this for TextInfo cache
|
||||
@@ -609,6 +626,9 @@ class CAQTextEntry(QLineEdit, PVGateway):
|
||||
def setText(self, value):
|
||||
QLineEdit.setText(self, value)
|
||||
self.currentText = self.text()
|
||||
#print ("FONT-2", self.font().pixelSize(), value)
|
||||
#print ("FONT-2", self.font().pointSize(), value)
|
||||
|
||||
|
||||
def enterEvent(self, event):
|
||||
if self.pv_info is not None:
|
||||
@@ -644,7 +664,7 @@ class CAQTextEntry(QLineEdit, PVGateway):
|
||||
|
||||
|
||||
class CAQSpinBox(QSpinBox, PVGateway):
|
||||
'''Channel access enabled QTextEntry widget'''
|
||||
'''Channel access enabled QSpinBox widget'''
|
||||
trigger_monitor_float = Signal(float, int, int)
|
||||
trigger_monitor_int = Signal(int, int, int)
|
||||
trigger_monitor_str = Signal(str, int, int)
|
||||
@@ -713,8 +733,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)
|
||||
|
||||
@@ -934,8 +954,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)
|
||||
|
||||
@@ -1105,25 +1125,21 @@ class reconnectQPushButton(QPushButton, QThread):
|
||||
def reconnect(self):
|
||||
QApplication.processEvents()
|
||||
|
||||
print("Reconnect")
|
||||
|
||||
self.isdirty = True
|
||||
if self._handles_to_reconnect:
|
||||
print("handles to reconnect", self._handles_to_reconnect, flush=True)
|
||||
|
||||
self.parent.cafe.reconnect(self._handles_to_reconnect)
|
||||
print("handles reconnected", self._handles_to_reconnect, flush=True)
|
||||
|
||||
self.isdirty = False
|
||||
#Uncheck reconnected channels
|
||||
for i in range(0, len(self.parent.pv_gateway)):
|
||||
#print(i, len(self.parent.pv_gateway), flush=True)
|
||||
#print( "ischecked", self.parent.item(
|
||||
# i, self.parent.no_columns-1).checkState(), Qt.Checked )
|
||||
#print("Connected", self.parent.cafe.isConnected(
|
||||
# self.parent.pv_gateway[i].handle), flush=True)
|
||||
|
||||
if self.parent.item(
|
||||
i, self.parent.no_columns-1).checkState() == Qt.Checked:
|
||||
if self.parent.cafe.isConnected(
|
||||
self.parent.pv_gateway[i].handle):
|
||||
#print("isConnected", flush=True)
|
||||
|
||||
self.parent.item(
|
||||
i, self.parent.no_columns-1).setCheckState(False)
|
||||
else:
|
||||
@@ -1159,12 +1175,15 @@ class CAQTableWidget(QTableWidget):
|
||||
return newDataFlag
|
||||
|
||||
|
||||
def paint_rows(self, row_range: list = [], reset=False, last_row=[" ", " "],
|
||||
def paint_rows(self, row_range: list=[], reset=False, last_row=[" ", " "],
|
||||
columns=[0]):
|
||||
|
||||
_qcolor_last_line = QColor("#d1e8e9")
|
||||
self.font_pts11 = QTableWidgetItem().font()
|
||||
self.font_pts11.setPixelSize(11)
|
||||
self.font_pts8 = QTableWidgetItem().font()
|
||||
self.font_pts8.setPointSize(8)
|
||||
if not row_range:
|
||||
row_range = [0, self.rowCount()-1]
|
||||
|
||||
if reset:
|
||||
_qcolor = self.item(0, self.columnCount()-1).background()
|
||||
_start = 0
|
||||
@@ -1175,44 +1194,45 @@ class CAQTableWidget(QTableWidget):
|
||||
_end = row_range[1]
|
||||
|
||||
for _row in range(_start, _end):
|
||||
_cell = QTableWidgetItem("{0}".format(_row+1))
|
||||
if not reset:
|
||||
_cell.setFont(self.font_pts11)
|
||||
_cell.setBackground(_qcolor)
|
||||
|
||||
#if not reset:
|
||||
#_cell.setFont(self.font_pts8)
|
||||
if 1 in columns:
|
||||
self.item(_row, 0).setBackground(_qcolor)
|
||||
self.item(_row, 0).setFont(self.font_pts11)
|
||||
self.item(_row, 0).setFont(self.font_pts8)
|
||||
if 0 in columns:
|
||||
_cell = QTableWidgetItem("{0}".format(_row+1))
|
||||
#if not reset:
|
||||
_cell.setFont(self.font_pts8)
|
||||
#_cell.setTextAlignment(Qt.AlignCenter)
|
||||
self.setVerticalHeaderItem(_row, _cell)
|
||||
|
||||
|
||||
|
||||
#last row
|
||||
|
||||
if reset and 0 in columns:
|
||||
_cell = QTableWidgetItem("{0}".format(last_row[0]))
|
||||
_cell.setFont(self.font_pts11)
|
||||
_cell.setFont(self.font_pts8)
|
||||
self.setVerticalHeaderItem(self.rowCount()-1, _cell)
|
||||
|
||||
self.item(self.rowCount()-1, 0).setTextAlignment(Qt.AlignCenter)
|
||||
self.item(self.rowCount()-1, 0).setText(str(last_row[1]))
|
||||
self.item(self.rowCount()-1, 0).setBackground(_qcolor)
|
||||
self.item(self.rowCount()-1, 0).setFont(self.font_pts11)
|
||||
self.item(self.rowCount()-1, 0).setFont(self.font_pts8)
|
||||
elif last_row[0] != " ":
|
||||
_cell = QTableWidgetItem("{0}".format(last_row[0]))
|
||||
_cell.setBackground(_qcolor_last_line)
|
||||
_cell.setFont(self.font_pts11)
|
||||
_cell.setFont(self.font_pts8)
|
||||
self.setVerticalHeaderItem(self.rowCount()-1, _cell)
|
||||
|
||||
if columns:
|
||||
self.item(self.rowCount()-1, 0).setTextAlignment(Qt.AlignCenter)
|
||||
self.item(self.rowCount()-1, 0).setText(str(last_row[1]))
|
||||
self.item(self.rowCount()-1, 0).setBackground(_qcolor_last_line)
|
||||
self.item(self.rowCount()-1, 0).setFont(self.font_pts11)
|
||||
self.item(self.rowCount()-1, 0).setFont(self.font_pts8)
|
||||
|
||||
|
||||
def widget_update(self):
|
||||
|
||||
""" Called when self.notif_unison is True """
|
||||
for _row, pvgate in enumerate(self.pv_gateway):
|
||||
|
||||
if not pvgate.notify_unison:
|
||||
@@ -1230,6 +1250,8 @@ class CAQTableWidget(QTableWidget):
|
||||
|
||||
#if timestamps the same - then skip
|
||||
_value = _pvd.value[0]
|
||||
if self.scale_factor != 1:
|
||||
_value = _value * self.scale_factor
|
||||
_value = pvgate.format_display_value(_value)
|
||||
|
||||
qtwi = QTableWidgetItem(str(_value)+ " ")
|
||||
@@ -1243,8 +1265,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)
|
||||
@@ -1305,6 +1327,8 @@ class CAQTableWidget(QTableWidget):
|
||||
|
||||
self.item(_row, val_col_no).setBackground(
|
||||
QColor(pvgate.bg_readback))
|
||||
#self.item(_row, val_col_no).setBackground(
|
||||
# QColor('#aeae66'))
|
||||
if self.show_timestamp:
|
||||
self.item(_row, ts_col_no).setBackground(
|
||||
QColor(pvgate.bg_readback))
|
||||
@@ -1383,7 +1407,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)
|
||||
|
||||
@@ -1436,6 +1460,7 @@ class CAQTableWidget(QTableWidget):
|
||||
connect_triggers=False, notify_freq_hz=self.notify_freq_hz,
|
||||
notify_unison=self.notify_unison, precision=self.precision)
|
||||
|
||||
|
||||
self.pv_gateway[i].is_initialize_complete()
|
||||
self.pv_gateway[i].trigger_connect.connect(
|
||||
self.receive_connect_update)
|
||||
@@ -1555,7 +1580,7 @@ class CAQTableWidget(QTableWidget):
|
||||
time.sleep(self.set_delay)
|
||||
##self.standby_value_button.setEnabled(False)
|
||||
#QApplication.sendPostedEvents()
|
||||
QApplication.processEvents(QEventLoop.AllEvents, 1.0)
|
||||
QApplication.processEvents(QEventLoop.AllEvents, 1)
|
||||
|
||||
if status != self.cyca.ICAFE_NORMAL:
|
||||
_mess = ("The following devices reported an error " +
|
||||
@@ -1590,8 +1615,6 @@ class CAQTableWidget(QTableWidget):
|
||||
return status, status_list, _pvs_to_set
|
||||
|
||||
|
||||
|
||||
|
||||
def restore_init_values(self, pv_list: list = []):
|
||||
|
||||
_text = self.restore_value_button.text()
|
||||
@@ -1634,7 +1657,7 @@ class CAQTableWidget(QTableWidget):
|
||||
if status_list[i] != self.cyca.ICAFE_NORMAL:
|
||||
status = status_list[i]
|
||||
time.sleep(self.set_delay)
|
||||
QApplication.processEvents(QEventLoop.AllEvents, 1.0)
|
||||
QApplication.processEvents(QEventLoop.AllEvents, 1)
|
||||
|
||||
if status != self.cyca.ICAFE_NORMAL:
|
||||
_mess = ("The following device(s) reported an error " +
|
||||
@@ -1769,8 +1792,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):
|
||||
@@ -1789,9 +1812,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
|
||||
@@ -1803,8 +1826,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)
|
||||
|
||||
@@ -1819,9 +1841,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):
|
||||
|
||||
@@ -1830,6 +1853,9 @@ class CAQTableWidget(QTableWidget):
|
||||
_column_width_timestamp = 210
|
||||
_column_width_checkbox = 22
|
||||
|
||||
item_font = QTableWidgetItem().font()
|
||||
item_font.setPixelSize(13)
|
||||
|
||||
self.setRowCount(len(self.pv_gateway)+1)
|
||||
self.setColumnCount(self.no_columns)
|
||||
self.setEditTriggers(QAbstractItemView.NoEditTriggers)
|
||||
@@ -1857,17 +1883,16 @@ class CAQTableWidget(QTableWidget):
|
||||
f = qtwt.font()
|
||||
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()
|
||||
@@ -1884,9 +1909,9 @@ class CAQTableWidget(QTableWidget):
|
||||
self.init_layout = QHBoxLayout(self.init_widget)
|
||||
self.init_value_button = QPushButton()
|
||||
self.init_value_button.setText("Update")
|
||||
_f = self.init_value_button.font()
|
||||
_f.setPointSize(8)
|
||||
self.init_value_button.setFont(_f)
|
||||
f = self.init_value_button.font()
|
||||
f.setPointSize(8)
|
||||
self.init_value_button.setFont(f)
|
||||
self.init_value_button.setFixedWidth(64)
|
||||
self.init_value_button.clicked.connect(self.update_init_values)
|
||||
self.init_value_button.setToolTip(
|
||||
@@ -1900,7 +1925,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)
|
||||
@@ -1908,9 +1934,9 @@ class CAQTableWidget(QTableWidget):
|
||||
self.restore_value_button.setStyleSheet(
|
||||
"QPushButton{background-color: rgb(212, 219, 157);}")
|
||||
self.restore_value_button.setText("Restore")
|
||||
_f = self.restore_value_button.font()
|
||||
_f.setPointSize(8)
|
||||
self.restore_value_button.setFont(_f)
|
||||
f = self.restore_value_button.font()
|
||||
f.setPointSize(8)
|
||||
self.restore_value_button.setFont(f)
|
||||
self.restore_value_button.setFixedWidth(80)
|
||||
self.restore_value_button.clicked.connect(self.restore_init_values)
|
||||
self.restore_value_button.setToolTip(
|
||||
@@ -1932,9 +1958,9 @@ class CAQTableWidget(QTableWidget):
|
||||
self.standby_value_button.setStyleSheet(
|
||||
"QPushButton{background-color: rgb(212, 219, 157);}")
|
||||
self.standby_value_button.setText("Standby")
|
||||
_f = self.standby_value_button.font()
|
||||
_f.setPointSize(8)
|
||||
self.standby_value_button.setFont(_f)
|
||||
f = self.standby_value_button.font()
|
||||
f.setPointSize(8)
|
||||
self.standby_value_button.setFont(f)
|
||||
self.standby_value_button.setFixedWidth(80)
|
||||
self.standby_value_button.clicked.connect(self.set_standby_values)
|
||||
self.standby_value_button.setToolTip(
|
||||
@@ -1943,7 +1969,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)
|
||||
@@ -1958,10 +1985,10 @@ class CAQTableWidget(QTableWidget):
|
||||
f = self.reconnect_button.font()
|
||||
|
||||
if 'Timestamp' in self.columns_dict.keys():
|
||||
f.setPointSize(8)
|
||||
f.setPixelSize(11) #previous 13
|
||||
self.reconnect_button.setFixedWidth(100)
|
||||
else:
|
||||
f.setPointSize(7) #6
|
||||
f.setPixelSize(11) #6
|
||||
self.reconnect_button.setFixedWidth(66) #58
|
||||
|
||||
self.reconnect_button.setFont(f)
|
||||
@@ -1985,22 +2012,43 @@ class CAQTableWidget(QTableWidget):
|
||||
self.cb_item_all)
|
||||
|
||||
|
||||
|
||||
if 'PV' in self.columns_dict.keys():
|
||||
header_item = QTableWidgetItem("Process Variable")
|
||||
f = header_item.font()
|
||||
f.setPixelSize(13)
|
||||
header_item.setFont(f)
|
||||
self.setHorizontalHeaderItem(self.columns_dict['PV'], header_item)
|
||||
|
||||
if 'Init' in self.columns_dict.keys():
|
||||
self.setHorizontalHeaderItem(self.columns_dict['Init'],
|
||||
QTableWidgetItem("Initial Value"))
|
||||
|
||||
self.setHorizontalHeaderItem(self.columns_dict['Value'],
|
||||
QTableWidgetItem("Value"))
|
||||
header_item = QTableWidgetItem("Initial Value")
|
||||
f = header_item.font()
|
||||
f.setPixelSize(13)
|
||||
header_item.setFont(f)
|
||||
self.setHorizontalHeaderItem(self.columns_dict['Init'], header_item)
|
||||
|
||||
header_item = QTableWidgetItem("Value")
|
||||
f = header_item.font()
|
||||
f.setPixelSize(13)
|
||||
header_item.setFont(f)
|
||||
self.setHorizontalHeaderItem(self.columns_dict['Value'], header_item)
|
||||
|
||||
|
||||
if 'Timestamp' in self.columns_dict.keys():
|
||||
header_item = QTableWidgetItem("Timestamp")
|
||||
f = header_item.font()
|
||||
f.setPixelSize(13)
|
||||
header_item.setFont(f)
|
||||
self.setHorizontalHeaderItem(self.columns_dict['Timestamp'],
|
||||
QTableWidgetItem("Timestamp"))
|
||||
self.setHorizontalHeaderItem(self.columns_dict['Reconnect'],
|
||||
QTableWidgetItem("R"))
|
||||
header_item)
|
||||
|
||||
header_item = QTableWidgetItem("R")
|
||||
f = header_item.font()
|
||||
f.setPixelSize(13)
|
||||
header_item.setFont(f)
|
||||
self.setHorizontalHeaderItem(self.columns_dict['Reconnect'],
|
||||
header_item)
|
||||
|
||||
self.setFocusPolicy(Qt.NoFocus)
|
||||
self.setEditTriggers(QAbstractItemView.NoEditTriggers)
|
||||
self.setSelectionMode(QAbstractItemView.NoSelection)
|
||||
@@ -2030,8 +2078,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"))
|
||||
@@ -2064,15 +2112,26 @@ class CAQTableWidget(QTableWidget):
|
||||
if self.scale_factor != 1:
|
||||
value = value * self.scale_factor
|
||||
_value = self.pv_gateway[_row].format_display_value(value)
|
||||
|
||||
#if 'QMD10' in self.pv_gateway[_row].pv_name:
|
||||
# print(_value + " from widgets.py" + self.pv_gateway[_row].pv_name)
|
||||
|
||||
|
||||
qtwi = QTableWidgetItem(str(_value) + " ")
|
||||
f = qtwi.font()
|
||||
f.setPointSize(8)
|
||||
qtwi.setFont(f)
|
||||
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']).setTextAlignment(
|
||||
Qt.AlignRight | Qt.AlignVCenter)
|
||||
|
||||
Qt.AlignmentFlag(Qt.AlignRight|Qt.AlignVCenter))
|
||||
|
||||
|
||||
if 'Timestamp' in self.columns_dict.keys():
|
||||
_handle = self.pv_gateway[_row].handle
|
||||
_pvd = self.pv_gateway[_row].cafe.getPVCache(_handle)
|
||||
@@ -2108,6 +2167,8 @@ class CAQTableWidget(QTableWidget):
|
||||
|
||||
_prop = self.pv_gateway[_row].qt_dynamic_property_get()
|
||||
|
||||
|
||||
|
||||
if _prop == self.pv_gateway[_row].READBACK_ALARM:
|
||||
|
||||
if alarm_severity == self.pv_gateway[_row].cyca.SEV_MAJOR:
|
||||
@@ -2152,6 +2213,11 @@ class CAQTableWidget(QTableWidget):
|
||||
elif _prop == self.pv_gateway[_row].READBACK_STATIC:
|
||||
self.item(_row, self.columns_dict['Value']).setBackground(
|
||||
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)
|
||||
|
||||
if 'Timestamp' in self.columns_dict.keys():
|
||||
self.item(_row, self.columns_dict['Timestamp']).setBackground(
|
||||
QColor(self.pv_gateway[_row].bg_readback))
|
||||
@@ -2535,7 +2601,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)
|
||||
@@ -2544,7 +2610,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)
|
||||
|
||||
@@ -2609,13 +2675,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)
|
||||
@@ -2623,9 +2689,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
|
||||
|
||||
|
||||
@@ -2659,14 +2725,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
|
||||
|
||||
|
||||
|
||||
3142
pvwidgets.py-
3142
pvwidgets.py-
File diff suppressed because it is too large
Load Diff
3461
pvwidgets.py:2.9
3461
pvwidgets.py:2.9
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user