From 168af9589e53c5a20fbea0439319b3a81b60a99c Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sun, 4 Oct 2015 17:55:57 +0800
Subject: [PATCH] gui/moninj: fix problems with dynamic modification of DDB

---
 artiq/gui/moninj.py | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/artiq/gui/moninj.py b/artiq/gui/moninj.py
index 835fb58ab..c14c099c2 100644
--- a/artiq/gui/moninj.py
+++ b/artiq/gui/moninj.py
@@ -23,9 +23,9 @@ _mode_enc = {
 
 
 class _TTLWidget(QtGui.QFrame):
-    def __init__(self, send_to_device, channel, force_out, title):
-        self.send_to_device = send_to_device
+    def __init__(self, channel, send_to_device, force_out, title):
         self.channel = channel
+        self.send_to_device = send_to_device
         self.force_out = force_out
 
         QtGui.QFrame.__init__(self)
@@ -119,7 +119,8 @@ class _TTLWidget(QtGui.QFrame):
 
 
 class _DDSWidget(QtGui.QFrame):
-    def __init__(self, sysclk, title):
+    def __init__(self, channel, sysclk, title):
+        self.channel = channel
         self.sysclk = sysclk
 
         QtGui.QFrame.__init__(self)
@@ -163,9 +164,11 @@ class _DeviceManager:
             self[k] = v
 
     def __setitem__(self, k, v):
-        self.ddb[k] = v
         if k in self.ttl_widgets:
             del self[k]
+        if k in self.dds_widgets:
+            del self[k]
+        self.ddb[k] = v
         if not isinstance(v, dict):
             return
         try:
@@ -176,14 +179,15 @@ class _DeviceManager:
                 if v["module"] == "artiq.coredevice.ttl":
                     channel = v["arguments"]["channel"]
                     force_out = v["class"] == "TTLOut"
-                    self.ttl_widgets[channel] = _TTLWidget(
-                        self.send_to_device, channel, force_out, title)
+                    self.ttl_widgets[k] = _TTLWidget(
+                        channel, self.send_to_device, force_out, title)
                     self.ttl_cb()
                 if (v["module"] == "artiq.coredevice.dds"
                         and v["class"] in {"AD9858", "AD9914"}):
                     channel = v["arguments"]["channel"]
                     sysclk = v["arguments"]["sysclk"]
-                    self.dds_widgets[channel] = _DDSWidget(sysclk, title)
+                    self.dds_widgets[channel] = _DDSWidget(
+                        channel, sysclk, title)
                     self.dds_cb()
         except KeyError:
             pass
@@ -191,8 +195,13 @@ class _DeviceManager:
     def __delitem__(self, k):
         del self.ddb[k]
         if k in self.ttl_widgets:
+            self.ttl_widgets[k].deleteLater()
             del self.ttl_widgets[k]
             self.ttl_cb()
+        if k in self.dds_widgets:
+            self.dds_widgets[k].deleteLater()
+            del self.dds_widgets[k]
+            self.dds_cb()
 
     def get_core_addr(self):
         try:
@@ -261,16 +270,17 @@ class MonInj(TaskObject):
         try:
             ttl_levels, ttl_oes, ttl_overrides = \
                 struct.unpack(">QQQ", data[:8*3])
-            for channel, w in self.dm.ttl_widgets.items():
+            for w in self.dm.ttl_widgets.values():
+                channel = w.channel
                 w.set_value(ttl_levels & (1 << channel),
                             ttl_oes & (1 << channel),
                             ttl_overrides & (1 << channel))
             dds_data = data[8*3:]
             ndds = len(dds_data)//4
             ftws = struct.unpack(">" + "I"*ndds, dds_data)
-            for channel, w in self.dm.dds_widgets.items():
+            for w in self.dm.dds_widgets.values():
                 try:
-                    ftw = ftws[channel]
+                    ftw = ftws[w.channel]
                 except KeyError:
                     pass
                 else: