Add children to CDIMemo. Remove empty groups (offset only) from the tree in the GUI.

Poikilos · Poikilos · commit c5edb84dc27d · 2026-02-24T12:47:28.000-05:00
diff --git a/examples/examples_gui.py b/examples/examples_gui.py
@@ -462,7 +462,8 @@ def _gui(self, parent):
 
         self.cdi_row += 1
         self.network = None
-        self.cdi_form = None
+        self.cdi_form = None  # type: CDIForm|None
+        # ^ CDIForm or other XMLDataProcessor subclass
 
         self.example_tab = ttk.Frame(self.notebook)
         self.example_tab.columnconfigure(index=0, weight=1)
@@ -492,7 +493,7 @@ def _gui(self, parent):
 
     def setupNetwork(self):
         self.network = OpenLCBNetwork(self.getValue('localNodeID'))
-        self.cdi_form = CDIForm(self.network.canLink, self.cdi_tab)  # XMLDataProcessor subclass
+        self.cdi_form = CDIForm(self.network.canLink, self.cdi_tab)
         self.cdi_form.setStatusCallback(self.setStatus)
         # ^ formerly OpenLCBNetwork() subclass
         # ^ CDIForm has ttk.Treeview etc.
diff --git a/examples/tkexamples/cdiform.py b/examples/tkexamples/cdiform.py
@@ -238,6 +238,12 @@ def _onPopScope(self, cm: CDIMemo):
                     parts.append(f'offset="{offset}"')
             self.debug(*parts)
             logger.debug(self.indent() + "Done ignoring {}".format(cm.tag))
+        if cm.iid:
+            # If in tree, check if it is an empty group (no name so remove it).
+            children = self._treeview.get_children(cm.iid)
+            if (cm.getTag() == "group") and (not children):
+                # self._treeview.detach(cm.iid)  # remove but don't destroy
+                self._treeview.delete(cm.iid)  # detach and destroy
         return cm
 
     def write(self, *args, **kwargs):
diff --git a/openlcb/cdimemo.py b/openlcb/cdimemo.py
@@ -1,6 +1,6 @@
 import xml.etree.ElementTree
 
-from typing import Optional, Union
+from typing import List, Optional, Union
 
 from openlcb.message import Message
 
@@ -14,6 +14,9 @@ class CDIMemo:
             of previous elements and offset of this element).
         content (str|None): string content (collected by parser from
             between the start and end tag).
+        children (List[CDIMemo]): List of children (Therefore not
+            complete until onPopScope, but you can also check if .end is
+            True in asynchronous scopes).
         done (bool): If True, downloadCDI is finished. Though document
             itself may be incomplete if 'error' is also set, stop
             tracking status of downloadCDI regardless.
@@ -45,6 +48,7 @@ def __init__(self, tag: Union[str, None] = None,
         self.message: Union[Message, None] = None  # type: Message|None
         self.iid = None  # type: str|None
         self.address = None  # type: int|None
+        self.children = []  # type: List[CDIMemo]
 
     def getTag(self):
         if self.element is None:
diff --git a/openlcb/xmldataprocessor.py b/openlcb/xmldataprocessor.py
@@ -430,6 +430,8 @@ def endElement(self, name: str):
             cm.parent = self._tag_stack[-1]
             cm.element = top_el
         # else parent & element should already have been set in startElement
+        if cm.parent is not None:
+            cm.parent.children.append(cm)
         _ = self.checkDone(cm)
         cm.content = self._flushCharBuffer()
         self.onPopScope(cm)
