kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #25398 from tarman3/migrateRampDressups

Browse Source 
CAM: _migrateRampDressups - fix #25391
This commit is contained in:
sliptonic
2025-12-27 11:31:07 -06:00
committed by GitHub
parent 51d2c88b02 6ecc6f780c
commit c5ce65cfb8
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/CAM/Path/Dressup/Gui/RampEntry.py
View File

@@ -400,7 +400,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))
@@ -475,7 +477,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]))

3
src/Mod/CAM/Path/Dressup/Utils.py
View File

@@ -22,7 +22,6 @@
# ***************************************************************************
import FreeCAD
import Path.Main.Job as PathJob
def selection():
@@ -31,7 +30,7 @@ def selection():
import FreeCADGui
sel = FreeCADGui.Selection.getSelectionEx()
if len(sel) == 1 and sel[0].Object.isDerivedFrom("Path::Feature") and PathJob.Instances():
if len(sel) == 1 and sel[0].Object.isDerivedFrom("Path::Feature"):
return sel[0].Object
return None

5
src/Mod/CAM/Path/Tool/Controller.py
View File

@@ -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: