diff --git a/core/nodeslicer/nodes/base.py b/core/nodeslicer/nodes/base.py index 9afed37..c16cc93 100644 --- a/core/nodeslicer/nodes/base.py +++ b/core/nodeslicer/nodes/base.py @@ -127,10 +127,11 @@ class MathNode(SliceNode): class SliceNodeJoiner(SliceNode): socket_type: str = "" output_socket_type: str = "" + socket_label: str = "" def init(self, context): - self.add_output(self.output_socket_type or self.socket_type) - self.add_multi_socket_group(self.socket_type) + self.add_output(self.output_socket_type or self.socket_type, name=self.socket_label) + self.add_multi_socket_group(self.socket_type, name=self.socket_label) class ExecSliceNode(SliceNode): button_label: str = 'Execute' diff --git a/core/nodeslicer/nodes/gcode.py b/core/nodeslicer/nodes/gcode.py index 2d0a343..e6d3d82 100644 --- a/core/nodeslicer/nodes/gcode.py +++ b/core/nodeslicer/nodes/gcode.py @@ -179,6 +179,7 @@ class SLICENODE_JoinGcode(SliceNodeJoiner): bl_label = "Join Gcode" socket_type = "NodeSocketString" output_socket_type = "NodeSocketString" + socket_label = "Gcode" def evaluate_output(self, socket_name: str, **_kwargs) -> str: from ....infra.blender.blender_slice_nodes_generic import resolve_input @@ -196,8 +197,8 @@ class SLICENODE_LoadGcode(SliceNode): bl_label = "Load Gcode File" def init(self, context): - self.add_input("NodeSocketString", "Filepath") - self.add_output("NodeSocketString") + self.add_input("NodeSocketStringFilePath", "Filepath") + self.add_output("NodeSocketString", name= "Gcode") def evaluate_output(self, socket_name: str, **_kwargs) -> str: path = self.resolve("Filepath") diff --git a/core/nodeslicer/nodes/mesh.py b/core/nodeslicer/nodes/mesh.py index 2ae35d7..1ae36d5 100644 --- a/core/nodeslicer/nodes/mesh.py +++ b/core/nodeslicer/nodes/mesh.py @@ -748,17 +748,11 @@ def _rename_slicing_item(geom: Any, new_name: str) -> Any: class SLICENODE_RenameMesh(SliceNode): bl_label = "Rename Mesh" - new_name: NfStringProperty(name="Name", default="RenamedMesh") # pyright: ignore[reportInvalidTypeForm] - def init(self, context): self.add_input("SLICESOCK_Mesh", "Geometry") self.add_input("NodeSocketString", "Name") self.add_output("SLICESOCK_Mesh", "Geometry") - def draw_buttons(self, context, layout): - assert layout - layout.prop(self, "new_name") - def evaluate_output(self, socket_name: str, **_kwargs) -> Any: if socket_name != "Geometry": return None @@ -768,7 +762,7 @@ class SLICENODE_RenameMesh(SliceNode): return None name_socket: str | None = self.resolve("Name") - target_name = name_socket if name_socket else self.new_name + target_name = name_socket if not target_name: return geom diff --git a/core/nodeslicer/nodes/output.py b/core/nodeslicer/nodes/output.py index 723583b..f8f38f7 100644 --- a/core/nodeslicer/nodes/output.py +++ b/core/nodeslicer/nodes/output.py @@ -73,7 +73,7 @@ class SLICENODE_GcodeToTextBlock(ExecSliceNode): def init(self, context): self._init_exec() - self.add_input("NodeSocketString") + self.add_input("NodeSocketString", "Gcode") def draw_buttons(self, context, layout): super().draw_buttons(context, layout) @@ -109,7 +109,7 @@ class SLICENODE_StartPrint(ExecSliceNode): def init(self, context): self._init_exec() - self.add_input("NodeSocketString") + self.add_input("NodeSocketString", "Gcode") self.add_input("SLICESOCK_Printer") def evaluate(self, operator=None):