Start adding enum outputs

Author: carterturn

blacs/plugins/virtual_device/__init__.py

@@ -30,6 +30,7 @@
 from blacs.device_base_class import DeviceTab
 from blacs.output_classes import AO as AO_output_class
 from blacs.output_classes import DO as DO_output_class
+from blacs.output_classes import EO as EO_output_class
 from blacs.output_classes import DDS as DDS_output_class
 
 from .virtual_device_tab import VirtualDeviceTab
@@ -122,6 +123,7 @@ def plugin_setup_complete(self, BLACS):
             vd_tab.create_widgets(self.BLACS['ui'].blacs.tablist,
                                   self.virtual_devices[name]['AO'],
                                   self.virtual_devices[name]['DO'],
+                                  self.virtual_devices[name]['EO'],
                                   self.virtual_devices[name]['DDS'])
 
         self.setup_complete = True
@@ -210,6 +212,7 @@ def _get_child_outputs(self, conn_table, root_devs, dev_name, tab):
         '''
         AOs = []
         DOs = []
+        EOs = []
         DDSs = []
 
         device_conn = conn_table.find_by_name(dev_name)
@@ -231,10 +234,12 @@ def _get_child_outputs(self, conn_table, root_devs, dev_name, tab):
                 DOs.append((child, child_dev.parent_port, inv))
             elif isinstance(channel, AO_output_class):
                 AOs.append((child, child_dev.parent_port))
+            elif isinstance(channel, EO_output_class):
+                EOs.append((child, child_dev.parent_port))
             elif isinstance(channel, DDS_output_class):
                 DDSs.append((child, child_dev.parent_port))
 
-        return AOs, DOs, DDSs
+        return AOs, DOs, EOs, DDSs
 
     def __init__(self, BLACS):
         '''
@@ -258,14 +263,15 @@ def __init__(self, BLACS):
 
                 analog_outputs = QStandardItem('Analog Outputs')
                 digital_outputs = QStandardItem('Digital Outputs')
+                enum_outputs = QStandardItem('Enum Outputs')
                 dds_outputs = QStandardItem('DDS Outputs')
 
                 device_item.appendRow(analog_outputs)
                 device_item.appendRow(digital_outputs)
                 device_item.appendRow(dds_outputs)
 
                 root_devs = self.BLACS['ui'].blacs.tablist.keys()
-                AOs, DOs, DDSs = self._get_child_outputs(connection_table, root_devs, tab_name, tab)
+                AOs, DOs, EOs, DDSs = self._get_child_outputs(connection_table, root_devs, tab_name, tab)
 
                 for DO in DOs:
                     DO_item = QStandardItem(DO[1] + ' - ' + DO[0])
@@ -284,6 +290,14 @@ def __init__(self, BLACS):
                     add_to_vd_item.setToolTip('Add this output to selected virtual device')
                     add_to_vd_item.setData(AO[1] + ' - ' + AO[0], self.CT_TREE_ROLE_NAME)
                     analog_outputs.appendRow([AO_item, add_to_vd_item])
+                for EO in EOs:
+                    EO_item = QStandardItem(EO[1] + ' - ' + EO[0])
+                    add_to_vd_item = QStandardItem()
+                    add_to_vd_item.setIcon(QIcon(':qtutils/fugue/arrow'))
+                    add_to_vd_item.setEditable(False)
+                    add_to_vd_item.setToolTip('Add this output to selected virtual device')
+                    add_to_vd_item.setData(EO[1] + ' - ' + EO[0], self.CT_TREE_ROLE_NAME)
+                    enum_outputs.appendRow([EO_item, add_to_vd_item])
                 for DDS in DDSs:
                     DDS_item = QStandardItem(DDS[1] + ' - ' + DDS[0])
                     add_to_vd_item = QStandardItem()
@@ -453,6 +467,16 @@ def on_edit_virtual_devices(self, *args, **kwargs):
                 do_item.setData(DO[2], self.VD_TREE_ROLE_DO_INVERTED)
                 digital_outputs.appendRow(self.make_virtual_device_output_row(do_item))
 
