Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 20b6749ed4 |
@@ -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
|
||||
@@ -714,7 +714,6 @@ class PVGateway(QWidget):
|
||||
def receive_monitor_update(self, value, status, alarm_severity):
|
||||
'''Triggered by monitor signal. For Widget to overload.'''
|
||||
|
||||
|
||||
|
||||
self.mutex_post_display.lock()
|
||||
_current_qt_dynamic_property = self.qt_dynamic_property_get()
|
||||
@@ -767,8 +766,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
|
||||
|
||||
@@ -1239,6 +1239,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)+ " ")
|
||||
@@ -1447,7 +1449,6 @@ 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(
|
||||
@@ -2098,7 +2099,10 @@ 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()
|
||||
|
||||
Reference in New Issue
Block a user