m-labs · Aug 1, 2015 · Aug 1, 2015
Showing with 46 additions and 2 deletions.

+1 −0 artiq/frontend/artiq_gui.py

+27 −0 artiq/gui/results.py

+18 −2 artiq/gui/state.py
diff --git a/artiq/frontend/artiq_gui.py b/artiq/frontend/artiq_gui.py
@@ -82,6 +82,7 @@ def main():
     atexit.register(lambda: loop.run_until_complete(d_explorer.sub_close()))
 
     d_results = ResultsDock(win, area)
+    smgr.register(d_results)
     loop.run_until_complete(d_results.sub_connect(
         args.server, args.port_notify))
     atexit.register(lambda: loop.run_until_complete(d_results.sub_close()))

diff --git a/artiq/gui/results.py b/artiq/gui/results.py
@@ -1,6 +1,7 @@
 import asyncio
 from collections import OrderedDict
 from functools import partial
+import logging
 
 from quamash import QtGui, QtCore
 from pyqtgraph import dockarea
@@ -11,6 +12,9 @@
 from artiq.gui.displays import *
 
 
+logger = logging.getLogger(__name__)
+
+
 class ResultsModel(DictSyncModel):
     def __init__(self, parent, init):
         DictSyncModel.__init__(self, ["Result", "Value"],
@@ -28,6 +32,12 @@ def convert(self, k, v, column):
            raise ValueError
 
 
+def _get_display_type_name(display_cls):
+    for name, (_, cls) in display_types.items():
+        if cls is display_cls:
+            return name
+
+
 class ResultsDock(dockarea.Dock):
     def __init__(self, dialog_parent, dock_area):
         dockarea.Dock.__init__(self, "Results", size=(1500, 500))
@@ -110,3 +120,20 @@ def on_close():
         dsp.sigClosed.connect(on_close)
         self.dock_area.addDock(dsp)
         self.dock_area.floatDock(dsp)
+
+    def save_state(self):
+        r = dict()
+        for name, display in self.displays.items():
+            r[name] = {
+                "ty": _get_display_type_name(type(display)),
+                "settings": display.settings
+            }
+        return r
+
+    def restore_state(self, state):
+        for name, desc in state.items():
+            try:
+                self.create_display(desc["ty"], None, name, desc["settings"])
+            except:
+                logger.warning("Failed to create display '%s'", name,
+                               exc_info=True)
diff --git a/artiq/gui/state.py b/artiq/gui/state.py
@@ -1,10 +1,14 @@
 import asyncio
 from collections import OrderedDict
+import logging
 
 from artiq.tools import TaskObject
 from artiq.protocols import pyon
 
 
+logger = logging.getLogger(__name__)
+
+
 # support Qt CamelCase naming scheme for save/restore state
 def _save_state(obj):
     method = getattr(obj, "save_state", None)
@@ -38,6 +42,8 @@ def load(self):
         try:
             data = pyon.load_file(self.filename)
         except FileNotFoundError:
+            logger.info("State database '%s' not found, using defaults",
+                        self.filename)
             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
@@ -47,10 +53,20 @@ def load(self):
         for name, obj in reversed(list(self.stateful_objects.items())):
             state = data.get(name, None)
             if state is not None:
-                _restore_state(obj, state)
+                try:
+                    _restore_state(obj, state)
+                except:
+                    logger.warning("Failed to restore state for object '%s'",
+                                   name, exc_info=True)
 
     def save(self):
-        data = {k: _save_state(v) for k, v in self.stateful_objects.items()}
+        data = dict()
+        for k, v in self.stateful_objects.items():
+            try:
+                data[k] = _save_state(v)
+            except:
+                logger.warning("Failed to save state for object '%s'", k,
+                               exc_info=True)
         pyon.store_file(self.filename, data)
 
     @asyncio.coroutine