From 3bf7fb24eb33bfea93b8a2ec812ad4e85674839a Mon Sep 17 00:00:00 2001 From: kreso-t Date: Wed, 29 Aug 2018 18:41:03 +0200 Subject: [PATCH] Path: Adaptive - support for cylindrical stock --- src/Mod/Path/PathScripts/PathAdaptive.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathAdaptive.py b/src/Mod/Path/PathScripts/PathAdaptive.py index 97430d7b12..5c148e0d8c 100644 --- a/src/Mod/Path/PathScripts/PathAdaptive.py +++ b/src/Mod/Path/PathScripts/PathAdaptive.py @@ -259,14 +259,17 @@ def Execute(op,obj): if obj.OperationType == "Clearing": if obj.Side == "Outside": - stockBB = op.stock.Shape.BoundBox - v=[] - v.append(FreeCAD.Vector(stockBB.XMin,stockBB.YMin,0)) - v.append(FreeCAD.Vector(stockBB.XMax,stockBB.YMin,0)) - v.append(FreeCAD.Vector(stockBB.XMax,stockBB.YMax,0)) - v.append(FreeCAD.Vector(stockBB.XMin,stockBB.YMax,0)) - v.append(FreeCAD.Vector(stockBB.XMin,stockBB.YMin,0)) - pathArray.append([v]) + if op.stock.StockType == "CreateCylinder": + pathArray.append([discretize(op.stock.Shape.Edges[0])]) + else: + stockBB = op.stock.Shape.BoundBox + v=[] + v.append(FreeCAD.Vector(stockBB.XMin,stockBB.YMin,0)) + v.append(FreeCAD.Vector(stockBB.XMax,stockBB.YMin,0)) + v.append(FreeCAD.Vector(stockBB.XMax,stockBB.YMax,0)) + v.append(FreeCAD.Vector(stockBB.XMin,stockBB.YMax,0)) + v.append(FreeCAD.Vector(stockBB.XMin,stockBB.YMin,0)) + pathArray.append([v]) if not obj.ProcessHoles: nestingLimit = 2 elif not obj.ProcessHoles: nestingLimit = 1 opType = area.AdaptiveOperationType.Clearing