add gonio default positions
This commit is contained in:
@@ -41,17 +41,15 @@ class MotorTweak(QWidget, Ui_MotorTweak):
|
||||
self._templates = {}
|
||||
|
||||
|
||||
def connect_motor(self, motor_base, short_name=None, **kwargs):
|
||||
def connect_motor(self, rec_name, short_name, **kwargs):
|
||||
# TODO: DO NOT USE Motor base class, but reduce to the only really needed PV: s.a. class QopticZoom(object)
|
||||
# TODO: have a own motor Class as class SimMotor:
|
||||
m = Motor(motor_base)
|
||||
m.get_position()
|
||||
self._ignore_limits = m.HLM == m.LLM # if both high/low limits are equal they are meaningless
|
||||
self._motor = m
|
||||
if not short_name:
|
||||
short_name = m.description
|
||||
self.short_name = short_name
|
||||
self._pvname = motor_base
|
||||
m._short_name = short_name
|
||||
self._rec_name = rec_name
|
||||
|
||||
for attr in ['RTYP', 'JVEL', 'HLS', 'LLS', 'TWV', 'RBV', 'VAL', 'LVIO', 'HLM', 'LLM']:
|
||||
# _log.debug('connecting to field {}'.format(attr))
|
||||
@@ -193,19 +191,19 @@ class MotorTweak(QWidget, Ui_MotorTweak):
|
||||
if field != src:
|
||||
return
|
||||
if field == 'VAL':
|
||||
self.event_val.emit(self._pvname, kw)
|
||||
self.event_val.emit(self._rec_name, kw)
|
||||
elif field == 'RBV':
|
||||
self.event_rbv.emit(kw['alias'], kw['value'], kw)
|
||||
elif field == 'LVIO':
|
||||
self.event_soft_limit.emit(self._pvname, kw)
|
||||
self.event_soft_limit.emit(self._rec_name, kw)
|
||||
elif field == 'HLS':
|
||||
self.event_high_hard_limit.emit(self._pvname, kw)
|
||||
self.event_axis_fault.emit(self._pvname, kw)
|
||||
self.event_high_hard_limit.emit(self._rec_name, kw)
|
||||
self.event_axis_fault.emit(self._rec_name, kw)
|
||||
elif field == 'LVIO':
|
||||
self.event_low_hard_limit.emit(self._pvname, kw)
|
||||
self.event_axis_fault.emit(self._pvname, kw)
|
||||
self.event_low_hard_limit.emit(self._rec_name, kw)
|
||||
self.event_axis_fault.emit(self._rec_name, kw)
|
||||
elif field == 'STAT':
|
||||
self.event_axis_fault.emit(self._pvname, kw)
|
||||
self.event_axis_fault.emit(self._rec_name, kw)
|
||||
|
||||
def update_label(self, **kwargs):
|
||||
m = self._motor
|
||||
|
||||
@@ -56,7 +56,7 @@ class SimMotorTweak(QWidget, Ui_MotorTweak):
|
||||
self._templates = {}
|
||||
|
||||
|
||||
def connect_motor(self, rec_name, short_name=None, *args, **kwargs):
|
||||
def connect_motor(self, rec_name, short_name, *args, **kwargs):
|
||||
self.label.setToolTip('{} => {}'.format(rec_name, short_name))
|
||||
self._motor=m=SimMotor(rec_name, short_name)
|
||||
self.set_motor_validator()
|
||||
|
||||
Reference in New Issue
Block a user