diff --git a/__test__/Board/__snapshots__/Mirror.test.ts.snap b/__test__/Board/__snapshots__/Mirror.test.ts.snap index 97f0684df..87f82de73 100644 --- a/__test__/Board/__snapshots__/Mirror.test.ts.snap +++ b/__test__/Board/__snapshots__/Mirror.test.ts.snap @@ -3,10 +3,10 @@ exports[`板件镜像 1`] = ` Array [ "Board", - 8, + 9, 2, 0, - false, + 0, 0, 2, 0, @@ -30,7 +30,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -50,16 +50,17 @@ Array [ 1, ], 0, + 0, 3, 764, 500.00000000000006, 18, true, "Polyline", - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -83,7 +84,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 6.123233995736766e-17, -1, @@ -103,6 +104,7 @@ Array [ 1, ], 0, + 0, 2, 4, Array [ @@ -195,10 +197,10 @@ Array [ exports[`板镜像后板边数据错误 1`] = ` Array [ "Board", - 8, + 9, 2, 0, - false, + 0, 0, 8, 0, @@ -222,7 +224,7 @@ Array [ ], 0, 0, - true, + 1, Array [ -1, 0, @@ -242,16 +244,17 @@ Array [ 1, ], 0, + 0, 3, 569.9999999999945, 88, 17.5, false, "Polyline", - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -275,7 +278,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -295,6 +298,7 @@ Array [ 1, ], 0, + 0, 2, 6, Array [ diff --git a/__test__/FileSystem/__snapshots__/file.test.ts.snap b/__test__/FileSystem/__snapshots__/file.test.ts.snap index 434ee37df..3c066803f 100644 --- a/__test__/FileSystem/__snapshots__/file.test.ts.snap +++ b/__test__/FileSystem/__snapshots__/file.test.ts.snap @@ -1,14 +1,14 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`changev 1`] = `"[10,101,1,2,1,false,0,1,\\"\\",2,2,false,0,1,\\"Line\\",8,2,100,false,1,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,1,[2,3,4],[0,0,0],2,4,false,0,3,0,2,3,false,0,3,0,0,0,1,0,1,\\"CommandHistoryRecord\\",1,\\"\\",2,2,1,\\"HistorycRecord\\",1,\\"RemoveObjectData\\",1,0,\\"CreateObjectData\\",1,[\\"Line\\",8,2,100,false,1,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,1,[0,0,0],[0,0,0]],\\"\\",100,1,\\"ObjectAllDataHistoryRecord\\",1,1,\\"AllObjectData\\",1,[8,2,100,false,1,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,1,[0,0,0],[0,0,0]],\\"\\",\\"\\",100,2,5,false,0,0,1,2,6,false,0,0,1,2,7,false,0,1,\\"\\",2,8,false,0,0,2,9,false,0,0,1,2,10,false,0,1,\\"\\",2,11,false,0,0,0,1,2,12,false,0,3,0,0]"`; +exports[`changev 1`] = `"[10,101,1,2,1,0,0,1,\\"\\",2,2,0,0,1,\\"Line\\",9,2,100,0,1,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,3,4],[0,0,0],2,4,0,0,3,0,2,3,0,0,3,0,0,0,1,0,1,\\"CommandHistoryRecord\\",1,\\"\\",2,2,1,\\"HistorycRecord\\",1,\\"RemoveObjectData\\",1,0,\\"CreateObjectData\\",1,[\\"Line\\",9,2,100,0,1,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,[0,0,0],[0,0,0]],\\"\\",100,1,\\"ObjectAllDataHistoryRecord\\",1,1,\\"AllObjectData\\",1,[9,2,100,0,1,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,[0,0,0],[0,0,0]],\\"\\",\\"\\",100,2,5,0,0,0,1,2,6,0,0,0,1,2,7,0,0,1,\\"\\",2,8,0,0,0,2,9,0,0,0,1,2,10,0,0,1,\\"\\",2,11,0,0,0,0,1,2,12,0,0,3,0,0]"`; -exports[`创建 修改 撤销撤销 重做重做 撤销 重做 1`] = `"[10,101,1,2,1,false,0,1,\\"\\",2,2,false,0,1,\\"Line\\",8,2,100,false,1,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,1,[1,2,3],[0,0,0],2,4,false,0,3,0,2,3,false,0,3,0,0,0,1,0,1,\\"CommandHistoryRecord\\",1,\\"\\",1,2,1,\\"HistorycRecord\\",1,\\"RemoveObjectData\\",1,0,\\"CreateObjectData\\",1,[\\"Line\\",8,2,100,false,1,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,1,[1,2,3],[0,0,0]],\\"\\",2,5,false,0,0,1,2,6,false,0,0,1,2,7,false,0,1,\\"\\",2,8,false,0,0,2,9,false,0,0,1,2,10,false,0,1,\\"\\",2,11,false,0,0,0,1,2,12,false,0,3,0,0]"`; +exports[`创建 修改 撤销撤销 重做重做 撤销 重做 1`] = `"[10,101,1,2,1,0,0,1,\\"\\",2,2,0,0,1,\\"Line\\",9,2,100,0,1,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,[1,2,3],[0,0,0],2,4,0,0,3,0,2,3,0,0,3,0,0,0,1,0,1,\\"CommandHistoryRecord\\",1,\\"\\",1,2,1,\\"HistorycRecord\\",1,\\"RemoveObjectData\\",1,0,\\"CreateObjectData\\",1,[\\"Line\\",9,2,100,0,1,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,[1,2,3],[0,0,0]],\\"\\",2,5,0,0,0,1,2,6,0,0,0,1,2,7,0,0,1,\\"\\",2,8,0,0,0,2,9,0,0,0,1,2,10,0,0,1,\\"\\",2,11,0,0,0,0,1,2,12,0,0,3,0,0]"`; -exports[`创建 修改 撤销撤销 重做重做 撤销 重做 2`] = `"[\\"HistoricManage\\",1,0,1,\\"CommandHistoryRecord\\",1,\\"\\",1,2,1,\\"HistorycRecord\\",1,\\"RemoveObjectData\\",1,0,\\"CreateObjectData\\",1,[\\"Line\\",8,2,100,false,1,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,1,[1,2,3],[0,0,0]],\\"\\"]"`; +exports[`创建 修改 撤销撤销 重做重做 撤销 重做 2`] = `"[\\"HistoricManage\\",1,0,1,\\"CommandHistoryRecord\\",1,\\"\\",1,2,1,\\"HistorycRecord\\",1,\\"RemoveObjectData\\",1,0,\\"CreateObjectData\\",1,[\\"Line\\",9,2,100,0,1,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,[1,2,3],[0,0,0]],\\"\\"]"`; exports[`测试创建 1`] = `"[\\"AllObjectData\\",1,[]]"`; -exports[`测试创建 2`] = `"[\\"BlockTableRecord\\",1,2,0,false,0,1,\\"\\",2,0,false,0,0]"`; +exports[`测试创建 2`] = `"[\\"BlockTableRecord\\",1,2,0,0,0,1,\\"\\",2,0,0,0,0]"`; exports[`测试创建 3`] = `"[\\"CommandHistoryRecord\\",1,\\"\\",0]"`; @@ -16,7 +16,7 @@ exports[`测试创建 4`] = `"[\\"CreateObjectData\\",1,[]]"`; exports[`测试创建 5`] = `"[\\"HistorycRecord\\",1,\\"\\",\\"\\",\\"\\"]"`; -exports[`测试创建 6`] = `"[\\"Line\\",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,1,[0,0,0],[0,0,0]]"`; +exports[`测试创建 6`] = `"[\\"Line\\",9,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,[0,0,0],[0,0,0]]"`; exports[`测试创建 7`] = `"[\\"ObjectAllDataHistoryRecord\\",1,1,\\"\\",\\"\\",\\"\\",0]"`; diff --git a/__test__/FileSystem/__snapshots__/wblockClone.test.ts.snap b/__test__/FileSystem/__snapshots__/wblockClone.test.ts.snap index 1421d5b21..b6abcab58 100644 --- a/__test__/FileSystem/__snapshots__/wblockClone.test.ts.snap +++ b/__test__/FileSystem/__snapshots__/wblockClone.test.ts.snap @@ -7,25 +7,25 @@ Array [ 1, 2, 1, - false, + 0, 0, 1, "", 2, 2, - false, + 0, 0, 0, 2, 4, - false, + 0, 0, 3, 1, "TextureTableRecord", 2, 100, - false, + 0, 4, 1, "贴图1", @@ -40,14 +40,14 @@ Array [ 0, 2, 3, - false, + 0, 0, 3, 1, "PhysicalMaterialRecord", 2, 101, - false, + 0, 3, 1, "材质1", @@ -110,49 +110,49 @@ Array [ 0, 2, 5, - false, + 0, 0, 0, 1, 2, 6, - false, + 0, 0, 0, 1, 2, 7, - false, + 0, 0, 1, "", 2, 8, - false, + 0, 0, 0, 2, 9, - false, + 0, 0, 0, 1, 2, 10, - false, + 0, 0, 1, "", 2, 11, - false, + 0, 0, 0, 0, 1, 2, 12, - false, + 0, 0, 3, 0, @@ -167,25 +167,25 @@ Array [ 1, 2, 1, - false, + 0, 0, 1, "", 2, 2, - false, + 0, 0, 0, 2, 4, - false, + 0, 0, 3, 2, "TextureTableRecord", 2, 100, - false, + 0, 4, 1, "贴图1", @@ -201,7 +201,7 @@ Array [ "TextureTableRecord", 2, 102, - false, + 0, 4, 1, "贴图1(1)", @@ -216,14 +216,14 @@ Array [ 0, 2, 3, - false, + 0, 0, 3, 2, "PhysicalMaterialRecord", 2, 101, - false, + 0, 3, 1, "材质1", @@ -282,7 +282,7 @@ Array [ "PhysicalMaterialRecord", 2, 103, - false, + 0, 3, 1, "材质1(1)", @@ -345,49 +345,49 @@ Array [ 0, 2, 5, - false, + 0, 0, 0, 1, 2, 6, - false, + 0, 0, 0, 1, 2, 7, - false, + 0, 0, 1, "", 2, 8, - false, + 0, 0, 0, 2, 9, - false, + 0, 0, 0, 1, 2, 10, - false, + 0, 0, 1, "", 2, 11, - false, + 0, 0, 0, 0, 1, 2, 12, - false, + 0, 0, 3, 0, @@ -402,25 +402,25 @@ Array [ 1, 2, 1, - false, + 0, 0, 1, "", 2, 2, - false, + 0, 0, 0, 2, 4, - false, + 0, 0, 3, 1, "TextureTableRecord", 2, 101, - false, + 0, 4, 1, "贴图1", @@ -435,14 +435,14 @@ Array [ 0, 2, 3, - false, + 0, 0, 3, 1, "PhysicalMaterialRecord", 2, 100, - false, + 0, 3, 1, "材质1", @@ -505,49 +505,49 @@ Array [ 0, 2, 5, - false, + 0, 0, 0, 1, 2, 6, - false, + 0, 0, 0, 1, 2, 7, - false, + 0, 0, 1, "", 2, 8, - false, + 0, 0, 0, 2, 9, - false, + 0, 0, 0, 1, 2, 10, - false, + 0, 0, 1, "", 2, 11, - false, + 0, 0, 0, 0, 1, 2, 12, - false, + 0, 0, 3, 0, diff --git a/__test__/Fillet/__snapshots__/ParalleLine.test.ts.snap b/__test__/Fillet/__snapshots__/ParalleLine.test.ts.snap index c5e5be98a..8e82c7194 100644 --- a/__test__/Fillet/__snapshots__/ParalleLine.test.ts.snap +++ b/__test__/Fillet/__snapshots__/ParalleLine.test.ts.snap @@ -34,10 +34,10 @@ Vector3 { exports[`平行线倒角 5`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -61,7 +61,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, 1, @@ -81,11 +81,12 @@ Array [ 1, ], 0, + 0, 2, 73.34943322499446, 5.248426322899339, 2.1068336693095455, - false, + 0, ] `; @@ -123,10 +124,10 @@ Vector3 { exports[`平行线倒角 10`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -150,7 +151,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, 1, @@ -170,11 +171,12 @@ Array [ 1, ], 0, + 0, 2, 73.34943322499456, 5.248426322899337, 2.1068336693095455, - true, + 1, ] `; @@ -212,10 +214,10 @@ Vector3 { exports[`平行线倒角 15`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -239,7 +241,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, 1, @@ -259,11 +261,12 @@ Array [ 1, ], 0, + 0, 2, 73.34943322499446, 2.1068336693095455, 5.248426322899339, - true, + 1, ] `; @@ -301,10 +304,10 @@ Vector3 { exports[`平行线倒角 20`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -328,7 +331,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, 1, @@ -348,11 +351,12 @@ Array [ 1, ], 0, + 0, 2, 73.34943322499446, 2.1068336693095455, 5.248426322899339, - false, + 0, ] `; @@ -390,10 +394,10 @@ Vector3 { exports[`平行线倒角 25`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -417,7 +421,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, 1, @@ -437,11 +441,12 @@ Array [ 1, ], 0, + 0, 2, 73.34943322499475, 3.6776299961044363, 0.5360373425146445, - false, + 0, ] `; @@ -479,10 +484,10 @@ Vector3 { exports[`平行线倒角 30`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -506,7 +511,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, 1, @@ -526,11 +531,12 @@ Array [ 1, ], 0, + 0, 2, 73.34943322499473, 3.6776299961044363, 0.5360373425146432, - true, + 1, ] `; @@ -568,10 +574,10 @@ Vector3 { exports[`平行线倒角 35`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -595,7 +601,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, 1, @@ -615,11 +621,12 @@ Array [ 1, ], 0, + 0, 2, 73.34943322499475, 0.5360373425146432, 3.6776299961044376, - true, + 1, ] `; @@ -657,10 +664,10 @@ Vector3 { exports[`平行线倒角 40`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -684,7 +691,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, 1, @@ -704,11 +711,12 @@ Array [ 1, ], 0, + 0, 2, 73.34943322499446, 0.5360373425146522, 3.677629996104439, - false, + 0, ] `; @@ -746,10 +754,10 @@ Vector3 { exports[`平行线倒角 45`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -773,7 +781,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, 1, @@ -793,11 +801,12 @@ Array [ 1, ], 0, + 0, 2, 73.34943322499451, 2.5106277611946757, 5.652220414784468, - false, + 0, ] `; @@ -835,10 +844,10 @@ Vector3 { exports[`平行线倒角 50`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -862,7 +871,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, 1, @@ -882,11 +891,12 @@ Array [ 1, ], 0, + 0, 2, 73.3494332249947, 2.510627761194672, 5.652220414784465, - true, + 1, ] `; @@ -924,10 +934,10 @@ Vector3 { exports[`平行线倒角 55`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -951,7 +961,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, 1, @@ -971,11 +981,12 @@ Array [ 1, ], 0, + 0, 2, 73.34943322499451, 5.652220414784469, 2.510627761194675, - true, + 1, ] `; @@ -1013,10 +1024,10 @@ Vector3 { exports[`平行线倒角 60`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -1040,7 +1051,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, 1, @@ -1060,11 +1071,12 @@ Array [ 1, ], 0, + 0, 2, 73.34943322499456, 5.652220414784465, 2.510627761194677, - false, + 0, ] `; @@ -1102,10 +1114,10 @@ Vector3 { exports[`平行线倒角 65`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -1129,7 +1141,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -1149,11 +1161,12 @@ Array [ 1, ], 0, + 0, 2, 19.138755980861262, 3.141592653589793, 0, - false, + 0, ] `; @@ -1191,10 +1204,10 @@ Vector3 { exports[`平行线倒角 70`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -1218,7 +1231,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -1238,11 +1251,12 @@ Array [ 1, ], 0, + 0, 2, 19.138755980861262, 3.141592653589793, 0, - true, + 1, ] `; @@ -1280,10 +1294,10 @@ Vector3 { exports[`平行线倒角 75`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -1307,7 +1321,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -1327,11 +1341,12 @@ Array [ 1, ], 0, + 0, 2, 19.138755980861262, 0, 3.141592653589793, - true, + 1, ] `; @@ -1369,10 +1384,10 @@ Vector3 { exports[`平行线倒角 80`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -1396,7 +1411,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -1416,11 +1431,12 @@ Array [ 1, ], 0, + 0, 2, 19.138755980861262, 0, 3.141592653589793, - false, + 0, ] `; @@ -1458,10 +1474,10 @@ Vector3 { exports[`平行线倒角 85`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -1485,7 +1501,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -1505,11 +1521,12 @@ Array [ 1, ], 0, + 0, 2, 25.71770334928226, 3.141592653589793, 0, - false, + 0, ] `; @@ -1547,10 +1564,10 @@ Vector3 { exports[`平行线倒角 90`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -1574,7 +1591,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -1594,11 +1611,12 @@ Array [ 1, ], 0, + 0, 2, 25.71770334928226, 3.141592653589793, 0, - true, + 1, ] `; @@ -1636,10 +1654,10 @@ Vector3 { exports[`平行线倒角 95`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -1663,7 +1681,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -1683,11 +1701,12 @@ Array [ 1, ], 0, + 0, 2, 25.71770334928226, 0, 3.141592653589793, - false, + 0, ] `; @@ -1725,10 +1744,10 @@ Vector3 { exports[`平行线倒角 100`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -1752,7 +1771,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -1772,11 +1791,12 @@ Array [ 1, ], 0, + 0, 2, 25.71770334928226, 0, 3.141592653589793, - true, + 1, ] `; @@ -1814,10 +1834,10 @@ Vector3 { exports[`平行线倒角 105`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -1841,7 +1861,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -1861,11 +1881,12 @@ Array [ 1, ], 0, + 0, 2, 19.138755980861163, 2.5347869566053345, 5.676379610195135, - false, + 0, ] `; @@ -1903,10 +1924,10 @@ Vector3 { exports[`平行线倒角 110`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -1930,7 +1951,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -1950,11 +1971,12 @@ Array [ 1, ], 0, + 0, 2, 19.138755980861216, 2.5347869566053323, 5.67637961019513, - true, + 1, ] `; @@ -1992,10 +2014,10 @@ Vector3 { exports[`平行线倒角 115`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -2019,7 +2041,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -2039,11 +2061,12 @@ Array [ 1, ], 0, + 0, 2, 19.13875598086116, 5.676379610195135, 2.534786956605335, - true, + 1, ] `; @@ -2081,10 +2104,10 @@ Vector3 { exports[`平行线倒角 120`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -2108,7 +2131,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -2128,11 +2151,12 @@ Array [ 1, ], 0, + 0, 2, 19.138755980861294, 5.676379610195132, 2.534786956605339, - false, + 0, ] `; @@ -2170,10 +2194,10 @@ Vector3 { exports[`平行线倒角 125`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -2197,7 +2221,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -2217,11 +2241,12 @@ Array [ 1, ], 0, + 0, 2, 25.71770334928209, 2.5347869566053367, 5.676379610195135, - false, + 0, ] `; @@ -2259,10 +2284,10 @@ Vector3 { exports[`平行线倒角 130`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -2286,7 +2311,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -2306,11 +2331,12 @@ Array [ 1, ], 0, + 0, 2, 25.717703349282267, 2.5347869566053376, 5.676379610195131, - true, + 1, ] `; @@ -2348,10 +2374,10 @@ Vector3 { exports[`平行线倒角 135`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -2375,7 +2401,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -2395,11 +2421,12 @@ Array [ 1, ], 0, + 0, 2, 25.717703349282235, 5.6763796101951325, 2.5347869566053394, - false, + 0, ] `; @@ -2437,10 +2464,10 @@ Vector3 { exports[`平行线倒角 140`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -2464,7 +2491,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -2484,11 +2511,12 @@ Array [ 1, ], 0, + 0, 2, 25.717703349282118, 5.676379610195134, 2.534786956605335, - true, + 1, ] `; @@ -2526,10 +2554,10 @@ Vector3 { exports[`平行线倒角 145`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -2553,7 +2581,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -2573,11 +2601,12 @@ Array [ 1, ], 0, + 0, 2, 45.20012262101521, 1.5707963267948966, 4.71238898038469, - false, + 0, ] `; @@ -2615,10 +2644,10 @@ Vector3 { exports[`平行线倒角 150`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -2642,7 +2671,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -2662,11 +2691,12 @@ Array [ 1, ], 0, + 0, 2, 45.20012262101521, 1.5707963267948966, 4.71238898038469, - true, + 1, ] `; @@ -2704,10 +2734,10 @@ Vector3 { exports[`平行线倒角 155`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -2731,7 +2761,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -2751,11 +2781,12 @@ Array [ 1, ], 0, + 0, 2, 45.20012262101521, 4.71238898038469, 1.5707963267948966, - true, + 1, ] `; @@ -2793,10 +2824,10 @@ Vector3 { exports[`平行线倒角 160`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -2820,7 +2851,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -2840,11 +2871,12 @@ Array [ 1, ], 0, + 0, 2, 45.20012262101521, 4.71238898038469, 1.5707963267948966, - false, + 0, ] `; @@ -2882,10 +2914,10 @@ Vector3 { exports[`平行线倒角 165`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -2909,7 +2941,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -2929,11 +2961,12 @@ Array [ 1, ], 0, + 0, 2, 58.10252336584995, 3.141592653589793, 0, - false, + 0, ] `; @@ -2971,10 +3004,10 @@ Vector3 { exports[`平行线倒角 170`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -2998,7 +3031,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -3018,11 +3051,12 @@ Array [ 1, ], 0, + 0, 2, 58.10252336584995, 3.141592653589793, 0, - true, + 1, ] `; @@ -3060,10 +3094,10 @@ Vector3 { exports[`平行线倒角 175`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -3087,7 +3121,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -3107,11 +3141,12 @@ Array [ 1, ], 0, + 0, 2, 58.10252336584995, 0, 3.141592653589793, - false, + 0, ] `; @@ -3149,10 +3184,10 @@ Vector3 { exports[`平行线倒角 180`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -3176,7 +3211,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -3196,11 +3231,12 @@ Array [ 1, ], 0, + 0, 2, 58.10252336584995, 0, 3.141592653589793, - true, + 1, ] `; @@ -3238,10 +3274,10 @@ Vector3 { exports[`平行线倒角 185`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -3265,7 +3301,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -3285,11 +3321,12 @@ Array [ 1, ], 0, + 0, 2, 82.31190810162093, 3.141592653589793, 0, - false, + 0, ] `; @@ -3327,10 +3364,10 @@ Vector3 { exports[`平行线倒角 190`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -3354,7 +3391,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -3374,11 +3411,12 @@ Array [ 1, ], 0, + 0, 2, 82.31190810162093, 3.141592653589793, 0, - true, + 1, ] `; @@ -3416,10 +3454,10 @@ Vector3 { exports[`平行线倒角 195`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -3443,7 +3481,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -3463,11 +3501,12 @@ Array [ 1, ], 0, + 0, 2, 82.31190810162093, 0, 3.141592653589793, - true, + 1, ] `; @@ -3505,10 +3544,10 @@ Vector3 { exports[`平行线倒角 200`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -3532,7 +3571,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -3552,11 +3591,12 @@ Array [ 1, ], 0, + 0, 2, 82.31190810162093, 0, 3.141592653589793, - false, + 0, ] `; @@ -3594,10 +3634,10 @@ Vector3 { exports[`平行线倒角 205`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -3621,7 +3661,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -3641,11 +3681,12 @@ Array [ 1, ], 0, + 0, 2, 51.64668743631091, 3.141592653589794, 0, - false, + 0, ] `; @@ -3683,10 +3724,10 @@ Vector3 { exports[`平行线倒角 210`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -3710,7 +3751,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -3730,11 +3771,12 @@ Array [ 1, ], 0, + 0, 2, 51.64668743631091, 3.141592653589793, 0, - true, + 1, ] `; @@ -3772,10 +3814,10 @@ Vector3 { exports[`平行线倒角 215`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -3799,7 +3841,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -3819,11 +3861,12 @@ Array [ 1, ], 0, + 0, 2, 51.64668743631091, 0, 3.141592653589793, - false, + 0, ] `; @@ -3861,10 +3904,10 @@ Vector3 { exports[`平行线倒角 220`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -3888,7 +3931,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -3908,11 +3951,12 @@ Array [ 1, ], 0, + 0, 2, 51.64668743631091, 0, 3.141592653589793, - true, + 1, ] `; @@ -3950,10 +3994,10 @@ Vector3 { exports[`平行线倒角 225`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -3977,7 +4021,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -3997,11 +4041,12 @@ Array [ 1, ], 0, + 0, 2, 51.98014101416747, 1.5707963267948966, 4.71238898038469, - false, + 0, ] `; @@ -4039,10 +4084,10 @@ Vector3 { exports[`平行线倒角 230`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -4066,7 +4111,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -4086,11 +4131,12 @@ Array [ 1, ], 0, + 0, 2, 51.98014101416747, 1.5707963267948966, 4.71238898038469, - true, + 1, ] `; @@ -4128,10 +4174,10 @@ Vector3 { exports[`平行线倒角 235`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -4155,7 +4201,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -4175,11 +4221,12 @@ Array [ 1, ], 0, + 0, 2, 51.98014101416747, 4.71238898038469, 1.5707963267948966, - false, + 0, ] `; @@ -4217,10 +4264,10 @@ Vector3 { exports[`平行线倒角 240`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -4244,7 +4291,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 1, 0, @@ -4264,11 +4311,12 @@ Array [ 1, ], 0, + 0, 2, 51.98014101416747, 4.71238898038469, 1.5707963267948966, - true, + 1, ] `; @@ -4306,10 +4354,10 @@ Vector3 { exports[`平行线倒角 245`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -4333,7 +4381,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, -1, @@ -4353,11 +4401,12 @@ Array [ 1, ], 0, + 0, 2, 304.88159012329635, 2.623635128323958, 5.765227781913751, - false, + 0, ] `; @@ -4395,10 +4444,10 @@ Vector3 { exports[`平行线倒角 250`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -4422,7 +4471,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, -1, @@ -4442,11 +4491,12 @@ Array [ 1, ], 0, + 0, 2, 304.88159012329595, 2.6236351283239516, 5.76522778191375, - true, + 1, ] `; @@ -4484,10 +4534,10 @@ Vector3 { exports[`平行线倒角 255`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -4511,7 +4561,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, -1, @@ -4531,11 +4581,12 @@ Array [ 1, ], 0, + 0, 2, 304.88159012329635, 5.765227781913751, 2.6236351283239583, - true, + 1, ] `; @@ -4573,10 +4624,10 @@ Vector3 { exports[`平行线倒角 260`] = ` Array [ - 8, + 9, 2, 0, - false, + 0, 0, 7, 0, @@ -4600,7 +4651,7 @@ Array [ ], 0, 0, - true, + 1, Array [ 0, -1, @@ -4620,10 +4671,11 @@ Array [ 1, ], 0, + 0, 2, 304.88159012329686, 5.765227781913755, 2.6236351283239596, - false, + 0, ] `; diff --git a/src/DatabaseServices/CADFiler.ts b/src/DatabaseServices/CADFiler.ts index d0060a051..b09f1792f 100644 --- a/src/DatabaseServices/CADFiler.ts +++ b/src/DatabaseServices/CADFiler.ts @@ -128,7 +128,7 @@ export class CADFiler return this._datas[this.readIndex++]; } - ReadBool(v: boolean) + ReadBool() { return Boolean(this.Read()); } diff --git a/src/DatabaseServices/CADObject.ts b/src/DatabaseServices/CADObject.ts index 916bbcfaf..655aa7f2b 100644 --- a/src/DatabaseServices/CADObject.ts +++ b/src/DatabaseServices/CADObject.ts @@ -144,7 +144,7 @@ export abstract class CADObject this.objectId = id; id.Object = this; } - this._isErase = file.Read(); + this._isErase = file.ReadBool(); if (ver > 1) this._Owner = file.ReadObjectId(); } //对象将自身数据写入到文件. @@ -152,7 +152,7 @@ export abstract class CADObject { file.Write(2); file.WriteObjectId(this.objectId); - file.Write(this._isErase); + file.WriteBool(this._isErase); file.WriteObjectId(this._Owner); } //局部撤销 diff --git a/src/DatabaseServices/Entity/Arc.ts b/src/DatabaseServices/Entity/Arc.ts index fbd0cad3d..b92a882e3 100644 --- a/src/DatabaseServices/Entity/Arc.ts +++ b/src/DatabaseServices/Entity/Arc.ts @@ -808,7 +808,7 @@ export class Arc extends Curve this._Radius = file.Read(); this._StartAngle = file.Read(); this._EndAngle = file.Read(); - this._Clockwise = file.Read(); + this._Clockwise = file.ReadBool(); } //对象将自身数据写入到文件. WriteFile(file: CADFiler) @@ -818,7 +818,7 @@ export class Arc extends Curve file.Write(this._Radius); file.Write(this._StartAngle); file.Write(this._EndAngle); - file.Write(this._Clockwise); + file.WriteBool(this._Clockwise); } //#endregion } diff --git a/src/DatabaseServices/Entity/Entity.ts b/src/DatabaseServices/Entity/Entity.ts index 96254e882..c5b5923d3 100644 --- a/src/DatabaseServices/Entity/Entity.ts +++ b/src/DatabaseServices/Entity/Entity.ts @@ -735,7 +735,7 @@ export class Entity extends CADObject this.GroupId = file.ReadHardObjectId(); if (ver > 5) - this._Visible = file.Read(); + this._Visible = file.ReadBool(); if (ver > 6) this._SpaceOCS.fromArray(file.Read()); if (ver > 7) @@ -750,7 +750,7 @@ export class Entity extends CADObject } if (ver > 8) - this._Freeze = file.Read(); + this._Freeze = file.ReadBool(); else this._Freeze = false; } @@ -764,7 +764,7 @@ export class Entity extends CADObject file.Write(this._Matrix.toArray()); file.WriteObjectId(this.Template); file.WriteHardObjectId(this.GroupId); - file.Write(this._Visible); + file.WriteBool(this._Visible); file.Write(this._SpaceOCS.toArray()); file.Write(this.ProcessingGroupList.length); diff --git a/src/DatabaseServices/EraseEntityData.ts b/src/DatabaseServices/EraseEntityData.ts index feb098d77..ca54252a9 100644 --- a/src/DatabaseServices/EraseEntityData.ts +++ b/src/DatabaseServices/EraseEntityData.ts @@ -6,12 +6,12 @@ export class EraseEntityData implements ISerialize { ReadFile(file: CADFiler): this { - this.isErase = file.Read(); + this.isErase = file.ReadBool(); return this; } WriteFile(file: CADFiler): this { - file.Write(this.isErase); + file.WriteBool(this.isErase); return this; } constructor(public isErase = true)