From 3e7966ad1240d17342b1aedabaa7a3350973f3b1 Mon Sep 17 00:00:00 2001 From: Rob Date: Sun, 15 Dec 2024 13:14:49 -0500 Subject: [PATCH] Property Reference Repair --- scripts/addons/cam/__init__.py | 21 +++++++------------ .../addons/cam/properties/machine_props.py | 20 +++++++++--------- .../addons/cam/properties/operation_props.py | 4 ++-- 3 files changed, 19 insertions(+), 26 deletions(-) diff --git a/scripts/addons/cam/__init__.py b/scripts/addons/cam/__init__.py index acac0d06..c6c428e7 100644 --- a/scripts/addons/cam/__init__.py +++ b/scripts/addons/cam/__init__.py @@ -86,7 +86,7 @@ from .operators.ops import ( ) from .properties.operation_props import CAM_OPERATION_Properties -from properties.chain_props import ( +from .properties.chain_props import ( CAM_CHAIN_Properties, CAM_OP_REFERENCE_Properties, ) @@ -97,29 +97,22 @@ from .properties.movement_props import CAM_MOVEMENT_Properties from .properties.optimisation_props import CAM_OPTIMISATION_Properties from .preferences import CamAddonPreferences from .preset_managers import ( - AddPresetCamCutter, - AddPresetCamMachine, - AddPresetCamOperation, CAM_CUTTER_MT_presets, - CAM_MACHINE_MT_presets, CAM_OPERATION_MT_presets, + CAM_MACHINE_MT_presets, + AddPresetCamCutter, + AddPresetCamOperation, + AddPresetCamMachine, ) from .ui import register as ui_register, unregister as ui_unregister - -# Import Interface Properties to create a PointerProperty in register() from .ui.panels.interface import CAM_INTERFACE_Properties from .utils import ( check_operations_on_load, update_operation, ) - -classes = [ - # .basrelief - DoBasRelief, - ProblemAreas, - # .chain +classes = ( CAM_OP_REFERENCE_Properties, CAM_CHAIN_Properties, CAM_INFO_Properties, @@ -191,7 +184,7 @@ classes = [ AddPresetCamCutter, AddPresetCamOperation, AddPresetCamMachine, -] +) def register() -> None: diff --git a/scripts/addons/cam/properties/machine_props.py b/scripts/addons/cam/properties/machine_props.py index 339b6c97..652ed8a0 100644 --- a/scripts/addons/cam/properties/machine_props.py +++ b/scripts/addons/cam/properties/machine_props.py @@ -13,8 +13,8 @@ from bpy.props import ( ) from bpy.types import PropertyGroup -from . import constants -from .utils import update_machine +from ..constants import PRECISION +from ..utils import update_machine class CAM_MACHINE_Properties(PropertyGroup): @@ -119,7 +119,7 @@ class CAM_MACHINE_Properties(PropertyGroup): name="Start Position", default=(0, 0, 0), unit="LENGTH", - precision=constants.PRECISION, + precision=PRECISION, subtype="XYZ", update=update_machine, ) @@ -127,7 +127,7 @@ class CAM_MACHINE_Properties(PropertyGroup): name="MTC Position", default=(0, 0, 0), unit="LENGTH", - precision=constants.PRECISION, + precision=PRECISION, subtype="XYZ", update=update_machine, ) @@ -135,7 +135,7 @@ class CAM_MACHINE_Properties(PropertyGroup): name="End Position", default=(0, 0, 0), unit="LENGTH", - precision=constants.PRECISION, + precision=PRECISION, subtype="XYZ", update=update_machine, ) @@ -144,7 +144,7 @@ class CAM_MACHINE_Properties(PropertyGroup): name="Work Area", default=(0.500, 0.500, 0.100), unit="LENGTH", - precision=constants.PRECISION, + precision=PRECISION, subtype="XYZ", update=update_machine, ) @@ -153,7 +153,7 @@ class CAM_MACHINE_Properties(PropertyGroup): default=0.0, min=0.00001, max=320000, - precision=constants.PRECISION, + precision=PRECISION, unit="LENGTH", ) feedrate_max: FloatProperty( @@ -161,7 +161,7 @@ class CAM_MACHINE_Properties(PropertyGroup): default=2, min=0.00001, max=320000, - precision=constants.PRECISION, + precision=PRECISION, unit="LENGTH", ) feedrate_default: FloatProperty( @@ -169,7 +169,7 @@ class CAM_MACHINE_Properties(PropertyGroup): default=1.5, min=0.00001, max=320000, - precision=constants.PRECISION, + precision=PRECISION, unit="LENGTH", ) hourly_rate: FloatProperty( @@ -243,7 +243,7 @@ class CAM_MACHINE_Properties(PropertyGroup): default=33, min=0.00001, max=320000, - precision=constants.PRECISION, + precision=PRECISION, unit="LENGTH", ) # exporter_start = StringProperty(name="exporter start", default="%") diff --git a/scripts/addons/cam/properties/operation_props.py b/scripts/addons/cam/properties/operation_props.py index 1e8b8b75..d3377194 100644 --- a/scripts/addons/cam/properties/operation_props.py +++ b/scripts/addons/cam/properties/operation_props.py @@ -20,8 +20,8 @@ from bpy.props import ( from bpy.types import ( PropertyGroup, ) -from . import constants -from .utils import ( +from .. import constants +from ..utils import ( get_strategy_list, operation_valid, update_operation,