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

dashboard: use master's friendly name in dashboard title

This commit is contained in:
Chris Ballance 2017-11-25 00:40:44 +00:00 committed by Sébastien Bourdeauducq
parent fafabacf97
commit 84b5e68349
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
artiq/frontend/artiq_dashboard.py
View File

@ -12,7 +12,7 @@ from quamash import QEventLoop
from artiq import __artiq_dir__ as artiq_dir, __version__ as artiq_version from artiq import __artiq_dir__ as artiq_dir, __version__ as artiq_version
from artiq.tools import (atexit_register_coroutine, verbosity_args, from artiq.tools import (atexit_register_coroutine, verbosity_args,
get_user_config_dir) get_user_config_dir)
from artiq.protocols.pc_rpc import AsyncioClient from artiq.protocols.pc_rpc import AsyncioClient, Client
from artiq.protocols.broadcast import Receiver from artiq.protocols.broadcast import Receiver
from artiq.gui.models import ModelSubscriber from artiq.gui.models import ModelSubscriber
from artiq.gui import state, log from artiq.gui import state, log
@ -110,6 +110,11 @@ def main():
atexit.register(client.close_rpc) atexit.register(client.close_rpc)
rpc_clients[target] = client rpc_clients[target] = client
config = Client(args.server, args.port_control, "master_config")
server_name = config.get_name()
if server_name is None:
server_name = args.server
disconnect_reported = False disconnect_reported = False
def report_disconnect(): def report_disconnect():
nonlocal disconnect_reported nonlocal disconnect_reported
@ -139,7 +144,7 @@ def main():
broadcast_clients[target] = client broadcast_clients[target] = client
# initialize main window # initialize main window
main_window = MainWindow(args.server) main_window = MainWindow(server_name)
smgr.register(main_window) smgr.register(main_window)
mdi_area = MdiArea() mdi_area = MdiArea()
mdi_area.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) mdi_area.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
@ -211,7 +216,7 @@ def main():
main_window.tabifyDockWidget(d_schedule, d_log0) main_window.tabifyDockWidget(d_schedule, d_log0)
logging.info("ARTIQ dashboard %s connected to %s", logging.info("ARTIQ dashboard %s connected to %s",
artiq_version, args.server) artiq_version, server_name)
# run # run
main_window.show() main_window.show()