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

refactoring and log of coorinate work

Browse Source
This commit is contained in:
zamofing_t
2022-09-02 12:46:51 +02:00
parent a54e580664
commit 45e8ab680f
8 changed files with 215 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
epics_widgets/MotorTweak.py
View File

@@ -60,7 +60,7 @@ class MotorTweak(QWidget, Ui_MotorTweak):
self.set_motor_validator()
self._drive_val.setText(m.get('VAL', as_string=True))
self._drive_val.returnPressed.connect(self.move_motor_to_position)
self._drive_val.returnPressed.connect(self.move_abs)
tweak_min = kwargs.get("tweak_min", 0.0001)
tweak_max = kwargs.get("tweak_max", 10.0)
@@ -112,7 +112,7 @@ class MotorTweak(QWidget, Ui_MotorTweak):
lineedit.setValidator(QDoubleValidator(min, max, m.PV('PREC').get(), lineedit))
def move_relative(self, dist):
def move_rel(self, dist):
try:
self._val+=dist
except AttributeError:
@@ -144,7 +144,7 @@ class MotorTweak(QWidget, Ui_MotorTweak):
status = DeltatauMotorStatus(m.motor_status)
return bool(DeltatauMotorStatus.MOTOR_HAS_BEEN_HOMED & status)
def move_motor_to_position(self, drive=None, wait=False, assert_position=False):
def move_abs(self, drive=None, wait=False, assert_position=False):
if drive is None:
drive = float(self._drive_val.text())
if assert_position:

10
epics_widgets/SimMotorTweak.py
View File

@@ -61,7 +61,7 @@ class SimMotorTweak(QWidget, Ui_MotorTweak):
self._motor=m=SimMotor(rec_name, short_name)
self.set_motor_validator()
self._drive_val.setText(str(m._pos))
self._drive_val.returnPressed.connect(self.move_motor_to_position)
self._drive_val.returnPressed.connect(self.move_abs)
self.jog_forward.hide()
self.jog_reverse.hide()
@@ -71,8 +71,8 @@ class SimMotorTweak(QWidget, Ui_MotorTweak):
self._tweak_val.setText(str(m._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.move_rel(float(self._tweak_val.text())))
self.tweak_reverse.clicked.connect(lambda m: self.move_rel(-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))
@@ -102,7 +102,7 @@ class SimMotorTweak(QWidget, Ui_MotorTweak):
lineedit.setValidator(QDoubleValidator(min, max, 5, lineedit))
def move_relative(self, dist, delay=None):
def move_rel(self, dist, delay=None):
m=self._motor
m._pos += dist
if delay:
@@ -144,7 +144,7 @@ class SimMotorTweak(QWidget, Ui_MotorTweak):
def is_done(self):
return True # in (0, 3)
def move_motor_to_position(self, drive=None, wait=False, assert_position=False):
def move_abs(self, drive=None, wait=False, assert_position=False):
m=self._motor
if assert_position:
wait=True

6
epics_widgets/SmaractMotorTweak.py
View File

@@ -80,7 +80,7 @@ class SmaractMotorTweak(QWidget, Ui_MotorTweak):
self.set_motor_validator()
self._drive_val.setText(self._pv_drive.get(as_string=True))
self._drive_val.returnPressed.connect(self.move_motor_to_position)
self._drive_val.returnPressed.connect(self.move_abs)
self.jog_forward.hide()
self.jog_reverse.hide()
@@ -120,7 +120,7 @@ class SmaractMotorTweak(QWidget, Ui_MotorTweak):
lineedit.setValidator(QDoubleValidator(min, max, 5, lineedit))
def move_relative(self, dist, delay=None):
def move_rel(self, dist, delay=None):
cur = self._pv_readback.get()
target = cur + dist
if delay:
@@ -158,7 +158,7 @@ class SmaractMotorTweak(QWidget, Ui_MotorTweak):
def is_done(self):
return self._pv_status.get() in (0, 3)
def move_motor_to_position(self, drive=None, wait=False, assert_position=False):
def move_abs(self, drive=None, wait=False, assert_position=False):
if assert_position:
wait=True
if drive is None: