diff --git a/core/nodeslicer/nodes.py b/core/nodeslicer/nodes.py index d03ffc8..e13e88f 100644 --- a/core/nodeslicer/nodes.py +++ b/core/nodeslicer/nodes.py @@ -8,7 +8,6 @@ from math import floor from pathlib import Path from typing import Any, TypeAlias import bpy -from bpy.props import BoolProperty import numpy as np from mathutils import Euler from .bpy_ns_types import NfStringProperty, NfEnumProperty, NfBoolProperty @@ -16,8 +15,8 @@ from .bpy_ns_types import NfStringProperty, NfEnumProperty, NfBoolProperty from ...registry import register_class from .. import slice from ..slice import Pather, slice_at_range, SlicePaths -from ...infra.blender_mesh_capture import SlicingCollection, SlicingObject, capture_mesh_edges, SlicingGroup -from ...infra.blender_slice_nodes_generic import SliceNode, resolve_input +from ...infra.blender.blender_mesh_capture import SlicingCollection, SlicingObject, capture_mesh_edges, SlicingGroup +from ...infra.blender.blender_slice_nodes_generic import SliceNode, resolve_input from .bpy_ns_types import notify_tree_changed from ...infra._3mf_writer._3mf import prepare_3mf @@ -262,7 +261,7 @@ class SLICENODE_InputPrinter(SliceNode): layout.prop(self, "host_type") # pyright: ignore[reportOptionalMemberAccess] def evaluate_output(self, socket_name: str, **_kwargs) -> Any: - from ...infra.printer_backends import PrinterConfig + from ...infra.networking.printer_backends import PrinterConfig return PrinterConfig( host=self.resolve("Host"), port=self.resolve("Port"), @@ -1093,7 +1092,7 @@ class SLICENODE_StartPrint(ExecSliceNode): self.add_input("SLICESOCK_Printer") def evaluate(self, operator=None): - from ...infra.printer_backends import ( + from ...infra.networking.printer_backends import ( PrinterConfig, PrusaLinkBackend, CrealityBackend, diff --git a/core/nodeslicer/sockets.py b/core/nodeslicer/sockets.py index 1b1ab46..68ab4e6 100644 --- a/core/nodeslicer/sockets.py +++ b/core/nodeslicer/sockets.py @@ -6,7 +6,7 @@ from bpy.types import Property, PropertyGroup, bpy_struct from .bpy_ns_types import NfStringProperty, NfFloatProperty, NfIntProperty, NfEnumProperty, NfPointerProperty from ...registry import register_class -from ...infra.blender_slice_nodes_generic import SliceNodeSocket +from ...infra.blender.blender_slice_nodes_generic import SliceNodeSocket from ..slice import SlicePaths from .bpy_ns_types import notify_tree_changed @@ -150,7 +150,7 @@ class OverrideItem(bpy.types.PropertyGroup): row.prop(self, "field", text="") row.prop(self, "value_str", text="") -from ...infra.mixins import CollectionMixin +from ...infra.blender.mixins import CollectionMixin class SLICESOCK_Overrides_Common(CollectionMixin, InputNodeSocket): bl_label = "Overrides" @@ -216,7 +216,7 @@ class SLICESOCK_Printer(InputNodeSocket): @property def value(self) -> Any: - from ...infra.printer_backends import PrinterConfig + from ...infra.networking.printer_backends import PrinterConfig return PrinterConfig( host=self.host, port=self.port, diff --git a/core/nodeslicer/tree.py b/core/nodeslicer/tree.py index 4f93362..cd274e6 100644 --- a/core/nodeslicer/tree.py +++ b/core/nodeslicer/tree.py @@ -4,7 +4,7 @@ import bpy from bpy.types import NodeTree, Operator, Menu from bpy.app.handlers import persistent -from ...infra.mixins import update_collection +from ...infra.blender.mixins import update_collection from ...registry import register_class if TYPE_CHECKING: diff --git a/infra/_3mf_writer/_3mf.py b/infra/_3mf_writer/_3mf.py index c6328f0..768843c 100644 --- a/infra/_3mf_writer/_3mf.py +++ b/infra/_3mf_writer/_3mf.py @@ -7,7 +7,7 @@ import os, shutil, tempfile import xml.etree.ElementTree as ET from datetime import date -from ..blender_mesh_capture import SlicingObject, SlicingGroup, SlicingCollection +from ..blender.blender_mesh_capture import SlicingObject, SlicingGroup, SlicingCollection script_dir = os.path.dirname(os.path.abspath(__file__)) diff --git a/infra/blender_bridge.py b/infra/blender/blender_bridge.py similarity index 100% rename from infra/blender_bridge.py rename to infra/blender/blender_bridge.py diff --git a/infra/blender_mesh_capture.py b/infra/blender/blender_mesh_capture.py similarity index 99% rename from infra/blender_mesh_capture.py rename to infra/blender/blender_mesh_capture.py index 27e8244..5b8716f 100644 --- a/infra/blender_mesh_capture.py +++ b/infra/blender/blender_mesh_capture.py @@ -10,8 +10,8 @@ from numpy.typing import NDArray from typing import Any -from ..core.geometry import crc32_array -from ..infra.blender_bridge import get_all_children +from ...core.geometry import crc32_array +from .blender_bridge import get_all_children TYPES_NAME = 'DEFAULT' diff --git a/infra/blender_slice_nodes_generic.py b/infra/blender/blender_slice_nodes_generic.py similarity index 97% rename from infra/blender_slice_nodes_generic.py rename to infra/blender/blender_slice_nodes_generic.py index d3048be..4265c55 100644 --- a/infra/blender_slice_nodes_generic.py +++ b/infra/blender/blender_slice_nodes_generic.py @@ -28,11 +28,11 @@ class SliceNode(Node, AutoBlIdName): return resolve_input(self.inputs.get(fieldname)) def add_output(self, bl_idname: str, name: str = ""): - from ..registry import get_label_by_name + from ...registry import get_label_by_name return self.outputs.new(bl_idname, name or get_label_by_name(bl_idname)) def add_input(self, bl_idname: str, name: str = "", multi: bool = False): - from ..registry import get_label_by_name + from ...registry import get_label_by_name sock = self.inputs.new(bl_idname, name or get_label_by_name(bl_idname)) if multi: sock.link_limit = 0 diff --git a/infra/mixins.py b/infra/blender/mixins.py similarity index 100% rename from infra/mixins.py rename to infra/blender/mixins.py diff --git a/infra/printer_backends.py b/infra/networking/printer_backends.py similarity index 99% rename from infra/printer_backends.py rename to infra/networking/printer_backends.py index 1de3206..8eee4c4 100644 --- a/infra/printer_backends.py +++ b/infra/networking/printer_backends.py @@ -216,7 +216,7 @@ class CrealityBackend(PrinterHttpBackend): @with_api_state('STARTING') def start_print(self, gcode: Path, name: str) -> None: - from ..infra.ftp_handling import ftp_upload, ftp_wipe, ftp_get_filesize + from ...infra.ftp_handling import ftp_upload, ftp_wipe, ftp_get_filesize file_size = gcode.stat().st_size diff --git a/ui/panels.py b/ui/panels.py index 159b550..3035839 100644 --- a/ui/panels.py +++ b/ui/panels.py @@ -1,6 +1,6 @@ from bpy.types import Panel -from ..infra.mixins import DrawCollectionMixin +from ..infra.blender.mixins import DrawCollectionMixin from ..registry import register_class