diff --git "a/Fs\345\210\206\346\224\257\350\257\264\346\230\216.txt" "b/Fs\345\210\206\346\224\257\350\257\264\346\230\216.txt" new file mode 100644 index 0000000000000000000000000000000000000000..12f38c133fad86a61d487ec48ec52104d0d03ec1 --- /dev/null +++ "b/Fs\345\210\206\346\224\257\350\257\264\346\230\216.txt" @@ -0,0 +1,4 @@ +在FoxCAD的基础上,将命名空间改为 Fs.Fox,并作为Fs团队AutoCAD的基础库之一使用 +目的: +(1)以便Fs的团队在生产环境中使用, 并希望能够更好的维护和开发FoxCAD +(2)重要更改会尽量反馈给FoxCAD的的主分支 \ No newline at end of file diff --git a/IFoxCAD.sln b/IFoxCAD.sln index 8b9d772194969843ac6842ac33ccc16608fb0f74..1cd06283db3c890f6293b2e740ff2aa5d067b61d 100644 --- a/IFoxCAD.sln +++ b/IFoxCAD.sln @@ -10,18 +10,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AE09C3B7-58A EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CADShared", "src\CADShared\CADShared.shproj", "{5178502E-9A78-4588-B849-33ED439976B2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IFoxCAD.AutoCad", "src\IFoxCAD.AutoCad\IFoxCAD.AutoCad.csproj", "{9A0A144F-6820-4D15-9D39-43B7298195E3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IFoxCAD.ZwCad", "src\IFoxCAD.ZwCad\IFoxCAD.ZwCad.csproj", "{8546C2AC-815C-47A1-9D8C-A6470DF44AD9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fs.Fox.AutoCad", "src\IFoxCAD.AutoCad\Fs.Fox.AutoCad.csproj", "{9A0A144F-6820-4D15-9D39-43B7298195E3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{46F3EDA8-A6D1-4707-8D03-731CADB41A56}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAcad2025", "tests\TestAcad2025\TestAcad2025.csproj", "{47C42AB4-C2F4-475B-899C-71FDE57D926E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestZcad2025", "tests\TestZcad2025\TestZcad2025.csproj", "{0B4601B4-CBDA-4FD8-9B31-C1E292D03068}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{7145708C-A65B-470E-A8DA-ED79AC9A42D7}" ProjectSection(SolutionItems) = preProject + Fs鍒嗘敮璇存槑.txt = Fs鍒嗘敮璇存槑.txt docs\鍏充簬IFoxCAD鐨勬灦鏋勮鏄.md = docs\鍏充簬IFoxCAD鐨勬灦鏋勮鏄.md EndProjectSection EndProject @@ -37,35 +34,27 @@ Global {9A0A144F-6820-4D15-9D39-43B7298195E3}.Debug|Any CPU.Build.0 = Debug|Any CPU {9A0A144F-6820-4D15-9D39-43B7298195E3}.Release|Any CPU.ActiveCfg = Release|Any CPU {9A0A144F-6820-4D15-9D39-43B7298195E3}.Release|Any CPU.Build.0 = Release|Any CPU - {8546C2AC-815C-47A1-9D8C-A6470DF44AD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8546C2AC-815C-47A1-9D8C-A6470DF44AD9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8546C2AC-815C-47A1-9D8C-A6470DF44AD9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8546C2AC-815C-47A1-9D8C-A6470DF44AD9}.Release|Any CPU.Build.0 = Release|Any CPU {47C42AB4-C2F4-475B-899C-71FDE57D926E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {47C42AB4-C2F4-475B-899C-71FDE57D926E}.Debug|Any CPU.Build.0 = Debug|Any CPU {47C42AB4-C2F4-475B-899C-71FDE57D926E}.Release|Any CPU.ActiveCfg = Release|Any CPU {47C42AB4-C2F4-475B-899C-71FDE57D926E}.Release|Any CPU.Build.0 = Release|Any CPU - {0B4601B4-CBDA-4FD8-9B31-C1E292D03068}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B4601B4-CBDA-4FD8-9B31-C1E292D03068}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B4601B4-CBDA-4FD8-9B31-C1E292D03068}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B4601B4-CBDA-4FD8-9B31-C1E292D03068}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {57CA0128-08DE-436F-B9F1-82C64F49BF67} - EndGlobalSection - GlobalSection(SharedMSBuildProjectFiles) = preSolution - CADShared\CADShared.projitems*{5178502e-9a78-4588-b849-33ed439976b2}*SharedItemsImports = 13 - CADShared\CADShared.projitems*{6b29955a-5796-4035-9297-210fa15d3846}*SharedItemsImports = 5 - EndGlobalSection GlobalSection(NestedProjects) = preSolution + {5178502E-9A78-4588-B849-33ED439976B2} = {AE09C3B7-58AC-4A68-9884-1F93FDA5D785} {9A0A144F-6820-4D15-9D39-43B7298195E3} = {AE09C3B7-58AC-4A68-9884-1F93FDA5D785} - {8546C2AC-815C-47A1-9D8C-A6470DF44AD9} = {AE09C3B7-58AC-4A68-9884-1F93FDA5D785} {47C42AB4-C2F4-475B-899C-71FDE57D926E} = {46F3EDA8-A6D1-4707-8D03-731CADB41A56} - {0B4601B4-CBDA-4FD8-9B31-C1E292D03068} = {46F3EDA8-A6D1-4707-8D03-731CADB41A56} {CED63D2D-0AF6-4831-806D-5E8E9B0D0A07} = {46F3EDA8-A6D1-4707-8D03-731CADB41A56} - {5178502E-9A78-4588-B849-33ED439976B2} = {AE09C3B7-58AC-4A68-9884-1F93FDA5D785} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {57CA0128-08DE-436F-B9F1-82C64F49BF67} + EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + tests\TestShared\TestShared.projitems*{47c42ab4-c2f4-475b-899c-71fde57d926e}*SharedItemsImports = 5 + src\CADShared\CADShared.projitems*{5178502e-9a78-4588-b849-33ed439976b2}*SharedItemsImports = 13 + src\CADShared\CADShared.projitems*{9a0a144f-6820-4d15-9d39-43b7298195e3}*SharedItemsImports = 5 + tests\TestShared\TestShared.projitems*{ced63d2d-0af6-4831-806d-5e8e9b0d0a07}*SharedItemsImports = 13 EndGlobalSection EndGlobal diff --git "a/docs/\345\205\263\344\272\216IFoxCAD\347\232\204\346\236\266\346\236\204\350\257\264\346\230\216.md" "b/docs/\345\205\263\344\272\216IFoxCAD\347\232\204\346\236\266\346\236\204\350\257\264\346\230\216.md" index ee3a985ec0fb36b41e94505d3f8f96379e1c029b..9ccddfef3c980eb2e3a6a36813945c9fd05d8d29 100644 --- "a/docs/\345\205\263\344\272\216IFoxCAD\347\232\204\346\236\266\346\236\204\350\257\264\346\230\216.md" +++ "b/docs/\345\205\263\344\272\216IFoxCAD\347\232\204\346\236\266\346\236\204\350\257\264\346\230\216.md" @@ -1,4 +1,4 @@ -# IFoxCAD鐨勬灦鏋勮鏄 +# Fs.Fox鐨勬灦鏋勮鏄 AutoCAD 鐨 .net api 鐨勬灦鏋勬槸濡備笅杩欐牱鐨勶細 @@ -64,13 +64,13 @@ h--write-->d[Database] g[Document or Database]--start-->f ``` -IFoxCAD鏄熀浜嶯FOX绫诲簱鐨勯噸鍒剁増锛屼富瑕佹槸鎻愪緵涓涓渶灏忓寲鐨勫唴鏍革紝鍗矰BTrans銆丼ymbolTable銆丷esultData銆丼electFilter绛夊熀纭绫伙紝鍏朵粬鐨勫姛鑳介兘閫氳繃鎵╁睍鏂规硶鐨勬柟寮忔潵瀹炵幇銆 +Fs.Fox鏄熀浜嶯FOX绫诲簱鐨勯噸鍒剁増锛屼富瑕佹槸鎻愪緵涓涓渶灏忓寲鐨勫唴鏍革紝鍗矰BTrans銆丼ymbolTable銆丷esultData銆丼electFilter绛夊熀纭绫伙紝鍏朵粬鐨勫姛鑳介兘閫氳繃鎵╁睍鏂规硶鐨勬柟寮忔潵瀹炵幇銆 鍏堕噸鍒剁殑鍘熷洜鍦ㄤ簬鍘烴FOX绫诲簱鐨勫皝瑁呰繃浜庡帤閲嶏紝鍒濆鑰呯悊瑙ｈ捣鏉ュ洶闅撅紝閲嶅埗鐗堝笇鏈涘仛鍒版渶灏忓寲鐨勫唴鏍革紝鏂逛究鐞嗚В锛岀劧鍚庝赴瀵岀殑鎵╁睍鍑芥暟鏉ュ疄鐜板ぇ閲忕殑鍔熻兘锛屼究浜庡鐫鐜版湁鐨勬暀绋嬩腑閭ｅ鍩轰簬Database鎵╁睍鍑芥暟灏佽鎬濊矾鐨勫垵瀛﹁呭揩閫熺殑鍏ラ棬銆 ## 涓銆佺粍缁囩粨鏋勫浘 -- IFoxCAD +- Fs.Fox ``` 鈹溾攢鈹鈹bin -- 鐢ㄤ簬鏀剧疆鐢熸垚鐨刵uget鍖呭拰dll 鈹溾攢鈹鈹docs -- 鏋舵瀯鍙奱pi瀹氫箟璇存槑鏂囨。 @@ -85,8 +85,8 @@ IFoxCAD鏄熀浜嶯FOX绫诲簱鐨勯噸鍒剁増锛屼富瑕佹槸鎻愪緵涓涓渶灏忓寲鐨勫唴鏍 鈹 鈹 鈹溾攢鈹鈹ResultData -- 鎵╁睍鏁版嵁 鈹 鈹 鈹溾攢鈹鈹Runtime -- 鏍稿績绫 鈹 鈹 鈹斺攢鈹鈹SelectionFilter -- 閫夋嫨闆嗚繃婊ゅ櫒绫 -鈹 鈹溾攢鈹鈹IFoxCAD.AutoCad -- AutoCAD鐨勭被搴擄紝鍐呴儴闄や簡globalusing澶栨棤鍏朵粬浠ｇ爜 -鈹 鈹斺攢鈹鈹IFoxCAD.ZwCad -- AutoCAD鐨勭被搴擄紝鍐呴儴闄や簡globalusing澶栨棤鍏朵粬浠ｇ爜 +鈹 鈹溾攢鈹鈹Fs.Fox.AutoCad -- AutoCAD鐨勭被搴擄紝鍐呴儴闄や簡globalusing澶栨棤鍏朵粬浠ｇ爜 +鈹 鈹斺攢鈹鈹Fs.Fox.ZwCad -- AutoCAD鐨勭被搴擄紝鍐呴儴闄や簡globalusing澶栨棤鍏朵粬浠ｇ爜 鈹斺攢鈹鈹tests -- 娴嬭瘯绫 鈹溾攢鈹鈹TestAcad2025 -- autocad娴嬭瘯 鈹溾攢鈹鈹TestShared -- 鍏变韩椤圭洰锛屾墍鏈夌殑娴嬭瘯浠ｇ爜閮藉湪杩欓噷 diff --git a/readme.md b/readme.md index 1e9570c669295da03aa67b9dc0d74958db582b66..7e99cdd2f4da013acaab24c58cd0b6919f7b344c 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# IFoxCAD 璇存槑 +# Fs.Fox 璇存槑 鍩轰簬.NET鐨凜ad浜屾寮鍙戠被搴撱 @@ -8,7 +8,7 @@ 鍚庢潵锛岀粡杩囦竴娈垫椂闂寸殑鏇存柊鍚庯紝鐢变簬鑾悕鍏跺鐨勫師鍥燦Fox绫诲簱鎸傛帀浜嗐傝岃繖鏃跺北浜哄悓瀛﹀凡缁忓熀鏈悆閫廚Fox绫诲簱锛岃冭檻鍒癗Fox鐨勫皝瑁呰繃浜庡鏉傦紝閬傝繘琛屼簡閲嶆瀯銆 -閲嶆瀯鐨勭被搴撳懡鍚嶄负IFoxCAD锛 瀵撴剰涓猴細**I(鐖)Fox(鐙愬摜)**锛屾湰椤圭洰鍙戝竷浜**Inspire Function锛堜腑鏂囧悕锛氳穬鍔ㄦ柟绋嬶級** 缁勭粐涓嬶紝鎰熻阿 **灏忚僵杞** 缁欒捣鐨勫悕瀛椼 +閲嶆瀯鐨勭被搴撳懡鍚嶄负Fs.Fox锛 瀵撴剰涓猴細**I(鐖)Fox(鐙愬摜)**锛屾湰椤圭洰鍙戝竷浜**Inspire Function锛堜腑鏂囧悕锛氳穬鍔ㄦ柟绋嬶級** 缁勭粐涓嬶紝鎰熻阿 **灏忚僵杞** 缁欒捣鐨勫悕瀛椼 鍙互鍔犵兢浜ゆ祦锛 @@ -20,9 +20,9 @@ #### 浜屻 浣跨敤甯姪 -IFoxCAD鐨勯」鐩枃妗ｈ鐪 **[IFoxCAD绫诲簱浠庡叆闂ㄥ埌绮鹃歖(https://www.kdocs.cn/l/cc6ZXSa0vMgD)**銆 +Fs.Fox鐨勯」鐩枃妗ｈ鐪 **[Fs.Fox绫诲簱浠庡叆闂ㄥ埌绮鹃歖(https://www.kdocs.cn/l/cc6ZXSa0vMgD)**銆 -IFoxCAD鐨凙PI鏂囨。璇风湅 **[IFoxCAD API 鏂囨。](https://inspirefunction.github.io/ifoxdoc/)**銆**璇锋敞鎰忚繖涓綉绔欓渶瑕佺瀛︽祻瑙** +Fs.Fox鐨凙PI鏂囨。璇风湅 **[Fs.Fox API 鏂囨。](https://inspirefunction.github.io/ifoxdoc/)**銆**璇锋敞鎰忚繖涓綉绔欓渶瑕佺瀛︽祻瑙** #### 涓夈両FoxCad 椤圭洰妯＄増 @@ -44,6 +44,6 @@ IFoxCAD鐨凙PI鏂囨。璇风湅 **[IFoxCAD API 鏂囨。](https://inspirefunction.github. 鏈熷緟浣犵殑鍙備笌锛屼綘鍙互鍋氬涓嬬殑宸ヤ綔鏉ュ府鍔㊣FoxCad鍙戝睍: - 濡傛灉浣犲湪浣跨敤鐨勮繃绋嬩腑鍙戠幇IFoxCad鐨勬煇浜涗笉瓒虫垨鑰卋ug锛屼綘鍙互鍦 [椤圭洰issues](https://gitee.com/inspirefunction/ifoxcad/issues) 閲屾彁浜ssue鏉ヤ緵寮鍙戜汉鍛樿繘琛屽畬鍠勩 -- 甯姪寮鍙戜汉鍛樼紪鍐欎娇鐢ㄦ枃妗ｏ紝鏂囨。鍦板潃瑙 **[IFoxCAD绫诲簱浠庡叆闂ㄥ埌绮鹃歖(https://www.kdocs.cn/l/cc6ZXSa0vMgD)** +- 甯姪寮鍙戜汉鍛樼紪鍐欎娇鐢ㄦ枃妗ｏ紝鏂囨。鍦板潃瑙 **[Fs.Fox绫诲簱浠庡叆闂ㄥ埌绮鹃歖(https://www.kdocs.cn/l/cc6ZXSa0vMgD)** - fork鏈」鐩紝淇bug锛屽鍔犲姛鑳斤紝骞舵彁浜r銆 diff --git a/src/CADShared/Algorithms/QuadTree/QuadEntity.cs b/src/CADShared/Algorithms/QuadTree/QuadEntity.cs index c5f7f11068f04ab5e0f797ff44e5be57a30637ee..cfe90ee2b1c472b3f177ce69aa02005b067cdb72 100644 --- a/src/CADShared/Algorithms/QuadTree/QuadEntity.cs +++ b/src/CADShared/Algorithms/QuadTree/QuadEntity.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /* * 杩欎釜绫诲瓨鍦ㄧ殑鎰忎箟鏄负浜嗕笉鏆撮湶Rect绫诲瓧娈 diff --git a/src/CADShared/Algorithms/QuadTree/QuadTree.cs b/src/CADShared/Algorithms/QuadTree/QuadTree.cs index 4ef6568570dc8e090fbeee9a88af98e0b18b94a8..ee37e624a4cfe50d132735eb1278edfd6ca76dd1 100644 --- a/src/CADShared/Algorithms/QuadTree/QuadTree.cs +++ b/src/CADShared/Algorithms/QuadTree/QuadTree.cs @@ -18,7 +18,7 @@ * 3.鎺ュ彛:绾︽潫閮借鏈夋浜ょ煩褰,鍚﹀垯鏃犳硶璋冪敤"鍖呭惈"鏂规硶 * 4.閫夋嫨妯″紡:妯′豢cad鐨勭獥閫夊拰妗嗛 */ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 鏍硅妭鐐规帶鍒跺櫒 diff --git a/src/CADShared/Algorithms/QuadTree/QuadTreeEvn.cs b/src/CADShared/Algorithms/QuadTree/QuadTreeEvn.cs index f077a02a4057ae10577d785727ffcf6956e7baac..5d8c5f6e80e5b29b59fd1c4e0be73ee2349a6f45 100644 --- a/src/CADShared/Algorithms/QuadTree/QuadTreeEvn.cs +++ b/src/CADShared/Algorithms/QuadTree/QuadTreeEvn.cs @@ -1,5 +1,5 @@ 锘#pragma warning disable CA2211 // 闈炲父閲忓瓧娈靛簲褰撲笉鍙 -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 鍥涘弶鏍戠幆澧冨彉閲 /// diff --git a/src/CADShared/Algorithms/QuadTree/QuadTreeNode.cs b/src/CADShared/Algorithms/QuadTree/QuadTreeNode.cs index a926bdab354ad7099cabe517972dafad6096428c..234347353a53c3b0255dd2d25f55b1e3ede37ad1 100644 --- a/src/CADShared/Algorithms/QuadTree/QuadTreeNode.cs +++ b/src/CADShared/Algorithms/QuadTree/QuadTreeNode.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 瀛愯妭鐐 diff --git a/src/CADShared/Algorithms/QuadTree/QuadTreeSelectMode.cs b/src/CADShared/Algorithms/QuadTree/QuadTreeSelectMode.cs index 624d313ad43aefe905eb3fb41e2f8b135409c3f5..43fdee47292090b67a1fc6e5c5100e5ebcfc4fad 100644 --- a/src/CADShared/Algorithms/QuadTree/QuadTreeSelectMode.cs +++ b/src/CADShared/Algorithms/QuadTree/QuadTreeSelectMode.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鍥涘弶鏍戦夋嫨妯″紡 diff --git a/src/CADShared/Algorithms/QuadTree/Rect.cs b/src/CADShared/Algorithms/QuadTree/Rect.cs index 1366442ee833adbd4aa9f6b84572abaa17637089..fc12af4b4788b1fee27c912155479defc665bea6 100644 --- a/src/CADShared/Algorithms/QuadTree/Rect.cs +++ b/src/CADShared/Algorithms/QuadTree/Rect.cs @@ -1,9 +1,9 @@ 锘縰sing System.Diagnostics; using System.Runtime.CompilerServices; #if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// Linq Distinct 娑堥噸姣旇緝涓ょ偣鍦ㄥ宸寖鍥村唴灏卞幓闄 diff --git a/src/CADShared/Assoc/AssocPersSubentityIdPEEx.cs b/src/CADShared/Assoc/AssocPersSubentityIdPEEx.cs index cc1cdfa338771f04973103cca4c68a874e23f26e..77c4525446104f17431299192d352a2a2beb20d1 100644 --- a/src/CADShared/Assoc/AssocPersSubentityIdPEEx.cs +++ b/src/CADShared/Assoc/AssocPersSubentityIdPEEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad.Assoc; +锘縩amespace Fs.Fox.Cad.Assoc; /// /// 瀛愬璞″叧绯籌d鎵╁睍 diff --git a/src/CADShared/Assoc/AssocUtils.cs b/src/CADShared/Assoc/AssocUtils.cs index c8c400185834c4b68949885419962c2a455d856a..c5ca26f83a26f136f7ec2668c2fdedd767e217b4 100644 --- a/src/CADShared/Assoc/AssocUtils.cs +++ b/src/CADShared/Assoc/AssocUtils.cs @@ -5,7 +5,7 @@ #endif -namespace IFoxCAD.Cad.Assoc; +namespace Fs.Fox.Cad.Assoc; /// /// 鍏宠仈鍔ㄤ綔杈呭姪绫 diff --git a/src/CADShared/Basal/General/ArrayEx.cs b/src/CADShared/Basal/General/ArrayEx.cs index 36bf8e7f1c6c17de151fca3181abdfce7ccbe039..230ab278e900d6df0a915e2c2d614760608045f1 100644 --- a/src/CADShared/Basal/General/ArrayEx.cs +++ b/src/CADShared/Basal/General/ArrayEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Basal; +锘縩amespace Fs.Fox.Basal; /* * 鐢变簬linq鐨勫嚱鏁板ぇ閮ㄥ垎甯︽湁鐘舵佹満,鑰宑ad鏄竴涓崟鏈虹▼搴, diff --git a/src/CADShared/Basal/General/DebugHelper.cs b/src/CADShared/Basal/General/DebugHelper.cs index cadff7efb9a72647b6bba87cd61b078ba6f7d13b..d0a1082228c00257c2ab0ce3ffe2914326270d1e 100644 --- a/src/CADShared/Basal/General/DebugHelper.cs +++ b/src/CADShared/Basal/General/DebugHelper.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Basal; +锘縩amespace Fs.Fox.Basal; /// /// 璋冭瘯宸ュ叿 /// diff --git a/src/CADShared/Basal/General/EnumEx.cs b/src/CADShared/Basal/General/EnumEx.cs index 0f761ce3577bc19cb0f52cbf6642fad16c2870cf..e2d9f5f3ee17d06f6bbf5da889535b752b95f7aa 100644 --- a/src/CADShared/Basal/General/EnumEx.cs +++ b/src/CADShared/Basal/General/EnumEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Basal; +锘縩amespace Fs.Fox.Basal; /// /// 鏋氫妇鎵╁睍 diff --git a/src/CADShared/Basal/General/LinqEx.cs b/src/CADShared/Basal/General/LinqEx.cs index 30036a163457105fc0093ca030f0f276f6f12a33..c254cbb5d181c0f2f28fab58634e169e3189dc4a 100644 --- a/src/CADShared/Basal/General/LinqEx.cs +++ b/src/CADShared/Basal/General/LinqEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Basal; +锘縩amespace Fs.Fox.Basal; /// /// linq 鎵╁睍绫 diff --git a/src/CADShared/Basal/General/LoopList.cs b/src/CADShared/Basal/General/LoopList.cs index 78355d5045db767d696188fdbbcc59a73e8016c8..3d5f13b27bd09c9327333784bc32ae5b8560361e 100644 --- a/src/CADShared/Basal/General/LoopList.cs +++ b/src/CADShared/Basal/General/LoopList.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Basal; +namespace Fs.Fox.Basal; #line hidden // 璋冭瘯鐨勬椂鍊欒烦杩囧畠 diff --git a/src/CADShared/Basal/General/LoopState.cs b/src/CADShared/Basal/General/LoopState.cs index 1367e869331c96486e80daa02e89e22d81ff57b9..8282391bdf2c990f3ecc08143919f8475dfa76fd 100644 --- a/src/CADShared/Basal/General/LoopState.cs +++ b/src/CADShared/Basal/General/LoopState.cs @@ -1,6 +1,6 @@ 锘// ReSharper disable InconsistentNaming #pragma warning disable CS1591 // 缂哄皯瀵瑰叕鍏卞彲瑙佺被鍨嬫垨鎴愬憳鐨 XML 娉ㄩ噴 -namespace IFoxCAD.Basal; +namespace Fs.Fox.Basal; #line hidden // 璋冭瘯鐨勬椂鍊欒烦杩囧畠 /// diff --git a/src/CADShared/Basal/Nullable/ArgumentNullEx.cs b/src/CADShared/Basal/Nullable/ArgumentNullEx.cs index 7fb7763d155fe169740d82758ebdd19763ac4f61..f43203031a9d3613b2008fcf11911ccf5c4e6707 100644 --- a/src/CADShared/Basal/Nullable/ArgumentNullEx.cs +++ b/src/CADShared/Basal/Nullable/ArgumentNullEx.cs @@ -1,6 +1,6 @@ 锘 #if a2024 || zcad -namespace IFoxCAD.Basal; +namespace Fs.Fox.Basal; /// /// 鍙傛暟null妫鏌ョ被 diff --git a/src/CADShared/Basal/Win/Enums.cs b/src/CADShared/Basal/Win/Enums.cs index 059f92ce810232a42a44bf9e94eaf0ebe16831a3..badc447fe1853d24ffe2e26a6715892613e1830a 100644 --- a/src/CADShared/Basal/Win/Enums.cs +++ b/src/CADShared/Basal/Win/Enums.cs @@ -1,6 +1,6 @@ 锘#pragma warning disable CS1591 // 缂哄皯瀵瑰叕鍏卞彲瑙佺被鍨嬫垨鎴愬憳鐨 XML 娉ㄩ噴 #if true -namespace IFoxCAD.Basal; +namespace Fs.Fox.Basal; // https://blog.csdn.net/qq_43812868/article/details/108587936 [Flags] diff --git a/src/CADShared/Basal/Win/PInvokeUser32.cs b/src/CADShared/Basal/Win/PInvokeUser32.cs index ef4dd5d8fad75f0491fd948b1efa315750aa85b3..a51828d5415d990e5fcf30fbb651d1459f5943cb 100644 --- a/src/CADShared/Basal/Win/PInvokeUser32.cs +++ b/src/CADShared/Basal/Win/PInvokeUser32.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Basal; +锘縩amespace Fs.Fox.Basal; /// /// PInvokeUser32 diff --git a/src/CADShared/Basal/Win/SystemEx.cs b/src/CADShared/Basal/Win/SystemEx.cs index 50d93db6fdc5958ea1e6b1009033b9f5f1ddb203..1f3dc3b0644931b1f235fab4c2288326d0cb9fe0 100644 --- a/src/CADShared/Basal/Win/SystemEx.cs +++ b/src/CADShared/Basal/Win/SystemEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Basal; +锘縩amespace Fs.Fox.Basal; /// /// 绯荤粺鎵╁睍 diff --git a/src/CADShared/Basal/Win/WindowsAPI.cs b/src/CADShared/Basal/Win/WindowsAPI.cs index 5125d471e94c218224c4df83e8c5517ef2be4700..00419e2c0073169b15b594431104293579ed376e 100644 --- a/src/CADShared/Basal/Win/WindowsAPI.cs +++ b/src/CADShared/Basal/Win/WindowsAPI.cs @@ -1,9 +1,9 @@ 锘#pragma warning disable CS1591 // 缂哄皯瀵瑰叕鍏卞彲瑙佺被鍨嬫垨鎴愬憳鐨 XML 娉ㄩ噴 #define Marshal #if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif -namespace IFoxCAD.Basal; +namespace Fs.Fox.Basal; public partial class WindowsAPI { @@ -89,8 +89,12 @@ public static bool GlobalLockTask(IntPtr data, Action task) //if (task == null) // throw new ArgumentNullException(nameof(task)); ArgumentNullException.ThrowIfNull(task); + + if (data == IntPtr.Zero) + { return false; + } try { diff --git a/src/CADShared/ExtensionMethod/BaseEx.cs b/src/CADShared/ExtensionMethod/BaseEx.cs index 51766f32cb8293c96b760b288f2107178da9aba1..dd48ab59c70b5b6fa306fee3320beec2ecda86ab 100644 --- a/src/CADShared/ExtensionMethod/BaseEx.cs +++ b/src/CADShared/ExtensionMethod/BaseEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鍩虹鎵╁睍 diff --git a/src/CADShared/ExtensionMethod/BulgeVertexWidth.cs b/src/CADShared/ExtensionMethod/BulgeVertexWidth.cs index 4303fd330aa1844c18f554902ddad2214bcd09be..75f2b65134f787eb5036b538b3ba7c6ecac45d57 100644 --- a/src/CADShared/ExtensionMethod/BulgeVertexWidth.cs +++ b/src/CADShared/ExtensionMethod/BulgeVertexWidth.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 澶氭绾跨殑椤剁偣,鍑稿害,澶村,灏惧 diff --git a/src/CADShared/ExtensionMethod/CollectionEx.cs b/src/CADShared/ExtensionMethod/CollectionEx.cs index f015ecb55849a99220c7265a18f72ca1919607b8..ade2b2229076e4d0fb9b0fd210e4e412d3b1cd27 100644 --- a/src/CADShared/ExtensionMethod/CollectionEx.cs +++ b/src/CADShared/ExtensionMethod/CollectionEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 闆嗗悎鎵╁睍绫 diff --git a/src/CADShared/ExtensionMethod/DBDictionaryEx.cs b/src/CADShared/ExtensionMethod/DBDictionaryEx.cs index 829b1ae9b5751da28ddb9335b6e18a956fe994e4..aa91bcd752b336a1244a5ece23641f915464371c 100644 --- a/src/CADShared/ExtensionMethod/DBDictionaryEx.cs +++ b/src/CADShared/ExtensionMethod/DBDictionaryEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 瀛楀吀鎵╁睍绫 diff --git a/src/CADShared/ExtensionMethod/DBObjectEx.cs b/src/CADShared/ExtensionMethod/DBObjectEx.cs index 13c23ce2fd35970fcbe81c6bec493c9c281a6335..7ce3fb2b348d71f6c73ff2ce81ac3c5712f7af40 100644 --- a/src/CADShared/ExtensionMethod/DBObjectEx.cs +++ b/src/CADShared/ExtensionMethod/DBObjectEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 瀹炰綋瀵硅薄鎵╁睍绫 diff --git a/src/CADShared/ExtensionMethod/DBTransEx.cs b/src/CADShared/ExtensionMethod/DBTransEx.cs index 88382674628866c4a8ec75341d11d1f3f8ea6895..46da3dfc13ff610753f734bd34ac8d96998c0615 100644 --- a/src/CADShared/ExtensionMethod/DBTransEx.cs +++ b/src/CADShared/ExtensionMethod/DBTransEx.cs @@ -1,6 +1,6 @@ 锘#define lack_test -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; #if lack_test /// diff --git a/src/CADShared/ExtensionMethod/DatabaseEx.cs b/src/CADShared/ExtensionMethod/DatabaseEx.cs index d4b535010dc99c52806f416aa72b77630e7ab307..663ba6848df68061b8fe464eab16245c2268ba16 100644 --- a/src/CADShared/ExtensionMethod/DatabaseEx.cs +++ b/src/CADShared/ExtensionMethod/DatabaseEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鏁版嵁搴撴墿灞曞嚱鏁 diff --git a/src/CADShared/ExtensionMethod/DocumentLockManager.cs b/src/CADShared/ExtensionMethod/DocumentLockManager.cs index 17a29289feec7e06329dbb1bfe39a46f3862609d..0e8abc7124a8a7f4544756b5b32e2d04dba76611 100644 --- a/src/CADShared/ExtensionMethod/DocumentLockManager.cs +++ b/src/CADShared/ExtensionMethod/DocumentLockManager.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鏂囨。閿佺鐞嗗櫒锛岀敤浜庣鐞嗘枃妗ｇ殑閿佸畾鍜岃В閿併 diff --git a/src/CADShared/ExtensionMethod/DwgMark.cs b/src/CADShared/ExtensionMethod/DwgMark.cs index 501da985663edaa07ff440e0d038b0bf5cef57ec..3e4541874d6c7a693b65d406b4232b74ee62adf0 100644 --- a/src/CADShared/ExtensionMethod/DwgMark.cs +++ b/src/CADShared/ExtensionMethod/DwgMark.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 涓篸wg鏂囦欢娣诲姞鏍囪 diff --git a/src/CADShared/ExtensionMethod/EditorEx.cs b/src/CADShared/ExtensionMethod/EditorEx.cs index 9d2f6c8e1b844bfc81f64ac1668c06ab7de5d301..c6cb2cd030cd6906b3cda88f6b819cfcc2c723a6 100644 --- a/src/CADShared/ExtensionMethod/EditorEx.cs +++ b/src/CADShared/ExtensionMethod/EditorEx.cs @@ -1,6 +1,6 @@ using ArgumentNullException = System.ArgumentNullException; -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 鍛戒护琛屾墿灞曠被 diff --git a/src/CADShared/ExtensionMethod/Entity/ArcEx.cs b/src/CADShared/ExtensionMethod/Entity/ArcEx.cs index 49922f4b293ff6e14a33721fe0f57daf26206b58..d15d4587c6141ca82425b0f70676b32b04d15959 100644 --- a/src/CADShared/ExtensionMethod/Entity/ArcEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/ArcEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鍦嗗姬鎵╁睍绫 diff --git a/src/CADShared/ExtensionMethod/Entity/BlockReferenceEx.cs b/src/CADShared/ExtensionMethod/Entity/BlockReferenceEx.cs index 39ad840c361bb10b9628b76c61b3ea5e73c11c36..6c1c04894086ff1613bfbbb2280d0429745a2137 100644 --- a/src/CADShared/ExtensionMethod/Entity/BlockReferenceEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/BlockReferenceEx.cs @@ -1,8 +1,8 @@ 锘#if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 鍧楀弬鐓ф墿灞曠被 diff --git a/src/CADShared/ExtensionMethod/Entity/BoundingInfo.cs b/src/CADShared/ExtensionMethod/Entity/BoundingInfo.cs index be90241426ca82d3c795ce24e66c4996e588115f..de53f38f8e473252cc6872f1bf8c0d9fdd1f3cdb 100644 --- a/src/CADShared/ExtensionMethod/Entity/BoundingInfo.cs +++ b/src/CADShared/ExtensionMethod/Entity/BoundingInfo.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鍜屽皻777 閲嶆瀯 diff --git a/src/CADShared/ExtensionMethod/Entity/CircleEx.cs b/src/CADShared/ExtensionMethod/Entity/CircleEx.cs index d0fba8ac4064b4f4956fbbcdceb0aae7982dc184..faeda1f91d0dba4e52862904efd823c2d0f74caa 100644 --- a/src/CADShared/ExtensionMethod/Entity/CircleEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/CircleEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鍦嗘墿灞曠被 diff --git a/src/CADShared/ExtensionMethod/Entity/CurveEx.cs b/src/CADShared/ExtensionMethod/Entity/CurveEx.cs index 14a51130884167c72f1099ce11dd0396dc90a847..1fd29484b3a967860dddabd00bf16ba282f04525 100644 --- a/src/CADShared/ExtensionMethod/Entity/CurveEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/CurveEx.cs @@ -1,10 +1,10 @@ // ReSharper disable ForCanBeConvertedToForeach #if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 瀹炰綋绫绘洸绾挎墿灞曠被 diff --git a/src/CADShared/ExtensionMethod/Entity/DBTextEx.cs b/src/CADShared/ExtensionMethod/Entity/DBTextEx.cs index 97a65112694af26d58b23cd655d9fc08621a4898..66a5a388410547198b3f17729a383044924a9f09 100644 --- a/src/CADShared/ExtensionMethod/Entity/DBTextEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/DBTextEx.cs @@ -1,6 +1,6 @@ 锘縰sing ArgumentNullException = System.ArgumentNullException; -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 鍗曡鏂囧瓧鎵╁睍绫 diff --git a/src/CADShared/ExtensionMethod/Entity/EntityBoundingInfo.cs b/src/CADShared/ExtensionMethod/Entity/EntityBoundingInfo.cs index 854f9cc4abf9d6ce133975f5aef77bdbe0e9c796..9af679753c9e0656ddca0a1311a12ec2cea9b6eb 100644 --- a/src/CADShared/ExtensionMethod/Entity/EntityBoundingInfo.cs +++ b/src/CADShared/ExtensionMethod/Entity/EntityBoundingInfo.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鑾峰彇瀹炰綋鍖呭洿鐩掍俊鎭柟娉 diff --git a/src/CADShared/ExtensionMethod/Entity/EntityEx.cs b/src/CADShared/ExtensionMethod/Entity/EntityEx.cs index 1f505418f0d11d02f7295ce88caa2a75b6dd33e3..a4ea2ef80617736beb47e179897f1184ce47eae6 100644 --- a/src/CADShared/ExtensionMethod/Entity/EntityEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/EntityEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 瀹炰綋鍥惧厓鎵╁睍绫 diff --git a/src/CADShared/ExtensionMethod/Entity/MTextEx.cs b/src/CADShared/ExtensionMethod/Entity/MTextEx.cs index 52c85a97c627360d2b00e06f6e05fae4a733e465..ea0d5fb27eb4ab1df4a203f42a2d6dabc0c75059 100644 --- a/src/CADShared/ExtensionMethod/Entity/MTextEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/MTextEx.cs @@ -1,6 +1,6 @@ 锘縰sing ArgumentNullException = System.ArgumentNullException; -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 澶氳鏂囧瓧鎵╁睍绫 diff --git a/src/CADShared/ExtensionMethod/Entity/PolylineEx.cs b/src/CADShared/ExtensionMethod/Entity/PolylineEx.cs index 25a034a6d74445767a18afe4d73c284063b3106d..a264c1052cab9f7c296163dff9db9829205f20c8 100644 --- a/src/CADShared/ExtensionMethod/Entity/PolylineEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/PolylineEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 澶氭绾挎墿灞曠被 diff --git a/src/CADShared/ExtensionMethod/Entity/RegionEx.cs b/src/CADShared/ExtensionMethod/Entity/RegionEx.cs index c8323058d0fa820247ae2c6828d57f362d67fdad..38c9cc66510ad5a56f48a8e21a13a5fd89d98d06 100644 --- a/src/CADShared/ExtensionMethod/Entity/RegionEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/RegionEx.cs @@ -4,7 +4,7 @@ #elif zcad using ZwSoft.ZwCAD.BoundaryRepresentation; #endif -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 闈㈠煙鎵╁睍 diff --git a/src/CADShared/ExtensionMethod/Enums.cs b/src/CADShared/ExtensionMethod/Enums.cs index 87f02c374237b4e5e0a9b86c62e5cdb21544822b..34f4c76d262177b3684045673a6e1422e4dd6488 100644 --- a/src/CADShared/ExtensionMethod/Enums.cs +++ b/src/CADShared/ExtensionMethod/Enums.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鍙傜収璺緞杞崲 diff --git a/src/CADShared/ExtensionMethod/ErrorInfoEx.cs b/src/CADShared/ExtensionMethod/ErrorInfoEx.cs index 9462d79201f2628644330fb9ef3f68c8c2a25b49..dbbbe48e9cd1ef8fed6c1d3e0839db407af02e7c 100644 --- a/src/CADShared/ExtensionMethod/ErrorInfoEx.cs +++ b/src/CADShared/ExtensionMethod/ErrorInfoEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// CAD閿欒澶у叏 diff --git a/src/CADShared/ExtensionMethod/Geomerty/Curve2dEx.cs b/src/CADShared/ExtensionMethod/Geomerty/Curve2dEx.cs index 251969df7b0a1007ccd7d937e67c3801c57047fd..c4b0a7f52fb8d7fb51326a51e4fe1ec09f6d5a16 100644 --- a/src/CADShared/ExtensionMethod/Geomerty/Curve2dEx.cs +++ b/src/CADShared/ExtensionMethod/Geomerty/Curve2dEx.cs @@ -1,6 +1,6 @@ // ReSharper disable SuggestVarOrType_SimpleTypes -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 浜岀淮瑙ｆ瀽绫绘洸绾胯浆鎹负浜岀淮瀹炰綋鏇茬嚎鎵╁睍绫 diff --git a/src/CADShared/ExtensionMethod/Geomerty/Curve3dEx.cs b/src/CADShared/ExtensionMethod/Geomerty/Curve3dEx.cs index d3d6139f978c173ed970462f2632e98def4adb8c..bf847230e6dc1533b82fb2a8c2c583d6b7a3f0ff 100644 --- a/src/CADShared/ExtensionMethod/Geomerty/Curve3dEx.cs +++ b/src/CADShared/ExtensionMethod/Geomerty/Curve3dEx.cs @@ -1,6 +1,6 @@ 锘// ReSharper disable SuggestVarOrType_SimpleTypes -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 涓夌淮瑙ｆ瀽绫绘洸绾胯浆鎹负涓夌淮瀹炰綋鏇茬嚎鎵╁睍绫 diff --git a/src/CADShared/ExtensionMethod/Geomerty/GeometryEx.cs b/src/CADShared/ExtensionMethod/Geomerty/GeometryEx.cs index 3558994a741017c644dabd6108f8061d63aad111..52686876904b12924caacb9418988915cbb9b20c 100644 --- a/src/CADShared/ExtensionMethod/Geomerty/GeometryEx.cs +++ b/src/CADShared/ExtensionMethod/Geomerty/GeometryEx.cs @@ -1,8 +1,8 @@ #if a2024 -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; using System.Drawing; diff --git a/src/CADShared/ExtensionMethod/Geomerty/PointEx.cs b/src/CADShared/ExtensionMethod/Geomerty/PointEx.cs index f920a3cd0bf8aca0f3b82e8d8dd72a22119175e3..e713ef86c53a4004c7afe37a3f07088be4bab93b 100644 --- a/src/CADShared/ExtensionMethod/Geomerty/PointEx.cs +++ b/src/CADShared/ExtensionMethod/Geomerty/PointEx.cs @@ -1,8 +1,8 @@ #if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 鐐 diff --git a/src/CADShared/ExtensionMethod/Hatch/HatchConverter.cs b/src/CADShared/ExtensionMethod/Hatch/HatchConverter.cs index fe79a623bd4dda12f333b6cbab53c6ad20401976..e8a49500bc5b682ef3bfc10e2fd6cd1781d563b2 100644 --- a/src/CADShared/ExtensionMethod/Hatch/HatchConverter.cs +++ b/src/CADShared/ExtensionMethod/Hatch/HatchConverter.cs @@ -2,10 +2,10 @@ // ReSharper disable ForCanBeConvertedToForeach #if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; using PointV = Point2d; diff --git a/src/CADShared/ExtensionMethod/Hatch/HatchEx.cs b/src/CADShared/ExtensionMethod/Hatch/HatchEx.cs index 5d6ccd09c35c2c5a22d95bd379fcdbb754155c5b..7abcc026fb420393c2e211eeeafc0906cbd57c98 100644 --- a/src/CADShared/ExtensionMethod/Hatch/HatchEx.cs +++ b/src/CADShared/ExtensionMethod/Hatch/HatchEx.cs @@ -1,6 +1,6 @@ // ReSharper disable CompareOfFloatsByEqualityOperator -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 鍏呭～鎵╁睍绫 diff --git a/src/CADShared/ExtensionMethod/Hatch/HatchInfo.cs b/src/CADShared/ExtensionMethod/Hatch/HatchInfo.cs index f836615f30fabe9e69cd6f853899ebb89f4e6bad..f8d6a1b1d9c01d05412d62c38252483b4f7a50e0 100644 --- a/src/CADShared/ExtensionMethod/Hatch/HatchInfo.cs +++ b/src/CADShared/ExtensionMethod/Hatch/HatchInfo.cs @@ -1,10 +1,10 @@ 锘 #if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /* * 娣诲姞鐨勭涓涓竟鐣屽繀椤绘槸澶栬竟鐣,鍗崇敤浜庡畾涔夊浘妗堝～鍏呮渶澶栭潰鐨勮竟鐣屻 diff --git a/src/CADShared/ExtensionMethod/IFoxUtils.cs b/src/CADShared/ExtensionMethod/IFoxUtils.cs index 3ab211a3e81030a040b23bdb4b13b6e6515a8100..7699c62fadb8b8579b2451e56e591b718402bf66 100644 --- a/src/CADShared/ExtensionMethod/IFoxUtils.cs +++ b/src/CADShared/ExtensionMethod/IFoxUtils.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 宸ュ叿绫 diff --git a/src/CADShared/ExtensionMethod/Jig/JigEx.cs b/src/CADShared/ExtensionMethod/Jig/JigEx.cs index c98511007a083be3b9a5100c00636e61f53aecd5..447f2087fa47912372aa3e94900b68e888320def 100644 --- a/src/CADShared/ExtensionMethod/Jig/JigEx.cs +++ b/src/CADShared/ExtensionMethod/Jig/JigEx.cs @@ -1,8 +1,8 @@ 锘#if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /* 灏佽jig * 20220726 闅愯棌浜嬩欢,鍒╃敤鍑芥暟杩涜鏁版嵁搴撳浘鍏冮噸缁 diff --git a/src/CADShared/ExtensionMethod/Jig/JigExTransient.cs b/src/CADShared/ExtensionMethod/Jig/JigExTransient.cs index e0bfeb06fcf4d6599236182dfb45720ef27621a3..d3a4028992693037e24dd02c43a901a7b3a4b635 100644 --- a/src/CADShared/ExtensionMethod/Jig/JigExTransient.cs +++ b/src/CADShared/ExtensionMethod/Jig/JigExTransient.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鐬佸鍣 diff --git a/src/CADShared/ExtensionMethod/ObjectIdEx.cs b/src/CADShared/ExtensionMethod/ObjectIdEx.cs index b3053502fcb392b1c125a5b24141aef540bc30bc..436943915426526fdd78dae31fee9f43dd1cc8f9 100644 --- a/src/CADShared/ExtensionMethod/ObjectIdEx.cs +++ b/src/CADShared/ExtensionMethod/ObjectIdEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 瀵硅薄id鎵╁睍绫 diff --git a/src/CADShared/ExtensionMethod/PaneEx.cs b/src/CADShared/ExtensionMethod/PaneEx.cs index 6295ac5ad3846287d5e770012761d7ebc70148d6..80e9a720f949b98baeb64f0d00681f655496bebb 100644 --- a/src/CADShared/ExtensionMethod/PaneEx.cs +++ b/src/CADShared/ExtensionMethod/PaneEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鎵樼洏绫绘墿灞 diff --git a/src/CADShared/ExtensionMethod/PromptOptionsEx.cs b/src/CADShared/ExtensionMethod/PromptOptionsEx.cs index 45c53416ad0587bfa1195c35d5a8ac9982f1cad2..e6c7895f599d5196e2dedfa3c8f18b098c2469cc 100644 --- a/src/CADShared/ExtensionMethod/PromptOptionsEx.cs +++ b/src/CADShared/ExtensionMethod/PromptOptionsEx.cs @@ -1,5 +1,5 @@ 锘// ReSharper disable UnusedAutoPropertyAccessor.Global -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 浜や簰璁剧疆鎵╁睍 diff --git a/src/CADShared/ExtensionMethod/RandomEx.cs b/src/CADShared/ExtensionMethod/RandomEx.cs index cf245380831dbf48a0b3f3f1e1f04029ec29f243..c87a4aaec38137e616879c9154490044cb659c44 100644 --- a/src/CADShared/ExtensionMethod/RandomEx.cs +++ b/src/CADShared/ExtensionMethod/RandomEx.cs @@ -4,12 +4,12 @@ *鈹 鍒涘缓鏃堕棿锛2022/8/30 22:49:30 *鈹 妯″潡鎻忚堪锛氶殢鏈烘暟鐢熸垚鍣 *鈹 浣跨敤鑼冨洿锛氶氱敤 - *鈹 璇 鏄:鏈ā鍧椾腑闄etRandom涓嶯extColor鏂规硶鏄疘FoxCAD鍘熸湁鐨勪互澶栵紝鍏朵粬鏂规硶鍧囬氳繃缃戠粶鏀堕泦鏁寸悊鑰屾潵銆 + *鈹 璇 鏄:鏈ā鍧椾腑闄etRandom涓嶯extColor鏂规硶鏄疐s.Fox鍘熸湁鐨勪互澶栵紝鍏朵粬鏂规硶鍧囬氳繃缃戠粶鏀堕泦鏁寸悊鑰屾潵銆 *鈹 浠ｇ爜鐗堟湰锛1.0 *鈹椻攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲攣鈹佲敍 */ -namespace IFoxCAD.Basal; +namespace Fs.Fox.Basal; /// /// 闅忔満鍊兼墿灞曠被 diff --git a/src/CADShared/ExtensionMethod/RedrawEx.cs b/src/CADShared/ExtensionMethod/RedrawEx.cs index d268252370807f72ff52019dc6e35c425d6136b6..f5f01bc22d6657b4da8864640468973ca72b3cd1 100644 --- a/src/CADShared/ExtensionMethod/RedrawEx.cs +++ b/src/CADShared/ExtensionMethod/RedrawEx.cs @@ -1,6 +1,6 @@ 锘// ReSharper disable InconsistentNaming -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 浜樉妯″紡 diff --git a/src/CADShared/ExtensionMethod/SelectionSetEx.cs b/src/CADShared/ExtensionMethod/SelectionSetEx.cs index 3d152fb2bd7f2f7b965fc5be5c6a7d8e046b58bd..e19819811604c141a5f363dd9f0145f80c9b040b 100644 --- a/src/CADShared/ExtensionMethod/SelectionSetEx.cs +++ b/src/CADShared/ExtensionMethod/SelectionSetEx.cs @@ -1,8 +1,8 @@ 锘#if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 閫夋嫨闆嗘墿灞曠被 diff --git a/src/CADShared/ExtensionMethod/SingleKeyWordHook.cs b/src/CADShared/ExtensionMethod/SingleKeyWordHook.cs index 0f1f84cec713216190e24cca0c7c9371436c365b..882d6cee7532d0f16ae6d1f9f3ac4a82772bcfe0 100644 --- a/src/CADShared/ExtensionMethod/SingleKeyWordHook.cs +++ b/src/CADShared/ExtensionMethod/SingleKeyWordHook.cs @@ -1,6 +1,6 @@ using Keys = System.Windows.Forms.Keys; -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 鍏抽敭瀛椾笉闇瑕佺┖鏍奸挬瀛 diff --git a/src/CADShared/ExtensionMethod/SymbolTableEx.cs b/src/CADShared/ExtensionMethod/SymbolTableEx.cs index f780fd663274b97e0b25bf8c6ef27b5f0be8751e..68ce392675f9f74148d39596c30a8cd99f82d4ae 100644 --- a/src/CADShared/ExtensionMethod/SymbolTableEx.cs +++ b/src/CADShared/ExtensionMethod/SymbolTableEx.cs @@ -1,6 +1,6 @@ 锘縰sing ArgumentNullException = System.ArgumentNullException; -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 绗﹀彿琛ㄧ被鎵╁睍鍑芥暟 diff --git a/src/CADShared/ExtensionMethod/SymbolTableRecordEx.cs b/src/CADShared/ExtensionMethod/SymbolTableRecordEx.cs index 4aa3a5ab2547dd5385ed6f7080514f863dfe5e5e..88bc22225f062fa18144bc011029c49339ef1771 100644 --- a/src/CADShared/ExtensionMethod/SymbolTableRecordEx.cs +++ b/src/CADShared/ExtensionMethod/SymbolTableRecordEx.cs @@ -1,9 +1,9 @@ 锘 #if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 绗﹀彿琛ㄨ褰曟墿灞曠被 diff --git a/src/CADShared/ExtensionMethod/TangentEx.cs b/src/CADShared/ExtensionMethod/TangentEx.cs index cc986b94b71ca93b390893eaa9980b2512ff2170..ab8b168741e76b1d5d81070d33d83aa514f57fbe 100644 --- a/src/CADShared/ExtensionMethod/TangentEx.cs +++ b/src/CADShared/ExtensionMethod/TangentEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 澶╂鎺ュ彛 diff --git a/src/CADShared/ExtensionMethod/TransactionEx.cs b/src/CADShared/ExtensionMethod/TransactionEx.cs index be152b69c6175bf6bdad0f7c05c10da9fb7e3302..bc3f855bf306520283d5a758d56c64dfc64d79a8 100644 --- a/src/CADShared/ExtensionMethod/TransactionEx.cs +++ b/src/CADShared/ExtensionMethod/TransactionEx.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// cad鐨勪簨鍔＄殑鎵╁睍绫 diff --git a/src/CADShared/ExtensionMethod/WindowEx.cs b/src/CADShared/ExtensionMethod/WindowEx.cs index bed51869d75b70d507bdcb2669dabe80963daa3c..e8cb4b06df2430f3ecfd0cdc9f88ca7aae7dfcbe 100644 --- a/src/CADShared/ExtensionMethod/WindowEx.cs +++ b/src/CADShared/ExtensionMethod/WindowEx.cs @@ -2,7 +2,7 @@ using System.Windows.Forms; using Window = System.Windows.Window; -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 绐椾綋鎵╁睍 diff --git a/src/CADShared/ExtensionMethod/XrefEx.cs b/src/CADShared/ExtensionMethod/XrefEx.cs index 39f78892771fbcbc3a5fdbe3d062b1e940350162..b83e2b4e724995f6830fcd986eb029501a4580cc 100644 --- a/src/CADShared/ExtensionMethod/XrefEx.cs +++ b/src/CADShared/ExtensionMethod/XrefEx.cs @@ -1,10 +1,10 @@ 锘// ReSharper disable ForCanBeConvertedToForeach #if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; #region 鍙傜収宸ュ巶 diff --git a/src/CADShared/Initialize/AcadEMR.cs b/src/CADShared/Initialize/AcadEMR.cs index 3fcfc03fff2675748c74849adbb9cdf22f26b09e..324c57e85d2d60850d53be9217923a299f6f612e 100644 --- a/src/CADShared/Initialize/AcadEMR.cs +++ b/src/CADShared/Initialize/AcadEMR.cs @@ -1,6 +1,6 @@ 锘#if true #if acad -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; // 浣滆: [VB.net]绂忚悵鍗 鑾辨槀绾冲路鑳栧瓙 // Email:oneeshine@163.com diff --git a/src/CADShared/Initialize/AssemInfo.cs b/src/CADShared/Initialize/AssemInfo.cs index de3f40debb2552222f27ebe1cd53b3a1bb728bb3..6d175cb64ea8b29c8b05a9b3b5a5634d575fc77a 100644 --- a/src/CADShared/Initialize/AssemInfo.cs +++ b/src/CADShared/Initialize/AssemInfo.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 绋嬪簭闆嗕俊鎭 diff --git a/src/CADShared/Initialize/AutoReg.cs b/src/CADShared/Initialize/AutoReg.cs index 8e9b1f594b23c818002d703b75937ebcaa38b1d5..21e4d0038dc67813326730582dc18632ddf25df7 100644 --- a/src/CADShared/Initialize/AutoReg.cs +++ b/src/CADShared/Initialize/AutoReg.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鑷姩鍔犺浇杈呭姪绫 diff --git a/src/CADShared/Initialize/AutoRegAssem.cs b/src/CADShared/Initialize/AutoRegAssem.cs index eeecf3c769c2cc1c6f0c17086589bba05435b9c3..0e0557751987be8db585ecedfac80d9eee3512fc 100644 --- a/src/CADShared/Initialize/AutoRegAssem.cs +++ b/src/CADShared/Initialize/AutoRegAssem.cs @@ -1,8 +1,8 @@ 锘#if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 娉ㄥ唽涓績 diff --git a/src/CADShared/Initialize/CheckFactory.cs b/src/CADShared/Initialize/CheckFactory.cs index ae66f980b468394b75511de0609a3504f3d97c62..7e988a848232ec83f0f88a559c3d2a33daf2819a 100644 --- a/src/CADShared/Initialize/CheckFactory.cs +++ b/src/CADShared/Initialize/CheckFactory.cs @@ -1,5 +1,5 @@ 锘#if DEBUG -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 鍛戒护妫鏌ョ被 diff --git a/src/CADShared/Initialize/IAutoGo.cs b/src/CADShared/Initialize/IAutoGo.cs index e9608bee64a5d97906a58ec058a50f2e73b0c494..a7c6dc198f2b937870fef93aba1f3b621c07d49d 100644 --- a/src/CADShared/Initialize/IAutoGo.cs +++ b/src/CADShared/Initialize/IAutoGo.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; using System.Diagnostics; diff --git a/src/CADShared/Initialize/MethodInfoHelper.cs b/src/CADShared/Initialize/MethodInfoHelper.cs index 79bede79fc9af4b5e429dc9830a571a587dfbe54..95d63712cf0a13c9b96ca7640778315157abf86a 100644 --- a/src/CADShared/Initialize/MethodInfoHelper.cs +++ b/src/CADShared/Initialize/MethodInfoHelper.cs @@ -1,8 +1,8 @@ 锘#if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; internal static class MethodInfoHelper { diff --git a/src/CADShared/PE/AcadPeInfo.cs b/src/CADShared/PE/AcadPeInfo.cs index fbec0a6bee1666202bda69b4d37a0cf189dc7dfa..b210766138390ce3d7f670131dc0406f0f3b89cf 100644 --- a/src/CADShared/PE/AcadPeInfo.cs +++ b/src/CADShared/PE/AcadPeInfo.cs @@ -1,6 +1,6 @@ 锘縰sing System.Diagnostics; -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 閫夋嫨妯″紡 diff --git a/src/CADShared/PE/DBmod.cs b/src/CADShared/PE/DBmod.cs index 3886bd90f5b12ea51f7df133f07d9fb492928d4e..2912d49b6d208675932ba4e589843ce003f7fb9c 100644 --- a/src/CADShared/PE/DBmod.cs +++ b/src/CADShared/PE/DBmod.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鑾峰彇鏁版嵁搴撲慨鏀圭姸鎬 diff --git a/src/CADShared/PE/PostCmd.cs b/src/CADShared/PE/PostCmd.cs index 3929b67c75ba8f8fb4f6c31b7618fd28ba67321c..a774b35f4758415632a1aff1f3296fdb29d1b653 100644 --- a/src/CADShared/PE/PostCmd.cs +++ b/src/CADShared/PE/PostCmd.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鍙戦佸懡浠 /// diff --git a/src/CADShared/PE/ProgramPE.cs b/src/CADShared/PE/ProgramPE.cs index fc9587d56c39495708be8d6b35caff98c388791d..3de19df073b41d281c78a84e4d12173bbf4da472 100644 --- a/src/CADShared/PE/ProgramPE.cs +++ b/src/CADShared/PE/ProgramPE.cs @@ -1,5 +1,5 @@ 锘#pragma warning disable CS1591 // 缂哄皯瀵瑰叕鍏卞彲瑙佺被鍨嬫垨鎴愬憳鐨 XML 娉ㄩ噴 -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; using System; using System.Collections; @@ -96,7 +96,7 @@ public PeInfo(string fullName) // 鏂囦欢娴 file = new FileStream(fullName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);// FileShare鎵嶈兘杩沜鐩 _PEFileByte = new byte[file.Length]; - file.Read(_PEFileByte, 0, _PEFileByte.Length); + int read = file.Read(_PEFileByte, 0, _PEFileByte.Length); LoadFile(); OpenFile = true; } diff --git a/src/CADShared/ResultData/LispList.cs b/src/CADShared/ResultData/LispList.cs index 9de3669231b183ca90d97113bd0c64767e87364b..5a954911017e6f487afb278329f34dfef60a0628 100644 --- a/src/CADShared/ResultData/LispList.cs +++ b/src/CADShared/ResultData/LispList.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// lisp鏁版嵁灏佽绫 diff --git a/src/CADShared/ResultData/TypedValueList.cs b/src/CADShared/ResultData/TypedValueList.cs index 51bfc5b30ff24851a34dd1cb194b508fe0886509..2fc739ed8bfc1691f2ce618b40078e76dc9b0555 100644 --- a/src/CADShared/ResultData/TypedValueList.cs +++ b/src/CADShared/ResultData/TypedValueList.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鐢ㄤ簬闆嗕腑绠＄悊鎵╁睍鏁版嵁/鎵╁睍瀛楀吀/resultBuffer鐨勭被 diff --git a/src/CADShared/ResultData/XDataList.cs b/src/CADShared/ResultData/XDataList.cs index ba4758cec2d3d1839dec4473bb0447976c7aad96..ad29c5c0ac412ae06d4c20e00d22f16e1d4821dd 100644 --- a/src/CADShared/ResultData/XDataList.cs +++ b/src/CADShared/ResultData/XDataList.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鎵╁睍鏁版嵁灏佽绫 diff --git a/src/CADShared/ResultData/XRecordDataList.cs b/src/CADShared/ResultData/XRecordDataList.cs index 10b95ba94afd9a12f74f2165aa17463d29e284ac..14ad28cfa2e0657ae64024c61afa4e704e3366c8 100644 --- a/src/CADShared/ResultData/XRecordDataList.cs +++ b/src/CADShared/ResultData/XRecordDataList.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鎵╁睍瀛楀吀鏁版嵁灏佽绫 diff --git a/src/CADShared/Runtime/AcPreferences.cs b/src/CADShared/Runtime/AcPreferences.cs index 53c4c9fa212c52f6d68eb54f27d692465272ebdc..a6810e5a4f6cc5d17e23da11740d0739a0e11ba7 100644 --- a/src/CADShared/Runtime/AcPreferences.cs +++ b/src/CADShared/Runtime/AcPreferences.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// AcapPreference鎵╁睍 diff --git a/src/CADShared/Runtime/DBTrans.cs b/src/CADShared/Runtime/DBTrans.cs index a1a4cb44a0f84ccdfe11037b060187efc417d306..5fbd14606e782a6f4edb8bc1a80d11ae81535f20 100644 --- a/src/CADShared/Runtime/DBTrans.cs +++ b/src/CADShared/Runtime/DBTrans.cs @@ -1,6 +1,6 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; #if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif using System.Diagnostics; using System.IO; diff --git a/src/CADShared/Runtime/Env.cs b/src/CADShared/Runtime/Env.cs index 3f88e3678d53491b5de373bce35a2faa9f0478cc..8db6a9b04c20f51b617109b80ed3da48fb002625 100644 --- a/src/CADShared/Runtime/Env.cs +++ b/src/CADShared/Runtime/Env.cs @@ -1,11 +1,11 @@ using System.Security; #if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif // ReSharper disable StringLiteralTypo -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 绯荤粺绠＄悊绫 diff --git a/src/CADShared/Runtime/IdleAction.cs b/src/CADShared/Runtime/IdleAction.cs index b3e0bd49f9aff60ce9e4ef0750a354fb1f502483..940774ac76a7bbda58c64daf5b890622a137b1ce 100644 --- a/src/CADShared/Runtime/IdleAction.cs +++ b/src/CADShared/Runtime/IdleAction.cs @@ -1,6 +1,6 @@ 锘縰sing Cursor = System.Windows.Forms.Cursor; -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 绌洪棽鎵ц diff --git a/src/CADShared/Runtime/IdleNoCommandAction.cs b/src/CADShared/Runtime/IdleNoCommandAction.cs index 72a60b96c364fc1b334e0503e37534c4b5fe9248..8b9a9b81a9705c7cfbcebecf809791fd5f6280f8 100644 --- a/src/CADShared/Runtime/IdleNoCommandAction.cs +++ b/src/CADShared/Runtime/IdleNoCommandAction.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 绌洪棽涓旀棤鍛戒护鏃舵墽琛 diff --git a/src/CADShared/Runtime/SymbolTable.cs b/src/CADShared/Runtime/SymbolTable.cs index ad73274b0ddd15dca062e4dafc790bae63d62eaa..b6ba9c4c994788365c80eb4e8fca1eeaefab8885 100644 --- a/src/CADShared/Runtime/SymbolTable.cs +++ b/src/CADShared/Runtime/SymbolTable.cs @@ -1,10 +1,10 @@ // ReSharper disable RedundantNameQualifier #if a2024 || zcad -using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; +using ArgumentNullException = Fs.Fox.Basal.ArgumentNullEx; #endif -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 绗﹀彿琛ㄧ鐞嗙被 diff --git a/src/CADShared/Runtime/SystemVariableManager.cs b/src/CADShared/Runtime/SystemVariableManager.cs index f502c1d3dd9346312cb0ec5ada0d11660ad633a8..16d5c2bc22e4ba37b76601b99d026e6ea3d4c2d4 100644 --- a/src/CADShared/Runtime/SystemVariableManager.cs +++ b/src/CADShared/Runtime/SystemVariableManager.cs @@ -1,6 +1,6 @@ 锘// ReSharper disable InconsistentNaming -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 绯荤粺鍙橀噺绠＄悊鍣 diff --git a/src/CADShared/SelectionFilter/OpComp.cs b/src/CADShared/SelectionFilter/OpComp.cs index 050c12286544255734d7ed581bbecc36a4703395..dd3a9c317b536a00e33ffd519485cf5ff9015c17 100644 --- a/src/CADShared/SelectionFilter/OpComp.cs +++ b/src/CADShared/SelectionFilter/OpComp.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 姣旇緝杩愮畻绗︾被 diff --git a/src/CADShared/SelectionFilter/OpEqual.cs b/src/CADShared/SelectionFilter/OpEqual.cs index e23e286081d4a6c61db0862975583c26d881a4a5..2218f2d18657f9921efe3f5ff6ad69297aab46e0 100644 --- a/src/CADShared/SelectionFilter/OpEqual.cs +++ b/src/CADShared/SelectionFilter/OpEqual.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 鐩哥瓑杩愮畻绗︾被 diff --git a/src/CADShared/SelectionFilter/OpFilter.cs b/src/CADShared/SelectionFilter/OpFilter.cs index 7eb495db4a131fa9fd17f2e150907dee87f4752c..3c2d58cbf4e5c7913a5edbf0c7525a8184edd2c7 100644 --- a/src/CADShared/SelectionFilter/OpFilter.cs +++ b/src/CADShared/SelectionFilter/OpFilter.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 閫夋嫨闆嗚繃婊ゅ櫒鎶借薄绫 diff --git a/src/CADShared/SelectionFilter/OpList.cs b/src/CADShared/SelectionFilter/OpList.cs index d6e84d02305dbe2f0b3b92caba8143dabca98661..18dc8325dd583c8bea15681fb4ff3e08ca3dd012 100644 --- a/src/CADShared/SelectionFilter/OpList.cs +++ b/src/CADShared/SelectionFilter/OpList.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 閫昏緫鎿嶄綔绗︾殑鍒楄〃鎶借薄绫 diff --git a/src/CADShared/SelectionFilter/OpLogi.cs b/src/CADShared/SelectionFilter/OpLogi.cs index b5570d180e8d356eecf618441064328e3e3dfb51..a3b1c771a98606877e97e85eabadd71edc9040f2 100644 --- a/src/CADShared/SelectionFilter/OpLogi.cs +++ b/src/CADShared/SelectionFilter/OpLogi.cs @@ -1,4 +1,4 @@ -锘縩amespace IFoxCAD.Cad; +锘縩amespace Fs.Fox.Cad; /// /// 杩囨护鍣ㄩ昏緫杩愮畻绗︽娊璞＄被 diff --git a/src/Directory.Build.props b/src/Directory.Build.props index faf83c7cdcbffed0b5bbb735cece5a053df48246..268a8e4dc804cb984f727d9a1f12955578eb561e 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -14,7 +14,7 @@ True True x64 - IFoxCAD.CAD + Fs.Fox.CAD true true ..\..\bin\$(Configuration)\ diff --git a/src/IFoxCAD.AutoCad/IFoxCAD.AutoCad.csproj b/src/IFoxCAD.AutoCad/Fs.Fox.AutoCad.csproj similarity index 62% rename from src/IFoxCAD.AutoCad/IFoxCAD.AutoCad.csproj rename to src/IFoxCAD.AutoCad/Fs.Fox.AutoCad.csproj index d2d9d1c636f430eca3c4119001b2a4df8690eba2..e9ebb1ed7ed9da0bec72cb8e352e885b798aa01a 100644 --- a/src/IFoxCAD.AutoCad/IFoxCAD.AutoCad.csproj +++ b/src/IFoxCAD.AutoCad/Fs.Fox.AutoCad.csproj @@ -6,9 +6,10 @@ - IFox.CAD.ACAD - IFox.CAD.ACAD - IFox.CAD.ACAD + + + + False @@ -19,7 +20,7 @@ none false - bin\Release\IFoxCAD.AutoCad.xml + bin\Release\Fs.Fox.AutoCad.xml @@ -30,6 +31,22 @@ $(Configuration);acad;a2025 true + + + False + + + + False + + + + False + + + + False + @@ -43,18 +60,18 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - + diff --git a/src/IFoxCAD.AutoCad/GlobalUsings.cs b/src/IFoxCAD.AutoCad/GlobalUsings.cs index 67dcfff663047d2efb5ed03f2fb037777e1afd30..a8adf19c9451f11900c5b31f1b3de3446d8e6db6 100644 --- a/src/IFoxCAD.AutoCad/GlobalUsings.cs +++ b/src/IFoxCAD.AutoCad/GlobalUsings.cs @@ -49,4 +49,4 @@ // global using System.Windows.Data; global using System.Net; global using System.Diagnostics.CodeAnalysis; -global using IFoxCAD.Basal; \ No newline at end of file +global using Fs.Fox.Basal; \ No newline at end of file diff --git a/tests/TestAcad2025/GlobalUsings.cs b/tests/TestAcad2025/GlobalUsings.cs index 045196f703ea51e14af47638509ed97287167b95..7fc7a822f636c8ea8bc9bd412723a6452da8c246 100644 --- a/tests/TestAcad2025/GlobalUsings.cs +++ b/tests/TestAcad2025/GlobalUsings.cs @@ -44,7 +44,7 @@ /// ifoxcad -global using IFoxCAD.Cad; -global using IFoxCAD.Basal; +global using Fs.Fox.Cad; +global using Fs.Fox.Basal; global using Test; diff --git a/tests/TestAcad2025/TestAcad2025.csproj b/tests/TestAcad2025/TestAcad2025.csproj index 126352d70dc681ed1b0df50713aad572978c0805..964840d75ba7230601b0da642767857f877cbbf0 100644 --- a/tests/TestAcad2025/TestAcad2025.csproj +++ b/tests/TestAcad2025/TestAcad2025.csproj @@ -33,7 +33,7 @@ - + @@ -54,7 +54,7 @@ - + \ No newline at end of file diff --git a/tests/TestShared/TestAddEntity.cs b/tests/TestShared/TestAddEntity.cs index 123ba77b7c46ef0d7960697ec7a8d38925a32628..3f401c37fdff39c3694c0a02b28f377d7c5d45f9 100644 --- a/tests/TestShared/TestAddEntity.cs +++ b/tests/TestShared/TestAddEntity.cs @@ -2,38 +2,35 @@ public partial class Test { - - - - - - - - - - - - + /// + /// 娴嬭瘯鐭╁舰鐨勫瑙掔嚎鏄惁鐩哥瓑锛岀浉閭昏竟鏄惁骞宠锛岀浉閭昏竟鏄惁鍨傜洿 + /// [CommandMethod(nameof(Test_Rec))] public void Test_Rec() { + // 瀹氫箟鍥涗釜鐐癸紝琛ㄧず鐭╁舰鐨勫洓涓《鐐 Point2d p1 = new(10000.2, 100000.5); Point2d p2 = new(15000.9, 100000.5); Point2d p3 = new(15000.9, 105000.7); Point2d p4 = new(10000.2, 105000.7); + // 璁＄畻鐩搁偦椤剁偣涔嬮棿鐨勫悜閲 var p12 = p2 - p1; var p23 = p3 - p2; var p34 = p4 - p3; var p41 = p1 - p4; + + // 璁＄畻瀵硅绾夸箣闂寸殑鍚戦噺 var p13 = p3 - p1; var p24 = p4 - p2; - + // 瀹氫箟90搴︾殑寮у害鍊 const double pi90 = Math.PI / 2; pi90.Print(); - Tools.TestTimes(1000000, "瀵硅绾", () => { + // 娴嬭瘯瀵硅绾块暱搴︽槸鍚︾浉绛夛紝骞舵鏌ョ浉閭昏竟鏄惁骞宠 + Tools.TestTimes(1000000, "瀵硅绾", () => + { var result = false; if (Math.Abs(p13.Length - p24.Length) <= 1e8) { @@ -41,22 +38,26 @@ public void Test_Rec() } }); + #pragma warning disable CS0219 // 鍙橀噺宸茶璧嬪硷紝浣嗕粠鏈娇鐢ㄨ繃瀹冪殑鍊 - Tools.TestTimes(1000000, "涓夋鐐逛箻", () => { + //浣跨敤涓夋鐐逛箻娉曟祴璇曠浉閭昏竟鏄惁鍨傜洿 + Tools.TestTimes(1000000, "涓夋鐐逛箻", () => + { bool result = Math.Abs(p12.DotProduct(p23)) < 1e8 && Math.Abs(p23.DotProduct(p34)) < 1e8 && Math.Abs(p34.DotProduct(p41)) < 1e8; }); - Tools.TestTimes(1000000, "涓夋鍨傜洿", () => { + //浣跨敤涓夋骞宠娴嬭瘯鐩搁偦杈规槸鍚﹀瀭鐩 + Tools.TestTimes(1000000, "涓夋鍨傜洿", () => + { bool result = p12.IsParallelTo(p23) && p23.IsParallelTo(p34) && p34.IsParallelTo(p41); }); #pragma warning restore CS0219 // 鍙橀噺宸茶璧嬪硷紝浣嗕粠鏈娇鐢ㄨ繃瀹冪殑鍊 } - - + [CommandMethod(nameof(Test_EntRoration))] diff --git a/tests/TestShared/TestCurve.cs b/tests/TestShared/TestCurve.cs index fd75698f2af5472409a2139940e55ee400d0e113..91ae9247cc00e09f0fad5aa02fc8e3ee4d7a9d33 100644 --- a/tests/TestShared/TestCurve.cs +++ b/tests/TestShared/TestCurve.cs @@ -47,7 +47,7 @@ public void Test_Graphspeed() if (ents == null) return; - var graph = new IFoxCAD.Cad.Graph(); // 涓轰簡璋冭瘯鍏堟妸鍥剧殑璁块棶鏀逛负internal + var graph = new Fs.Fox.Cad.Graph(); // 涓轰簡璋冭瘯鍏堟妸鍥剧殑璁块棶鏀逛负internal foreach (var curve in ents) { graph.AddEdge(curve!.GetGeCurve()); diff --git a/tests/TestShared/TestDwgFilerEx.cs b/tests/TestShared/TestDwgFilerEx.cs index 6513cda72b004dda51cd30719f8cd3e6f89c6f9a..50eed0ed9c2b960d2f7b43540c0b7b242a0d1c76 100644 --- a/tests/TestShared/TestDwgFilerEx.cs +++ b/tests/TestShared/TestDwgFilerEx.cs @@ -1,7 +1,7 @@ 锘#if false namespace Test; -using DxfFiler = IFoxCAD.Cad.DxfFiler; +using DxfFiler = Fs.Fox.Cad.DxfFiler; public class CmdTestDwgFilerEx { diff --git a/tests/TestShared/TestDwgMark.cs b/tests/TestShared/TestDwgMark.cs index cf0d712a10b0a146bf02f9985329a7b2ad7eb4b4..7f869e2d79d023099512207d067f1eb339800c4a 100644 --- a/tests/TestShared/TestDwgMark.cs +++ b/tests/TestShared/TestDwgMark.cs @@ -1,5 +1,5 @@ namespace Test; -using IFoxCAD.Cad; +using Fs.Fox.Cad; public class TestDwgMark { [CommandMethod(nameof(DwgMarktest))] public void DwgMarktest() { diff --git a/tests/TestShared/TestMarshal.cs b/tests/TestShared/TestMarshal.cs index 80398e2910a1312defdfbd13c97c6b5cf2c834b1..c2c15f69be6162ed260363e85ab92522cbb845cf 100644 --- a/tests/TestShared/TestMarshal.cs +++ b/tests/TestShared/TestMarshal.cs @@ -1,5 +1,5 @@ 锘縰sing System.Diagnostics; -using static IFoxCAD.Basal.WindowsAPI; +using static Fs.Fox.Basal.WindowsAPI; namespace TestShared; diff --git a/tests/TestShared/TestXRecord.cs b/tests/TestShared/TestXRecord.cs index 1fcb85c819ed51ebc0a1629dddd4447f88ed5b5a..2b8b95fd96c170c38b64cbe0d7a2050da1b7e3ca 100644 --- a/tests/TestShared/TestXRecord.cs +++ b/tests/TestShared/TestXRecord.cs @@ -4,7 +4,7 @@ #if NewtonsoftJson using System.Diagnostics; using Newtonsoft.Json; -using static IFoxCAD.Cad.WindowsAPI; +using static Fs.Fox.Cad.WindowsAPI; namespace Test_XRecord; diff --git a/tests/TestZcad2025/TestZcad2025.csproj b/tests/TestZcad2025/TestZcad2025.csproj index 89cf1ba77f1ba02466d1bbf49e7be9c975a259b0..6e24d93c3e3a2a7a9d5d518450bd8dcb9861b8f9 100644 --- a/tests/TestZcad2025/TestZcad2025.csproj +++ b/tests/TestZcad2025/TestZcad2025.csproj @@ -21,14 +21,8 @@ - - - - - - - - + +