m-labs · Nov 11, 2015 · Nov 11, 2015 · Nov 11, 2015
Showing with 30 additions and 18 deletions.

+2 −8 artiq/frontend/artiq_gui.py

+19 −4 artiq/gui/console.py

+1 −3 artiq/gui/datasets.py

+8 −3 artiq/protocols/sync_struct.py
diff --git a/artiq/frontend/artiq_gui.py b/artiq/frontend/artiq_gui.py
@@ -120,14 +120,8 @@ def main():
     d_log = log.LogDock(sub_clients["log"])
     smgr.register(d_log)
 
-    def _set_dataset(k, v):
-        asyncio.ensure_future(rpc_clients["dataset_db"].set(k, v))
-    def _del_dataset(k):
-        asyncio.ensure_future(rpc_clients["dataset_db"].delete(k))
-    d_console = console.ConsoleDock(
-        d_datasets.get_dataset,
-        _set_dataset,
-        _del_dataset)
+    d_console = console.ConsoleDock(sub_clients["datasets"],
+                                    rpc_clients["dataset_db"])
 
     area.addDock(d_console, "bottom")
     area.addDock(d_log, "above", d_console)

diff --git a/artiq/gui/console.py b/artiq/gui/console.py
@@ -1,3 +1,5 @@
+import asyncio
+
 from pyqtgraph import console, dockarea
 
 
@@ -12,12 +14,25 @@
 """
 
 class ConsoleDock(dockarea.Dock):
-    def __init__(self, get_dataset, set_dataset, del_dataset):
+    def __init__(self, dataset_sub, dataset_ctl):
         dockarea.Dock.__init__(self, "Console", size=(1000, 300))
+        self.dataset_sub = dataset_sub
+        self.dataset_ctl = dataset_ctl
         ns = {
-            "get_dataset": get_dataset,
-            "set_dataset": set_dataset,
-            "del_dataset": del_dataset
+            "get_dataset": self.get_dataset,
+            "set_dataset": self.set_dataset,
+            "del_dataset": self.del_dataset
         }
         c = console.ConsoleWidget(namespace=ns, text=_help)
         self.addWidget(c)
+
+    def get_dataset(self, k):
+        if self.dataset_sub.model is None:
+            raise IOError("Datasets not available yet")
+        return self.dataset_sub.model.backing_store[k][1]
+
+    def set_dataset(self, k, v):
+        asyncio.ensure_future(self.dataset_ctl.set(k, v))
+
+    def del_dataset(self, k):
+        asyncio.ensure_future(self.dataset_ctl.delete(k))
diff --git a/artiq/gui/datasets.py b/artiq/gui/datasets.py
@@ -66,6 +66,7 @@ def __init__(self, dialog_parent, dock_area, datasets_sub):
 
         self.table_model = Model(dict())
         datasets_sub.add_setmodel_callback(self.set_model)
+        datasets_sub.notify_cbs.append(self.on_mod)
 
         add_display_box = QtGui.QGroupBox("Add display")
         grid.addWidget(add_display_box, 1, 1)
@@ -84,9 +85,6 @@ def _search_datasets(self):
             self.table_model_filter.setFilterFixedString(
                 self.search.displayText())
 
-    def get_dataset(self, key):
-        return self.table_model.backing_store[key][1]
-
     def set_model(self, model):
         self.table_model = model
         self.table_model_filter = QSortFilterProxyModel()

diff --git a/artiq/protocols/sync_struct.py b/artiq/protocols/sync_struct.py
@@ -51,11 +51,16 @@ class Subscriber:
     :param notify_cb: An optional function called every time a mod is received
         from the publisher. The mod is passed as parameter. The function is
         called after the mod has been processed.
+        A list of functions may also be used, and they will be called in turn.
     """
     def __init__(self, notifier_name, target_builder, notify_cb=None):
         self.notifier_name = notifier_name
         self.target_builder = target_builder
-        self.notify_cb = notify_cb
+        if notify_cb is None:
+            notify_cb = []
+        if not isinstance(notify_cb, list):
+            notify_cb = [notify_cb]
+        self.notify_cbs = notify_cb
 
     async def connect(self, host, port, before_receive_cb=None):
         self.reader, self.writer = \
@@ -97,8 +102,8 @@ async def _receive_cr(self):
             else:
                 process_mod(target, mod)
 
-            if self.notify_cb is not None:
-                self.notify_cb(mod)
+            for notify_cb in self.notify_cbs:
+                notify_cb(mod)
 
 
 class Notifier: