diff --git a/scripts/addons/cam/cam_chunk.py b/scripts/addons/cam/cam_chunk.py index b3d7670a..fadd422c 100644 --- a/scripts/addons/cam/cam_chunk.py +++ b/scripts/addons/cam/cam_chunk.py @@ -815,7 +815,7 @@ def mesh_from_curve_to_chunk(object): lastvi = 0 vtotal = len(mesh.vertices) perc = 0 - progress("Processing Curve - START - Vertices: " + str(vtotal)) + progress(f"Processing Curve - START - Vertices: {vtotal}") for vi in range(0, len(mesh.vertices) - 1): co = (mesh.vertices[vi].co + object.location).to_tuple() if not dk.isdisjoint([(vi, vi + 1)]) and d[(vi, vi + 1)] == 1: @@ -999,7 +999,7 @@ async def sample_chunks_n_axis(o, pathSamples, layers): percent = int(100 * n / totlen) if percent != last_percent: - await progress_async("sampling paths", percent) + await progress_async("Sampling Paths", percent) last_percent = percent n += 1 sampled = False @@ -1752,7 +1752,7 @@ async def sample_chunks(o, pathSamples, layers): for s, in_ambient in zip(our_points, ambient_contains): if o.strategy != "WATERLINE" and int(100 * n / totlen) != last_percent: last_percent = int(100 * n / totlen) - await progress_async("sampling paths ", last_percent) + await progress_async("Sampling Paths", last_percent) n += 1 x = s[0] y = s[1] @@ -2037,7 +2037,7 @@ async def sort_chunks(chunks, o, last_pos=None): """ if o.strategy != "WATERLINE": - await progress_async("sorting paths") + await progress_async("Sorting Paths") # the getNext() function of CamPathChunk was running out of recursion limits. sys.setrecursionlimit(100000) sortedchunks = [] @@ -2050,7 +2050,7 @@ async def sort_chunks(chunks, o, last_pos=None): pos = (0, 0, 0) if last_pos is None else last_pos while len(chunks) > 0: if o.strategy != "WATERLINE" and time.time() - last_progress_time > 0.1: - await progress_async("Sorting paths", 100.0 * (total - len(chunks)) / total) + await progress_async("Sorting Paths", 100.0 * (total - len(chunks)) / total) last_progress_time = time.time() ch = None if ( diff --git a/scripts/addons/cam/gcode_path.py b/scripts/addons/cam/gcode_path.py index 74d5ffe4..96be9411 100644 --- a/scripts/addons/cam/gcode_path.py +++ b/scripts/addons/cam/gcode_path.py @@ -1010,7 +1010,7 @@ async def get_path_3_axis(context, operation): i += 1 percent = int(h / nslices * 100) - await progress_async("waterline layers ", percent) + await progress_async("Waterline Layers", percent) lastslice = poly if (o.movement.type == "CONVENTIONAL" and o.movement.spindle_rotation == "CCW") or ( diff --git a/scripts/addons/cam/operators/__init__.py b/scripts/addons/cam/operators/__init__.py index d1f37558..e92607d5 100644 --- a/scripts/addons/cam/operators/__init__.py +++ b/scripts/addons/cam/operators/__init__.py @@ -35,8 +35,8 @@ from .curve_tools_ops import ( CamCurveBoolean, CamCurveConvexHull, CamCurveIntarsion, - CamCurveOvercuts, - CamCurveOvercutsB, + CamCurveSimpleOvercuts, + CamCurveBoneFilletOvercuts, CamCurveRemoveDoubles, CamMeshGetPockets, CamObjectSilhouette, @@ -95,8 +95,8 @@ classes = [ CamCurveBoolean, CamCurveConvexHull, CamCurveIntarsion, - CamCurveOvercuts, - CamCurveOvercutsB, + CamCurveSimpleOvercuts, + CamCurveBoneFilletOvercuts, CamCurveRemoveDoubles, CamMeshGetPockets, CamObjectSilhouette, diff --git a/scripts/addons/cam/operators/curve_tools_ops.py b/scripts/addons/cam/operators/curve_tools_ops.py index 8f6554f3..9dc351e2 100644 --- a/scripts/addons/cam/operators/curve_tools_ops.py +++ b/scripts/addons/cam/operators/curve_tools_ops.py @@ -215,11 +215,11 @@ class CamCurveIntarsion(Operator): # intarsion or joints -class CamCurveOvercuts(Operator): +class CamCurveSimpleOvercuts(Operator): """Adds Overcuts for Slots""" bl_idname = "object.curve_overcuts" - bl_label = "Add Overcuts - A" + bl_label = "Simple Fillet Overcuts" bl_options = {"REGISTER", "UNDO"} diameter: FloatProperty( @@ -328,11 +328,11 @@ class CamCurveOvercuts(Operator): # Overcut type B -class CamCurveOvercutsB(Operator): +class CamCurveBoneFilletOvercuts(Operator): """Adds Overcuts for Slots""" bl_idname = "object.curve_overcuts_b" - bl_label = "Add Overcuts - B" + bl_label = "Bone Fillet Overcuts" bl_options = {"REGISTER", "UNDO"} diameter: FloatProperty( diff --git a/scripts/addons/cam/ui/panels/curve_tools_panel.py b/scripts/addons/cam/ui/panels/curve_tools_panel.py index 0fc4a051..4a76f62c 100644 --- a/scripts/addons/cam/ui/panels/curve_tools_panel.py +++ b/scripts/addons/cam/ui/panels/curve_tools_panel.py @@ -23,7 +23,7 @@ class VIEW3D_PT_tools_curvetools(Panel): col.operator("object.curve_intarsion", icon="OUTLINER_DATA_META") column = col.column(align=True) column.operator("object.curve_overcuts", icon="CON_SIZELIKE") - column.operator("object.curve_overcuts_b", icon="CON_SIZELIKE") + column.operator("object.curve_overcuts_b", icon="GROUP_BONE") column = col.column(align=True) column.operator( "object.silhouette", diff --git a/scripts/addons/cam/utilities/async_utils.py b/scripts/addons/cam/utilities/async_utils.py index c98234ac..c2880076 100644 --- a/scripts/addons/cam/utilities/async_utils.py +++ b/scripts/addons/cam/utilities/async_utils.py @@ -23,6 +23,6 @@ def progress_async(text, n=None, value_type="%"): Raises: Exception: If an exception is thrown during the operation. """ - throw_exception = yield ("progress", {"text": text, "n": n, "value_type": value_type}) + throw_exception = yield ("Progress:", {"text": text, "n": n, "value_type": value_type}) if throw_exception is not None: raise throw_exception diff --git a/scripts/addons/cam/utilities/image_utils.py b/scripts/addons/cam/utilities/image_utils.py index e610bfad..ecd4c8c1 100644 --- a/scripts/addons/cam/utilities/image_utils.py +++ b/scripts/addons/cam/utilities/image_utils.py @@ -308,7 +308,7 @@ async def offset_area(o, samples): _offset_inner_loop( y1, y2, cutterArrayNan, cwidth, sourceArray, width, height, comparearea ) - await progress_async("offset depth image", int((y2 * 100) / comparearea.shape[1])) + await progress_async("Offset Depth Image", int((y2 * 100) / comparearea.shape[1])) o.offset_image[m : width - cwidth + m, m : height - cwidth + m] = comparearea print("\nOffset Image Time " + str(time.time() - t))