Merge pull request #1270 from lorenzncode/assy-hier

Remove one level of hierarchy in STEP export

Author: jmwright

cadquery/occ_impl/assembly.py

@@ -152,16 +152,12 @@ def toCAF(
     tool.SetAutoNaming_s(False)
     ctool = XCAFDoc_DocumentTool.ColorTool_s(doc.Main())
 
-    # add root
-    top = tool.NewShape()
-    TDataStd_Name.Set_s(top, TCollection_ExtendedString("CQ assembly"))
-
     # used to store labels with unique part-color combinations
     unique_objs: Dict[Tuple[Color, AssemblyObjects], TDF_Label] = {}
     # used to cache unique, possibly meshed, compounds; allows to avoid redundant meshing operations if same object is referenced multiple times in an assy
     compounds: Dict[AssemblyObjects, Compound] = {}
 
-    def _toCAF(el, ancestor, color):
+    def _toCAF(el, ancestor, color) -> TDF_Label:
 
         # create a subassy
         subassy = tool.NewShape()
@@ -207,11 +203,14 @@ def _toCAF(el, ancestor, color):
         for child in el.children:
             _toCAF(child, subassy, current_color)
 
-        # add the current subassy to the higher level assy
-        tool.AddComponent(ancestor, subassy, el.loc.wrapped)
+        if ancestor:
+            # add the current subassy to the higher level assy
+            tool.AddComponent(ancestor, subassy, el.loc.wrapped)
+
+        return subassy
 
     # process the whole assy recursively
-    _toCAF(assy, top, None)
+    top = _toCAF(assy, None, None)
 
     tool.UpdateAssemblies()
 

tests/test_assembly.py

@@ -479,6 +479,21 @@ def test_assembly(simple_assy, nested_assy):
     assert kvs[-1][0] == "TOP"
 
 
+@pytest.mark.parametrize(
+    "assy_fixture, root_name", [("simple_assy", None), ("nested_assy", "TOP")],
+)
+def test_assy_root_name(assy_fixture, root_name, request):
+    assy = request.getfixturevalue(assy_fixture)
+    _, doc = toCAF(assy, True)
+    root = get_doc_nodes(doc, False)[0]
+    if root_name:
+        assert root["name"] == root_name
+    else:
+        # When a name is not user-specifed, the name is assigned a UUID
+        m = re.findall(r"[0-9a-f]+", root["name"])
+        assert list(map(len, m)) == [8, 4, 4, 4, 12]
+
+
 def test_step_export(nested_assy, tmp_path_factory):
     # Use a temporary directory
     tmpdir = tmp_path_factory.mktemp("out")