This commit is contained in:
2022-08-16 07:00:30 +02:00
parent d2c3bff1c7
commit a5b400208c
7 changed files with 273 additions and 196 deletions

View File

@@ -18,8 +18,8 @@ from PyQt5.uic import loadUiType
from epics.ca import pend_event
Ui_MotorTweak, QWidget = loadUiType('epics_widgets/MotorTweak.ui')
logger = logging.getLogger(__name__)
logger.setLevel(logging.INFO)
_log = logging.getLogger(__name__)
#logger.setLevel(logging.INFO)
class SimMotor:
def __init__(self,motor_base, short_name):
@@ -140,9 +140,9 @@ class SimMotorTweak(QWidget, Ui_MotorTweak):
if assert_position:
wait=True
if drive is None:
logger.debug('{} abs target from widget'.format(self.short_name))
_log.debug('{} abs target from widget'.format(self.motor._short_name))
drive = float(self._drive_val.text())
logger.debug('{} abs move => {}'.format(self.short_name, drive))
_log.debug('{} abs move => {}'.format(self.motor._short_name, drive))
self._pos=drive
def emit_signals(self, **kw):
@@ -180,12 +180,12 @@ class SimMotorTweak(QWidget, Ui_MotorTweak):
status = kw['char_value']
if status in ('Holding', 'Stopped'):
v = self._pv_readback.get(as_string=True)
logger.debug('updating VAL on status change to holding/stopped = {}'.format(v))
_log.debug('updating VAL on status change to holding/stopped = {}'.format(v))
self._drive_val.setText(v)
def set_val(self, **kw):
v = kw['char_value']
logger.debug('updating VAL = {}'.format(v))
_log.debug('updating VAL = {}'.format(v))
self._drive_val.setText(v)
def update_label(self, **kwargs):
@@ -242,9 +242,9 @@ class SimMotorTweak(QWidget, Ui_MotorTweak):
self._controlbox.setDisabled(False)
elif action == changeprecAction:
msg = 'Precision for motor {}'.format(name)
logger.debug('prec before %d', prec)
_log.debug('prec before %d', prec)
prec, ok = QInputDialog.getInt(self, msg, msg, prec, 0, 10)
logger.debug('prec after (%d) %d', ok, prec)
_log.debug('prec after (%d) %d', ok, prec)
if ok:
self._prec = prec