From cccb12fb678ca9a511e7a08d27c18c8633ee10ee Mon Sep 17 00:00:00 2001 From: palain Date: Wed, 2 Oct 2024 11:47:25 -0300 Subject: [PATCH] remove blendercam references for compliance with blender usage --- scripts/addons/cam/autoupdate.py | 8 ++++---- scripts/addons/cam/basrelief.py | 2 +- scripts/addons/cam/cam_chunk.py | 2 +- scripts/addons/cam/cam_operation.py | 2 +- scripts/addons/cam/chain.py | 2 +- scripts/addons/cam/collision.py | 2 +- scripts/addons/cam/constants.py | 4 ++-- scripts/addons/cam/curvecamcreate.py | 2 +- scripts/addons/cam/curvecamequation.py | 2 +- scripts/addons/cam/curvecamtools.py | 2 +- scripts/addons/cam/exception.py | 2 +- scripts/addons/cam/gcodeimportparser.py | 2 +- scripts/addons/cam/gcodepath.py | 2 +- scripts/addons/cam/involute_gear.py | 2 +- scripts/addons/cam/joinery.py | 2 +- scripts/addons/cam/machine_settings.py | 2 +- scripts/addons/cam/numba_wrapper.py | 2 +- scripts/addons/cam/ops.py | 6 +++--- scripts/addons/cam/pack.py | 2 +- scripts/addons/cam/parametric.py | 2 +- scripts/addons/cam/pattern.py | 2 +- scripts/addons/cam/polygon_utils_cam.py | 2 +- scripts/addons/cam/preferences.py | 4 ++-- scripts/addons/cam/preset_managers.py | 2 +- scripts/addons/cam/puzzle_joinery.py | 2 +- scripts/addons/cam/simple.py | 2 +- scripts/addons/cam/simulation.py | 2 +- scripts/addons/cam/slice.py | 2 +- scripts/addons/cam/strategy.py | 4 ++-- scripts/addons/cam/testing.py | 2 +- scripts/addons/cam/ui_panels/info.py | 12 ++++++------ scripts/addons/cam/ui_panels/op_properties.py | 2 +- scripts/addons/cam/utils.py | 4 ++-- scripts/addons/cam/voronoi.py | 2 +- 34 files changed, 48 insertions(+), 48 deletions(-) diff --git a/scripts/addons/cam/autoupdate.py b/scripts/addons/cam/autoupdate.py index ed148c80..fbcf9d6d 100644 --- a/scripts/addons/cam/autoupdate.py +++ b/scripts/addons/cam/autoupdate.py @@ -1,6 +1,6 @@ -"""BlenderCAM 'autoupdate.py' +"""CNC CAM 'autoupdate.py' -Classes to check for, download and install BlenderCAM updates. +Classes to check for, download and install CNC CAM updates. """ import calendar @@ -23,7 +23,7 @@ from .version import __version__ as current_version class UpdateChecker(bpy.types.Operator): """Check for Updates""" bl_idname = "render.cam_check_updates" - bl_label = "Check for Updates in BlenderCAM Plugin" + bl_label = "Check for Updates in CNC CAM Plugin" bl_options = {'REGISTER', 'UNDO'} def execute(self, context): @@ -172,7 +172,7 @@ class Updater(bpy.types.Operator): class UpdateSourceOperator(bpy.types.Operator): bl_idname = "render.cam_set_update_source" - bl_label = "Set BlenderCAM Update Source" + bl_label = "Set CNC CAM Update Source" new_source: StringProperty( default='', diff --git a/scripts/addons/cam/basrelief.py b/scripts/addons/cam/basrelief.py index c651cb55..48e14c90 100644 --- a/scripts/addons/cam/basrelief.py +++ b/scripts/addons/cam/basrelief.py @@ -971,7 +971,7 @@ def buildMesh(mesh_z, br): print("Faces:" + str(len(ob.data.polygons))) print("Vertices:" + str(len(ob.data.vertices))) -# Switches to cycles render to CYCLES to render the sceen then switches it back to BLENDERCAM_RENDER for basRelief +# Switches to cycles render to CYCLES to render the sceen then switches it back to CNCCAM_RENDER for basRelief def renderScene(width, height, bit_diameter, passes_per_radius, make_nodes, view_layer): diff --git a/scripts/addons/cam/cam_chunk.py b/scripts/addons/cam/cam_chunk.py index 7e703bc9..f46695de 100644 --- a/scripts/addons/cam/cam_chunk.py +++ b/scripts/addons/cam/cam_chunk.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'chunk.py' © 2012 Vilem Novak +"""CNC CAM 'chunk.py' © 2012 Vilem Novak Classes and Functions to build, store and optimize CAM path chunks. """ diff --git a/scripts/addons/cam/cam_operation.py b/scripts/addons/cam/cam_operation.py index 922a7c1d..18d1f9a4 100644 --- a/scripts/addons/cam/cam_operation.py +++ b/scripts/addons/cam/cam_operation.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'cam_operation.py' +"""CNC CAM 'cam_operation.py' All properties of a single CAM Operation. """ diff --git a/scripts/addons/cam/chain.py b/scripts/addons/cam/chain.py index c9ab8b56..613f7e42 100644 --- a/scripts/addons/cam/chain.py +++ b/scripts/addons/cam/chain.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'chain.py' +"""CNC CAM 'chain.py' All properties of a CAM Chain (a series of Operations), and the Chain's Operation reference. """ diff --git a/scripts/addons/cam/collision.py b/scripts/addons/cam/collision.py index 3f360180..f97029f4 100644 --- a/scripts/addons/cam/collision.py +++ b/scripts/addons/cam/collision.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'collision.py' © 2012 Vilem Novak +"""CNC CAM 'collision.py' © 2012 Vilem Novak Functions for Bullet and Cutter collision checks. """ diff --git a/scripts/addons/cam/constants.py b/scripts/addons/cam/constants.py index ded35044..7161aef4 100644 --- a/scripts/addons/cam/constants.py +++ b/scripts/addons/cam/constants.py @@ -1,6 +1,6 @@ -"""BlenderCAM 'constants.py' +"""CNC CAM 'constants.py' -Package to store all constants of BlenderCAM. +Package to store all constants of CNC CAM. """ # PRECISION is used in most operations diff --git a/scripts/addons/cam/curvecamcreate.py b/scripts/addons/cam/curvecamcreate.py index 826fd389..f008c523 100644 --- a/scripts/addons/cam/curvecamcreate.py +++ b/scripts/addons/cam/curvecamcreate.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'curvecamcreate.py' © 2021, 2022 Alain Pelletier +"""CNC CAM 'curvecamcreate.py' © 2021, 2022 Alain Pelletier Operators to create a number of predefined curve objects. """ diff --git a/scripts/addons/cam/curvecamequation.py b/scripts/addons/cam/curvecamequation.py index eb71da90..de577122 100644 --- a/scripts/addons/cam/curvecamequation.py +++ b/scripts/addons/cam/curvecamequation.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'curvecamequation.py' © 2021, 2022 Alain Pelletier +"""CNC CAM 'curvecamequation.py' © 2021, 2022 Alain Pelletier Operators to create a number of geometric shapes with curves. """ diff --git a/scripts/addons/cam/curvecamtools.py b/scripts/addons/cam/curvecamtools.py index 91902de1..4bf192dd 100644 --- a/scripts/addons/cam/curvecamtools.py +++ b/scripts/addons/cam/curvecamtools.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'curvecamtools.py' © 2012 Vilem Novak, 2021 Alain Pelletier +"""CNC CAM 'curvecamtools.py' © 2012 Vilem Novak, 2021 Alain Pelletier Operators that perform various functions on existing curves. """ diff --git a/scripts/addons/cam/exception.py b/scripts/addons/cam/exception.py index 10cf4030..6471baa1 100644 --- a/scripts/addons/cam/exception.py +++ b/scripts/addons/cam/exception.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'exception.py' +"""CNC CAM 'exception.py' Generic CAM Exception class. """ diff --git a/scripts/addons/cam/gcodeimportparser.py b/scripts/addons/cam/gcodeimportparser.py index 119fa03a..c2062774 100644 --- a/scripts/addons/cam/gcodeimportparser.py +++ b/scripts/addons/cam/gcodeimportparser.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'gcodeimportparser.py' +"""CNC CAM 'gcodeimportparser.py' Code modified from YAGV (Yet Another G-code Viewer) - https://github.com/jonathanwin/yagv No license terms found in YAGV repo, will assume GNU release diff --git a/scripts/addons/cam/gcodepath.py b/scripts/addons/cam/gcodepath.py index 528a21ba..edf7d40d 100644 --- a/scripts/addons/cam/gcodepath.py +++ b/scripts/addons/cam/gcodepath.py @@ -240,7 +240,7 @@ def exportGcodePath(filename, vertslist, operations): # start program c.program_begin(0, filename) c.flush_nc() - c.comment('G-code Generated with BlenderCAM and NC library') + c.comment('G-code Generated with CNC CAM and NC library') # absolute coordinates c.absolute() diff --git a/scripts/addons/cam/involute_gear.py b/scripts/addons/cam/involute_gear.py index 2f0c9db1..225a99c3 100644 --- a/scripts/addons/cam/involute_gear.py +++ b/scripts/addons/cam/involute_gear.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'involute_gear.py' Ported by Alain Pelletier Jan 2022 +"""CNC CAM 'involute_gear.py' Ported by Alain Pelletier Jan 2022 from: Public Domain Parametric Involute Spur Gear (and involute helical gear and involute rack) diff --git a/scripts/addons/cam/joinery.py b/scripts/addons/cam/joinery.py index ce97070f..450ed750 100644 --- a/scripts/addons/cam/joinery.py +++ b/scripts/addons/cam/joinery.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'joinery.py' © 2021 Alain Pelletier +"""CNC CAM 'joinery.py' © 2021 Alain Pelletier Functions to create various woodworking joints - mortise, finger etc. """ diff --git a/scripts/addons/cam/machine_settings.py b/scripts/addons/cam/machine_settings.py index d8094bf5..90514dee 100644 --- a/scripts/addons/cam/machine_settings.py +++ b/scripts/addons/cam/machine_settings.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'machine_settings.py' +"""CNC CAM 'machine_settings.py' All CAM machine properties. """ diff --git a/scripts/addons/cam/numba_wrapper.py b/scripts/addons/cam/numba_wrapper.py index e21756a7..348a3479 100644 --- a/scripts/addons/cam/numba_wrapper.py +++ b/scripts/addons/cam/numba_wrapper.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'numba_wrapper.py' +"""CNC CAM 'numba_wrapper.py' Patch to ensure functions will run if numba is unavailable. """ diff --git a/scripts/addons/cam/ops.py b/scripts/addons/cam/ops.py index 3a032b89..529a2621 100644 --- a/scripts/addons/cam/ops.py +++ b/scripts/addons/cam/ops.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'ops.py' © 2012 Vilem Novak +"""CNC CAM 'ops.py' © 2012 Vilem Novak Blender Operator definitions are in this file. They mostly call the functions from 'utils.py' @@ -1015,12 +1015,12 @@ class CamChainOperationRemove(Operator): def fixUnits(): - """Set up units for BlenderCAM. + """Set up units for CNC CAM. This function configures the unit settings for the current Blender scene. It sets the rotation system to degrees and the scale length to 1.0, ensuring that the units are appropriately configured for use within - BlenderCAM. + CNC CAM. """ s = bpy.context.scene diff --git a/scripts/addons/cam/pack.py b/scripts/addons/cam/pack.py index 8a3595b3..9a0cafec 100644 --- a/scripts/addons/cam/pack.py +++ b/scripts/addons/cam/pack.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'pack.py' © 2012 Vilem Novak +"""CNC CAM 'pack.py' © 2012 Vilem Novak Takes all selected curves, converts them to polygons, offsets them by the pre-set margin then chooses a starting location possibly inside the already occupied area and moves and rotates the diff --git a/scripts/addons/cam/parametric.py b/scripts/addons/cam/parametric.py index e04b7af2..4248b786 100644 --- a/scripts/addons/cam/parametric.py +++ b/scripts/addons/cam/parametric.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'parametric.py' © 2019 Devon (Gorialis) R +"""CNC CAM 'parametric.py' © 2019 Devon (Gorialis) R MIT License diff --git a/scripts/addons/cam/pattern.py b/scripts/addons/cam/pattern.py index 92dd9885..a90aaf7a 100644 --- a/scripts/addons/cam/pattern.py +++ b/scripts/addons/cam/pattern.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'pattern.py' © 2012 Vilem Novak +"""CNC CAM 'pattern.py' © 2012 Vilem Novak Functions to read CAM path patterns and return CAM path chunks. """ diff --git a/scripts/addons/cam/polygon_utils_cam.py b/scripts/addons/cam/polygon_utils_cam.py index 8c0e04f7..4c48d474 100644 --- a/scripts/addons/cam/polygon_utils_cam.py +++ b/scripts/addons/cam/polygon_utils_cam.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'polygon_utils_cam.py' © 2012 Vilem Novak +"""CNC CAM 'polygon_utils_cam.py' © 2012 Vilem Novak Functions to handle shapely operations and conversions - curve, coords, polygon """ diff --git a/scripts/addons/cam/preferences.py b/scripts/addons/cam/preferences.py index 553315fa..8d4436e1 100644 --- a/scripts/addons/cam/preferences.py +++ b/scripts/addons/cam/preferences.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'preferences.py' +"""CNC CAM 'preferences.py' Class to store all Addon preferences. """ @@ -80,7 +80,7 @@ class CamAddonPreferences(AddonPreferences): def draw(self, context): layout = self.layout layout.label( - text="Use Experimental Features when you want to help development of BlenderCAM:" + text="Use Experimental Features when you want to help development of CNC CAM:" ) layout.prop(self, "experimental") layout.prop(self, "update_source") diff --git a/scripts/addons/cam/preset_managers.py b/scripts/addons/cam/preset_managers.py index 0418859f..131290dd 100644 --- a/scripts/addons/cam/preset_managers.py +++ b/scripts/addons/cam/preset_managers.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'preset_managers.py' +"""CNC CAM 'preset_managers.py' Operators and Menus for CAM Machine, Cutter and Operation Presets. """ diff --git a/scripts/addons/cam/puzzle_joinery.py b/scripts/addons/cam/puzzle_joinery.py index eadeec86..79f8b3d5 100644 --- a/scripts/addons/cam/puzzle_joinery.py +++ b/scripts/addons/cam/puzzle_joinery.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'puzzle_joinery.py' © 2021 Alain Pelletier +"""CNC CAM 'puzzle_joinery.py' © 2021 Alain Pelletier Functions to add various puzzle joints as curves. """ diff --git a/scripts/addons/cam/simple.py b/scripts/addons/cam/simple.py index 15967e4f..98b5a9c6 100644 --- a/scripts/addons/cam/simple.py +++ b/scripts/addons/cam/simple.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'simple.py' © 2012 Vilem Novak +"""CNC CAM 'simple.py' © 2012 Vilem Novak Various helper functions, less complex than those found in the 'utils' files. """ diff --git a/scripts/addons/cam/simulation.py b/scripts/addons/cam/simulation.py index 08d115d6..d5c31ecd 100644 --- a/scripts/addons/cam/simulation.py +++ b/scripts/addons/cam/simulation.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'simulation.py' © 2012 Vilem Novak +"""CNC CAM 'simulation.py' © 2012 Vilem Novak Functions to generate a mesh simulation from CAM Chain / Operation data. """ diff --git a/scripts/addons/cam/slice.py b/scripts/addons/cam/slice.py index a3db7054..43e53bb6 100644 --- a/scripts/addons/cam/slice.py +++ b/scripts/addons/cam/slice.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'slice.py' © 2021 Alain Pelletier +"""CNC CAM 'slice.py' © 2021 Alain Pelletier Very simple slicing for 3D meshes, useful for plywood cutting. Completely rewritten April 2021. diff --git a/scripts/addons/cam/strategy.py b/scripts/addons/cam/strategy.py index 800402b1..bed2def3 100644 --- a/scripts/addons/cam/strategy.py +++ b/scripts/addons/cam/strategy.py @@ -1,6 +1,6 @@ -"""BlenderCAM 'strategy.py' © 2012 Vilem Novak +"""CNC CAM 'strategy.py' © 2012 Vilem Novak -Strategy functionality of BlenderCAM - e.g. Cutout, Parallel, Spiral, Waterline +Strategy functionality of CNC CAM - e.g. Cutout, Parallel, Spiral, Waterline The functions here are called with operators defined in 'ops.py' """ diff --git a/scripts/addons/cam/testing.py b/scripts/addons/cam/testing.py index a12a5d2e..020dfb03 100644 --- a/scripts/addons/cam/testing.py +++ b/scripts/addons/cam/testing.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'testing.py' © 2012 Vilem Novak +"""CNC CAM 'testing.py' © 2012 Vilem Novak Functions for automated testing. """ diff --git a/scripts/addons/cam/ui_panels/info.py b/scripts/addons/cam/ui_panels/info.py index 827b0e14..c9fb6a6d 100644 --- a/scripts/addons/cam/ui_panels/info.py +++ b/scripts/addons/cam/ui_panels/info.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'info.py' +"""CNC CAM 'info.py' 'CAM Info & Warnings' properties and panel in Properties > Render """ @@ -63,7 +63,7 @@ class CAM_INFO_Panel(CAMButtonsPanel, Panel): always_show_panel = True prop_level = { - 'draw_blendercam_version': 0, + 'draw_cnccam_version': 0, 'draw_opencamlib_version': 1, 'draw_op_warnings': 0, 'draw_op_time': 0, @@ -71,13 +71,13 @@ class CAM_INFO_Panel(CAMButtonsPanel, Panel): 'draw_op_money_cost': 1, } - # Draw blendercam version (and whether there are updates available) - def draw_blendercam_version(self): + # Draw CNC CAM version (and whether there are updates available) + def draw_cnccam_version(self): addon_prefs = bpy.context.preferences.addons["bl_ext.user_default.blendercam"].preferences if not self.has_correct_level(): return self.layout.label( - text=f'BlenderCAM v{".".join([str(x) for x in cam_version])}') + text=f'CNC CAM v{".".join([str(x) for x in cam_version])}') if len(addon_prefs.new_version_available) > 0: self.layout.label(text=f"New Version Available:") self.layout.label( @@ -151,7 +151,7 @@ class CAM_INFO_Panel(CAMButtonsPanel, Panel): # Display the Info Panel def draw(self, context): self.context = context - self.draw_blendercam_version() + self.draw_cnccam_version() self.draw_opencamlib_version() if self.op: self.draw_op_warnings() diff --git a/scripts/addons/cam/ui_panels/op_properties.py b/scripts/addons/cam/ui_panels/op_properties.py index 53e9557c..d0441579 100644 --- a/scripts/addons/cam/ui_panels/op_properties.py +++ b/scripts/addons/cam/ui_panels/op_properties.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'op_properties.py' +"""CMC CAM 'op_properties.py' 'CAM Operation Setup' panel in Properties > Render """ diff --git a/scripts/addons/cam/utils.py b/scripts/addons/cam/utils.py index 9a8a2ff1..095f0348 100644 --- a/scripts/addons/cam/utils.py +++ b/scripts/addons/cam/utils.py @@ -1,6 +1,6 @@ -"""BlenderCAM 'utils.py' © 2012 Vilem Novak +"""CNC CAM 'utils.py' © 2012 Vilem Novak -Main functionality of BlenderCAM. +Main functionality of CNC CAM. The functions here are called with operators defined in 'ops.py' """ diff --git a/scripts/addons/cam/voronoi.py b/scripts/addons/cam/voronoi.py index 694d45ff..53a489e8 100644 --- a/scripts/addons/cam/voronoi.py +++ b/scripts/addons/cam/voronoi.py @@ -1,4 +1,4 @@ -"""BlenderCAM 'voronoi.py' +"""CNC CAM 'voronoi.py' Voronoi diagram calculator/ Delaunay triangulator