M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

gui: save dock area state

This commit is contained in:
Sebastien Bourdeauducq 2015-08-01 16:48:44 +08:00
parent 9e24b56099
commit 00cae1c23a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artiq/frontend/artiq_gui.py
View File

@ -10,8 +10,8 @@ import os
from quamash import QEventLoop, QtGui from quamash import QEventLoop, QtGui
from pyqtgraph import dockarea from pyqtgraph import dockarea
from artiq.protocols.file_db import FlatFileDB
from artiq.protocols.pc_rpc import AsyncioClient from artiq.protocols.pc_rpc import AsyncioClient
from artiq.gui.state import StateManager
from artiq.gui.explorer import ExplorerDock from artiq.gui.explorer import ExplorerDock
from artiq.gui.moninj import MonInj from artiq.gui.moninj import MonInj
from artiq.gui.results import ResultsDock from artiq.gui.results import ResultsDock
@ -53,16 +53,16 @@ class _MainWindow(QtGui.QMainWindow):
def closeEvent(self, *args): def closeEvent(self, *args):
self.exit_request.set() self.exit_request.set()
def main(): def main():
args = get_argparser().parse_args()
db = FlatFileDB(args.db_file, default_data=dict())
app = QtGui.QApplication([]) app = QtGui.QApplication([])
loop = QEventLoop(app) loop = QEventLoop(app)
asyncio.set_event_loop(loop) asyncio.set_event_loop(loop)
atexit.register(lambda: loop.close()) atexit.register(lambda: loop.close())
args = get_argparser().parse_args()
smgr = StateManager(args.db_file)
schedule_ctl = AsyncioClient() schedule_ctl = AsyncioClient()
loop.run_until_complete(schedule_ctl.connect_rpc( loop.run_until_complete(schedule_ctl.connect_rpc(
args.server, args.port_control, "master_schedule")) args.server, args.port_control, "master_schedule"))
@ -70,6 +70,7 @@ def main():
win = _MainWindow(app) win = _MainWindow(app)
area = dockarea.DockArea() area = dockarea.DockArea()
smgr.register(area)
win.setCentralWidget(area) win.setCentralWidget(area)
status_bar = QtGui.QStatusBar() status_bar = QtGui.QStatusBar()
status_bar.showMessage("Connected to {}".format(args.server)) status_bar.showMessage("Connected to {}".format(args.server))
@ -125,6 +126,9 @@ def main():
area.addDock(d_log, "above", d_console) area.addDock(d_log, "above", d_console)
area.addDock(d_schedule, "above", d_log) area.addDock(d_schedule, "above", d_log)
smgr.load()
smgr.start()
atexit.register(lambda: loop.run_until_complete(smgr.stop()))
win.show() win.show()
loop.run_until_complete(win.exit_request.wait()) loop.run_until_complete(win.exit_request.wait())