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

lot a small steps...

Browse Source
This commit is contained in:
zamofing_t
2022-08-16 18:45:26 +02:00
parent ed3502f002
commit aa9a2c9948
3 changed files with 53 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
epics_widgets/SimMotorTweak.py
View File

@@ -72,6 +72,8 @@ class SimMotorTweak(QWidget, Ui_MotorTweak):
self._tweak_val.setText(str(twv))
self._tweak_val.setValidator(QDoubleValidator(tweak_min, tweak_max, 4, self._tweak_val))
#self._tweak_val.editingFinished.connect(lambda m=self._pv_tweak_val: m.put(self._tweak_val.text()))
self.tweak_forward.clicked.connect(lambda m: self.move_relative(float(self._tweak_val.text())))
self.tweak_reverse.clicked.connect(lambda m: self.move_relative(-float(self._tweak_val.text())))
#self.tweak_forward.clicked.connect(lambda m: self._pv_tweak_f.put(1))
#self.tweak_reverse.clicked.connect(lambda m: self._pv_tweak_r.put(1))
@@ -101,9 +103,11 @@ class SimMotorTweak(QWidget, Ui_MotorTweak):
def move_relative(self, dist, delay=None):
target = self.motor._pos + dist
self.motor._pos += dist
if delay:
sleep(delay)
_log.debug('{} rel move => {}'.format(self.motor._short_name, dist))
self.update_label()
def get_position(self):
return self.motor._pos
@@ -136,14 +140,14 @@ class SimMotorTweak(QWidget, Ui_MotorTweak):
return True # in (0, 3)
def move_motor_to_position(self, drive=None, wait=False, assert_position=False):
if assert_position:
wait=True
if drive is None:
_log.debug('{} abs target from widget'.format(self.motor._short_name))
drive = float(self._drive_val.text())
_log.debug('{} abs move => {}'.format(self.motor._short_name, drive))
self._pos=drive
self.motor._pos=drive
self.update_label()
def emit_signals(self, **kw):
field = kw['source_field']
@@ -189,9 +193,11 @@ class SimMotorTweak(QWidget, Ui_MotorTweak):
self._drive_val.setText(v)
def update_label(self, **kwargs):
self.label.setText(self._templates[self._label_style].format(rbv=self._pv_readback.get()))
self.tweak_forward.setToolTip('tweak forward by {:.3f} {}'.format(self._pv_tweak_val.get(), self._units))
self.tweak_reverse.setToolTip('tweak reverse by {:.3f} {}'.format(self._pv_tweak_val.get(), self._units))
self.label.setText(self._templates[self._label_style].format(rbv=self.motor._pos))
self._drive_val.setText(f'{self.motor._pos:.3f}')
twv=float(self._tweak_val.text())
self.tweak_forward.setToolTip('tweak forward by {:.3f} {}'.format(twv, self.motor._units))
self.tweak_reverse.setToolTip('tweak reverse by {:.3f} {}'.format(twv, self.motor._units))
def tweak_event(self, event):
sign = event.angleDelta().y()