mirror of
https://github.com/m-labs/artiq.git
synced 2024-12-25 11:18:27 +08:00
dashboard: store separate configuration data for each master, keyed by server and port
This commit is contained in:
parent
cfb41e71a8
commit
2852e793ab
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user