From bf9eb949fe44035820d73162df969eeba3741ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Station=C3=A4r=5CHenrik?= Date: Mon, 30 Dec 2024 11:17:12 +0100 Subject: [PATCH 1/9] Fix missing imports in puzzle_joinery --- scripts/addons/cam/puzzle_joinery.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/addons/cam/puzzle_joinery.py b/scripts/addons/cam/puzzle_joinery.py index d107d7cb..dcf28e9e 100644 --- a/scripts/addons/cam/puzzle_joinery.py +++ b/scripts/addons/cam/puzzle_joinery.py @@ -31,6 +31,10 @@ from .utilities.simple_utils import ( rotate, make_active, remove_multiple, + select_multiple, + join_multiple, + remove_doubles, + add_rectangle, ) From c654d3c83c7b39c9253690d0185f055e7efda3ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Station=C3=A4r=5CHenrik?= Date: Mon, 30 Dec 2024 11:31:07 +0100 Subject: [PATCH 2/9] Fix missing imports in cam_chunk --- scripts/addons/cam/cam_chunk.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/addons/cam/cam_chunk.py b/scripts/addons/cam/cam_chunk.py index cad16e48..f6fd8223 100644 --- a/scripts/addons/cam/cam_chunk.py +++ b/scripts/addons/cam/cam_chunk.py @@ -14,6 +14,7 @@ from math import ( ) import sys import time +import random import numpy as np import shapely @@ -31,7 +32,7 @@ except ImportError: pass import bpy -from mathutils import Vector +from mathutils import Vector, Euler try: import bl_ext.blender_org.simplify_curves_plus as curve_simplify @@ -59,6 +60,8 @@ from .utilities.chunk_utils import ( from .utilities.image_utils import ( get_sample_image, prepare_area, + render_sample_image, + get_circle_binary, ) from .utilities.numba_utils import jit from .utilities.ocl_utils import ( @@ -84,6 +87,7 @@ from .utilities.simple_utils import ( tuple_multiply, tuple_subtract, is_vertical_limit, + get_cache_path, ) From 44e2c19f48b47e5c199d5b6481e6b0f11d3c4072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Station=C3=A4r=5CHenrik?= Date: Mon, 30 Dec 2024 11:39:57 +0100 Subject: [PATCH 3/9] Fix reference in pack --- scripts/addons/cam/pack.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/addons/cam/pack.py b/scripts/addons/cam/pack.py index 4ecf5ca8..704b91ef 100644 --- a/scripts/addons/cam/pack.py +++ b/scripts/addons/cam/pack.py @@ -225,5 +225,5 @@ def pack_curves(): i += 1 t = time.time() - t - polygon_utils_cam.shapely_to_curve("test", sgeometry.MultiPolygon(placedpolys), 0) + shapely_to_curve("test", sgeometry.MultiPolygon(placedpolys), 0) print(t) From 9bccef0479b73acc98a51456c73c3a4a13596acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Station=C3=A4r=5CHenrik?= Date: Mon, 30 Dec 2024 12:05:40 +0100 Subject: [PATCH 4/9] Fixing reference in testing.py --- scripts/addons/cam/testing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/addons/cam/testing.py b/scripts/addons/cam/testing.py index 8089a6bc..33a2d156 100644 --- a/scripts/addons/cam/testing.py +++ b/scripts/addons/cam/testing.py @@ -5,7 +5,7 @@ Functions for automated testing. import bpy -from .gcodepath import getPath +from .gcode_path import getPath from .utilities.simple_utils import activate From 8e856d39e53fdba05edc9ad1665aacf21abe3186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Station=C3=A4r=5CHenrik?= Date: Mon, 30 Dec 2024 13:40:51 +0100 Subject: [PATCH 5/9] Fix import and reference in optimisation_panel-py --- scripts/addons/cam/ui/panels/optimisation_panel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/addons/cam/ui/panels/optimisation_panel.py b/scripts/addons/cam/ui/panels/optimisation_panel.py index 3d9f81c2..e734a9bc 100644 --- a/scripts/addons/cam/ui/panels/optimisation_panel.py +++ b/scripts/addons/cam/ui/panels/optimisation_panel.py @@ -9,6 +9,7 @@ from bpy.types import Panel from .parent_panel import CAMParentPanel +from ...utilities.version_utils import opencamlib_version class CAM_OPTIMISATION_Panel(CAMParentPanel, Panel): """CAM Optimisation Panel""" @@ -86,7 +87,7 @@ class CAM_OPTIMISATION_Panel(CAMParentPanel, Panel): if self.op.remove_redundant_points: row = col.row() row.use_property_split = True - row.prop(self.op, "simplify_tol") + row.prop(self.op, "simplify_tolerance") # Use Modifiers if self.op.geometry_source in ["OBJECT", "COLLECTION"]: From abd986b2ec508151f7c048e28bf0e2f10d6eafb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Station=C3=A4r=5CHenrik?= Date: Mon, 30 Dec 2024 13:46:14 +0100 Subject: [PATCH 6/9] Fix missing import in bounds_utils.py --- scripts/addons/cam/utilities/bounds_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/addons/cam/utilities/bounds_utils.py b/scripts/addons/cam/utilities/bounds_utils.py index 394cb844..06995233 100644 --- a/scripts/addons/cam/utilities/bounds_utils.py +++ b/scripts/addons/cam/utilities/bounds_utils.py @@ -12,7 +12,7 @@ from .simple_utils import ( progress, unit_value_to_string, ) - +from ..exception import CamException def get_bounds_worldspace(obs, use_modifiers=False): """Get the bounding box of a list of objects in world space. From 300e7e819523c9bef6981aae734866ef3e09586c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Station=C3=A4r=5CHenrik?= Date: Mon, 30 Dec 2024 14:28:59 +0100 Subject: [PATCH 7/9] Fix missing import in index_utils.py --- scripts/addons/cam/utilities/index_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/addons/cam/utilities/index_utils.py b/scripts/addons/cam/utilities/index_utils.py index 586844b9..d9dc928a 100644 --- a/scripts/addons/cam/utilities/index_utils.py +++ b/scripts/addons/cam/utilities/index_utils.py @@ -8,7 +8,7 @@ import shapely import bpy from .simple_utils import activate - +from .orient_utils import rotation_to_2_axes def prepare_indexed(o): """Prepare and index objects in the given collection. From 26fb125a30d18946aef5603ef10525210275a08d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Station=C3=A4r=5CHenrik?= Date: Mon, 30 Dec 2024 14:36:53 +0100 Subject: [PATCH 8/9] Fix missing import in thread_utils.py --- scripts/addons/cam/utilities/thread_utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/addons/cam/utilities/thread_utils.py b/scripts/addons/cam/utilities/thread_utils.py index 598ce5fa..240a2fcb 100644 --- a/scripts/addons/cam/utilities/thread_utils.py +++ b/scripts/addons/cam/utilities/thread_utils.py @@ -2,6 +2,7 @@ They mostly call the functions from 'utils.py' """ +import threading import bpy From 506d29ef668aaac8bdf4dcc8dff1b4480eed3fa4 Mon Sep 17 00:00:00 2001 From: hmunktell <5789534+hmunktell@users.noreply.github.com> Date: Mon, 30 Dec 2024 13:38:27 +0000 Subject: [PATCH 9/9] :art: Format Python code with psf/black --- scripts/addons/cam/ui/panels/optimisation_panel.py | 1 + scripts/addons/cam/utilities/bounds_utils.py | 1 + scripts/addons/cam/utilities/index_utils.py | 1 + 3 files changed, 3 insertions(+) diff --git a/scripts/addons/cam/ui/panels/optimisation_panel.py b/scripts/addons/cam/ui/panels/optimisation_panel.py index e734a9bc..cd582b60 100644 --- a/scripts/addons/cam/ui/panels/optimisation_panel.py +++ b/scripts/addons/cam/ui/panels/optimisation_panel.py @@ -11,6 +11,7 @@ from .parent_panel import CAMParentPanel from ...utilities.version_utils import opencamlib_version + class CAM_OPTIMISATION_Panel(CAMParentPanel, Panel): """CAM Optimisation Panel""" diff --git a/scripts/addons/cam/utilities/bounds_utils.py b/scripts/addons/cam/utilities/bounds_utils.py index 06995233..2fc48baf 100644 --- a/scripts/addons/cam/utilities/bounds_utils.py +++ b/scripts/addons/cam/utilities/bounds_utils.py @@ -14,6 +14,7 @@ from .simple_utils import ( ) from ..exception import CamException + def get_bounds_worldspace(obs, use_modifiers=False): """Get the bounding box of a list of objects in world space. diff --git a/scripts/addons/cam/utilities/index_utils.py b/scripts/addons/cam/utilities/index_utils.py index d9dc928a..b9655412 100644 --- a/scripts/addons/cam/utilities/index_utils.py +++ b/scripts/addons/cam/utilities/index_utils.py @@ -10,6 +10,7 @@ import bpy from .simple_utils import activate from .orient_utils import rotation_to_2_axes + def prepare_indexed(o): """Prepare and index objects in the given collection.