Merge pull request #19 from hmunktell/fix-imports

Fix various imports and references

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,
 )
 
 

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)

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,
 )
 
 

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
 

scripts/addons/cam/ui/panels/optimisation_panel.py

@@ -9,6 +9,8 @@ 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 +88,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"]:

scripts/addons/cam/utilities/bounds_utils.py

@@ -12,6 +12,7 @@ from .simple_utils import (
     progress,
     unit_value_to_string,
 )
+from ..exception import CamException
 
 
 def get_bounds_worldspace(obs, use_modifiers=False):

scripts/addons/cam/utilities/index_utils.py

@@ -8,6 +8,7 @@ import shapely
 import bpy
 
 from .simple_utils import activate
+from .orient_utils import rotation_to_2_axes
 
 
 def prepare_indexed(o):

scripts/addons/cam/utilities/thread_utils.py

@@ -2,6 +2,7 @@
 
 They mostly call the functions from 'utils.py'
 """
+import threading
 
 import bpy