From 099630252547c9b38a461e3c8e8bff67f4532e35 Mon Sep 17 00:00:00 2001
From: DYH <1742647821@qq.com>
Date: Wed, 26 Apr 2023 21:36:17 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/CAD/IFox.CAD.Shared/ExtensionMethod/ObjectIdEx.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/CAD/IFox.CAD.Shared/ExtensionMethod/ObjectIdEx.cs b/src/CAD/IFox.CAD.Shared/ExtensionMethod/ObjectIdEx.cs
index 171d110..d0d5105 100644
--- a/src/CAD/IFox.CAD.Shared/ExtensionMethod/ObjectIdEx.cs
+++ b/src/CAD/IFox.CAD.Shared/ExtensionMethod/ObjectIdEx.cs
@@ -76,8 +76,8 @@ public static ObjectId GetObjectId(this Database db, string handleString)
{
if (long.TryParse(handleString, System.Globalization.NumberStyles.HexNumber, null, out long l))
{
- var hanle = new Handle(l);
- if (db.TryGetObjectId(hanle, out ObjectId id))
+ var handle = new Handle(l);
+ if (db.TryGetObjectId(handle, out ObjectId id))
{
return id;
}
--
Gitee
From 336bfd26d39deb1c91bb89b35816a9b3ef640a79 Mon Sep 17 00:00:00 2001
From: DYH <1742647821@qq.com>
Date: Wed, 26 Apr 2023 21:41:20 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=AD=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/CAD/IFox.CAD.Shared/ExtensionMethod/ObjectIdEx.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/CAD/IFox.CAD.Shared/ExtensionMethod/ObjectIdEx.cs b/src/CAD/IFox.CAD.Shared/ExtensionMethod/ObjectIdEx.cs
index d0d5105..9c2a359 100644
--- a/src/CAD/IFox.CAD.Shared/ExtensionMethod/ObjectIdEx.cs
+++ b/src/CAD/IFox.CAD.Shared/ExtensionMethod/ObjectIdEx.cs
@@ -92,7 +92,7 @@ public static ObjectId GetObjectId(this Database db, string handleString)
/// id有效返回 ，反之返回
public static bool IsOk(this ObjectId id)
{
- return !id.IsNull && id.IsValid && !id.IsErased && !id.IsEffectivelyErased && id.IsResident;
+ return id is { IsNull: false, IsValid: true, IsErased: false, IsEffectivelyErased: false, IsResident: true };
}
///
--
Gitee
From 2d08c09fda55b1623cef11fe13534d31565946e6 Mon Sep 17 00:00:00 2001
From: DYH <1742647821@qq.com>
Date: Wed, 26 Apr 2023 21:45:58 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=9E=AC=E6=80=81=E5=9C=A8=E4=B8=AD?=
=?UTF-8?q?=E6=9C=9Bcad=E7=9A=84=E5=8F=AF=E4=BB=A5=E7=94=A8=E7=9A=84?=
=?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E9=99=90=E5=88=B6acad?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IFox.CAD.Shared/ExtensionMethod/Jig/JigExTransient.cs | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/CAD/IFox.CAD.Shared/ExtensionMethod/Jig/JigExTransient.cs b/src/CAD/IFox.CAD.Shared/ExtensionMethod/Jig/JigExTransient.cs
index 55f9e8e..6dc7efc 100644
--- a/src/CAD/IFox.CAD.Shared/ExtensionMethod/Jig/JigExTransient.cs
+++ b/src/CAD/IFox.CAD.Shared/ExtensionMethod/Jig/JigExTransient.cs
@@ -1,5 +1,4 @@
-#if acad
-namespace IFoxCAD.Cad;
+namespace IFoxCAD.Cad;
///
/// 瞬态容器
@@ -139,5 +138,4 @@ protected virtual void Dispose(bool disposing)
Clear();// 清空瞬态容器并移除对象在图纸上的显示
}
#endregion
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
--
Gitee
From 0d4e4893faf6c4245034f0f25f12813e332efa3f Mon Sep 17 00:00:00 2001
From: DYH <1742647821@qq.com>
Date: Wed, 26 Apr 2023 22:50:32 +0800
Subject: [PATCH 4/4] =?UTF-8?q?2d=E7=82=B9=E7=9A=84GetMidPointTo=E6=96=B9?=
=?UTF-8?q?=E6=B3=95=E5=90=8D=E9=87=8D=E5=A4=8D=EF=BC=8C=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IFox.CAD.Shared/ExtensionMethod/GeometryEx.cs | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/src/CAD/IFox.CAD.Shared/ExtensionMethod/GeometryEx.cs b/src/CAD/IFox.CAD.Shared/ExtensionMethod/GeometryEx.cs
index 58e9da3..12355c0 100644
--- a/src/CAD/IFox.CAD.Shared/ExtensionMethod/GeometryEx.cs
+++ b/src/CAD/IFox.CAD.Shared/ExtensionMethod/GeometryEx.cs
@@ -617,18 +617,6 @@ public static Point3d GetMidPointTo(this Point3d pt1, Point3d pt2)
pt1.Z * 0.5 + pt2.Z * 0.5);
}
- ///
- /// 获取两个点之间的中点
- ///
- /// 第一点
- /// 第二点
- /// 返回两个点之间的中点
- public static Point2d GetMidPointTo(this Point2d pt1, Point2d pt2)
- {
- // (pt1 + pt2) / 2; // 溢出风险
- return new(pt1.X * 0.5 + pt2.X * 0.5,
- pt1.Y * 0.5 + pt2.Y * 0.5);
- }
///
/// 根据世界坐标计算用户坐标
--
Gitee