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

helix generator shouldn't assume flip.

Browse Source 
shortend test case
This commit is contained in:
sliptonic
2022-01-16 18:42:35 -06:00
parent e6631679cc
commit 199e5264cd
2 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Path/Generators/helix_generator.py
View File

@@ -56,10 +56,6 @@ def generate(
startPoint = edge.Vertexes[0].Point
endPoint = edge.Vertexes[1].Point
# Swap start and end points if edge line is inverted
if startPoint.z < endPoint.z:
endPoint = edge.Vertexes[0].Point
startPoint = edge.Vertexes[1].Point
PathLog.track(
"(helix: <{}, {}>\n hole radius {}\n inner radius {}\n step over {}\n start point {}\n end point {}\n step_down {}\n tool diameter {}\n direction {}\n startat {})".format(
@@ -115,6 +111,10 @@ def generate(
):
raise ValueError("edge is not aligned with Z axis")
if startPoint.z < endPoint.z:
raise ValueError("start point is below end point")
if inner_radius > 0:
PathLog.debug("(annulus mode)\n")
hole_radius = hole_radius - tool_diameter / 2

33
src/Mod/Path/PathTests/TestPathHelixGenerator.py
View File

@@ -34,7 +34,7 @@ PathLog.trackModule(PathLog.thisModule())
def _resetArgs():
v1 = FreeCAD.Vector(5, 5, 20)
v2 = FreeCAD.Vector(5, 5, 10)
v2 = FreeCAD.Vector(5, 5, 18)
edg = Part.makeLine(v1, v2)
@@ -57,24 +57,8 @@ G2 I-7.500000 J0.000000 X-2.500000 Y5.000000 Z19.500000\
G2 I7.500000 J0.000000 X12.500000 Y5.000000 Z19.000000\
G2 I-7.500000 J0.000000 X-2.500000 Y5.000000 Z18.500000\
G2 I7.500000 J0.000000 X12.500000 Y5.000000 Z18.000000\
G2 I-7.500000 J0.000000 X-2.500000 Y5.000000 Z17.500000\
G2 I7.500000 J0.000000 X12.500000 Y5.000000 Z17.000000\
G2 I-7.500000 J0.000000 X-2.500000 Y5.000000 Z16.500000\
G2 I7.500000 J0.000000 X12.500000 Y5.000000 Z16.000000\
G2 I-7.500000 J0.000000 X-2.500000 Y5.000000 Z15.500000\
G2 I7.500000 J0.000000 X12.500000 Y5.000000 Z15.000000\
G2 I-7.500000 J0.000000 X-2.500000 Y5.000000 Z14.500000\
G2 I7.500000 J0.000000 X12.500000 Y5.000000 Z14.000000\
G2 I-7.500000 J0.000000 X-2.500000 Y5.000000 Z13.500000\
G2 I7.500000 J0.000000 X12.500000 Y5.000000 Z13.000000\
G2 I-7.500000 J0.000000 X-2.500000 Y5.000000 Z12.500000\
G2 I7.500000 J0.000000 X12.500000 Y5.000000 Z12.000000\
G2 I-7.500000 J0.000000 X-2.500000 Y5.000000 Z11.500000\
G2 I7.500000 J0.000000 X12.500000 Y5.000000 Z11.000000\
G2 I-7.500000 J0.000000 X-2.500000 Y5.000000 Z10.500000\
G2 I7.500000 J0.000000 X12.500000 Y5.000000 Z10.000000\
G2 I-7.500000 J0.000000 X-2.500000 Y5.000000 Z10.000000\
G2 I7.500000 J0.000000 X12.500000 Y5.000000 Z10.000000\
G2 I-7.500000 J0.000000 X-2.500000 Y5.000000 Z18.000000\
G2 I7.500000 J0.000000 X12.500000 Y5.000000 Z18.000000\
G0 X5.000000 Y5.000000 Z20.000000"
def test00(self):
@@ -167,17 +151,10 @@ G0 X5.000000 Y5.000000 Z20.000000"
def test09(self):
"""Test Helix Generator with inverted vertical edge"""
args = _resetArgs()
v1 = FreeCAD.Vector(5, 5, 10)
v1 = FreeCAD.Vector(5, 5, 18)
v2 = FreeCAD.Vector(5, 5, 20)
edg = Part.makeLine(v1, v2)
args["edge"] = edg
result = generator.generate(**args)
self.assertRaises(ValueError, generator.generate, **args)
self.assertTrue(type(result) is list)
self.assertTrue(type(result[0]) is Path.Command)
gcode = "".join([r.toGCode() for r in result])
self.assertTrue(
gcode == self.expectedHelixGCode, "Incorrect helix g-code generated"
)