m-labs · Aug 1, 2015 · Aug 1, 2015 · Aug 1, 2015
Showing with 74 additions and 14 deletions.

+9 −5 artiq/frontend/artiq_gui.py

+63 −0 artiq/gui/state.py

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

diff --git a/artiq/gui/state.py b/artiq/gui/state.py
@@ -0,0 +1,63 @@
+import asyncio
+from collections import OrderedDict
+
+from artiq.tools import TaskObject
+from artiq.protocols import pyon
+
+
+# support Qt CamelCase naming scheme for save/restore state
+def _save_state(obj):
+    method = getattr(obj, "save_state", None)
+    if method is None:
+        method = obj.saveState
+    return method()
+
+
+def _restore_state(obj, state):
+    method = getattr(obj, "restore_state", None)
+    if method is None:
+        method = obj.restoreState
+    method(state)
+
+
+class StateManager(TaskObject):
+    def __init__(self, filename, autosave_period=30):
+        self.filename = filename
+        self.autosave_period = autosave_period
+        self.stateful_objects = OrderedDict()
+
+    def register(self, obj, name=None):
+        if name is None:
+            name = obj.__class__.__name__
+        if name in self.stateful_objects:
+            raise RuntimeError("Name '{}' already exists in state"
+                               .format(name))
+        self.stateful_objects[name] = obj
+
+    def load(self):
+        try:
+            data = pyon.load_file(self.filename)
+        except FileNotFoundError:
+            return
+        # The state of one object may depend on the state of another,
+        # e.g. the display state may create docks that are referenced in
+        # the area state.
+        # To help address this problem, state is restored in the opposite
+        # order as the stateful objects are registered.
+        for name, obj in reversed(list(self.stateful_objects.items())):
+            state = data.get(name, None)
+            if state is not None:
+                _restore_state(obj, state)
+
+    def save(self):
+        data = {k: _save_state(v) for k, v in self.stateful_objects.items()}
+        pyon.store_file(self.filename, data)
+
+    @asyncio.coroutine
+    def _do(self):
+        try:
+            while True:
+                yield from asyncio.sleep(self.autosave_period)
+                self.save()
+        finally:
+            self.save()
diff --git a/artiq/protocols/file_db.py b/artiq/protocols/file_db.py
@@ -5,16 +5,9 @@
 
 
 class FlatFileDB:
-    def __init__(self, filename, default_data=None):
+    def __init__(self, filename):
         self.filename = filename
-        try:
-            data = pyon.load_file(self.filename)
-        except FileNotFoundError:
-            if default_data is None:
-                raise
-            else:
-                data = default_data
-        self.data = Notifier(data)
+        self.data = Notifier(pyon.load_file(self.filename))
         self.hooks = []
 
     def save(self):