diff --git a/core/nodeslicer/nodes/mesh.py b/core/nodeslicer/nodes/mesh.py
index 08db20f..564d0d7 100644
--- a/core/nodeslicer/nodes/mesh.py
+++ b/core/nodeslicer/nodes/mesh.py
@@ -534,7 +534,7 @@ class SLICENODE_TransformGeometry(SliceNode):
self.add_output("SLICESOCK_Geometry", "Geometry")
def evaluate_output(self, socket_name: str, **_kwargs) -> Any:
- if socket_name not in ("Geometry"):
+ if socket_name not in ("Geometry",):
return None
geom_data: Any = self.resolve("Geometry")
@@ -835,6 +835,3 @@ class SLICENODE_AssignPropertyToObject(SliceNode):
props.append(("", str(item)))
return _assign_properties_to_item(geom, props)
-
-
-
diff --git a/infra/_3mf_writer/_3mf.py b/infra/_3mf_writer/_3mf.py
index 743e9de..4cc6047 100644
--- a/infra/_3mf_writer/_3mf.py
+++ b/infra/_3mf_writer/_3mf.py
@@ -1,18 +1,18 @@
from __future__ import annotations
-from typing import Any
-from numpy.typing import NDArray
from pathlib import Path
import numpy as np
import os, shutil, tempfile
import xml.etree.ElementTree as ET
from datetime import date
+from typing import Any
-from ..blender.blender_mesh_capture import SlicingObject, SlicingGroup, SlicingCollection
+from ..blender.blender_mesh_capture import SlicingGroup, SlicingCollection
script_dir = os.path.dirname(os.path.abspath(__file__))
-def write_metadata_xml(group: SlicingGroup, filepath):
+
+def write_metadata_xml(group: SlicingGroup, filepath: str | Path) -> None:
# Custom sorting order for object types
object_type_order = {
'ModelPart': 0,
@@ -28,23 +28,31 @@ def write_metadata_xml(group: SlicingGroup, filepath):
for j, (k, collection) in enumerate(valid_collections.items()):
- sorted_data: list[tuple[NDArray[Any], NDArray[Any], SlicingObject]] = sorted(zip(collection.mesh_start_ids, collection.mesh_end_ids, collection.objects), key=lambda x: object_type_order.get(x[2].object_type, 5))
+ sorted_data = sorted(
+ zip(collection.mesh_start_ids, collection.mesh_end_ids, collection.objects),
+ key=lambda x: (
+ 0 if x[2].name == collection.name else 1,
+ object_type_order.get(x[2].object_type, 5),
+ x[2].name,
+ ),
+ )
object_elem = ET.SubElement(xml_content, "object", id=str(j+1), instances_count="1")
ET.SubElement(object_elem, "metadata", type="object", key="name", value=collection.name)
for i, (start, end, metadata) in enumerate(sorted_data):
- if metadata.object_type == "ModelPart":
- for mod in metadata.modifiers:
- ET.SubElement(object_elem, "metadata", type="object", key=mod['param_id'], value=mod['param_value'])
volume_elem = ET.SubElement(object_elem, "volume", firstid=str(start), lastid=str(end))
-
ET.SubElement(volume_elem, "metadata", type="volume", key="name", value=metadata.name)
+
if metadata.object_type == "ParameterModifier":
ET.SubElement(volume_elem, "metadata", type="volume", key="modifier", value="1")
+
+ if metadata.object_type in ["ModelPart", "ParameterModifier"]:
for mod in metadata.modifiers:
+ if not mod: continue
ET.SubElement(volume_elem, "metadata", type="volume", key=mod['param_id'], value=mod['param_value'])
+
ET.SubElement(volume_elem, "metadata", type="volume", key="volume_type", value=metadata.object_type)
ET.SubElement(volume_elem, "metadata", type="volume", key="extruder", value=str(metadata.extruder))
ET.SubElement(volume_elem, "metadata", type="volume", key="source_object_id", value="0")
@@ -56,19 +64,21 @@ def write_metadata_xml(group: SlicingGroup, filepath):
xml_tree = ET.ElementTree(xml_content)
xml_tree.write(filepath, encoding="UTF-8", xml_declaration=True)
-def write_wipe_tower_xml(group: SlicingGroup, filename):
+
+def write_wipe_tower_xml(group: SlicingGroup, filename: str | Path) -> None:
with open(filename, 'w', encoding="UTF-8") as file:
- file.write(f'\n')
+ file.write('\n')
file.write(f'\n')
-def write_model_xml(group: SlicingGroup, filename: str):
+
+def write_model_xml(group: SlicingGroup, filename: str | Path) -> None:
now = date.today().isoformat()
# Open file for writing
with open(filename, 'w', encoding="UTF-8") as file:
# Write the XML declaration and opening model tag
- file.write(f'\n')
- file.write(f'\n')
+ file.write('\n')
+ file.write('\n')
# Write metadata entries using list comprehension
metadata_entries: list[tuple[str, str]] = [
@@ -86,7 +96,7 @@ def write_model_xml(group: SlicingGroup, filename: str):
file.writelines([f' {value}\n' for name, value in metadata_entries])
# Write resources element and object using list comprehension
- file.write(f' \n')
+ file.write(' \n')
verts_template = np.vectorize(lambda x, y, z: '\n' % (x, y, z))
idx_template = np.vectorize(lambda a, b, c: '\n' % (a, b, c))
@@ -101,40 +111,41 @@ def write_model_xml(group: SlicingGroup, filename: str):
if uv.size and t_idx.size:
file.write(f' \n')
+ file.write(' \n')
+ file.write(' \n')
- file.write(f' \n')
+ file.write(' \n')
# Write build element
- file.write(f' \n')
- ox, oy, oz = group.object_offset[0], group.object_offset[1], group.object_offset[2]
+ file.write(' \n')
+ ox, oy, oz = getattr(group, "object_offset", (0.0, 0.0, 0.0))
transform_str = f"1 0 0 0 1 0 0 0 1 {ox} {oy} {oz}"
for i, k in enumerate(valid_collections):
if not valid_collections[k].unique_verts[0].size: continue
- file.writelines([f'