From 2852e793ab0bc37fdd3cf0f054b4b4aa8fbe8921 Mon Sep 17 00:00:00 2001 From: Chris Ballance Date: Sat, 25 Nov 2017 00:05:44 +0000 Subject: [PATCH] dashboard: store separate configuration data for each master, keyed by server and port --- artiq/frontend/artiq_dashboard.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/artiq/frontend/artiq_dashboard.py b/artiq/frontend/artiq_dashboard.py index 18dd2b9fb..203f514d8 100755 --- a/artiq/frontend/artiq_dashboard.py +++ b/artiq/frontend/artiq_dashboard.py @@ -21,9 +21,6 @@ from artiq.dashboard import (experiments, shortcuts, explorer, def get_argparser(): - default_db_file = os.path.join(get_user_config_dir(), - "artiq_dashboard.pyon") - parser = argparse.ArgumentParser(description="ARTIQ Dashboard") parser.add_argument( "-s", "--server", default="::1", @@ -38,9 +35,8 @@ def get_argparser(): "--port-broadcast", default=1067, type=int, help="TCP port to connect to for broadcasts") parser.add_argument( - "--db-file", default=default_db_file, - help="database file for local GUI settings " - "(default: %(default)s)") + "--db-file", default=None, + help="database file for local GUI settings") verbosity_args(parser) return parser @@ -93,6 +89,12 @@ def main(): args = get_argparser().parse_args() widget_log_handler = log.init_log(args, "dashboard") + if args.db_file is None: + args.db_file = os.path.join(get_user_config_dir(), + "artiq_dashboard_{server}_{port}.pyon".format( + server=args.server.replace(":","."), + port=args.port_notify)) + app = QtWidgets.QApplication(["ARTIQ Dashboard"]) loop = QEventLoop(app) asyncio.set_event_loop(loop)