From cc14e8c41d449170d79f7931658ea286284af4fa Mon Sep 17 00:00:00 2001 From: tian <11429339@qq.com> Date: Sat, 21 Feb 2026 11:49:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=BF=87=E6=97=B6=E7=9A=84?= =?UTF-8?q?=20animationCollisionCount=20=E5=8F=98=E9=87=8F=E5=92=8C?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Commands/GenerateCollisionReportCommand.cs | 7 ++----- src/UI/WPF/ViewModels/AnimationControlViewModel.cs | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Commands/GenerateCollisionReportCommand.cs b/src/Commands/GenerateCollisionReportCommand.cs index ed24126..68cd8d8 100644 --- a/src/Commands/GenerateCollisionReportCommand.cs +++ b/src/Commands/GenerateCollisionReportCommand.cs @@ -698,8 +698,8 @@ namespace NavisworksTransport.Commands result.UniqueCollidedObjects = new HashSet(uniqueCollidedObjectsList); result.BoundingBoxTestCount = 0; - // 设置动画碰撞数量 - result.AnimationCollisions = clashIntegration?.AnimationCollisionCount ?? 0; + // 动画碰撞数量已弃用，始终设为0（预计算碰撞数现在作为参数传递） + result.AnimationCollisions = 0; // 从碰撞结果的Item1中获取运动构件信息 if (allCollisions.Count > 0 && allCollisions[0].Item1 != null) @@ -843,12 +843,9 @@ namespace NavisworksTransport.Commands // 总体统计 report.AppendLine("=== 总体统计 ==="); - var clashIntegration = ClashDetectiveIntegration.Instance; - var animationCollisionCount = clashIntegration?.AnimationCollisionCount ?? 0; report.AppendLine($"总碰撞数: {collisionData.ClashDetectiveCollisionCount}个"); report.AppendLine($"碰撞构件: {collisionData.UniqueCollidedObjects.Count}个"); - report.AppendLine($"检测点: {animationCollisionCount}个"); report.AppendLine(); // 碰撞构件清单（新增） diff --git a/src/UI/WPF/ViewModels/AnimationControlViewModel.cs b/src/UI/WPF/ViewModels/AnimationControlViewModel.cs index 6ed160d..6986e42 100644 --- a/src/UI/WPF/ViewModels/AnimationControlViewModel.cs +++ b/src/UI/WPF/ViewModels/AnimationControlViewModel.cs @@ -4809,9 +4809,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels { if (reportData.IsValid) { - // 🔧 修复：显示动画过程缓存的碰撞数量，而非测试数量 - var animationCollisionCount = _clashIntegration?.AnimationCollisionCount ?? 0; - var summary = $"动画碰撞: {animationCollisionCount}个 | Clash Detective权威结果: {reportData.TotalCollisions}个"; + // 碰撞报告已生成，显示 Clash Detective 权威结果 UpdateMainStatus("碰撞报告已生成"); } else