+            enum_outputs = QStandardItem('Enum Outputs')
+            device_item.appendRow(enum_outputs)
+            for EO in vd['EO']:
+                if EO[0] not in self.BLACS['ui'].blacs.tablist:
+                    # BLACS tab removed, remove virtual device
+                    continue
+                chan = self.BLACS['ui'].blacs.tablist[EO[0]].get_channel(EO[1])
+                eo_item = QStandardItem(EO[0] + '.' + chan.name)
+                enum_outputs.appendRow(self.make_virtual_device_output_row(eo_item))
+
             dds_outputs = QStandardItem('DDS Outputs')
             device_item.appendRow(dds_outputs)
             for DDS in vd['DDS']:

blacs/plugins/virtual_device/virtual_device_tab.py

@@ -10,14 +10,15 @@
 
 class VirtualDeviceTab(PluginTab):
 
-    def create_widgets(self, blacs_tablist, AOs, DOs, DDSs):
+    def create_widgets(self, blacs_tablist, AOs, DOs, EOs, DDSs):
         '''
         This function sets up the tab, and should be called as soon as the plugin is otherwise ready.
         Here, we create dictionaries of widgets (initially connecting them to outputs).
         '''
         self._blacs_tablist = blacs_tablist
         self._AOs = {(AO[0], AO[1]): None for AO in AOs}
         self._DOs = {(DO[0], DO[1], DO[2]): None for DO in DOs}
+        self._EOs = {(EO[0], EO[1]): None for EO in EOs}
         self._DDSs = {(DDS[0], DDS[1]): None for DDS in DDSs}
 
         for AO in self._AOs.keys():
@@ -36,6 +37,14 @@ def create_widgets(self, blacs_tablist, AOs, DOs, DDSs):
                 self._DOs[DO].setText(virtual_label)
                 self._DOs[DO].last_DO = None
 
+        for EO in self._EOs.keys():
+            if self._EOs[EO] is None:
+                chan = self._blacs_tablist[EO[0]].get_channel(EO[1])
+                orig_label = chan.name.split('-')
+                virtual_label = '%s\n%s' % (EO[0]+'.'+orig_label[0], orig_label[1])
+                self._EOs[EO] = chan.create_widget(virtual_label, False, None)
+                self._EOs[EO].last_AO = None
+
         for DDS in self._DDSs.keys():
             if self._DDSs[DDS] is None:
                 chan = self._blacs_tablist[DDS[0]].get_channel(DDS[1])
@@ -48,6 +57,8 @@ def create_widgets(self, blacs_tablist, AOs, DOs, DDSs):
             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._EOs) > 0:
+            self.place_widget_group('Enum Outputs', [v for k, v in self._EOs.items()])
         if len(self._DDSs) > 0:
             self.place_widget_group('DDS Outputs', [v for k, v in self._DDSs.items()])
 
@@ -68,6 +79,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 EO in self._EOs.keys():
+            if self._EOs[EO] is not None:
+                new_EO = self._blacs_tablist[EO[0]].get_channel(EO[1])
+                if self._EOs[EO].get_EO() is None and self._EOs[EO].last_EO != new_EO:
+                    self._EOs[EO].set_EO(new_EO)
         for DDS in self._DDSs.keys():
             if self._DDSs[DDS] is not None:
                 new_DDS = self._blacs_tablist[DDS[0]].get_channel(DDS[1])
@@ -87,6 +103,10 @@ 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 EO in self._EOs.keys():
+            if EO[0] == closing_device_name:
+                self._EOs[EO].last_EO = self._EOs[EO].get_EO()
+                self._EOs[EO].set_EO(None)
         for DDS in self._DDSs.keys():
             if DDS[0] == closing_device_name:
                 old_DDS = self._blacs_tablist[DDS[0]].get_channel(DDS[1])