diff --git a/__test__/FeedingToolPath/FeedingToolPath.test.ts b/__test__/FeedingToolPath/FeedingToolPath.test.ts index fc54ccca8..9515d8b52 100644 --- a/__test__/FeedingToolPath/FeedingToolPath.test.ts +++ b/__test__/FeedingToolPath/FeedingToolPath.test.ts @@ -49,7 +49,7 @@ test("极限刀半径", () => let data = [1, "Board", 2, 1, 0, false, 7, 0, [0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, -657.7056127057733, -888.0170782475586, 0, 1], 0, 1, 1200, 600, 18, true, "Polyline", 2, 1, 0, false, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 2, 4, [0, 0], 0, [600, 0], 0, [600, 1200], 0, [0, 1200], 0, true, 1, 1, 560, 310, 15, false, "Polyline", 2, 1, 0, false, 1, 0, [0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 533.9316239316239, 40.76923076923083, 0, 1], 0, 2, 8, [-269.2307692307692, -223.9316239316239], 0, [-209.23076923076923, -223.9316239316239], 0, [-209.2307692307692, -473.9316239316239], 0, [40.7692307692308, -473.9316239316239], 0, [40.76923076923081, -533.9316239316239], 0, [-519.2307692307692, -533.9316239316238], 0, [-519.2307692307692, -473.9316239316238], 0, [-269.23076923076917, -473.9316239316238], 0, true, 0, 30, 0, [0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, -990.7928086301262, -752.1719826564371, 0, 1], null, null, 1, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], null, "", "{\"roomName\":\"\",\"cabinetName\":\"\",\"boardName\":\"\",\"material\":\"\",\"color\":\"\",\"lines\":0,\"bigHoleDir\":0,\"drillType\":\"three\",\"composingFace\":2,\"highSealed\":[],\"sealedUp\":\"1\",\"sealedDown\":\"1\",\"sealedLeft\":\"1\",\"sealedRight\":\"1\",\"knifeRad\":\"0\",\"grooveAddLength\":\"0\",\"grooveAddWidth\":\"0\",\"grooveAddDepth\":\"0\",\"spliteHeight\":\"\",\"spliteWidth\":\"\",\"spliteThickness\":\"\"}", 0]; let brs = LoadBoardsFromFileData(data); - testPathCount(brs[0], 3); + testPathCount(brs[0], 4); data = [1, "Board", 2, 1, 0, false, 7, 0, [0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, -663.8732094729834, -1836.8490686954794, 0, 1], 0, 1, 1200, 600, 18, true, "Polyline", 2, 1, 0, false, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 2, 4, [0, 0], 0, [600, 0], 0, [600, 1200], 0, [0, 1200], 0, true, 1, 1, 746.2524018100552, 30, 18, false, "Polyline", 2, 1, 0, false, 2, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1480.7590848806103, 719.3699285130117, 0, 1], 0, 2, 4, [-1450.7590848806103, 26.7131494779253], 0, [-1450.7590848806103, -719.3699285130117], 0, [-1480.7590848806103, -719.3699285130117], 0, [-1480.7590848806103, 26.88247329704346], 0, true, 0, 15, 0, [0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, -864.4413047383622, -1532.97311226155, 0, 1], null, null, 1, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], null, "", "{\"roomName\":\"\",\"cabinetName\":\"\",\"boardName\":\"\",\"material\":\"\",\"color\":\"\",\"lines\":0,\"bigHoleDir\":0,\"drillType\":\"three\",\"composingFace\":2,\"highSealed\":[],\"sealedUp\":\"1\",\"sealedDown\":\"1\",\"sealedLeft\":\"1\",\"sealedRight\":\"1\",\"knifeRad\":\"0\",\"grooveAddLength\":\"0\",\"grooveAddWidth\":\"0\",\"grooveAddDepth\":\"0\",\"spliteHeight\":\"\",\"spliteWidth\":\"\",\"spliteThickness\":\"\"}", 0]; brs = LoadBoardsFromFileData(data); diff --git a/__test__/FeedingToolPath/__snapshots__/FeedingToolPath.test.ts.snap b/__test__/FeedingToolPath/__snapshots__/FeedingToolPath.test.ts.snap index 5ac8672a8..726ef5ef8 100644 --- a/__test__/FeedingToolPath/__snapshots__/FeedingToolPath.test.ts.snap +++ b/__test__/FeedingToolPath/__snapshots__/FeedingToolPath.test.ts.snap @@ -82,7 +82,7 @@ exports[`复杂造型01: 曲线长度 9`] = `3.2524680966497335`; exports[`复杂造型01: 曲线长度 10`] = `301.66992978702626`; -exports[`复杂造型01: 曲线长度 11`] = `1749.8631881230112`; +exports[`复杂造型01: 曲线长度 11`] = `1749.8631881230117`; exports[`复杂造型01: 曲线长度 12`] = `7.8285491298056655`; @@ -108,19 +108,19 @@ exports[`复杂造型测试: 曲线长度 2`] = `13653.90128815112`; exports[`复杂造型测试: 曲线长度 3`] = `2368.4150990997623`; -exports[`复杂造型测试: 曲线长度 4`] = `1335.5629222865505`; +exports[`复杂造型测试: 曲线长度 4`] = `1335.5629222865464`; -exports[`复杂造型测试: 曲线长度 5`] = `1265.9777684790147`; +exports[`复杂造型测试: 曲线长度 5`] = `1265.9777684790145`; -exports[`复杂造型测试: 曲线长度 6`] = `2261.915055343594`; +exports[`复杂造型测试: 曲线长度 6`] = `2261.9150553435934`; -exports[`复杂造型测试: 曲线长度 7`] = `8.0486334855557`; +exports[`复杂造型测试: 曲线长度 7`] = `8.048633485555133`; exports[`复杂造型测试: 曲线长度 8`] = `875.5142132396979`; -exports[`复杂造型测试: 曲线长度 9`] = `1565.1472656712765`; +exports[`复杂造型测试: 曲线长度 9`] = `1565.147265671276`; -exports[`复杂造型测试: 曲线长度 10`] = `692.0908822142659`; +exports[`复杂造型测试: 曲线长度 10`] = `692.0908822142652`; exports[`复杂造型测试: 曲线长度 11`] = `227.8342135021163`; @@ -140,7 +140,7 @@ exports[`复杂造型测试: 曲线长度 18`] = `342.70973636046426`; exports[`复杂造型测试: 曲线长度 19`] = `476.0989607667295`; -exports[`复杂造型测试: 曲线长度 20`] = `1167.5479341842504`; +exports[`复杂造型测试: 曲线长度 20`] = `1167.5479341842502`; exports[`复杂造型测试: 曲线长度 21`] = `413.7195254587742`; @@ -224,41 +224,43 @@ exports[`极限刀半径#I11UDE: 走刀数量 1`] = `9`; exports[`极限刀半径: 曲线长度 1`] = `3600`; -exports[`极限刀半径: 曲线长度 2`] = `1314.2477796076937`; +exports[`极限刀半径: 曲线长度 2`] = `267.1238898038468`; -exports[`极限刀半径: 曲线长度 3`] = `1740`; +exports[`极限刀半径: 曲线长度 3`] = `827.1238898038469`; -exports[`极限刀半径: 曲线长度 4`] = `3600`; +exports[`极限刀半径: 曲线长度 4`] = `1740`; -exports[`极限刀半径: 曲线长度 5`] = `716.1675009811012`; +exports[`极限刀半径: 曲线长度 5`] = `3600`; -exports[`极限刀半径: 曲线长度 6`] = `1552.3359576397822`; +exports[`极限刀半径: 曲线长度 6`] = `716.1675009811012`; -exports[`极限刀半径: 曲线长度 7`] = `3600`; +exports[`极限刀半径: 曲线长度 7`] = `1552.335957639782`; -exports[`极限刀半径: 曲线长度 8`] = `1638.9591725161224`; +exports[`极限刀半径: 曲线长度 8`] = `3600`; -exports[`极限刀半径: 曲线长度 9`] = `47.12388980384689`; +exports[`极限刀半径: 曲线长度 9`] = `1638.9591725161224`; exports[`极限刀半径: 曲线长度 10`] = `47.12388980384689`; -exports[`极限刀半径: 曲线长度 11`] = `3517.9183450322453`; +exports[`极限刀半径: 曲线长度 11`] = `47.12388980384689`; -exports[`极限刀半径: 曲线长度 12`] = `3600`; +exports[`极限刀半径: 曲线长度 12`] = `3517.9183450322453`; -exports[`极限刀半径: 曲线长度 13`] = `617.1238898038469`; +exports[`极限刀半径: 曲线长度 13`] = `3600`; -exports[`极限刀半径: 曲线长度 14`] = `1040`; +exports[`极限刀半径: 曲线长度 14`] = `617.1238898038469`; -exports[`极限刀半径: 曲线长度 15`] = `3600`; +exports[`极限刀半径: 曲线长度 15`] = `1040`; -exports[`极限刀半径: 曲线长度 16`] = `390`; +exports[`极限刀半径: 曲线长度 16`] = `3600`; -exports[`极限刀半径: 曲线长度 17`] = `23.56194490192345`; +exports[`极限刀半径: 曲线长度 17`] = `390`; -exports[`极限刀半径: 曲线长度 18`] = `900`; +exports[`极限刀半径: 曲线长度 18`] = `23.56194490192345`; -exports[`极限刀半径: 走刀数量 1`] = `1`; +exports[`极限刀半径: 曲线长度 19`] = `900`; + +exports[`极限刀半径: 走刀数量 1`] = `2`; exports[`极限刀半径: 走刀数量 2`] = `1`; diff --git a/__test__/Fillet/__snapshots__/polyline.test.ts.snap b/__test__/Fillet/__snapshots__/polyline.test.ts.snap index e8377d49c..e50b4994b 100644 --- a/__test__/Fillet/__snapshots__/polyline.test.ts.snap +++ b/__test__/Fillet/__snapshots__/polyline.test.ts.snap @@ -10,17 +10,17 @@ exports[`双圆多段线倒角 4`] = `1208.3752684304045`; exports[`双圆多段线倒角 5`] = `1200.7933322000165`; -exports[`双圆多段线倒角 6`] = `1200.7933322000163`; +exports[`双圆多段线倒角 6`] = `1200.7933322000165`; -exports[`双圆多段线倒角 7`] = `1200.793332200017`; +exports[`双圆多段线倒角 7`] = `1200.7933322000167`; exports[`双圆多段线倒角 8`] = `1200.793332200017`; exports[`多段线闭合标志首尾有弧 1`] = `1357.0494514094473`; -exports[`多段线闭合标志首尾有弧 2`] = `1357.049451409447`; +exports[`多段线闭合标志首尾有弧 2`] = `1357.0494514094473`; -exports[`多段线闭合标志首尾有弧 3`] = `1357.0494514094473`; +exports[`多段线闭合标志首尾有弧 3`] = `1357.049451409447`; exports[`多段线闭合标志首尾有弧 4`] = `1357.0494514094473`;