sf-mx/SwissMX
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tracking object bugs after collection

Browse Source
This commit is contained in:
zamofing_t
2022-09-19 09:22:28 +02:00
parent a1ceef7de9
commit 21afed9739
5 changed files with 54 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
epics_widgets/MotorTweak.py
View File

@@ -20,7 +20,7 @@ SPMG_GO = 3
class MotorTweak(QWidget, Ui_MotorTweak):
event_val = pyqtSignal(str, dict)
event_readback = pyqtSignal(str, float, dict)
event_rbv = pyqtSignal(str, float, dict)
event_soft_limit = pyqtSignal(str, dict)
event_high_hard_limit = pyqtSignal(str, dict)
event_low_hard_limit = pyqtSignal(str, dict)
@@ -202,7 +202,7 @@ class MotorTweak(QWidget, Ui_MotorTweak):
if field == 'VAL':
self.event_val.emit(self._pvname, kw)
elif field == 'RBV':
self.event_readback.emit(kw['alias'], kw['value'], kw)
self.event_rbv.emit(kw['alias'], kw['value'], kw)
elif field == 'LVIO':
self.event_soft_limit.emit(self._pvname, kw)
elif field == 'HLS':
@@ -382,3 +382,31 @@ class MotorTweak(QWidget, Ui_MotorTweak):
path.setFillRule(Qt.WindingFill)
path.addRoundedRect(x, y, w, h, rounding, rounding)
qp.drawPath(path)
if __name__ == "__main__":
logging.basicConfig(level=logging.DEBUG, format='%(levelname)s:%(module)s:%(lineno)d:%(funcName)s:%(message)s ')
_log.debug('start')
def cb_rbv(*args,**kwargs):
_log.debug(f'RBV{args} {kwargs}')
import sys
from PyQt5.QtWidgets import QApplication, QWidget, QLabel
app=QApplication(sys.argv)
mot_widget=MotorTweak()
#mot_widget.event_val.connect(cb_rbv)
mot_widget.event_rbv.connect(cb_rbv)
pfx='SAR-EXPMX'
mot_widget.connect_motor(f"{pfx}:MOT_FY", alias="fast_y", label="fast Y")
mot_widget.setGeometry(50, 50, 520, 100)
mot_widget.setWindowTitle("PyQt5 Example")
mot_widget.show()
sys.exit(app.exec_())

4
epics_widgets/SimMotorTweak.py
View File

@@ -34,7 +34,7 @@ class SimMotor:
class SimMotorTweak(QWidget, Ui_MotorTweak):
event_val = pyqtSignal(str, dict)
event_readback = pyqtSignal(str, dict)
event_rbv = pyqtSignal(str, dict)
event_soft_limit = pyqtSignal(str, dict)
event_high_hard_limit = pyqtSignal(str, dict)
event_low_hard_limit = pyqtSignal(str, dict)
@@ -162,7 +162,7 @@ class SimMotorTweak(QWidget, Ui_MotorTweak):
if field == 'VAL':
self.event_val.emit(m._rec_name, kw)
elif field == 'RBV':
self.event_readback.emit(m._rec_name, kw)
self.event_rbv.emit(m._rec_name, kw)
elif field == 'LVIO':
self.event_soft_limit.emit(m._rec_name, kw)
elif field == 'HLS':

4
epics_widgets/SmaractMotorTweak.py
View File

@@ -23,7 +23,7 @@ SPMG_GO = 3
class SmaractMotorTweak(QWidget, Ui_MotorTweak):
event_val = pyqtSignal(str, dict)
event_readback = pyqtSignal(str, dict)
event_rbv = pyqtSignal(str, dict)
event_soft_limit = pyqtSignal(str, dict)
event_high_hard_limit = pyqtSignal(str, dict)
event_low_hard_limit = pyqtSignal(str, dict)
@@ -184,7 +184,7 @@ class SmaractMotorTweak(QWidget, Ui_MotorTweak):
if field == 'VAL':
self.event_val.emit(self._pvname, kw)
elif field == 'RBV':
self.event_readback.emit(self._pvname, kw)
self.event_rbv.emit(self._pvname, kw)
elif field == 'LVIO':
self.event_soft_limit.emit(self._pvname, kw)
elif field == 'HLS':