Fix some uses of extrude

Signed-off-by: Nick Cameron <nrc@ncameron.org>
This commit is contained in:
Nick Cameron
2025-01-22 11:21:17 +13:00
parent da2072e005
commit 09df8a734a
6 changed files with 14 additions and 19 deletions

View File

@ -646,14 +646,14 @@ test.describe('Testing selections', () => {
await checkCodeAtHoverPosition( await checkCodeAtHoverPosition(
'flatExtrusionFace', 'flatExtrusionFace',
flatExtrusionFace, flatExtrusionFace,
`angledLineThatIntersects({angle=3.14,intersectTag=a,offset=0},%)extrude(5+7,%)`, `angledLineThatIntersects({angle=3.14,intersectTag=a,offset=0},%)extrude(length=5+7)`,
'}, %)' '}, %)'
) )
await checkCodeAtHoverPosition( await checkCodeAtHoverPosition(
'tangentialArcTo', 'tangentialArcTo',
tangentialArcTo, tangentialArcTo,
'tangentialArcTo([13.14+0,13.14],%)extrude(5+7,%)', 'tangentialArcTo([13.14+0,13.14],%)extrude(length=5+7)',
'tangentialArcTo([13.14 + 0, 13.14], %)' 'tangentialArcTo([13.14 + 0, 13.14], %)'
) )
await checkCodeAtHoverPosition( await checkCodeAtHoverPosition(
@ -678,15 +678,10 @@ test.describe('Testing selections', () => {
await checkCodeAtHoverPosition( await checkCodeAtHoverPosition(
'close', 'close',
close, close,
'close()extrude(5+7,%)', 'close()extrude(length=5+7)',
'close()'
)
await checkCodeAtHoverPosition(
'closeEdge',
closeEdge,
`close()`,
'close()' 'close()'
) )
await checkCodeAtHoverPosition('closeEdge', closeEdge, `close()`, 'close()')
await checkCodeAtHoverPosition( await checkCodeAtHoverPosition(
'closeAdjacentEdge', 'closeAdjacentEdge',
closeAdjacentEdge, closeAdjacentEdge,

View File

@ -272,7 +272,7 @@ impl Backend {
} }
const part001 = cube([0,0], 20) const part001 = cube([0,0], 20)
|> close(%) |> close(%)
|> extrude(20, %)"# |> extrude(length=20)"#
.to_string(), .to_string(),
); );
} }

View File

@ -3335,7 +3335,7 @@ part001 = startSketchOn('XY')
|> line(end = [0, 20], tag = $seg01) |> line(end = [0, 20], tag = $seg01)
|> line(end = [-20, 0], tag = $seg01) |> line(end = [-20, 0], tag = $seg01)
|> close() |> close()
|> ^^^extrude(3.14, %)"#; |> ^^^extrude(length = 3.14)"#;
// Send open file. // Send open file.
server server

View File

@ -3731,7 +3731,7 @@ firstExtrude = startSketchOn('XY')
|> line([20, 0], %) |> line([20, 0], %)
|> line([0, -8], %) |> line([0, -8], %)
|> close(%) |> close(%)
|> extrude(2, %) |> extrude(length=2)
secondExtrude = startSketchOn('XY') secondExtrude = startSketchOn('XY')
|> startProfileAt([0,0], %) |> startProfileAt([0,0], %)
@ -4208,7 +4208,7 @@ let other_thing = 2 * cos(3)"#;
|> line([w, 0], %) |> line([w, 0], %)
|> line([0, -l], %) |> line([0, -l], %)
|> close(%) |> close(%)
|> extrude(h, %) |> extrude(length=h)
return myBox return myBox
} }
@ -4509,7 +4509,7 @@ mod snapshot_tests {
|> line([0, 10], %) |> line([0, 10], %)
|> tangentialArc([-5, 5], %) |> tangentialArc([-5, 5], %)
|> line([5, -15], %) |> line([5, -15], %)
|> extrude(10, %) |> extrude(length=10)
"# "#
); );
snapshot_test!(b, "myVar = min(5 , -legLen(5, 4))"); // Space before comma snapshot_test!(b, "myVar = min(5 , -legLen(5, 4))"); // Space before comma

View File

@ -13,4 +13,4 @@ sketch002 = startSketchOn(extrude001, seg02)
|> line([2, -3], %) |> line([2, -3], %)
|> lineTo([profileStartX(%), profileStartY(%)], %) |> lineTo([profileStartX(%), profileStartY(%)], %)
|> close(%) |> close(%)
extrude002 = extrude(5, sketch002) extrude002 = extrude(sketch002, length = 5)

View File

@ -4,25 +4,25 @@ sketch001 = startSketchOn('XZ')
|> line([5, -8], %, $seg01) |> line([5, -8], %, $seg01)
|> lineTo([profileStartX(%), profileStartY(%)], %) |> lineTo([profileStartX(%), profileStartY(%)], %)
|> close(%) |> close(%)
extrude001 = extrude(6, sketch001) extrude001 = extrude(sketch001, length = 6)
sketch002 = startSketchOn(extrude001, seg01) sketch002 = startSketchOn(extrude001, seg01)
|> startProfileAt([-0.5, 0.5], %) |> startProfileAt([-0.5, 0.5], %)
|> line([2, 5], %) |> line([2, 5], %)
|> line([2, -5], %) |> line([2, -5], %)
|> lineTo([profileStartX(%), profileStartY(%)], %) |> lineTo([profileStartX(%), profileStartY(%)], %)
|> close(%) |> close(%)
extrude002 = extrude(5, sketch002) extrude002 = extrude(sketch002, length = 5)
sketch003 = startSketchOn(extrude002, 'END') sketch003 = startSketchOn(extrude002, 'END')
|> startProfileAt([1, 1.5], %) |> startProfileAt([1, 1.5], %)
|> line([0.5, 2], %, $seg02) |> line([0.5, 2], %, $seg02)
|> line([1, -2], %) |> line([1, -2], %)
|> lineTo([profileStartX(%), profileStartY(%)], %) |> lineTo([profileStartX(%), profileStartY(%)], %)
|> close(%) |> close(%)
extrude003 = extrude(4, sketch003) extrude003 = extrude(sketch002, length = 4)
sketch004 = startSketchOn(extrude003, seg02) sketch004 = startSketchOn(extrude003, seg02)
|> startProfileAt([-3, 14], %) |> startProfileAt([-3, 14], %)
|> line([0.5, 1], %) |> line([0.5, 1], %)
|> line([0.5, -2], %) |> line([0.5, -2], %)
|> lineTo([profileStartX(%), profileStartY(%)], %) |> lineTo([profileStartX(%), profileStartY(%)], %)
|> close(%) |> close(%)
extrude004 = extrude(3, sketch004) extrude004 = extrude(sketch002, length = 3)