diff --git a/csaxs_bec/bec_widgets/widgets/xray_eye/x_ray_eye.py b/csaxs_bec/bec_widgets/widgets/xray_eye/x_ray_eye.py index 463b8ed..521ce2f 100644 --- a/csaxs_bec/bec_widgets/widgets/xray_eye/x_ray_eye.py +++ b/csaxs_bec/bec_widgets/widgets/xray_eye/x_ray_eye.py @@ -28,12 +28,14 @@ class XRayEye(BECWidget, QWidget): def __init__(self, parent=None, **kwargs): super().__init__(parent=parent, **kwargs) + self.get_bec_shortcuts() self._init_ui() self._make_connections() + # Connection to redis endpoints self.bec_dispatcher.connect_slot(self.device_updates,MessageEndpoints.device_readback("omny_xray_gui")) - self.bec_dispatcher.connect_slot(self.on_tomo_angle_readback,MessageEndpoints.device_readback("fsamroy")) + self.connect_motors() def _init_ui(self): self.core_layout = QHBoxLayout(self) @@ -110,9 +112,11 @@ class XRayEye(BECWidget, QWidget): # Sample/Message form (bottom) form = QGridLayout() self.sample_name_line_edit = QLineEdit(parent=self) + self.sample_name_line_edit.setReadOnly(True) form.addWidget(QLabel("Sample", parent=self),0,0) form.addWidget(self.sample_name_line_edit,0,1) self.message_line_edit = QLineEdit(parent=self) + self.message_line_edit.setReadOnly(True) form.addWidget(QLabel("Message", parent=self),1,0) form.addWidget(self.message_line_edit,1,1) self.control_panel_layout.addLayout(form) @@ -145,7 +149,18 @@ class XRayEye(BECWidget, QWidget): sep.setFrameShadow(QFrame.Sunken) sep.setLineWidth(1) return sep + ################################################################################ + # Device Connection logic + ################################################################################ + def connect_motors(self): + """ Checks one of the possible motors for flomni, omny and lamni setup.""" + possible_motors = ['osamroy','lsamrot','fsamroy'] + + for motor in possible_motors: + if motor in self.dev: + self.bec_dispatcher.connect_slot(self.on_tomo_angle_readback,MessageEndpoints.device_readback(motor)) + logger.info(f"Succesfully connected to {motor}") ################################################################################ # Properties ported from the original OmnyAlignment, can be adjusted as needed ################################################################################