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

Path Adaptive: fix for duplicate edge detection

Browse Source
This commit is contained in:
kreso-t
2018-08-27 19:18:05 +02:00
committed by wmayer
parent b1904d92c2
commit 6e8fcff3ab
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Path/PathScripts/PathAdaptive.py
View File

@@ -30,13 +30,15 @@ def connectEdges(edges):
for edge in edges:
p1 = edge.valueAt(edge.FirstParameter)
p2 = edge.valueAt(edge.LastParameter)
m1 = edge.valueAt((edge.LastParameter+edge.LastParameter)/2)
duplicate = False
for ex in remaining:
exp1 = ex.valueAt(ex.FirstParameter)
exp2 = ex.valueAt(ex.LastParameter)
if IsEqualInXYPlane(exp1, p1) and IsEqualInXYPlane(exp2, p2):
exm1 = ex.valueAt((ex.FirstParameter + ex.LastParameter)/2)
if IsEqualInXYPlane(exp1, p1) and IsEqualInXYPlane(exp2, p2) and IsEqualInXYPlane(exm1, m1):
duplicate = True
if IsEqualInXYPlane(exp1, p2) and IsEqualInXYPlane(exp2, p1):
if IsEqualInXYPlane(exp1, p2) and IsEqualInXYPlane(exp2, p1) and IsEqualInXYPlane(exm1, m1):
duplicate = True
if not duplicate:
remaining.append(edge)

2
src/Mod/Path/PathScripts/PathAdaptiveGui.py
View File

@@ -48,7 +48,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
#tolerance
form.Tolerance = QtGui.QSlider(QtCore.Qt.Horizontal)
form.Tolerance.setMinimum(5)
form.Tolerance.setMinimum(2)
form.Tolerance.setMaximum(15)
form.Tolerance.setTickInterval(1)
form.Tolerance.setValue(10)