From b91a4b6ecdc5bd09787f0b836efca335597e9954 Mon Sep 17 00:00:00 2001 From: Russell Johnson <47639332+Russ4262@users.noreply.github.com> Date: Sat, 24 Jul 2021 11:42:30 -0500 Subject: [PATCH] Path: Restore edge processing to Adaptive as in 0.19 release --- src/Mod/Path/PathScripts/PathAdaptive.py | 9 ++------- src/Mod/Path/PathScripts/PathFeatureExtensionsGui.py | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathAdaptive.py b/src/Mod/Path/PathScripts/PathAdaptive.py index 6ece55493f..f7b96cf96e 100644 --- a/src/Mod/Path/PathScripts/PathAdaptive.py +++ b/src/Mod/Path/PathScripts/PathAdaptive.py @@ -601,13 +601,8 @@ def _get_working_edges(op, obj): edgeWires = DraftGeomUtils.findWires(rawEdges) if edgeWires: for w in edgeWires: - # Extrude closed wire, take cross-section (flatten), and add area to regions list with faces - if w.isClosed(): - extLen = w.BoundBox.ZLength + 10.0 - extrudeWire = w.extrude(FreeCAD.Vector(0.0, 0.0, extLen * 5.0)) - slices = extrudeWire.slice(FreeCAD.Vector(0.0, 0.0, 1.0), math.floor(w.BoundBox.ZMin + (extLen * 2.5))) - slices[0].translate(FreeCAD.Vector(0.0, 0.0, 0.0 - slices[0].BoundBox.ZMin)) - all_regions.append(Part.Face(slices[0])) # Add wire area to all regions for combination with extensions + for e in w.Edges: + edge_list.append([discretize(e)]) # Apply regular Extensions op.exts = [] # pylint: disable=attribute-defined-outside-init diff --git a/src/Mod/Path/PathScripts/PathFeatureExtensionsGui.py b/src/Mod/Path/PathScripts/PathFeatureExtensionsGui.py index 4f7da3c630..078c28ee63 100644 --- a/src/Mod/Path/PathScripts/PathFeatureExtensionsGui.py +++ b/src/Mod/Path/PathScripts/PathFeatureExtensionsGui.py @@ -440,7 +440,7 @@ class TaskPanelExtensionPage(PathOpGui.TaskPanelPage): baseItem.setData(base[0].Label, QtCore.Qt.EditRole) baseItem.setSelectable(False) for sub in sorted(base[1]): - if sub.startswith('Face') or True: + if sub.startswith('Face'): show = True baseItem.appendRow(self.createItemForBaseModel(base[0], sub, edges, extensions)) if show: