Public
/
WebCAD
mirror of https://gitee.com/cf-fz/WebCAD.git
7
1
Fork 0
Code Issues Projects Releases Wiki Activity

优化:规范用字,异形,造型

Browse Source
20230809
ChenX 1 year ago
parent cdc238da32
commit 6d31acfd77
12 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File

6
__test__/EdgeSealing/EdgeSealing.test.ts
Unescape View File

@ -37,7 +37,7 @@ test("常规板件,常规坐标系", () =>
testBrSealing(vBr, sealingSize); testBrSealing(vBr, sealingSize);
}); });
test("异型板件,常规坐标系", () => test("异形板件,常规坐标系", () =>
{ {
let data = let data =
[1, "Board", 2, 1, 0, false, 7, 0, [0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 3681.8686077049847, -1396.263281011676, 0, 1], 0, 1, 1336.1737079222257, 2039.4230278812934, 1, false, "Polyline", 2, 1, 0, true, 7, 0, [6.123233995736766e-17, -1, 0, 0, 1, 6.123233995736766e-17, 0, 0, 0, 0, 1, 0, 1396.2632810116759, 3681.8686077049847, 0, 1], 0, 2, 5, [2345.694899782759, -1396.263281011676], 0, [3681.8686077049847, -1396.263281011676], 0, [3681.8686077049847, 443.1597468696174], 0.41421356237309503, [3481.8686077049847, 643.1597468696174], 0, [2345.694899782759, 643.1597468696174], 0, true, 0, 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]; [1, "Board", 2, 1, 0, false, 7, 0, [0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 3681.8686077049847, -1396.263281011676, 0, 1], 0, 1, 1336.1737079222257, 2039.4230278812934, 1, false, "Polyline", 2, 1, 0, true, 7, 0, [6.123233995736766e-17, -1, 0, 0, 1, 6.123233995736766e-17, 0, 0, 0, 0, 1, 0, 1396.2632810116759, 3681.8686077049847, 0, 1], 0, 2, 5, [2345.694899782759, -1396.263281011676], 0, [3681.8686077049847, -1396.263281011676], 0, [3681.8686077049847, 443.1597468696174], 0.41421356237309503, [3481.8686077049847, 643.1597468696174], 0, [2345.694899782759, 643.1597468696174], 0, true, 0, 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];
@ -59,7 +59,7 @@ test("异型板件,常规坐标系", () =>
testBrSealing(br, sealingSize); testBrSealing(br, sealingSize);
}); });
test("异型板件,非常规坐标系", () => test("异形板件,非常规坐标系", () =>
{ {
let data = let data =
[1, "Board", 2, 1, 0, false, 7, 0, [0, 0, 1, 0, -1, 0, 0, 0, 0, -1, 0, 0, 15844.064994449893, 0, -2833.834144511985, 1], 0, 1, 10835.306755747779, 7823.377849356992, 1, false, "Polyline", 2, 1, 0, true, 7, 0, [6.123233995736766e-17, -1, 0, 0, 1, 6.123233995736766e-17, 0, 0, 0, 0, 1, 0, 2833.8341445119845, 15844.064994449893, 0, 1], 0, 2, 6, [5008.758238702114, -2833.834144511985], 0, [5008.758238702114, 2775.380162574158], -0.414213562373095, [7222.921780972962, 4989.543704845006], 0, [13759.976048629745, 4989.543704845006], -0.8565683416116343, [14392.594203564273, 919.700241432878], 0, [14076.28512609701, -2833.834144511985], 0, true, 0, 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]; [1, "Board", 2, 1, 0, false, 7, 0, [0, 0, 1, 0, -1, 0, 0, 0, 0, -1, 0, 0, 15844.064994449893, 0, -2833.834144511985, 1], 0, 1, 10835.306755747779, 7823.377849356992, 1, false, "Polyline", 2, 1, 0, true, 7, 0, [6.123233995736766e-17, -1, 0, 0, 1, 6.123233995736766e-17, 0, 0, 0, 0, 1, 0, 2833.8341445119845, 15844.064994449893, 0, 1], 0, 2, 6, [5008.758238702114, -2833.834144511985], 0, [5008.758238702114, 2775.380162574158], -0.414213562373095, [7222.921780972962, 4989.543704845006], 0, [13759.976048629745, 4989.543704845006], -0.8565683416116343, [14392.594203564273, 919.700241432878], 0, [14076.28512609701, -2833.834144511985], 0, true, 0, 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];
@ -72,7 +72,7 @@ test("异型板件,非常规坐标系", () =>
sealingSize = [2, 1, 2]; sealingSize = [2, 1, 2];
testBrSealing(br, sealingSize); testBrSealing(br, sealingSize);
}); });
test("异型板件,非相切圆弧", () => test("异形板件,非相切圆弧", () =>
{ {
let data = let data =
[1, "Board", 3, 2, 102, false, 1, 2, 0, [0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 112.87179487179475, -263.53276353276357, 0, 1], 2, 1200, 600.0000000000001, 18, false, "Polyline", 3, 2, 0, false, 0, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 2, 5, [0, 0], 0, [600, 0], 0, [600, 1200], 0, [300, 1200], -0.563703247863248, [0, 900], 0, true, 0, 3, 0, 0, 0, 2, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 112.87179487179475, -263.53276353276357, 0, 1], 1, "右侧板", "{\"roomName\":\"\",\"cabinetName\":\"\",\"boardName\":\"\",\"material\":\"\",\"color\":\"\",\"lines\":0,\"bigHoleDir\":0,\"drillType\":\"three\",\"composingFace\":2,\"highSealed\":[{\"size\":1},{\"size\":2},{\"size\":3},{\"size\":4},{\"size\":5}],\"sealedUp\":\"1\",\"sealedDown\":\"1\",\"sealedLeft\":\"1\",\"sealedRight\":\"1\",\"spliteHeight\":\"\",\"spliteWidth\":\"\",\"spliteThickness\":\"\"}", 0, 0]; [1, "Board", 3, 2, 102, false, 1, 2, 0, [0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 112.87179487179475, -263.53276353276357, 0, 1], 2, 1200, 600.0000000000001, 18, false, "Polyline", 3, 2, 0, false, 0, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 2, 5, [0, 0], 0, [600, 0], 0, [600, 1200], 0, [300, 1200], -0.563703247863248, [0, 900], 0, true, 0, 3, 0, 0, 0, 2, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 112.87179487179475, -263.53276353276357, 0, 1], 1, "右侧板", "{\"roomName\":\"\",\"cabinetName\":\"\",\"boardName\":\"\",\"material\":\"\",\"color\":\"\",\"lines\":0,\"bigHoleDir\":0,\"drillType\":\"three\",\"composingFace\":2,\"highSealed\":[{\"size\":1},{\"size\":2},{\"size\":3},{\"size\":4},{\"size\":5}],\"sealedUp\":\"1\",\"sealedDown\":\"1\",\"sealedLeft\":\"1\",\"sealedRight\":\"1\",\"spliteHeight\":\"\",\"spliteWidth\":\"\",\"spliteThickness\":\"\"}", 0, 0];

2
__test__/EdgeSealing/SmoothEdge.test.ts
Unescape View File

@ -11,7 +11,7 @@ describe("见光面封边测试", () =>
scale: 10, scale: 10,
filterArr: [], filterArr: [],
}; };
test("异型板和层板", () => test("异形板和层板", () =>
{ {
let data = { "file": [2, "Board", 8, 2, 245, false, 1, 2, 0, [0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 2386.6534132798843, -350.616335546365, 991, 1], 0, 0, true, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 2386.6534132798843, -350.616335546365, 991, 1], 0, 3, 1164, 582, 18, true, "Polyline", 8, 2, 0, false, 0, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, true, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 2, 4, [0, 0], 0, [582, 0], 0, [582, 1164], 0, [0, 1164], 0, true, 0, 3, 0, 0, 0, 0, 0, 9, 0, "层板", "", "", "", "", "", 0, 1, "test", 2, 4, 3, 3, 3, 6, "3", "3", "6", "3", "", "", "", 4, "test", "test", "test", "test", true, true, 0, 0, 0, 0, 0, 0, 0, 0, true, "Board", 8, 2, 246, false, 1, 3, 0, [1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 1222.6534132798843, 249.383664453635, 0, 1], 0, 0, true, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 2145.2890228780084, 249.383664453635, 0, 1], 0, 3, 2000, 1165.1248637220942, 18, false, "Polyline", 8, 2, 0, false, 0, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -3335.482188966598, -7.2639225183823015, 0, 1], 0, 0, true, [1, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, -3335.482188966598, -7.2639225183823015, 0, 1], 0, 2, 12, [4064.7800097898426, 2007.2639225183823], 0, [4064.7800097898426, 810.169491525735], 0, [4111.269113906065, 810.169491525735], 0, [4111.269113906065, 2007.2639225183823], 0, [4500.607052688692, 2007.2639225183823], 0, [4500.607052688692, 7.2639225183823015], 0, [3335.482188966598, 7.2639225183823015], 0, [3335.482188966598, 2007.2639225183823], 0, [3737.419234971441, 2007.2639225183823], 0, [3737.419234971441, 786.9249394675348], 0, [3761.632310031973, 786.9249394675348], 0, [3761.632310031973, 2007.2639225183823], 0, true, 0, 3, 0, 0, 0, 0, 0, 9, 2, "背板", "", "", "", "", "", 0, 1, "test", 2, 4, 6, 3, 6, 6, "6", "6", "6", "3", "", "", "", 12, "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", false, true, 0, 0, 0, 0, 0, 0, 0, 0, true], "basePt": { "x": 1222.6534132798843, "y": -350.616335546365, "z": 0 }, "ucs": [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1] }; let data = { "file": [2, "Board", 8, 2, 245, false, 1, 2, 0, [0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 2386.6534132798843, -350.616335546365, 991, 1], 0, 0, true, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 2386.6534132798843, -350.616335546365, 991, 1], 0, 3, 1164, 582, 18, true, "Polyline", 8, 2, 0, false, 0, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, true, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 2, 4, [0, 0], 0, [582, 0], 0, [582, 1164], 0, [0, 1164], 0, true, 0, 3, 0, 0, 0, 0, 0, 9, 0, "层板", "", "", "", "", "", 0, 1, "test", 2, 4, 3, 3, 3, 6, "3", "3", "6", "3", "", "", "", 4, "test", "test", "test", "test", true, true, 0, 0, 0, 0, 0, 0, 0, 0, true, "Board", 8, 2, 246, false, 1, 3, 0, [1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 1222.6534132798843, 249.383664453635, 0, 1], 0, 0, true, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 2145.2890228780084, 249.383664453635, 0, 1], 0, 3, 2000, 1165.1248637220942, 18, false, "Polyline", 8, 2, 0, false, 0, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -3335.482188966598, -7.2639225183823015, 0, 1], 0, 0, true, [1, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, -3335.482188966598, -7.2639225183823015, 0, 1], 0, 2, 12, [4064.7800097898426, 2007.2639225183823], 0, [4064.7800097898426, 810.169491525735], 0, [4111.269113906065, 810.169491525735], 0, [4111.269113906065, 2007.2639225183823], 0, [4500.607052688692, 2007.2639225183823], 0, [4500.607052688692, 7.2639225183823015], 0, [3335.482188966598, 7.2639225183823015], 0, [3335.482188966598, 2007.2639225183823], 0, [3737.419234971441, 2007.2639225183823], 0, [3737.419234971441, 786.9249394675348], 0, [3761.632310031973, 786.9249394675348], 0, [3761.632310031973, 2007.2639225183823], 0, true, 0, 3, 0, 0, 0, 0, 0, 9, 2, "背板", "", "", "", "", "", 0, 1, "test", 2, 4, 6, 3, 6, 6, "6", "6", "6", "3", "", "", "", 12, "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", false, true, 0, 0, 0, 0, 0, 0, 0, 0, true], "basePt": { "x": 1222.6534132798843, "y": -350.616335546365, "z": 0 }, "ucs": [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1] };
let brs = LoadBoardsFromFileData(data) as Board[]; let brs = LoadBoardsFromFileData(data) as Board[];

20
__test__/EdgeSealing/__snapshots__/EdgeSealing.test.ts.snap
Unescape View File

@ -44,25 +44,25 @@ exports[`常规板件,常规坐标系 2`] = `"711624.00000"`;
exports[`常规板件,常规坐标系 3`] = `"712816.00000"`; exports[`常规板件,常规坐标系 3`] = `"712816.00000"`;
exports[`异型板件,常规坐标系 1`] = `"2709777.78838"`; exports[`异形板件,常规坐标系 1`] = `"2709777.78838"`;
exports[`异型板件,常规坐标系 2`] = `"2682243.40490"`; exports[`异形板件,常规坐标系 2`] = `"2682243.40490"`;
exports[`异型板件,常规坐标系 3`] = `"2660261.48331"`; exports[`异形板件,常规坐标系 3`] = `"2660261.48331"`;
exports[`异型板件,常规坐标系 4`] = `"2628158.64434"`; exports[`异形板件,常规坐标系 4`] = `"2628158.64434"`;
exports[`异型板件,常规坐标系 5`] = `"2603082.55192"`; exports[`异形板件,常规坐标系 5`] = `"2603082.55192"`;
exports[`异型板件,非常规坐标系 1`] = `"75939516.39226"`; exports[`异形板件,非常规坐标系 1`] = `"75939516.39226"`;
exports[`异型板件,非常规坐标系 2`] = `"75917994.66935"`; exports[`异形板件,非常规坐标系 2`] = `"75917994.66935"`;
exports[`异型板件,非常规坐标系 3`] = `"75908930.01960"`; exports[`异形板件,非常规坐标系 3`] = `"75908930.01960"`;
exports[`异型板件,非相切圆弧 1`] = `"635612.27514"`; exports[`异形板件,非相切圆弧 1`] = `"635612.27514"`;
exports[`异型板件,非相切圆弧 2`] = `"626242.21968"`; exports[`异形板件,非相切圆弧 2`] = `"626242.21968"`;
exports[`获取封边错误案例 1`] = `"153800.94126"`; exports[`获取封边错误案例 1`] = `"153800.94126"`;

2
__test__/EdgeSealing/seal.test.ts
Unescape View File

@ -23,7 +23,7 @@ test('无法计算封边', () =>
test('封边', () => test('封边', () =>
{ {
let d = let d =
{ "file": [1, "Board", 10, 2, 100, 0, 1, 2, 71, [0, 1, -1.8369701987210297e-16, 0, -1, 0, 0, 0, 0, 1.8369701987210297e-16, 1, 0, 2808.550429183707, 1026.6977927045664, 2.842170943040401e-14, 1], 0, 0, 1, [1, 0, 0, 0, 0, 1, -1.8369701987210297e-16, 0, 0, 1.8369701987210297e-16, 1, 0, 2808.550429183707, 1026.6977927045664, 2.842170943040401e-14, 1], 0, 0, 1, 3, 1600.976909041937, 216.70369214357592, 18, false, "Polyline", 10, 2, 0, 0, 0, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, 1, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, 1, 2, 37, [203.75274236917448, 0.6657821176631771], -0.12647817046362458, [216.58249214357465, 3.9639078952714044], 0, [216.70369214357606, 3.9639078952714044], 0, [216.70349214357384, 3.9670232852913614], 0, [216.7026921436518, 3.970172431976607], 0.005962190972429685, [216.04074477292943, 6.451513648837135], -0.002176672718212006, [215.35998088513043, 8.927953781329961], -0.00044376333274056043, [213.84759951148862, 14.544604951137444], -0.0003667819041204022, [212.34429214357397, 20.16382417328441], -0.001544194315380855, [206.4925267933031, 42.376867817670245], -0.0015310584877568476, [200.7774921435739, 64.62548417628375], -0.009890393483378371, [165.09260900743266, 218.00339530303336], -0.006193200118673486, [134.3552921435803, 372.4679898662846], -0.003954883402352878, [109.80113359540337, 510.43208818801577], -0.0012080368562184874, [86.67219214350916, 648.6462885313813], -0.00011581093482110962, [53.09282355173491, 852.6265914568794], 0.00002500101529673068, [19.906391149862884, 1054.4486651826255], 0, [21.720227807596984, 1087.039396742547], -0.00521091907627027, [26.7729988737874, 1161.6355313137447], -0.006073474799553129, [35.294008103393935, 1255.8468454906397], -0.0050452671458160485, [45.90799214357321, 1349.8476338032733], -0.009637488483441259, [73.09402035463063, 1540.2785908202159], -0.0021345969443920146, [83.22271449620018, 1600.9769090419366], 0, [62.8446583269706, 1600.9769090419366], 0.0036001887197470227, [48.08769214356744, 1510.076619646293], 0.009976279550128881, [20.351018578063304, 1303.993887760866], 0.01322079246633355, [2.2040921435805103, 1096.8779752522942], -0.0042031964376284, [0.3365602451176528, 1069.9961093543807], 0.06027708278844141, [1.4769921435768083, 1043.2679710122866], 0, [61.287392140351585, 679.720449795841], 0.00009084267787460379, [68.4354857399303, 636.314626773783], 0.0003367141025187746, [75.62069214250369, 592.9149412077645], 0.0017524780389864619, [96.762927535794, 468.4425780357958], 0.003912932302896014, [119.31359214358599, 344.2207988532739], 0.007554149456815115, [154.3982712660013, 173.3497428441044], 0.011551705859636422, [195.9783921435751, 3.9698256912733987], 0.3388891824181241, [201.16284145136657, -5.506706202140776e-13], 0.12647815605716622, true, 0, 3, 0, 0, 0, 0, 0, 11, 0, "异型板", "", "", "", "", "", 0, 0, "三合一", 2, 8, 1, 1, 1, 1, 1, 1, 1, 1, "1", "1", "1", "1", "", "", "", 37, "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", true, true, 0, 0, 0, 0, 0, 0, 0, 0, true, 0, 0, null], "basePt": { "x": 1207.57352014177, "y": 1026.6977927045664, "z": -1.1386113011652544e-14 }, "ucs": [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1] }; { "file": [1, "Board", 10, 2, 100, 0, 1, 2, 71, [0, 1, -1.8369701987210297e-16, 0, -1, 0, 0, 0, 0, 1.8369701987210297e-16, 1, 0, 2808.550429183707, 1026.6977927045664, 2.842170943040401e-14, 1], 0, 0, 1, [1, 0, 0, 0, 0, 1, -1.8369701987210297e-16, 0, 0, 1.8369701987210297e-16, 1, 0, 2808.550429183707, 1026.6977927045664, 2.842170943040401e-14, 1], 0, 0, 1, 3, 1600.976909041937, 216.70369214357592, 18, false, "Polyline", 10, 2, 0, 0, 0, 7, 0, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, 1, [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1], 0, 0, 1, 2, 37, [203.75274236917448, 0.6657821176631771], -0.12647817046362458, [216.58249214357465, 3.9639078952714044], 0, [216.70369214357606, 3.9639078952714044], 0, [216.70349214357384, 3.9670232852913614], 0, [216.7026921436518, 3.970172431976607], 0.005962190972429685, [216.04074477292943, 6.451513648837135], -0.002176672718212006, [215.35998088513043, 8.927953781329961], -0.00044376333274056043, [213.84759951148862, 14.544604951137444], -0.0003667819041204022, [212.34429214357397, 20.16382417328441], -0.001544194315380855, [206.4925267933031, 42.376867817670245], -0.0015310584877568476, [200.7774921435739, 64.62548417628375], -0.009890393483378371, [165.09260900743266, 218.00339530303336], -0.006193200118673486, [134.3552921435803, 372.4679898662846], -0.003954883402352878, [109.80113359540337, 510.43208818801577], -0.0012080368562184874, [86.67219214350916, 648.6462885313813], -0.00011581093482110962, [53.09282355173491, 852.6265914568794], 0.00002500101529673068, [19.906391149862884, 1054.4486651826255], 0, [21.720227807596984, 1087.039396742547], -0.00521091907627027, [26.7729988737874, 1161.6355313137447], -0.006073474799553129, [35.294008103393935, 1255.8468454906397], -0.0050452671458160485, [45.90799214357321, 1349.8476338032733], -0.009637488483441259, [73.09402035463063, 1540.2785908202159], -0.0021345969443920146, [83.22271449620018, 1600.9769090419366], 0, [62.8446583269706, 1600.9769090419366], 0.0036001887197470227, [48.08769214356744, 1510.076619646293], 0.009976279550128881, [20.351018578063304, 1303.993887760866], 0.01322079246633355, [2.2040921435805103, 1096.8779752522942], -0.0042031964376284, [0.3365602451176528, 1069.9961093543807], 0.06027708278844141, [1.4769921435768083, 1043.2679710122866], 0, [61.287392140351585, 679.720449795841], 0.00009084267787460379, [68.4354857399303, 636.314626773783], 0.0003367141025187746, [75.62069214250369, 592.9149412077645], 0.0017524780389864619, [96.762927535794, 468.4425780357958], 0.003912932302896014, [119.31359214358599, 344.2207988532739], 0.007554149456815115, [154.3982712660013, 173.3497428441044], 0.011551705859636422, [195.9783921435751, 3.9698256912733987], 0.3388891824181241, [201.16284145136657, -5.506706202140776e-13], 0.12647815605716622, true, 0, 3, 0, 0, 0, 0, 0, 11, 0, "异形板", "", "", "", "", "", 0, 0, "三合一", 2, 8, 1, 1, 1, 1, 1, 1, 1, 1, "1", "1", "1", "1", "", "", "", 37, "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", "三合一", true, true, 0, 0, 0, 0, 0, 0, 0, 0, true, 0, 0, null], "basePt": { "x": 1207.57352014177, "y": 1026.6977927045664, "z": -1.1386113011652544e-14 }, "ucs": [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1] };
let br = LoadEntityFromFileData(d)[0] as Board; let br = LoadEntityFromFileData(d)[0] as Board;
let seald = GetSealedBoardContour(br); let seald = GetSealedBoardContour(br);

2
src/UI/Components/Board/BoardConfigModal.tsx
Unescape View File

@ -150,7 +150,7 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
marginRight: 7 marginRight: 7
}} }}
checked={canDrawSpeical.get()} checked={canDrawSpeical.get()}
label="异型" label="异形"
inline={true} inline={true}
onChange={() => canDrawSpeical.set(!canDrawSpeical.get())} onChange={() => canDrawSpeical.set(!canDrawSpeical.get())}
/> />

6
src/UI/Components/Board/BoardFindModify.tsx
Unescape View File

@ -171,7 +171,7 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
const entPars = [ const entPars = [
["木削", "useWood"], ["排钻", "useDrill"], ["层板钉", "useNail"], ["木削", "useWood"], ["排钻", "useDrill"], ["层板钉", "useNail"],
["门板", "useDoor"], ["标注", "useDim"], ["异型", "useSpecial"], ["门板", "useDoor"], ["标注", "useDim"], ["异形", "useSpecial"],
["造型", "useModeling"], ["造型", "useModeling"],
]; ];
@ -664,7 +664,7 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
/> />
<Button <Button
className={Classes.INTENT_PRIMARY} className={Classes.INTENT_PRIMARY}
text="去除造型异型" text="去除造型异形"
onClick={() => onClick={() =>
{ {
store.OnOk(ModalState.Ok, { type: EFindType.RemoveModelingAndSpecial }); store.OnOk(ModalState.Ok, { type: EFindType.RemoveModelingAndSpecial });
@ -674,7 +674,7 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
<div> <div>
<Button <Button
className={Classes.INTENT_PRIMARY} className={Classes.INTENT_PRIMARY}
text="去除异型" text="去除异形"
onClick={() => onClick={() =>
{ {
store.OnOk(ModalState.Ok, { type: EFindType.RemoveSpecialShape }); store.OnOk(ModalState.Ok, { type: EFindType.RemoveSpecialShape });

2
src/UI/Components/Board/CommonBoardOption.tsx
Unescape View File

@ -266,7 +266,7 @@ export function AddCommonBoardProps(Com: React.ComponentType<ICommonOptionProps>
if (!this.canModeling.get() && board.HasGroove) if (!this.canModeling.get() && board.HasGroove)
board.ClearBoardModeling(); board.ClearBoardModeling();
//取消勾选异型，板件回复正常形状 //取消勾选异形，板件回复正常形状
if (!this.canDrawSpecial.get() && !isRect) if (!this.canDrawSpecial.get() && !isRect)
board.ConverToRectSolid(); board.ConverToRectSolid();

2
src/UI/Components/Board/SpecialBoardModal.tsx
Unescape View File

@ -54,7 +54,7 @@ export class SpecialShapeBoardModal extends React.Component<{ store: SpecialShap
const store = this.props.store; const store = this.props.store;
return ( return (
<CommonModal <CommonModal
title="绘制异型" title="绘制异形"
close={() => app.Editor.ModalManage.Destory()} close={() => app.Editor.ModalManage.Destory()}
className="yx-config" className="yx-config"
store={store} store={store}

2
src/UI/Components/CommandPanel/CommandList.ts
Unescape View File

@ -406,7 +406,7 @@ export const CommandList: ICommand[] = [
defaultCustom: "ZXLK", defaultCustom: "ZXLK",
command: CommandNames.ZXLK, command: CommandNames.ZXLK,
type: "画板", type: "画板",
chName: "造形轮廓应用", chName: "造型轮廓应用",
// enName: "SpecialShapedBoard Contour", // enName: "SpecialShapedBoard Contour",
chDes: "批量应用造型轮廓到板", chDes: "批量应用造型轮廓到板",
}, },

2
src/UI/Components/CommandPanel/ConfigListType.ts
Unescape View File

@ -11,7 +11,7 @@ export const ConfigCommandMap: { [key in BoardModalType]?: string; } =
sg: CommandNames.SingleBoard, //单板 sg: CommandNames.SingleBoard, //单板
skt: CommandNames.CloseStrip, //收口条 skt: CommandNames.CloseStrip, //收口条
dr: CommandNames.DrillConfig, //排钻配置 dr: CommandNames.DrillConfig, //排钻配置
// zx: CommandNames.RightPanelModel, //造形 // zx: CommandNames.RightPanelModel, //造型
mb: CommandNames.Door, //门板 mb: CommandNames.Door, //门板
// hinge:CommandNames., //铰链 无命令 在模板铰链文件查看 不做 // hinge:CommandNames., //铰链 无命令 在模板铰链文件查看 不做
findBr: CommandNames.BoardFindModify, //查找修改 findBr: CommandNames.BoardFindModify, //查找修改

2
src/UI/Components/Modal/HideSelectModal.tsx
Unescape View File

@ -48,7 +48,7 @@ export const KEY2LABEL: AllString<IHSOption> = {
footer: "地脚线", footer: "地脚线",
tbBoard: "顶底板", tbBoard: "顶底板",
closingStrip: "收口条", closingStrip: "收口条",
specialShape: "异型板", specialShape: "异形板",
door: "门板", door: "门板",
drawer: "抽屉", drawer: "抽屉",
winerack: "酒格", winerack: "酒格",

2
src/UI/Store/BoardStore.ts
Unescape View File

@ -820,7 +820,7 @@ export class ClosingStripStore extends BoardStore<ClosingStripOption>
} }
export class SpecialShapeStore extends BoardStore<BoardConfigOption> export class SpecialShapeStore extends BoardStore<BoardConfigOption>
{ {
title = "绘制异型板"; title = "绘制异形板";
@observable m_Option: BoardConfigOption = { @observable m_Option: BoardConfigOption = {
version: 1, version: 1,
name: "层板", name: "层板",

Write Preview
Loading…
Cancel
Save