srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

artiq_dashboard: connect Devices sub after loading state

This commit is contained in:
Simon Renblad 2024-04-29 11:21:35 +08:00
parent 15e1aef38b
commit d47be456ff
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
artiq/frontend/artiq_dashboard.py
View File

@ -236,13 +236,6 @@ def main():
) )
atexit_register_coroutine(d_waveform.stop, loop=loop) atexit_register_coroutine(d_waveform.stop, loop=loop)
def init_cbs(ddb):
moninj_mgr.dm.init_ddb(ddb)
d_waveform.init_ddb(ddb)
return ddb
devices_sub = Subscriber("devices", init_cbs, [moninj_mgr.dm.notify_ddb, d_waveform.notify_ddb])
loop.run_until_complete(devices_sub.connect(args.server, args.port_notify))
atexit_register_coroutine(devices_sub.close, loop=loop)
d_interactive_args = interactive_args.InteractiveArgsDock( d_interactive_args = interactive_args.InteractiveArgsDock(
sub_clients["interactive_args"], sub_clients["interactive_args"],
@ -278,7 +271,18 @@ def main():
# Otherwise, the windows of those applets that are in detached # Otherwise, the windows of those applets that are in detached
# QDockWidgets fail to be embedded. # QDockWidgets fail to be embedded.
main_window.show() main_window.show()
smgr.load() smgr.load()
# connect devices_sub after loading state, else moninj widgets may not be created
def init_cbs(ddb):
moninj_mgr.dm.init_ddb(ddb)
d_waveform.init_ddb(ddb)
return ddb
devices_sub = Subscriber("devices", init_cbs, [moninj_mgr.dm.notify_ddb, d_waveform.notify_ddb])
loop.run_until_complete(devices_sub.connect(args.server, args.port_notify))
atexit_register_coroutine(devices_sub.close, loop=loop)
smgr.start(loop=loop) smgr.start(loop=loop)
atexit_register_coroutine(smgr.stop, loop=loop) atexit_register_coroutine(smgr.stop, loop=loop)