remove reload code

scripts/addons/cam/bridges.py

@@ -23,13 +23,7 @@
 import bpy
 from bpy.props import *
 
-import importlib
 from cam import utils
-try:
-	importlib.reload(utils)
-except:
-    print("PROBLEM RELOADING MODULE cam.utils AT "+__name__)
-
 import mathutils
 import math
 

scripts/addons/cam/chunk.py

@@ -23,18 +23,8 @@
 import shapely
 from shapely.geometry import polygon as spolygon
 from shapely import geometry as sgeometry
-
-import importlib
-camModules=["polygon_utils_cam", "simple"]
-for mod in camModules:
-    try:
-        modName=mod.split(".")[-1]
-        exec(modName + "=importlib.import_module('cam."+ mod+"')")
-        exec("importlib.reload("+modName+")")
-    except:
-        print("PROBLEM (RE)LOADING MODULE cam."+mod+" AT "+__name__)
+from cam import polygon_utils_cam
 from cam.simple import *
-
 import math
 
 def Rotate_pbyp(originp, p, ang): ## rotate point around another point with angle

scripts/addons/cam/collision.py

@@ -22,13 +22,9 @@
 import bpy
 import time
 
-import importlib
 from cam import simple
 from cam.simple import *
-try:
-	importlib.reload(simple)
-except:
-	print("PROBLEM RELOADING MODULE cam.simple AT "+__name__)
+
 
 BULLET_SCALE = 10000  # this is a constant for scaling the rigidbody collision world for higher precision from bullet library
 CUTTER_OFFSET = (-5 * BULLET_SCALE, -5 * BULLET_SCALE,

scripts/addons/cam/curvecamequation.py

@@ -24,22 +24,11 @@
 import bpy
 from bpy.props import *
 
-
-import importlib
-camModules=["utils", "parametric"]
-for mod in camModules:
-    try:
-        modName=mod.split(".")[-1]
-        exec(modName + "=importlib.import_module('cam."+ mod+"')")
-        exec("importlib.reload("+modName+")")
-    except:
-        print("PROBLEM (RE)LOADING MODULE cam."+mod+" AT "+__name__)
-	
+from cam import utils, parametric
 import math
 from Equation import Expression
 import numpy as np
 
-
 class CamSineCurve(bpy.types.Operator):
     """Object sine """  # by Alain Pelletier april 2021
     bl_idname = "object.sine"

scripts/addons/cam/curvecamtools.py

@@ -27,23 +27,13 @@ from bpy.props import *
 from bpy.types import Operator
 from bpy_extras.io_utils import ImportHelper
 
-import importlib
-camModules=["utils", "pack", "polygon_utils_cam", "simple", "gcodepath", "bridges", "parametric", "gcodeimportparser"]
-for mod in camModules:
-    try:
-        modName=mod.split(".")[-1]
-        exec(modName + "=importlib.import_module('cam."+ mod+"')")
-        exec("importlib.reload("+modName+")")
-    except:
-        print("PROBLEM (RE)LOADING MODULE cam."+mod+" AT "+__name__)
-        
+from cam import utils, pack, polygon_utils_cam, simple, gcodepath, bridges, parametric, gcodeimportparser
 import shapely
 import mathutils
 import math
 from Equation import Expression
 import numpy as np
 
-
 # boolean operations for curve objects
 class CamCurveBoolean(bpy.types.Operator):
     """perform Boolean operation on two or more curves"""

scripts/addons/cam/gcodepath.py

@@ -31,22 +31,30 @@ from bpy.props import *
 
 import numpy
 
-import importlib
-camModules=["chunk", "collision", "simple", "utils", "strategy", "pattern", "polygon_utils_cam", "image_utils", "nc.iso"]
-for mod in camModules:
-    try:
-        modName=mod.split(".")[-1]
-        exec(modName + "=importlib.import_module('cam."+ mod+"')")
-        exec("importlib.reload("+modName+")")
-    except:
-        print("PROBLEM (RE)LOADING MODULE cam."+mod+" AT "+__name__)
+from cam import chunk
 from cam.chunk import *
+
+from cam import collision
 from cam.collision import *
+
+from cam import simple
 from cam.simple import *
+
+from cam import utils
+from cam import strategy
+
+from cam import pattern
 from cam.pattern import *
+
+from cam import polygon_utils_cam
 from cam.polygon_utils_cam import *
+
+from cam import image_utils
 from cam.image_utils import *
 
+from cam.nc import iso
+
+
 
 def pointonline(a,b,c,tolerence):
     b=b-a  # convert to vector by subtracting origin

scripts/addons/cam/image_utils.py

@@ -28,18 +28,12 @@ import curve_simplify
 import mathutils
 from mathutils import *
 
-
-import importlib
-camModules=["simple", "chunk", "simulation"]
-for mod in camModules:
-    try:
-        modName=mod.split(".")[-1]
-        exec(modName + "=importlib.import_module('cam."+ mod+"')")
-        exec("importlib.reload("+modName+")")
-    except:
-        print("PROBLEM (RE)LOADING MODULE cam."+mod+" AT "+__name__)
+from cam import simple
 from cam.simple import *
+from cam import chunk
 from cam.chunk import *
+from cam import simulation
+
 
 def getCircle(r, z):
     car = numpy.array((0), dtype=float)

scripts/addons/cam/ops.py

@@ -27,21 +27,12 @@ from bpy.props import *
 from bpy_extras.io_utils import ImportHelper
 
 import subprocess, os, threading
-
-import cam
-import importlib
-camModules=["utils", "pack", "polygon_utils_cam", "simple", "gcodepath", "bridges", "simulation"]
-for mod in camModules:
-    try:
-        modName=mod.split(".")[-1]
-        exec(modName + "=importlib.import_module('cam."+ mod+"')")
-        exec("importlib.reload("+modName+")")
-    except:
-        print("PROBLEM (RE)LOADING MODULE cam."+mod+" AT "+__name__)
-
+from cam import utils, pack, polygon_utils_cam, simple,gcodepath,bridges, simulation
 import shapely
 import mathutils
 import math
+import cam
+
 
 
 

scripts/addons/cam/pack.py

@@ -20,16 +20,7 @@
 # ***** END GPL LICENCE BLOCK *****
 
 import bpy
-import importlib
-camModules=["utils", "simple", "polygon_utils_cam"]
-for mod in camModules:
-    try:
-        modName=mod.split(".")[-1]
-        exec(modName + "=importlib.import_module('cam."+ mod+"')")
-        exec("importlib.reload("+modName+")")
-    except:
-        print("PROBLEM (RE)LOADING MODULE cam."+mod+" AT "+__name__)
-
+from cam import utils, simple, polygon_utils_cam
 import shapely
 from shapely import geometry as sgeometry
 from shapely import affinity, prepared

scripts/addons/cam/pattern.py

@@ -23,19 +23,12 @@ import time
 import mathutils
 from mathutils import *
 
-import importlib
-camModules=["simple", "chunk", "polygon_utils_cam"]
-for mod in camModules:
-	try:
-		modName=mod.split(".")[-1]
-		exec(modName + "=importlib.import_module('cam."+ mod+"')")
-		exec("importlib.reload("+modName+")")
-	except:
-		print("PROBLEM (RE)LOADING MODULE cam."+mod+" AT "+__name__)
+
+from cam import simple, chunk
 from cam.simple import *
 from cam.chunk import *
+from cam import polygon_utils_cam
 from cam.polygon_utils_cam import *
-
 import shapely
 from shapely import geometry as sgeometry
 import numpy

scripts/addons/cam/simulation.py

@@ -26,18 +26,11 @@ import mathutils
 import math
 import time
 from bpy.props import *
+from cam import utils
 import numpy as np
 
-import importlib
-camModules=["utils", "simple", "image_utils"]
-for mod in camModules:
-    try:
-        modName=mod.split(".")[-1]
-        exec(modName + "=importlib.import_module('cam."+ mod+"')")
-        exec("importlib.reload("+modName+")")
-    except:
-        print("PROBLEM (RE)LOADING MODULE cam."+mod+" AT "+__name__)
-
+from cam import simple
+from cam import image_utils
 
 def createSimulationObject(name, operations, i):
     oname = 'csim_' + name

scripts/addons/cam/slice.py

@@ -23,12 +23,9 @@
 # completely rewritten April 2021
 
 import bpy
-import importlib
+
 from cam import utils
-try:
-	importlib.reload(utils)
-except:
-	print("PROBLEM RELOADING MODULE cam.utils AT "+__name__)
+
 
 
 def slicing2d(ob, height):  # April 2020 Alain Pelletier

scripts/addons/cam/strategy.py

@@ -25,29 +25,22 @@ import bpy
 from bpy.props import *
 import time
 import math
-import sys
 from math import *
 from bpy_extras import object_utils
-
-import importlib
-
-camModules = ["chunk", "collision", "simple", "pattern", "utils", "bridges", "polygon_utils_cam", "image_utils"]
-for mod in camModules:
-    try:
-        modName = mod.split(".")[-1]
-        exec(modName + "=importlib.import_module('cam." + mod + "')")
-        exec("importlib.reload(" + modName + ")")
-    except:
-        print("PROBLEM (RE)LOADING MODULE cam." + mod + " AT " + __name__)
+from cam import chunk
 from cam.chunk import *
+from cam import collision
 from cam.collision import *
+from cam import simple
 from cam.simple import *
+from cam import pattern
 from cam.pattern import *
+from cam import utils, bridges
 from cam.utils import *
+from cam import polygon_utils_cam
 from cam.polygon_utils_cam import *
+from cam import image_utils
 from cam.image_utils import *
-import cam.ops
-from cam.ops import *
 
 from shapely.geometry import polygon as spolygon
 from shapely import geometry as sgeometry

scripts/addons/cam/testing.py

@@ -22,15 +22,7 @@
 import sys
 import bpy
 
-import importlib
-camModules=["simple", "utils"]
-for mod in camModules:
-    try:
-        modName=mod.split(".")[-1]
-        exec(modName + "=importlib.import_module('cam."+ mod+"')")
-        exec("importlib.reload("+modName+")")
-    except:
-        print("PROBLEM (RE)LOADING MODULE cam."+mod+" AT "+__name__)
+from cam import simple, utils
 from cam.simple import *
 
 

scripts/addons/cam/ui.py

@@ -31,15 +31,7 @@ from bpy.props import (StringProperty,
 from bpy.types import (Panel, Menu, Operator, PropertyGroup, )
 
 
-import importlib
-camModules=["gcodeimportparser", "simple"]
-for mod in camModules:
-    try:
-        modName=mod.split(".")[-1]
-        exec(modName + "=importlib.import_module('cam."+ mod+"')")
-        exec("importlib.reload("+modName+")")
-    except:
-        print("PROBLEM (RE)LOADING MODULE cam."+mod+" AT "+__name__)
+from cam import gcodeimportparser, simple
 from cam.simple import *
 
 # EXPERIMENTAL=True#False

scripts/addons/cam/utils.py

@@ -32,15 +32,7 @@ from bpy_extras import object_utils
 
 import sys, numpy,pickle
 
-import importlib
-camModules=["chunk", "collision", "simple", "pattern", "polygon_utils_cam", "image_utils", "opencamlib.opencamlib"]
-for mod in camModules:
-    try:
-        modName=mod.split(".")[-1]
-        exec(modName + "=importlib.import_module('cam."+ mod+"')")
-        exec("importlib.reload("+modName+")")
-    except:
-        print("PROBLEM (RE)LOADING MODULE cam."+mod+" AT "+__name__)
+
 from cam.chunk import *
 from cam.collision import *
 from cam.simple import *