M-Labs/artiq
2
0
Fork 2
mirror of https://github.com/m-labs/artiq.git synced 2024-12-25 11:18:27 +08:00
Code Issues Projects Releases Wiki Activity

gui,browser: save state in home folder

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2016-04-15 19:05:12 +08:00
parent e1a229028d
commit d4ba525c9d
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE_NOTES.rst
View File

@ -34,6 +34,8 @@ unreleased [2.x]
Experiments no longer need to do it explicitly. Experiments no longer need to do it explicitly.
* The result folders are formatted "%Y-%m-%d/%H instead of "%Y-%m-%d/%H-%M". * The result folders are formatted "%Y-%m-%d/%H instead of "%Y-%m-%d/%H-%M".
(i.e. grouping by day and then by hour, instead of by day and then by minute) (i.e. grouping by day and then by hour, instead of by day and then by minute)
* GUI tools save their state file in the user's home directory instead of the
current directory.
unreleased [1.0rc3] unreleased [1.0rc3]

10
artiq/frontend/artiq_browser.py
View File

@ -15,10 +15,16 @@ from artiq.browser import datasets, files
def get_argparser(): def get_argparser():
if os.name == "nt":
default_db_file = os.path.expanduser("~\\artiq_browser.pyon")
else:
default_db_file = os.path.expanduser("~/.artiq_browser.pyon")
parser = argparse.ArgumentParser(description="ARTIQ Browser") parser = argparse.ArgumentParser(description="ARTIQ Browser")
parser.add_argument( parser.add_argument(
"--db-file", default="artiq_browser.pyon", "--db-file", default=default_db_file,
help="database file for local browser settings") help="database file for local browser settings "
"(default: %(default)s)")
parser.add_argument("PATH", nargs="?", help="browse path or file") parser.add_argument("PATH", nargs="?", help="browse path or file")
verbosity_args(parser) verbosity_args(parser)
return parser return parser

10
artiq/frontend/artiq_dashboard.py
View File

@ -18,6 +18,11 @@ from artiq.dashboard import (experiments, shortcuts, explorer,
def get_argparser(): def get_argparser():
if os.name == "nt":
default_db_file = os.path.expanduser("~\\artiq_dashboard.pyon")
else:
default_db_file = os.path.expanduser("~/.artiq_dashboard.pyon")
parser = argparse.ArgumentParser(description="ARTIQ Dashboard") parser = argparse.ArgumentParser(description="ARTIQ Dashboard")
parser.add_argument( parser.add_argument(
"-s", "--server", default="::1", "-s", "--server", default="::1",
@ -29,8 +34,9 @@ def get_argparser():
"--port-control", default=3251, type=int, "--port-control", default=3251, type=int,
help="TCP port to connect to for control") help="TCP port to connect to for control")
parser.add_argument( parser.add_argument(
"--db-file", default="artiq_dashboard.pyon", "--db-file", default=default_db_file,
help="database file for local GUI settings") help="database file for local GUI settings "
"(default: %(default)s)")
verbosity_args(parser) verbosity_args(parser)
return parser return parser