From bf189c7891c015f95080fb53841a45fd4456fb24 Mon Sep 17 00:00:00 2001 From: ZhangChengbo Date: Mon, 9 Dec 2024 17:00:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B0=86=E5=91=BD=E5=90=8D=E7=A9=BA?= =?UTF-8?q?=E9=97=B4=E6=94=B9=E4=B8=BAFs.Fox?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IFoxCAD.sln | 32 ++++++------------ ...66\346\236\204\350\257\264\346\230\216.md" | 10 +++--- readme.md | 10 +++--- .../Algorithms/QuadTree/QuadEntity.cs | 2 +- src/CADShared/Algorithms/QuadTree/QuadTree.cs | 2 +- .../Algorithms/QuadTree/QuadTreeEvn.cs | 2 +- .../Algorithms/QuadTree/QuadTreeNode.cs | 2 +- .../Algorithms/QuadTree/QuadTreeSelectMode.cs | 2 +- src/CADShared/Algorithms/QuadTree/Rect.cs | 4 +-- .../Assoc/AssocPersSubentityIdPEEx.cs | 2 +- src/CADShared/Assoc/AssocUtils.cs | 2 +- src/CADShared/Basal/General/ArrayEx.cs | 2 +- src/CADShared/Basal/General/DebugHelper.cs | 2 +- src/CADShared/Basal/General/EnumEx.cs | 2 +- src/CADShared/Basal/General/LinqEx.cs | 2 +- src/CADShared/Basal/General/LoopList.cs | 2 +- src/CADShared/Basal/General/LoopState.cs | 2 +- .../Basal/Nullable/ArgumentNullEx.cs | 2 +- src/CADShared/Basal/Win/Enums.cs | 2 +- src/CADShared/Basal/Win/PInvokeUser32.cs | 2 +- src/CADShared/Basal/Win/SystemEx.cs | 2 +- src/CADShared/Basal/Win/WindowsAPI.cs | 4 +-- src/CADShared/ExtensionMethod/BaseEx.cs | 2 +- .../ExtensionMethod/BulgeVertexWidth.cs | 2 +- src/CADShared/ExtensionMethod/CollectionEx.cs | 2 +- .../ExtensionMethod/DBDictionaryEx.cs | 2 +- src/CADShared/ExtensionMethod/DBObjectEx.cs | 2 +- src/CADShared/ExtensionMethod/DBTransEx.cs | 2 +- src/CADShared/ExtensionMethod/DatabaseEx.cs | 2 +- .../ExtensionMethod/DocumentLockManager.cs | 2 +- src/CADShared/ExtensionMethod/DwgMark.cs | 2 +- src/CADShared/ExtensionMethod/EditorEx.cs | 2 +- src/CADShared/ExtensionMethod/Entity/ArcEx.cs | 2 +- .../Entity/BlockReferenceEx.cs | 4 +-- .../ExtensionMethod/Entity/BoundingInfo.cs | 2 +- .../ExtensionMethod/Entity/CircleEx.cs | 2 +- .../ExtensionMethod/Entity/CurveEx.cs | 4 +-- .../ExtensionMethod/Entity/DBTextEx.cs | 2 +- .../Entity/EntityBoundingInfo.cs | 2 +- .../ExtensionMethod/Entity/EntityEx.cs | 2 +- .../ExtensionMethod/Entity/MTextEx.cs | 2 +- .../ExtensionMethod/Entity/PolylineEx.cs | 2 +- .../ExtensionMethod/Entity/RegionEx.cs | 2 +- src/CADShared/ExtensionMethod/Enums.cs | 2 +- src/CADShared/ExtensionMethod/ErrorInfoEx.cs | 2 +- .../ExtensionMethod/Geomerty/Curve2dEx.cs | 2 +- .../ExtensionMethod/Geomerty/Curve3dEx.cs | 2 +- .../ExtensionMethod/Geomerty/GeometryEx.cs | 4 +-- .../ExtensionMethod/Geomerty/PointEx.cs | 4 +-- .../ExtensionMethod/Hatch/HatchConverter.cs | 4 +-- .../ExtensionMethod/Hatch/HatchEx.cs | 2 +- .../ExtensionMethod/Hatch/HatchInfo.cs | 4 +-- src/CADShared/ExtensionMethod/IFoxUtils.cs | 2 +- src/CADShared/ExtensionMethod/Jig/JigEx.cs | 4 +-- .../ExtensionMethod/Jig/JigExTransient.cs | 2 +- src/CADShared/ExtensionMethod/ObjectIdEx.cs | 2 +- src/CADShared/ExtensionMethod/PaneEx.cs | 2 +- .../ExtensionMethod/PromptOptionsEx.cs | 2 +- src/CADShared/ExtensionMethod/RandomEx.cs | 4 +-- src/CADShared/ExtensionMethod/RedrawEx.cs | 2 +- .../ExtensionMethod/SelectionSetEx.cs | 4 +-- .../ExtensionMethod/SingleKeyWordHook.cs | 2 +- .../ExtensionMethod/SymbolTableEx.cs | 2 +- .../ExtensionMethod/SymbolTableRecordEx.cs | 4 +-- src/CADShared/ExtensionMethod/TangentEx.cs | 2 +- .../ExtensionMethod/TransactionEx.cs | 2 +- src/CADShared/ExtensionMethod/WindowEx.cs | 2 +- src/CADShared/ExtensionMethod/XrefEx.cs | 4 +-- src/CADShared/Initialize/AcadEMR.cs | 2 +- src/CADShared/Initialize/AssemInfo.cs | 2 +- src/CADShared/Initialize/AutoReg.cs | 2 +- src/CADShared/Initialize/AutoRegAssem.cs | 4 +-- src/CADShared/Initialize/CheckFactory.cs | 2 +- src/CADShared/Initialize/IAutoGo.cs | 2 +- src/CADShared/Initialize/MethodInfoHelper.cs | 4 +-- src/CADShared/PE/AcadPeInfo.cs | 2 +- src/CADShared/PE/DBmod.cs | 2 +- src/CADShared/PE/PostCmd.cs | 2 +- src/CADShared/PE/ProgramPE.cs | 4 +-- src/CADShared/ResultData/LispList.cs | 2 +- src/CADShared/ResultData/TypedValueList.cs | 2 +- src/CADShared/ResultData/XDataList.cs | 2 +- src/CADShared/ResultData/XRecordDataList.cs | 2 +- src/CADShared/Runtime/AcPreferences.cs | 2 +- src/CADShared/Runtime/DBTrans.cs | 4 +-- src/CADShared/Runtime/Env.cs | 4 +-- src/CADShared/Runtime/IdleAction.cs | 2 +- src/CADShared/Runtime/IdleNoCommandAction.cs | 2 +- src/CADShared/Runtime/SymbolTable.cs | 4 +-- .../Runtime/SystemVariableManager.cs | 2 +- src/CADShared/SelectionFilter/OpComp.cs | 2 +- src/CADShared/SelectionFilter/OpEqual.cs | 2 +- src/CADShared/SelectionFilter/OpFilter.cs | 2 +- src/CADShared/SelectionFilter/OpList.cs | 2 +- src/CADShared/SelectionFilter/OpLogi.cs | 2 +- src/Directory.Build.props | 2 +- src/IFoxCAD.AutoCad/GlobalUsings.cs | 2 +- src/IFoxCAD.AutoCad/IFoxCAD.AutoCad.csproj | 33 ++++++++++++++----- tests/TestAcad2025/GlobalUsings.cs | 4 +-- tests/TestAcad2025/TestAcad2025.csproj | 2 +- tests/TestShared/TestCurve.cs | 2 +- tests/TestShared/TestDwgFilerEx.cs | 2 +- tests/TestShared/TestDwgMark.cs | 2 +- tests/TestShared/TestMarshal.cs | 2 +- tests/TestShared/TestXRecord.cs | 2 +- tests/TestZcad2025/TestZcad2025.csproj | 10 ++---- 106 files changed, 168 insertions(+), 169 deletions(-) diff --git a/IFoxCAD.sln b/IFoxCAD.sln index 8b9d772..023ccc2 100644 --- a/IFoxCAD.sln +++ b/IFoxCAD.sln @@ -12,14 +12,10 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CADShared", "src\CADShared\ 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}" -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 docs\关于IFoxCAD的架构说明.md = docs\关于IFoxCAD的架构说明.md @@ -37,35 +33,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 ee3a985..9ccddfe 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是基于NFOX类库的重制版，主要是提供一个最小化的内核，即DBTrans、SymbolTable、ResultData、SelectFilter等基础类，其他的功能都通过扩展方法的方式来实现。 +Fs.Fox是基于NFOX类库的重制版，主要是提供一个最小化的内核，即DBTrans、SymbolTable、ResultData、SelectFilter等基础类，其他的功能都通过扩展方法的方式来实现。 其重制的原因在于原NFOX类库的封装过于厚重，初学者理解起来困难，重制版希望做到最小化的内核，方便理解，然后丰富的扩展函数来实现大量的功能，便于学着现有的教程中那套基于Database扩展函数封装思路的初学者快速的入门。 ## 一、组织结构图 -- IFoxCAD +- Fs.Fox ``` ├───bin -- 用于放置生成的nuget包和dll ├───docs -- 架构及api定义说明文档 @@ -85,8 +85,8 @@ IFoxCAD是基于NFOX类库的重制版，主要是提供一个最小化的内核 │ │ ├───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 1e9570c..7e99cdd 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# IFoxCAD 说明 +# Fs.Fox 说明 基于.NET的Cad二次开发类库。 @@ -8,7 +8,7 @@ 后来，经过一段时间的更新后，由于莫名其妙的原因NFox类库挂掉了。而这时山人同学已经基本吃透NFox类库，考虑到NFox的封装过于复杂，遂进行了重构。 -重构的类库命名为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的API文档请看 **[IFoxCAD API 文档](https://inspirefunction.github.io/ifoxdoc/)**。**请注意这个网站需要科学浏览** +Fs.Fox的API文档请看 **[Fs.Fox API 文档](https://inspirefunction.github.io/ifoxdoc/)**。**请注意这个网站需要科学浏览** #### 三、IFoxCad 项目模版 @@ -44,6 +44,6 @@ IFoxCAD的API文档请看 **[IFoxCAD API 文档](https://inspirefunction.github. 期待你的参与，你可以做如下的工作来帮助IFoxCad发展: - 如果你在使用的过程中发现IFoxCad的某些不足或者bug，你可以在 [项目issues](https://gitee.com/inspirefunction/ifoxcad/issues) 里提交issue来供开发人员进行完善。 -- 帮助开发人员编写使用文档，文档地址见 **[IFoxCAD类库从入门到精通](https://www.kdocs.cn/l/cc6ZXSa0vMgD)** +- 帮助开发人员编写使用文档，文档地址见 **[Fs.Fox类库从入门到精通](https://www.kdocs.cn/l/cc6ZXSa0vMgD)** - fork本项目，修复bug，增加功能，并提交pr。 diff --git a/src/CADShared/Algorithms/QuadTree/QuadEntity.cs b/src/CADShared/Algorithms/QuadTree/QuadEntity.cs index c5f7f11..cfe90ee 100644 --- a/src/CADShared/Algorithms/QuadTree/QuadEntity.cs +++ b/src/CADShared/Algorithms/QuadTree/QuadEntity.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /* * 这个类存在的意义是为了不暴露Rect类字段 diff --git a/src/CADShared/Algorithms/QuadTree/QuadTree.cs b/src/CADShared/Algorithms/QuadTree/QuadTree.cs index 4ef6568..ee37e62 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 f077a02..5d8c5f6 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 a926bda..2343473 100644 --- a/src/CADShared/Algorithms/QuadTree/QuadTreeNode.cs +++ b/src/CADShared/Algorithms/QuadTree/QuadTreeNode.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 子节点 diff --git a/src/CADShared/Algorithms/QuadTree/QuadTreeSelectMode.cs b/src/CADShared/Algorithms/QuadTree/QuadTreeSelectMode.cs index 624d313..43fdee4 100644 --- a/src/CADShared/Algorithms/QuadTree/QuadTreeSelectMode.cs +++ b/src/CADShared/Algorithms/QuadTree/QuadTreeSelectMode.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 四叉树选择模式 diff --git a/src/CADShared/Algorithms/QuadTree/Rect.cs b/src/CADShared/Algorithms/QuadTree/Rect.cs index 1366442..fc12af4 100644 --- a/src/CADShared/Algorithms/QuadTree/Rect.cs +++ b/src/CADShared/Algorithms/QuadTree/Rect.cs @@ -1,9 +1,9 @@ using 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 cc1cdfa..77c4525 100644 --- a/src/CADShared/Assoc/AssocPersSubentityIdPEEx.cs +++ b/src/CADShared/Assoc/AssocPersSubentityIdPEEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad.Assoc; +namespace Fs.Fox.Cad.Assoc; /// /// 子对象关系Id扩展 diff --git a/src/CADShared/Assoc/AssocUtils.cs b/src/CADShared/Assoc/AssocUtils.cs index c8c4001..c5ca26f 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 36bf8e7..230ab27 100644 --- a/src/CADShared/Basal/General/ArrayEx.cs +++ b/src/CADShared/Basal/General/ArrayEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Basal; +namespace Fs.Fox.Basal; /* * 由于linq的函数大部分带有状态机,而cad是一个单机程序, diff --git a/src/CADShared/Basal/General/DebugHelper.cs b/src/CADShared/Basal/General/DebugHelper.cs index cadff7e..d0a1082 100644 --- a/src/CADShared/Basal/General/DebugHelper.cs +++ b/src/CADShared/Basal/General/DebugHelper.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Basal; +namespace Fs.Fox.Basal; /// /// 调试工具 /// diff --git a/src/CADShared/Basal/General/EnumEx.cs b/src/CADShared/Basal/General/EnumEx.cs index 0f761ce..e2d9f5f 100644 --- a/src/CADShared/Basal/General/EnumEx.cs +++ b/src/CADShared/Basal/General/EnumEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Basal; +namespace Fs.Fox.Basal; /// /// 枚举扩展 diff --git a/src/CADShared/Basal/General/LinqEx.cs b/src/CADShared/Basal/General/LinqEx.cs index 30036a1..c254cbb 100644 --- a/src/CADShared/Basal/General/LinqEx.cs +++ b/src/CADShared/Basal/General/LinqEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Basal; +namespace Fs.Fox.Basal; /// /// linq 扩展类 diff --git a/src/CADShared/Basal/General/LoopList.cs b/src/CADShared/Basal/General/LoopList.cs index 78355d5..3d5f13b 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 1367e86..8282391 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 7fb7763..f432030 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 059f92c..badc447 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 ef4dd5d..a51828d 100644 --- a/src/CADShared/Basal/Win/PInvokeUser32.cs +++ b/src/CADShared/Basal/Win/PInvokeUser32.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Basal; +namespace Fs.Fox.Basal; /// /// PInvokeUser32 diff --git a/src/CADShared/Basal/Win/SystemEx.cs b/src/CADShared/Basal/Win/SystemEx.cs index 50d93db..1f3dc3b 100644 --- a/src/CADShared/Basal/Win/SystemEx.cs +++ b/src/CADShared/Basal/Win/SystemEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Basal; +namespace Fs.Fox.Basal; /// /// 系统扩展 diff --git a/src/CADShared/Basal/Win/WindowsAPI.cs b/src/CADShared/Basal/Win/WindowsAPI.cs index 5125d47..ce794d2 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 { diff --git a/src/CADShared/ExtensionMethod/BaseEx.cs b/src/CADShared/ExtensionMethod/BaseEx.cs index 51766f3..dd48ab5 100644 --- a/src/CADShared/ExtensionMethod/BaseEx.cs +++ b/src/CADShared/ExtensionMethod/BaseEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 基础扩展 diff --git a/src/CADShared/ExtensionMethod/BulgeVertexWidth.cs b/src/CADShared/ExtensionMethod/BulgeVertexWidth.cs index 4303fd3..75f2b65 100644 --- a/src/CADShared/ExtensionMethod/BulgeVertexWidth.cs +++ b/src/CADShared/ExtensionMethod/BulgeVertexWidth.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 多段线的顶点,凸度,头宽,尾宽 diff --git a/src/CADShared/ExtensionMethod/CollectionEx.cs b/src/CADShared/ExtensionMethod/CollectionEx.cs index f015ecb..ade2b22 100644 --- a/src/CADShared/ExtensionMethod/CollectionEx.cs +++ b/src/CADShared/ExtensionMethod/CollectionEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 集合扩展类 diff --git a/src/CADShared/ExtensionMethod/DBDictionaryEx.cs b/src/CADShared/ExtensionMethod/DBDictionaryEx.cs index 829b1ae..aa91bcd 100644 --- a/src/CADShared/ExtensionMethod/DBDictionaryEx.cs +++ b/src/CADShared/ExtensionMethod/DBDictionaryEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 字典扩展类 diff --git a/src/CADShared/ExtensionMethod/DBObjectEx.cs b/src/CADShared/ExtensionMethod/DBObjectEx.cs index 162575c..2ba4124 100644 --- a/src/CADShared/ExtensionMethod/DBObjectEx.cs +++ b/src/CADShared/ExtensionMethod/DBObjectEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 实体对象扩展类 diff --git a/src/CADShared/ExtensionMethod/DBTransEx.cs b/src/CADShared/ExtensionMethod/DBTransEx.cs index 8838267..46da3df 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 d4b5350..663ba68 100644 --- a/src/CADShared/ExtensionMethod/DatabaseEx.cs +++ b/src/CADShared/ExtensionMethod/DatabaseEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 数据库扩展函数 diff --git a/src/CADShared/ExtensionMethod/DocumentLockManager.cs b/src/CADShared/ExtensionMethod/DocumentLockManager.cs index 17a2928..0e8abc7 100644 --- a/src/CADShared/ExtensionMethod/DocumentLockManager.cs +++ b/src/CADShared/ExtensionMethod/DocumentLockManager.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 文档锁管理器，用于管理文档的锁定和解锁。 diff --git a/src/CADShared/ExtensionMethod/DwgMark.cs b/src/CADShared/ExtensionMethod/DwgMark.cs index 501da98..3e45418 100644 --- a/src/CADShared/ExtensionMethod/DwgMark.cs +++ b/src/CADShared/ExtensionMethod/DwgMark.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 为dwg文件添加标记 diff --git a/src/CADShared/ExtensionMethod/EditorEx.cs b/src/CADShared/ExtensionMethod/EditorEx.cs index 9d2f6c8..c6cb2cd 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 49922f4..d15d458 100644 --- a/src/CADShared/ExtensionMethod/Entity/ArcEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/ArcEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 圆弧扩展类 diff --git a/src/CADShared/ExtensionMethod/Entity/BlockReferenceEx.cs b/src/CADShared/ExtensionMethod/Entity/BlockReferenceEx.cs index 39ad840..6c1c048 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 be90241..de53f38 100644 --- a/src/CADShared/ExtensionMethod/Entity/BoundingInfo.cs +++ b/src/CADShared/ExtensionMethod/Entity/BoundingInfo.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 和尚777 重构 diff --git a/src/CADShared/ExtensionMethod/Entity/CircleEx.cs b/src/CADShared/ExtensionMethod/Entity/CircleEx.cs index d0fba8a..faeda1f 100644 --- a/src/CADShared/ExtensionMethod/Entity/CircleEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/CircleEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 圆扩展类 diff --git a/src/CADShared/ExtensionMethod/Entity/CurveEx.cs b/src/CADShared/ExtensionMethod/Entity/CurveEx.cs index 14a5113..1fd2948 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 97a6511..66a5a38 100644 --- a/src/CADShared/ExtensionMethod/Entity/DBTextEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/DBTextEx.cs @@ -1,6 +1,6 @@ using 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 854f9cc..9af6797 100644 --- a/src/CADShared/ExtensionMethod/Entity/EntityBoundingInfo.cs +++ b/src/CADShared/ExtensionMethod/Entity/EntityBoundingInfo.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 获取实体包围盒信息方法 diff --git a/src/CADShared/ExtensionMethod/Entity/EntityEx.cs b/src/CADShared/ExtensionMethod/Entity/EntityEx.cs index 1f50541..a4ea2ef 100644 --- a/src/CADShared/ExtensionMethod/Entity/EntityEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/EntityEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 实体图元扩展类 diff --git a/src/CADShared/ExtensionMethod/Entity/MTextEx.cs b/src/CADShared/ExtensionMethod/Entity/MTextEx.cs index 52c85a9..ea0d5fb 100644 --- a/src/CADShared/ExtensionMethod/Entity/MTextEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/MTextEx.cs @@ -1,6 +1,6 @@ using 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 25a034a..a264c10 100644 --- a/src/CADShared/ExtensionMethod/Entity/PolylineEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/PolylineEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 多段线扩展类 diff --git a/src/CADShared/ExtensionMethod/Entity/RegionEx.cs b/src/CADShared/ExtensionMethod/Entity/RegionEx.cs index 6cb3c0d..4af6db2 100644 --- a/src/CADShared/ExtensionMethod/Entity/RegionEx.cs +++ b/src/CADShared/ExtensionMethod/Entity/RegionEx.cs @@ -3,7 +3,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 87f02c3..34f4c76 100644 --- a/src/CADShared/ExtensionMethod/Enums.cs +++ b/src/CADShared/ExtensionMethod/Enums.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 参照路径转换 diff --git a/src/CADShared/ExtensionMethod/ErrorInfoEx.cs b/src/CADShared/ExtensionMethod/ErrorInfoEx.cs index 9462d79..dbbbe48 100644 --- a/src/CADShared/ExtensionMethod/ErrorInfoEx.cs +++ b/src/CADShared/ExtensionMethod/ErrorInfoEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// CAD错误大全 diff --git a/src/CADShared/ExtensionMethod/Geomerty/Curve2dEx.cs b/src/CADShared/ExtensionMethod/Geomerty/Curve2dEx.cs index 251969d..c4b0a7f 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 d3d6139..bf84723 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 3558994..5268687 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 f920a3c..e713ef8 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 fe79a62..e8a4950 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 5d6ccd0..7abcc02 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 f836615..f8d6a1b 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 3ab211a..7699c62 100644 --- a/src/CADShared/ExtensionMethod/IFoxUtils.cs +++ b/src/CADShared/ExtensionMethod/IFoxUtils.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 工具类 diff --git a/src/CADShared/ExtensionMethod/Jig/JigEx.cs b/src/CADShared/ExtensionMethod/Jig/JigEx.cs index c985110..447f208 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 e0bfeb0..d3a4028 100644 --- a/src/CADShared/ExtensionMethod/Jig/JigExTransient.cs +++ b/src/CADShared/ExtensionMethod/Jig/JigExTransient.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 瞬态容器 diff --git a/src/CADShared/ExtensionMethod/ObjectIdEx.cs b/src/CADShared/ExtensionMethod/ObjectIdEx.cs index b305350..4369439 100644 --- a/src/CADShared/ExtensionMethod/ObjectIdEx.cs +++ b/src/CADShared/ExtensionMethod/ObjectIdEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 对象id扩展类 diff --git a/src/CADShared/ExtensionMethod/PaneEx.cs b/src/CADShared/ExtensionMethod/PaneEx.cs index 6295ac5..80e9a72 100644 --- a/src/CADShared/ExtensionMethod/PaneEx.cs +++ b/src/CADShared/ExtensionMethod/PaneEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 托盘类扩展 diff --git a/src/CADShared/ExtensionMethod/PromptOptionsEx.cs b/src/CADShared/ExtensionMethod/PromptOptionsEx.cs index 45c5341..e6c7895 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 cf24538..c87a4aa 100644 --- a/src/CADShared/ExtensionMethod/RandomEx.cs +++ b/src/CADShared/ExtensionMethod/RandomEx.cs @@ -4,12 +4,12 @@ *┃ 创建时间：2022/8/30 22:49:30 *┃ 模块描述：随机数生成器 *┃ 使用范围：通用 - *┃ 说 明:本模块中除GetRandom与NextColor方法是IFoxCAD原有的以外，其他方法均通过网络收集整理而来。 + *┃ 说 明:本模块中除GetRandom与NextColor方法是Fs.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 d268252..f5f01bc 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 3d152fb..e198198 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 0f1f84c..882d6ce 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 f780fd6..68ce392 100644 --- a/src/CADShared/ExtensionMethod/SymbolTableEx.cs +++ b/src/CADShared/ExtensionMethod/SymbolTableEx.cs @@ -1,6 +1,6 @@ using 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 4aa3a5a..88bc222 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 cc986b9..ab8b168 100644 --- a/src/CADShared/ExtensionMethod/TangentEx.cs +++ b/src/CADShared/ExtensionMethod/TangentEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 天正接口 diff --git a/src/CADShared/ExtensionMethod/TransactionEx.cs b/src/CADShared/ExtensionMethod/TransactionEx.cs index be152b6..bc3f855 100644 --- a/src/CADShared/ExtensionMethod/TransactionEx.cs +++ b/src/CADShared/ExtensionMethod/TransactionEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// cad的事务的扩展类 diff --git a/src/CADShared/ExtensionMethod/WindowEx.cs b/src/CADShared/ExtensionMethod/WindowEx.cs index bed5186..e8cb4b0 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 39f7889..b83e2b4 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 3fcfc03..324c57e 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 de3f40d..6d175cb 100644 --- a/src/CADShared/Initialize/AssemInfo.cs +++ b/src/CADShared/Initialize/AssemInfo.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 程序集信息 diff --git a/src/CADShared/Initialize/AutoReg.cs b/src/CADShared/Initialize/AutoReg.cs index 8e9b1f5..21e4d00 100644 --- a/src/CADShared/Initialize/AutoReg.cs +++ b/src/CADShared/Initialize/AutoReg.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 自动加载辅助类 diff --git a/src/CADShared/Initialize/AutoRegAssem.cs b/src/CADShared/Initialize/AutoRegAssem.cs index eeecf3c..0e05577 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 ae66f98..7e988a8 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 e9608be..a7c6dc1 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 79bede7..95d6371 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 fbec0a6..b210766 100644 --- a/src/CADShared/PE/AcadPeInfo.cs +++ b/src/CADShared/PE/AcadPeInfo.cs @@ -1,6 +1,6 @@ using System.Diagnostics; -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 选择模式 diff --git a/src/CADShared/PE/DBmod.cs b/src/CADShared/PE/DBmod.cs index 3886bd9..2912d49 100644 --- a/src/CADShared/PE/DBmod.cs +++ b/src/CADShared/PE/DBmod.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 获取数据库修改状态 diff --git a/src/CADShared/PE/PostCmd.cs b/src/CADShared/PE/PostCmd.cs index 3929b67..a774b35 100644 --- a/src/CADShared/PE/PostCmd.cs +++ b/src/CADShared/PE/PostCmd.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 发送命令 /// diff --git a/src/CADShared/PE/ProgramPE.cs b/src/CADShared/PE/ProgramPE.cs index fc9587d..3de19df 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才能进c盘 _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 9de3669..5a95491 100644 --- a/src/CADShared/ResultData/LispList.cs +++ b/src/CADShared/ResultData/LispList.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// lisp数据封装类 diff --git a/src/CADShared/ResultData/TypedValueList.cs b/src/CADShared/ResultData/TypedValueList.cs index 51bfc5b..2fc739e 100644 --- a/src/CADShared/ResultData/TypedValueList.cs +++ b/src/CADShared/ResultData/TypedValueList.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 用于集中管理扩展数据/扩展字典/resultBuffer的类 diff --git a/src/CADShared/ResultData/XDataList.cs b/src/CADShared/ResultData/XDataList.cs index ba4758c..ad29c5c 100644 --- a/src/CADShared/ResultData/XDataList.cs +++ b/src/CADShared/ResultData/XDataList.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 扩展数据封装类 diff --git a/src/CADShared/ResultData/XRecordDataList.cs b/src/CADShared/ResultData/XRecordDataList.cs index 10b95ba..14ad28c 100644 --- a/src/CADShared/ResultData/XRecordDataList.cs +++ b/src/CADShared/ResultData/XRecordDataList.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 扩展字典数据封装类 diff --git a/src/CADShared/Runtime/AcPreferences.cs b/src/CADShared/Runtime/AcPreferences.cs index 53c4c9f..a6810e5 100644 --- a/src/CADShared/Runtime/AcPreferences.cs +++ b/src/CADShared/Runtime/AcPreferences.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// AcapPreference扩展 diff --git a/src/CADShared/Runtime/DBTrans.cs b/src/CADShared/Runtime/DBTrans.cs index a1a4cb4..5fbd146 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 3f88e36..8db6a9b 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 b3e0bd4..940774a 100644 --- a/src/CADShared/Runtime/IdleAction.cs +++ b/src/CADShared/Runtime/IdleAction.cs @@ -1,6 +1,6 @@ using 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 72a60b9..8b9a9b8 100644 --- a/src/CADShared/Runtime/IdleNoCommandAction.cs +++ b/src/CADShared/Runtime/IdleNoCommandAction.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 空闲且无命令时执行 diff --git a/src/CADShared/Runtime/SymbolTable.cs b/src/CADShared/Runtime/SymbolTable.cs index ad73274..b6ba9c4 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 a418ea7..a0b36a7 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 050c122..dd3a9c3 100644 --- a/src/CADShared/SelectionFilter/OpComp.cs +++ b/src/CADShared/SelectionFilter/OpComp.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 比较运算符类 diff --git a/src/CADShared/SelectionFilter/OpEqual.cs b/src/CADShared/SelectionFilter/OpEqual.cs index e23e286..2218f2d 100644 --- a/src/CADShared/SelectionFilter/OpEqual.cs +++ b/src/CADShared/SelectionFilter/OpEqual.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 相等运算符类 diff --git a/src/CADShared/SelectionFilter/OpFilter.cs b/src/CADShared/SelectionFilter/OpFilter.cs index 7eb495d..3c2d58c 100644 --- a/src/CADShared/SelectionFilter/OpFilter.cs +++ b/src/CADShared/SelectionFilter/OpFilter.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 选择集过滤器抽象类 diff --git a/src/CADShared/SelectionFilter/OpList.cs b/src/CADShared/SelectionFilter/OpList.cs index d6e84d0..18dc832 100644 --- a/src/CADShared/SelectionFilter/OpList.cs +++ b/src/CADShared/SelectionFilter/OpList.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 逻辑操作符的列表抽象类 diff --git a/src/CADShared/SelectionFilter/OpLogi.cs b/src/CADShared/SelectionFilter/OpLogi.cs index b5570d1..a3b1c77 100644 --- a/src/CADShared/SelectionFilter/OpLogi.cs +++ b/src/CADShared/SelectionFilter/OpLogi.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.Cad; +namespace Fs.Fox.Cad; /// /// 过滤器逻辑运算符抽象类 diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 0e6a1c4..36c8476 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/GlobalUsings.cs b/src/IFoxCAD.AutoCad/GlobalUsings.cs index 67dcfff..a8adf19 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/src/IFoxCAD.AutoCad/IFoxCAD.AutoCad.csproj b/src/IFoxCAD.AutoCad/IFoxCAD.AutoCad.csproj index d2d9d1c..66f0521 100644 --- a/src/IFoxCAD.AutoCad/IFoxCAD.AutoCad.csproj +++ b/src/IFoxCAD.AutoCad/IFoxCAD.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 + @@ -45,16 +62,16 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - + diff --git a/tests/TestAcad2025/GlobalUsings.cs b/tests/TestAcad2025/GlobalUsings.cs index 045196f..7fc7a82 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 126352d..80bedf6 100644 --- a/tests/TestAcad2025/TestAcad2025.csproj +++ b/tests/TestAcad2025/TestAcad2025.csproj @@ -54,7 +54,7 @@ - + \ No newline at end of file diff --git a/tests/TestShared/TestCurve.cs b/tests/TestShared/TestCurve.cs index fd75698..91ae924 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 6513cda..50eed0e 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 cf0d712..7f869e2 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 80398e2..c2c15f6 100644 --- a/tests/TestShared/TestMarshal.cs +++ b/tests/TestShared/TestMarshal.cs @@ -1,5 +1,5 @@ using 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 1fcb85c..2b8b95f 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 89cf1ba..6e24d93 100644 --- a/tests/TestZcad2025/TestZcad2025.csproj +++ b/tests/TestZcad2025/TestZcad2025.csproj @@ -21,14 +21,8 @@ - - - - - - - - + + -- Gitee From 3850558d68932512106532207ac57cc8e8c3bb49 Mon Sep 17 00:00:00 2001 From: ZhangChengbo Date: Tue, 10 Dec 2024 14:48:43 +0800 Subject: [PATCH 2/4] 0 --- IFoxCAD.sln | 2 +- src/CADShared/Basal/Win/WindowsAPI.cs | 4 ++++ .../{IFoxCAD.AutoCad.csproj => Fs.Fox.AutoCad.csproj} | 2 +- tests/TestAcad2025/TestAcad2025.csproj | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) rename src/IFoxCAD.AutoCad/{IFoxCAD.AutoCad.csproj => Fs.Fox.AutoCad.csproj} (97%) diff --git a/IFoxCAD.sln b/IFoxCAD.sln index 023ccc2..afd983d 100644 --- a/IFoxCAD.sln +++ b/IFoxCAD.sln @@ -10,7 +10,7 @@ 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}" +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 diff --git a/src/CADShared/Basal/Win/WindowsAPI.cs b/src/CADShared/Basal/Win/WindowsAPI.cs index ce794d2..00419e2 100644 --- a/src/CADShared/Basal/Win/WindowsAPI.cs +++ b/src/CADShared/Basal/Win/WindowsAPI.cs @@ -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/IFoxCAD.AutoCad/IFoxCAD.AutoCad.csproj b/src/IFoxCAD.AutoCad/Fs.Fox.AutoCad.csproj similarity index 97% rename from src/IFoxCAD.AutoCad/IFoxCAD.AutoCad.csproj rename to src/IFoxCAD.AutoCad/Fs.Fox.AutoCad.csproj index 66f0521..e9ebb1e 100644 --- a/src/IFoxCAD.AutoCad/IFoxCAD.AutoCad.csproj +++ b/src/IFoxCAD.AutoCad/Fs.Fox.AutoCad.csproj @@ -60,7 +60,7 @@ - + diff --git a/tests/TestAcad2025/TestAcad2025.csproj b/tests/TestAcad2025/TestAcad2025.csproj index 80bedf6..964840d 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 -- Gitee From 89c963850d91a93cf489301a2d52a2abb3e45530 Mon Sep 17 00:00:00 2001 From: ZhangChengbo Date: Tue, 10 Dec 2024 16:08:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=9C=A8FoxCAD=E7=9A=84=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=B8=8A,=E5=B0=86=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20Fs.Fox,=E5=B9=B6=E4=BD=9C=E4=B8=BAFs?= =?UTF-8?q?=E5=9B=A2=E9=98=9FAutoCAD=E7=9A=84=E5=9F=BA=E7=A1=80=E5=BA=93?= =?UTF-8?q?=E4=B9=8B=E4=B8=80=E4=BD=BF=E7=94=A8=20=E7=9B=AE=E7=9A=84:=20(1?= =?UTF-8?q?)=E4=BB=A5=E4=BE=BFFs=E7=9A=84=E5=9B=A2=E9=98=9F=E5=9C=A8?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E4=B8=AD=E4=BD=BF=E7=94=A8?= =?UTF-8?q?,=20=E5=B9=B6=E5=B8=8C=E6=9C=9B=E8=83=BD=E5=A4=9F=E6=9B=B4?= =?UTF-8?q?=E5=A5=BD=E7=9A=84=E7=BB=B4=E6=8A=A4=E5=92=8C=E5=BC=80=E5=8F=91?= =?UTF-8?q?FoxCAD=20(2)=E9=87=8D=E8=A6=81=E6=9B=B4=E6=94=B9=E4=BC=9A?= =?UTF-8?q?=E5=B0=BD=E9=87=8F=E5=8F=8D=E9=A6=88=E7=BB=99FoxCAD=E7=9A=84?= =?UTF-8?q?=E7=9A=84=E4=B8=BB=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Fs\345\210\206\346\224\257\350\257\264\346\230\216.txt" | 4 ++++ IFoxCAD.sln | 1 + 2 files changed, 5 insertions(+) create mode 100644 "Fs\345\210\206\346\224\257\350\257\264\346\230\216.txt" 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 0000000..12f38c1 --- /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 afd983d..1cd0628 100644 --- a/IFoxCAD.sln +++ b/IFoxCAD.sln @@ -18,6 +18,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAcad2025", "tests\TestA 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 -- Gitee From beba8161197285983e05009b82092ac28c0afd5f Mon Sep 17 00:00:00 2001 From: ZhangChengbo Date: Tue, 10 Dec 2024 16:25:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E4=B8=AD=E6=97=A0=E6=95=88=E7=A9=BA=E6=A0=BC?= =?UTF-8?q?,=20=E5=A2=9E=E5=8A=A0Test=5FRec=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/TestShared/TestAddEntity.cs | 37 ++++++++++++++++--------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/tests/TestShared/TestAddEntity.cs b/tests/TestShared/TestAddEntity.cs index 123ba77..3f401c3 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))] -- Gitee