diff --git a/src/Mod/CAM/Path/Dressup/Gui/RampEntry.py b/src/Mod/CAM/Path/Dressup/Gui/RampEntry.py index 47def949bf..d2415f5da0 100644 --- a/src/Mod/CAM/Path/Dressup/Gui/RampEntry.py +++ b/src/Mod/CAM/Path/Dressup/Gui/RampEntry.py @@ -407,7 +407,9 @@ class ObjectDressup: covered = True i = i + 1 if len(rampedges) == 0: - Path.Log.warn("No suitable edges for ramping, plunge will remain as such") + Path.Log.warning( + "No suitable edges for ramping, plunge will remain as such" + ) outedges.append(edge) else: # Path.Log.debug("Doing ramp to edges: {}".format(rampedges)) @@ -482,7 +484,7 @@ class ObjectDressup: rampedges.append(candidate) j = j + 1 if not loopFound: - Path.Log.warn("No suitable helix found, leaving as a plunge") + Path.Log.warning("No suitable helix found, leaving as a plunge") outedges.append(edge) else: outedges.extend(self.createHelix(rampedges, edge.start_point[2])) diff --git a/src/Mod/CAM/Path/Tool/Controller.py b/src/Mod/CAM/Path/Tool/Controller.py index ec62888287..286e3dbe47 100644 --- a/src/Mod/CAM/Path/Tool/Controller.py +++ b/src/Mod/CAM/Path/Tool/Controller.py @@ -29,6 +29,7 @@ import FreeCAD import Path from Path.Tool.toolbit import ToolBit import Path.Base.Generator.toolchange as toolchange +import Path.Dressup.Utils as PathDressup if False: @@ -91,7 +92,7 @@ def _migrateRampDressups(tc): else "HorizFeed" ) - if op.Base.ToolController == tc: + if PathDressup.baseOp(op).ToolController == tc: ramps.add(ramp) if rampFeedRate == "Horizontal Feed Rate": feed = "HorizFeed" @@ -130,7 +131,7 @@ def _migrateRampDressups(tc): # Loop over ramps and assign each one the appropriate TC for _, ramp, feed in job_ramp_feeds: - ramp.Base.ToolController = feed_to_tc[feed] + PathDressup.baseOp(ramp).ToolController = feed_to_tc[feed] class ToolController: