KCL: Angled line should use keyword args (#5803)
We continue migrating KCL stdlib functions to use keyword arguments. Next up is the `angledLine` family of functions (except `angledLineThatIntersects, which will be a quick follow-up).
Before vs. after:
`angledLine({angle = 90, length = 3}, %, $edge)`
=> `angledLine(angle = 90, length = 3, tag = $edge)`
`angledLineOfXLength({angle = 90, length = 3}, %, $edge)`
=> `angledLine(angle = 90, lengthX = 3, tag = $edge)`
`angledLineOfYLength({angle = 90, length = 3}, %, $edge)`
=> `angledLine(angle = 90, lengthY = 3, tag = $edge)`
`angledLineToX({angle = 90, length = 3}, %, $edge)`
=> `angledLine(angle = 90, endAbsoluteX = 3, tag = $edge)`
`angledLineToY({angle = 90, length = 3}, %, $edge)`
=> `angledLine(angle = 90, endAbsoluteY = 3, tag = $edge)`
This commit is contained in:
@ -3,39 +3,39 @@ flowchart LR
|
||||
subgraph path2 [Path]
|
||||
2["Path<br>[206, 250, 0]"]
|
||||
3["Segment<br>[256, 290, 0]"]
|
||||
4["Segment<br>[296, 359, 0]"]
|
||||
5["Segment<br>[365, 392, 0]"]
|
||||
6["Segment<br>[398, 429, 0]"]
|
||||
7["Segment<br>[435, 470, 0]"]
|
||||
8["Segment<br>[476, 575, 0]"]
|
||||
9["Segment<br>[581, 612, 0]"]
|
||||
10["Segment<br>[618, 696, 0]"]
|
||||
11["Segment<br>[702, 729, 0]"]
|
||||
12["Segment<br>[735, 757, 0]"]
|
||||
13["Segment<br>[763, 798, 0]"]
|
||||
14["Segment<br>[804, 850, 0]"]
|
||||
15["Segment<br>[856, 864, 0]"]
|
||||
4["Segment<br>[296, 365, 0]"]
|
||||
5["Segment<br>[371, 398, 0]"]
|
||||
6["Segment<br>[404, 435, 0]"]
|
||||
7["Segment<br>[441, 476, 0]"]
|
||||
8["Segment<br>[482, 562, 0]"]
|
||||
9["Segment<br>[568, 599, 0]"]
|
||||
10["Segment<br>[605, 664, 0]"]
|
||||
11["Segment<br>[670, 697, 0]"]
|
||||
12["Segment<br>[703, 725, 0]"]
|
||||
13["Segment<br>[731, 766, 0]"]
|
||||
14["Segment<br>[772, 818, 0]"]
|
||||
15["Segment<br>[824, 832, 0]"]
|
||||
16[Solid2d]
|
||||
end
|
||||
subgraph path60 [Path]
|
||||
60["Path<br>[1032, 1076, 0]"]
|
||||
61["Segment<br>[1082, 1116, 0]"]
|
||||
62["Segment<br>[1122, 1185, 0]"]
|
||||
63["Segment<br>[1191, 1218, 0]"]
|
||||
64["Segment<br>[1224, 1255, 0]"]
|
||||
65["Segment<br>[1261, 1296, 0]"]
|
||||
66["Segment<br>[1302, 1401, 0]"]
|
||||
67["Segment<br>[1407, 1438, 0]"]
|
||||
68["Segment<br>[1444, 1522, 0]"]
|
||||
69["Segment<br>[1528, 1555, 0]"]
|
||||
70["Segment<br>[1561, 1583, 0]"]
|
||||
71["Segment<br>[1589, 1624, 0]"]
|
||||
72["Segment<br>[1630, 1676, 0]"]
|
||||
73["Segment<br>[1682, 1690, 0]"]
|
||||
60["Path<br>[1000, 1044, 0]"]
|
||||
61["Segment<br>[1050, 1084, 0]"]
|
||||
62["Segment<br>[1090, 1159, 0]"]
|
||||
63["Segment<br>[1165, 1192, 0]"]
|
||||
64["Segment<br>[1198, 1229, 0]"]
|
||||
65["Segment<br>[1235, 1270, 0]"]
|
||||
66["Segment<br>[1276, 1356, 0]"]
|
||||
67["Segment<br>[1362, 1393, 0]"]
|
||||
68["Segment<br>[1399, 1458, 0]"]
|
||||
69["Segment<br>[1464, 1491, 0]"]
|
||||
70["Segment<br>[1497, 1519, 0]"]
|
||||
71["Segment<br>[1525, 1560, 0]"]
|
||||
72["Segment<br>[1566, 1612, 0]"]
|
||||
73["Segment<br>[1618, 1626, 0]"]
|
||||
74[Solid2d]
|
||||
end
|
||||
1["Plane<br>[182, 200, 0]"]
|
||||
17["Sweep Revolve<br>[875, 994, 0]"]
|
||||
17["Sweep Revolve<br>[843, 962, 0]"]
|
||||
18[Wall]
|
||||
19[Wall]
|
||||
20[Wall]
|
||||
@ -77,8 +77,8 @@ flowchart LR
|
||||
56["SweepEdge Adjacent"]
|
||||
57["SweepEdge Opposite"]
|
||||
58["SweepEdge Adjacent"]
|
||||
59["Plane<br>[1008, 1026, 0]"]
|
||||
75["Sweep Extrusion<br>[1696, 1734, 0]"]
|
||||
59["Plane<br>[976, 994, 0]"]
|
||||
75["Sweep Extrusion<br>[1632, 1670, 0]"]
|
||||
76[Wall]
|
||||
77[Wall]
|
||||
78[Wall]
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -12,23 +12,17 @@ Fy = 0.5
|
||||
sketch001 = startSketchOn(-YZ)
|
||||
|> startProfileAt([back_walls_width / 2, 0], %)
|
||||
|> xLine(length = wall_thickness / 2)
|
||||
|> angledLineToX({ angle = 45, to = back_walls_width }, %, $seg01)
|
||||
|> angledLine(angle = 45, endAbsoluteX = back_walls_width, tag = $seg01)
|
||||
|> yLine(endAbsolute = height)
|
||||
|> xLine(length = -wall_thickness)
|
||||
|> yLine(endAbsolute = segEndY(seg01))
|
||||
|> angledLineToX({
|
||||
angle = 45,
|
||||
to = back_walls_width / 2 + wall_thickness / 2
|
||||
}, %)
|
||||
|> angledLine(angle = 45, endAbsoluteX = back_walls_width / 2 + wall_thickness / 2)
|
||||
|> xLine(length = -wall_thickness)
|
||||
|> angledLineToX({
|
||||
angle = 180 - 45,
|
||||
to = wall_thickness
|
||||
}, %)
|
||||
|> angledLine(angle = 180 - 45, endAbsoluteX = wall_thickness)
|
||||
|> yLine(endAbsolute = height)
|
||||
|> xLine(endAbsolute = 0)
|
||||
|> yLine(endAbsolute = segEndY(seg01))
|
||||
|> angledLineToY({ angle = 180 - 45, to = 0 }, %)
|
||||
|> angledLine(angle = 180 - 45, endAbsoluteY = 0)
|
||||
|> close(%)
|
||||
part001 = revolve(
|
||||
sketch001,
|
||||
@ -42,22 +36,16 @@ part001 = revolve(
|
||||
sketch002 = startSketchOn(-YZ)
|
||||
|> startProfileAt([back_walls_width / 2, 0], %)
|
||||
|> xLine(length = wall_thickness / 2)
|
||||
|> angledLineToX({ angle = 45, to = back_walls_width }, %, $seg02)
|
||||
|> angledLine(angle = 45, endAbsoluteX = back_walls_width, tag = $seg02)
|
||||
|> yLine(endAbsolute = height)
|
||||
|> xLine(length = -wall_thickness)
|
||||
|> yLine(endAbsolute = segEndY(seg01))
|
||||
|> angledLineToX({
|
||||
angle = 45,
|
||||
to = back_walls_width / 2 + wall_thickness / 2
|
||||
}, %)
|
||||
|> angledLine(angle = 45, endAbsoluteX = back_walls_width / 2 + wall_thickness / 2)
|
||||
|> xLine(length = -wall_thickness)
|
||||
|> angledLineToX({
|
||||
angle = 180 - 45,
|
||||
to = wall_thickness
|
||||
}, %)
|
||||
|> angledLine(angle = 180 - 45, endAbsoluteX = wall_thickness)
|
||||
|> yLine(endAbsolute = height)
|
||||
|> xLine(endAbsolute = 0)
|
||||
|> yLine(endAbsolute = segEndY(seg02))
|
||||
|> angledLineToY({ angle = 180 - 45, to = 0 }, %)
|
||||
|> angledLine(angle = 180 - 45, endAbsoluteY = 0)
|
||||
|> close(%)
|
||||
|> extrude(length = back_length - height)
|
||||
|
||||
@ -139,9 +139,9 @@ description: Variables in memory after executing poop_chute.kcl
|
||||
"id": "[uuid]",
|
||||
"sourceRange": [],
|
||||
"tag": {
|
||||
"commentStart": 352,
|
||||
"end": 358,
|
||||
"start": 352,
|
||||
"commentStart": 358,
|
||||
"end": 364,
|
||||
"start": 358,
|
||||
"type": "TagDeclarator",
|
||||
"value": "seg01"
|
||||
},
|
||||
@ -258,9 +258,9 @@ description: Variables in memory after executing poop_chute.kcl
|
||||
0.0
|
||||
],
|
||||
"tag": {
|
||||
"commentStart": 352,
|
||||
"end": 358,
|
||||
"start": 352,
|
||||
"commentStart": 358,
|
||||
"end": 364,
|
||||
"start": 358,
|
||||
"type": "TagDeclarator",
|
||||
"value": "seg01"
|
||||
},
|
||||
@ -595,9 +595,9 @@ description: Variables in memory after executing poop_chute.kcl
|
||||
0.0
|
||||
],
|
||||
"tag": {
|
||||
"commentStart": 352,
|
||||
"end": 358,
|
||||
"start": 352,
|
||||
"commentStart": 358,
|
||||
"end": 364,
|
||||
"start": 358,
|
||||
"type": "TagDeclarator",
|
||||
"value": "seg01"
|
||||
},
|
||||
@ -899,9 +899,9 @@ description: Variables in memory after executing poop_chute.kcl
|
||||
"id": "[uuid]",
|
||||
"sourceRange": [],
|
||||
"tag": {
|
||||
"commentStart": 1178,
|
||||
"end": 1184,
|
||||
"start": 1178,
|
||||
"commentStart": 1152,
|
||||
"end": 1158,
|
||||
"start": 1152,
|
||||
"type": "TagDeclarator",
|
||||
"value": "seg02"
|
||||
},
|
||||
@ -1018,9 +1018,9 @@ description: Variables in memory after executing poop_chute.kcl
|
||||
0.0
|
||||
],
|
||||
"tag": {
|
||||
"commentStart": 1178,
|
||||
"end": 1184,
|
||||
"start": 1178,
|
||||
"commentStart": 1152,
|
||||
"end": 1158,
|
||||
"start": 1152,
|
||||
"type": "TagDeclarator",
|
||||
"value": "seg02"
|
||||
},
|
||||
|
||||
@ -16,23 +16,17 @@ Fy = 0.5
|
||||
sketch001 = startSketchOn(-YZ)
|
||||
|> startProfileAt([back_walls_width / 2, 0], %)
|
||||
|> xLine(length = wall_thickness / 2)
|
||||
|> angledLineToX({ angle = 45, to = back_walls_width }, %, $seg01)
|
||||
|> angledLine(angle = 45, endAbsoluteX = back_walls_width, tag = $seg01)
|
||||
|> yLine(endAbsolute = height)
|
||||
|> xLine(length = -wall_thickness)
|
||||
|> yLine(endAbsolute = segEndY(seg01))
|
||||
|> angledLineToX({
|
||||
angle = 45,
|
||||
to = back_walls_width / 2 + wall_thickness / 2
|
||||
}, %)
|
||||
|> angledLine(angle = 45, endAbsoluteX = back_walls_width / 2 + wall_thickness / 2)
|
||||
|> xLine(length = -wall_thickness)
|
||||
|> angledLineToX({
|
||||
angle = 180 - 45,
|
||||
to = wall_thickness
|
||||
}, %)
|
||||
|> angledLine(angle = 180 - 45, endAbsoluteX = wall_thickness)
|
||||
|> yLine(endAbsolute = height)
|
||||
|> xLine(endAbsolute = 0)
|
||||
|> yLine(endAbsolute = segEndY(seg01))
|
||||
|> angledLineToY({ angle = 180 - 45, to = 0 }, %)
|
||||
|> angledLine(angle = 180 - 45, endAbsoluteY = 0)
|
||||
|> close(%)
|
||||
part001 = revolve(
|
||||
sketch001,
|
||||
@ -46,22 +40,16 @@ part001 = revolve(
|
||||
sketch002 = startSketchOn(-YZ)
|
||||
|> startProfileAt([back_walls_width / 2, 0], %)
|
||||
|> xLine(length = wall_thickness / 2)
|
||||
|> angledLineToX({ angle = 45, to = back_walls_width }, %, $seg02)
|
||||
|> angledLine(angle = 45, endAbsoluteX = back_walls_width, tag = $seg02)
|
||||
|> yLine(endAbsolute = height)
|
||||
|> xLine(length = -wall_thickness)
|
||||
|> yLine(endAbsolute = segEndY(seg01))
|
||||
|> angledLineToX({
|
||||
angle = 45,
|
||||
to = back_walls_width / 2 + wall_thickness / 2
|
||||
}, %)
|
||||
|> angledLine(angle = 45, endAbsoluteX = back_walls_width / 2 + wall_thickness / 2)
|
||||
|> xLine(length = -wall_thickness)
|
||||
|> angledLineToX({
|
||||
angle = 180 - 45,
|
||||
to = wall_thickness
|
||||
}, %)
|
||||
|> angledLine(angle = 180 - 45, endAbsoluteX = wall_thickness)
|
||||
|> yLine(endAbsolute = height)
|
||||
|> xLine(endAbsolute = 0)
|
||||
|> yLine(endAbsolute = segEndY(seg02))
|
||||
|> angledLineToY({ angle = 180 - 45, to = 0 }, %)
|
||||
|> angledLine(angle = 180 - 45, endAbsoluteY = 0)
|
||||
|> close(%)
|
||||
|> extrude(length = back_length - height)
|
||||
|
||||
Reference in New Issue
Block a user