From 5d1999bbae0584c3195cfb35054720e093ca24b3 Mon Sep 17 00:00:00 2001 From: tangkong Date: Thu, 19 Oct 2023 13:30:34 -0700 Subject: [PATCH] DOC: Hint Optional[ophyd.Signal] and move to init --- atef/procedure.py | 4 ++-- atef/widgets/config/data_active.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/atef/procedure.py b/atef/procedure.py index b0819471..6359f487 100644 --- a/atef/procedure.py +++ b/atef/procedure.py @@ -157,7 +157,7 @@ class Target: def to_signal( self, signal_cache: Optional[_SignalCache] = None - ) -> Optional[ophyd.EpicsSignal]: + ) -> Optional[ophyd.Signal]: """ Return the signal described by this Target. First attempts to use the device + attr information to look up the signal in happi, falling back @@ -165,7 +165,7 @@ def to_signal( Returns ------- - ophyd.EpicsSignal + ophyd.Signal the signal described by this Target """ try: diff --git a/atef/widgets/config/data_active.py b/atef/widgets/config/data_active.py index 1f95adea..bd776dc8 100644 --- a/atef/widgets/config/data_active.py +++ b/atef/widgets/config/data_active.py @@ -25,7 +25,7 @@ import typhos import typhos.cli import typhos.display -from ophyd.signal import EpicsSignalBase +from ophyd.signal import Signal from qtpy import QtCore, QtGui, QtWidgets from qtpy.QtCore import Qt from qtpy.QtWidgets import QDialogButtonBox @@ -901,7 +901,7 @@ def __init__(self, data: Optional[ValueToTarget] = None, **kwargs): self.edit_widget = None if data is None: data = ValueToTarget() - self._sig = None + self._sig: Optional[Signal] = None self._curr_value = None self._dtype = None self._enum_strs = None @@ -960,7 +960,7 @@ def update_input_placeholder(self) -> None: Updates value input widget with a QLineEdit with the approriate validator given the target's datatype """ - self._sig: EpicsSignalBase = self.data.to_signal() + self._sig = self.data.to_signal() if self._sig is None: self.edit_widget = QtWidgets.QLabel('(no target set)') insert_widget(self.edit_widget, self.value_input_placeholder)