diff --git a/e2e/playwright/snapshot-tests.spec.ts b/e2e/playwright/snapshot-tests.spec.ts index 4171cc4e0..1486867d0 100644 --- a/e2e/playwright/snapshot-tests.spec.ts +++ b/e2e/playwright/snapshot-tests.spec.ts @@ -77,11 +77,7 @@ part001 = startSketchOn(-XZ) ) |> xLine(endAbsolute = totalLen, tag = $seg03) |> yLine(length = -armThick, tag = $seg01) - |> angledLineThatIntersects({ - angle = turns::HALF_TURN, - offset = -armThick, - intersectTag = seg04 - }, %) + |> angledLineThatIntersects(angle = turns::HALF_TURN, offset = -armThick, intersectTag = seg04) |> angledLine(angle = segAng(seg04, %) + 180, endAbsoluteY = turns::ZERO) |> angledLine( angle = -bottomAng, @@ -90,11 +86,7 @@ part001 = startSketchOn(-XZ) ) |> xLine(length = endAbsolute = segEndX(seg03) + 0) |> yLine(length = -segLen(seg01, %)) - |> angledLineThatIntersects({ - angle = turns::HALF_TURN, - offset = -armThick, - intersectTag = seg02 - }, %) + |> angledLineThatIntersects(angle = turns::HALF_TURN, offset = -armThick, intersectTag = seg02) |> angledLine(angle = segAng(seg02, %) + 180, endAbsoluteY = -baseHeight) |> xLine(endAbsolute = turns::ZERO) |> close() diff --git a/e2e/playwright/storageStates.ts b/e2e/playwright/storageStates.ts index a27f57067..cc6273946 100644 --- a/e2e/playwright/storageStates.ts +++ b/e2e/playwright/storageStates.ts @@ -93,11 +93,7 @@ part001 = startSketchOn(XZ) |> angledLine(angle = 30, lengthY = 3 + 0 ) |> angledLine(angle = 22.14 + 0, endAbsoluteX = 12) |> angledLine(angle = 30, endAbsoluteY = 11.14) -|> angledLineThatIntersects({ - angle: 3.14, - intersectTag: a, - offset: 0 -}, %) +|> angledLineThatIntersects(angle = 3.14, intersectTag = a, offset = 0) |> tangentialArc(endAbsolute = [13.14 + 0, 13.14]) |> close() |> extrude(length = 5 + 7) diff --git a/e2e/playwright/testing-segment-overlays.spec.ts b/e2e/playwright/testing-segment-overlays.spec.ts index 2684e9411..2a411a8b9 100644 --- a/e2e/playwright/testing-segment-overlays.spec.ts +++ b/e2e/playwright/testing-segment-overlays.spec.ts @@ -224,11 +224,7 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => { |> angledLine(angle = -91, lengthY = 19 + 0) |> angledLine(angle = 3 + 0, endAbsoluteX = 5 + 26) |> angledLine(angle = 89, endAbsoluteY = 20 + 9.14 + 0) - |> angledLineThatIntersects({ - angle = 4.14, - intersectTag = a, - offset = 9 - }, %) + |> angledLineThatIntersects(angle = 4.14, intersectTag = a, offset = 9) |> tangentialArc(endAbsolute = [5 + 3.14 + 13, 20 + 3.14]) ` ) @@ -472,11 +468,7 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => { |> angledLine(angle = -91, lengthY = 19 + 0) |> angledLine(angle = 3 + 0, endAbsoluteX = 26) |> angledLine(angle = 89, endAbsoluteY = 9.14 + 0) - |> angledLineThatIntersects({ - angle = 4.14, - intersectTag = a, - offset = 9 - }, %) + |> angledLineThatIntersects(angle = 4.14, intersectTag = a, offset = 9) |> tangentialArc(endAbsolute = [3.14 + 13, 3.14]) ` ) @@ -597,11 +589,7 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => { |> angledLine(angle = -91, lengthY = 19 + 0) |> angledLine(angle = 3 + 0, endAbsoluteX = 26) |> angledLine(angle = 89, endAbsoluteY = 9.14 + 0) - |> angledLineThatIntersects({ - angle = 4.14, - intersectTag = a, - offset = 9 - }, %) + |> angledLineThatIntersects(angle = 4.14, intersectTag = a, offset = 9) |> tangentialArc(endAbsolute = [3.14 + 13, 1.14]) ` ) @@ -691,21 +679,9 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => { y: angledLineThatIntersects.y, }, constraintType: 'angle', - expectBeforeUnconstrained: `angledLineThatIntersects({ - angle = 4.14, - intersectTag = a, - offset = 9 - }, %)`, - expectAfterUnconstrained: `angledLineThatIntersects({ - angle = angle003, - intersectTag = a, - offset = 9 - }, %)`, - expectFinal: `angledLineThatIntersects({ - angle = -176, - offset = 9, - intersectTag = a - }, %)`, + expectBeforeUnconstrained: `angledLineThatIntersects(angle = 4.14, intersectTag = a, offset = 9)`, + expectAfterUnconstrained: `angledLineThatIntersects(angle = angle003, intersectTag = a,offset = 9)`, + expectFinal: `angledLineThatIntersects(angle = -176, offset = 9, intersectTag = a)`, ang: ang + 180, locator: '[data-overlay-toolbar-index="11"]', }) @@ -716,21 +692,9 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => { y: angledLineThatIntersects.y, }, constraintType: 'intersectionOffset', - expectBeforeUnconstrained: `angledLineThatIntersects({ - angle = -176, - offset = 9, - intersectTag = a - }, %)`, - expectAfterUnconstrained: `angledLineThatIntersects({ - angle = -176, - offset = perpDist001, - intersectTag = a - }, %)`, - expectFinal: `angledLineThatIntersects({ - angle = -176, - offset = 9, - intersectTag = a - }, %)`, + expectBeforeUnconstrained: `angledLineThatIntersects(angle = -176, offset = 9, intersectTag = a)`, + expectAfterUnconstrained: `angledLineThatIntersects(angle = -176, offset = perpDist001, intersectTag = a)`, + expectFinal: `angledLineThatIntersects(angle = -176, offset = 9, intersectTag = a)`, ang: ang + 180, locator: '[data-overlay-toolbar-index="11"]', }) @@ -753,11 +717,7 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => { |> angledLine(angle = -91, lengthY = 19 + 0) |> angledLine(angle = 3 + 0, endAbsoluteX = 26) |> angledLine(angle = 89, endAbsoluteY = 9.14 + 0) - |> angledLineThatIntersects({ - angle = 4.14, - intersectTag = a, - offset = 9 - }, %) + |> angledLineThatIntersects(angle = 4.14, intersectTag = a, offset = 9) |> tangentialArc(endAbsolute = [3.14 + 13, -3.14]) ` ) @@ -1083,11 +1043,7 @@ part001 = startSketchOn(XZ) |> angledLine(angle = -91, lengthY = 19 + 0) |> angledLine(angle = 3 + 0, endAbsoluteX = 26) |> angledLine(angle = 89, endAbsoluteY = 9.14 + 0) - |> angledLineThatIntersects({ - angle = 4.14, - intersectTag = a, - offset = 9 - }, %) + |> angledLineThatIntersects(angle = 4.14, intersectTag = a, offset = 9) |> tangentialArc(endAbsolute = [3.14 + 13, 1.14]) |> arcTo({ interior = [16.25, 5.12], @@ -1169,11 +1125,7 @@ part001 = startSketchOn(XZ) ang = await u.getAngle('[data-overlay-index="11"]') await deleteSegmentSequence({ hoverPos: { x: segmentToDelete.x, y: segmentToDelete.y }, - codeToBeDeleted: `angledLineThatIntersects({ - angle = 4.14, - intersectTag = a, - offset = 9 - }, %)`, + codeToBeDeleted: `angledLineThatIntersects(angle = 4.14, intersectTag = a, offset = 9)`, stdLibFnName: 'angledLineThatIntersects', ang: ang + 180, steps: 7, diff --git a/e2e/playwright/testing-selections.spec.ts b/e2e/playwright/testing-selections.spec.ts index a002d936e..89d20ae01 100644 --- a/e2e/playwright/testing-selections.spec.ts +++ b/e2e/playwright/testing-selections.spec.ts @@ -524,11 +524,7 @@ part001 = startSketchOn(XZ) |> angledLine(angle = 30, lengthY = 3 + 0) |> angledLine(angle = 22.14 + 0, endAbsoluteX = 12) |> angledLine(angle = 30, endAbsoluteY = 11.14) - |> angledLineThatIntersects({ - angle = 3.14, - intersectTag = a, - offset = 0 - }, %) + |> angledLineThatIntersects(angle = 3.14, intersectTag = a, offset = 0) |> tangentialArc(endAbsolute = [13.14 + 0, 13.14]) |> close() |> extrude(length = 5 + 7) @@ -660,7 +656,7 @@ part001 = startSketchOn(XZ) await checkCodeAtHoverPosition( 'flatExtrusionFace', flatExtrusionFace, - `angledLineThatIntersects({angle=3.14,intersectTag=a,offset=0},%)extrude(length=5+7)`, + `angledLineThatIntersects(angle=3.14,intersectTag=a,offset=0)extrude(length=5+7)`, '}, %)' ) @@ -724,7 +720,7 @@ part001 = startSketchOn(XZ) await checkCodeAtHoverPosition( 'straightSegmentAdjacentEdge', straightSegmentAdjacentEdge, - `angledLineThatIntersects({angle=3.14,intersectTag=a,offset=0},%)`, + `angledLineThatIntersects(angle=3.14,intersectTag=a,offset=0)`, '}, %)' ) diff --git a/e2e/playwright/various.spec.ts b/e2e/playwright/various.spec.ts index 5703830f2..28c849391 100644 --- a/e2e/playwright/various.spec.ts +++ b/e2e/playwright/various.spec.ts @@ -66,11 +66,7 @@ part001 = startSketchOn(-XZ) ) |> xLine(endAbsolute = totalLen, tag = $seg03) |> yLine(length = -armThick, tag = $seg01) -|> angledLineThatIntersects({ - angle = turns::HALF_TURN, - offset = -armThick, - intersectTag = seg04 - }, %) +|> angledLineThatIntersects(angle = turns::HALF_TURN, offset = -armThick, intersectTag = seg04) |> angledLine(angle = segAng(seg04) + 180, endAbsoluteY = turns::ZERO) |> angledLine( angle = -bottomAng, @@ -79,11 +75,7 @@ part001 = startSketchOn(-XZ) ) |> xLine(endAbsolute = segEndX(seg03) + 0) |> yLine(length = -segLen(seg01)) -|> angledLineThatIntersects({ - angle = turns::HALF_TURN, - offset = -armThick, - intersectTag = seg02 - }, %) +|> angledLineThatIntersects(angle = turns::HALF_TURN, offset = -armThick, intersectTag = seg02) |> angledLine(angle = segAng(seg02) + 180, endAbsoluteY = -baseHeight) |> xLine(endAbsolute = turns::ZERO) |> close()