Skip to content

Updated runviewer to use the new labscript-utils device registry. #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dihm merged 1 commit into from
Nov 30, 2021
Merged

Updated runviewer to use the new labscript-utils device registry. #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions runviewer/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
import qtutils.icons
splash.update_text('importing labscript suite modules')
from labscript_utils.connections import ConnectionTable
import labscript_devices
from labscript_utils import device_registry

from labscript_utils.labconfig import LabConfig, save_appconfig, load_appconfig
from labscript_utils.ls_zprocess import ZMQServer, ProcessTree
Expand Down Expand Up @@ -1521,8 +1521,7 @@ def _load_device(self, device, clock=None):
print('loading %s' % device.name)
module = device.device_class
# Load the master pseudoclock class
# labscript_devices.import_device(module)
device_class = labscript_devices.get_runviewer_parser(module)
device_class = device_registry.get_runviewer_parser(module)
device_instance = device_class(self.path, device)
clocklines_and_triggers = device_instance.get_traces(self.add_trace, clock)

Expand Down
3 changes: 1 addition & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ python_requires = >=3.6
install_requires =
desktop-app>=0.1.2
importlib_metadata
labscript_devices>=3.0.0
labscript_utils>=3.0.0
labscript_utils>=3.1.0b1
labscript-c-extensions
pyqtgraph>=0.11.0rc0
qtutils>=2.0.0
Expand Down