Now handling DDS devices

Author: carterturn

blacs/plugins/virtual_device/__init__.py

@@ -205,7 +205,7 @@ def _get_child_outputs(self, conn_table, root_devs, dev_name, tab):
             elif isinstance(channel, AO_output_class):
                 AOs.append((child, child_dev.parent_port))
             elif isinstance(channel, DDS_output_class):
-                DDSS.append((child, child_dev.parent_port))
+                DDSs.append((child, child_dev.parent_port))
 
         return AOs, DOs, DDSs
 
@@ -346,6 +346,7 @@ def on_virtual_devices_item_changed(self, item):
                                                 [new_device_item, None, None, remove_item])
             new_device_item.appendRow(QStandardItem('Analog Outputs'))
             new_device_item.appendRow(QStandardItem('Digital Outputs'))
+            new_device_item.appendRow(QStandardItem('DDS Outputs'))
 
             item.setText(self.VD_TREE_DUMMY_ROW_TEXT)
 
@@ -385,6 +386,12 @@ def on_edit_virtual_devices(self, *args, **kwargs):
                 chan = self.BLACS['ui'].blacs.tablist[DO[0]].get_channel(DO[1])
                 digital_outputs.appendRow(self.make_virtual_device_output_row(DO[0] + '.' + chan.name))
 
+            dds_outputs = QStandardItem('DDS Outputs')
+            device_item.appendRow(dds_outputs)
+            for DDS in vd['DDS']:
+                chan = self.BLACS['ui'].blacs.tablist[DDS[0]].get_channel(DDS[1])
+                dds_outputs.appendRow(self.make_virtual_device_output_row(DDS[0] + '.' + chan.name))
+
         add_vd_item = QStandardItem(self.VD_TREE_DUMMY_ROW_TEXT)
         add_vd_item.setData(True, self.VD_TREE_ROLE_IS_DUMMY_ROW)
         add_vd_item.setFlags(Qt.ItemIsEnabled | Qt.ItemIsEditable)
@@ -460,6 +467,10 @@ def _encode_virtual_devices(self):
                         DO_name = output_group.child(k).text().split(' - ')[0].split('.')
                         inverted = output_group.child(k).data(self.VD_TREE_ROLE_DO_INVERTED)
                         virtual_device_data[vd.text()]['DO'].append((DO_name[0], DO_name[1], inverted))
+                elif output_group.text() == 'DDS Outputs':
+                    for k in range(output_group.rowCount()):
+                        DDS_name = output_group.child(k).text().split(' - ')[0].split('.')
+                        virtual_device_data[vd.text()]['DDS'].append((DDS_name[0], DDS_name[1]))
 
         return virtual_device_data
 

blacs/plugins/virtual_device/virtual_device_tab.py

@@ -3,6 +3,7 @@
 from qtutils.qt.QtWidgets import *
 
 from labscript_utils.qtwidgets.toolpalette import ToolPaletteGroup
+from labscript_utils.qtwidgets.ddsoutput import DDSOutput
 
 from blacs.tab_base_classes import PluginTab
 
@@ -22,22 +23,32 @@ def create_widgets(self, blacs_tablist, AOs, DOs, DDSs):
             if self._AOs[AO] is None:
                 chan = self._blacs_tablist[AO[0]].get_channel(AO[1])
                 orig_label = chan.name.split('-')
-                self._AOs[AO] = chan.create_widget('%s\n%s'%(AO[0]+'.'+orig_label[0], orig_label[1]), False, None)
+                virtual_label = '%s\n%s' % (AO[0]+'.'+orig_label[0], orig_label[1])
+                self._AOs[AO] = chan.create_widget(virtual_label, False, None)
                 self._AOs[AO].last_AO = None
 
         for DO in self._DOs.keys():
             if self._DOs[DO] is None:
                 self._DOs[DO] = self._blacs_tablist[DO[0]].get_channel(DO[1]).create_widget(inverted=DO[2])
                 orig_label = self._DOs[DO].text().split('\n')
-                self._DOs[DO].setText('%s\n%s'%(DO[0]+'.'+orig_label[0], orig_label[1]))
+                virtual_label = '%s\n%s' % (DO[0]+'.'+orig_label[0], orig_label[1])
+                self._DOs[DO].setText(virtual_label)
                 self._DOs[DO].last_DO = None
 
-        dds_widgets = [] # TODO
+        for DDS in self._DDSs.keys():
+            if self._DDSs[DDS] is None:
+                chan = self._blacs_tablist[DDS[0]].get_channel(DDS[1])
+                orig_label = chan.name.split(' - ')
+                self._DDSs[DDS] = DDSOutput(DDS[0]+'.'+orig_label[0], orig_label[1])
+                chan.add_widget(self._DDSs[DDS])
+                self._DDSs[DDS].last_DDS = None
 
         if len(self._AOs) > 0:
             self.place_widget_group('Analog Outputs', [v for k, v in self._AOs.items()])
         if len(self._DOs) > 0:
             self.place_widget_group('Digital Outputs', [v for k, v in self._DOs.items()])
+        if len(self._DDSs) > 0:
+            self.place_widget_group('DDS Outputs', [v for k, v in self._DDSs.items()])
 
         return
 
@@ -56,6 +67,11 @@ def connect_widgets(self):
                 new_DO = self._blacs_tablist[DO[0]].get_channel(DO[1])
                 if self._DOs[DO].get_DO() is None and self._DOs[DO].last_DO != new_DO:
                     self._DOs[DO].set_DO(new_DO)
+        for DDS in self._DDSs.keys():
+            if self._DDSs[DDS] is not None:
+                new_DDS = self._blacs_tablist[DDS[0]].get_channel(DDS[1])
+                if self._DDSs[DDS].last_DDS != new_DDS:
+                    new_DDS.add_widget(self._DDSs[DDS])
 
     def disconnect_widgets(self, closing_device_name):
         '''
@@ -70,6 +86,11 @@ def disconnect_widgets(self, closing_device_name):
             if DO[0] == closing_device_name:
                 self._DOs[DO].last_DO = self._DOs[DO].get_DO()
                 self._DOs[DO].set_DO(None)
+        for DDDS in self._DDSs.keys():
+            if DDS[0] == closing_device_name:
+                old_DDS = self._blacs_tablist[DDS[0]].get_channel(DDS[1])
+                self._DDSs[DDS].last_DDS = old_DDS
+                old_DDS.remove_widget(self._DDSs[DDS])
 
     def place_widget_group(self, name, widgets):
         widget = QWidget()