From 1622d6cb90cd338d03400737dc2fc8309f3afa3b Mon Sep 17 00:00:00 2001
From: tian <11429339@qq.com>
Date: Sun, 7 Sep 2025 02:46:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E4=B8=80=E7=82=B9=E8=BF=87?=
=?UTF-8?q?=E6=97=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Core/PathPlanningManager.cs | 4 +-
src/Core/PathPointRenderPlugin.cs | 164 ------------------
src/UI/WPF/ViewModels/PathEditingViewModel.cs | 2 +-
3 files changed, 3 insertions(+), 167 deletions(-)
diff --git a/src/Core/PathPlanningManager.cs b/src/Core/PathPlanningManager.cs
index 2f4487b..cea33ab 100644
--- a/src/Core/PathPlanningManager.cs
+++ b/src/Core/PathPlanningManager.cs
@@ -50,8 +50,8 @@ namespace NavisworksTransport
private PathPoint _previewPoint = null;
// 网格可视化设置
- private bool _showWalkableGrid = true;
- private bool _showObstacleGrid = true;
+ private bool _showWalkableGrid = false;
+ private bool _showObstacleGrid = false;
private bool _showUnknownGrid = false;
private bool _isPreviewMode = false;
private int _previewInsertIndex = -1; // 保存预览点应该插入的索引位置
diff --git a/src/Core/PathPointRenderPlugin.cs b/src/Core/PathPointRenderPlugin.cs
index f1569b3..bad46b2 100644
--- a/src/Core/PathPointRenderPlugin.cs
+++ b/src/Core/PathPointRenderPlugin.cs
@@ -788,134 +788,6 @@ namespace NavisworksTransport
#endregion
- #region 向后兼容的旧接口（保留以避免编译错误）
-
- ///
- /// [已过时] 添加球体标记 - 请使用RenderPath方法代替
- ///
- /// 圆心位置
- /// 路径点类型
- /// 序号
- [Obsolete("此方法已过时，请使用RenderPath方法进行统一的路径可视化", false)]
- public void AddCircleMarker(Point3D center, PathPointType pointType, int sequenceNumber)
- {
- LogManager.WriteLog($"[兼容性警告] 使用了已过时的AddCircleMarker方法，建议使用RenderPath方法");
-
- try
- {
- // 为了兼容性，创建一个临时路径
- var tempPath = new PathRoute($"TempPath_{Guid.NewGuid().ToString("N").Substring(0, 8)}")
- {
- Id = $"temp_{sequenceNumber}_{DateTime.Now.Ticks}"
- };
-
- var pathPoint = new PathPoint(center, $"Point_{sequenceNumber}", pointType)
- {
- Index = 0
- };
- tempPath.Points.Add(pathPoint);
-
- // 使用新的渲染方法
- RenderPath(tempPath);
- }
- catch (Exception ex)
- {
- LogManager.WriteLog($"[兼容性标记] 添加标记失败: {ex.Message}");
- }
- }
-
- ///
- /// 移除指定位置的球体标记
- ///
- /// 位置
- /// 容差距离（米）
- /// 是否成功移除
- public bool RemoveMarkerAt(Point3D position, double tolerance = 1.0)
- {
- bool removed = false;
-
- try
- {
- lock (_lockObject)
- {
- for (int i = _circleMarkers.Count - 1; i >= 0; i--)
- {
- var marker = _circleMarkers[i];
- var distance = CalculateDistance(marker.Center, position);
-
- if (distance <= tolerance)
- {
- _circleMarkers.RemoveAt(i);
- removed = true;
- LogManager.WriteLog($"[球体标记] 移除标记: 序号={marker.SequenceNumber}, 距离={distance:F2}m");
- }
- }
- }
-
- if (removed)
- {
- RequestViewRefresh();
- }
- }
- catch (Exception ex)
- {
- LogManager.WriteLog($"[球体标记] 移除标记失败: {ex.Message}");
- }
-
- return removed;
- }
-
- ///
- /// [已过时] 清除所有球体标记 - 请使用ClearAllPaths方法代替
- ///
- [Obsolete("此方法已过时，请使用ClearAllPaths方法", false)]
- public void ClearAllMarkers()
- {
- LogManager.WriteLog($"[兼容性警告] 使用了已过时的ClearAllMarkers方法，建议使用ClearAllPaths方法");
- ClearAllPaths();
- }
-
- ///
- /// [已过时] 清除所有自动路径标记 - 请使用ClearAllPaths方法代替
- ///
- [Obsolete("此方法已过时，请使用ClearAllPaths方法", false)]
- public void ClearAutoPathMarkers()
- {
- LogManager.WriteLog($"[兼容性警告] 使用了已过时的ClearAutoPathMarkers方法，建议使用ClearAllPaths方法");
- ClearAllPaths();
- }
-
- ///
- /// [已过时] 清除手动路径标记 - 请使用ClearAllPaths方法代替
- ///
- [Obsolete("此方法已过时，请使用ClearAllPaths方法", false)]
- public void ClearManualPathMarkers()
- {
- LogManager.WriteLog($"[兼容性警告] 使用了已过时的ClearManualPathMarkers方法，建议使用ClearAllPaths方法");
- ClearAllPaths();
- }
-
- ///
- /// [已过时] 获取所有球体标记的副本 - 此方法不再适用于新的路径系统
- ///
- /// 空列表
- [Obsolete("此方法已过时，新的路径系统不使用独立的标记概念", false)]
- public List GetAllMarkers()
- {
- LogManager.WriteLog($"[兼容性警告] 使用了已过时的GetAllMarkers方法，新系统不再支持独立标记");
- return new List();
- }
-
- ///
- /// [已过时] 根据序号更新一个已存在的球体标记 - 请使用UpdatePointInPath方法代替
- ///
- [Obsolete("此方法已过时，请使用UpdatePointInPath方法更新路径中的点", false)]
- public void UpdateMarker(int sequenceNumber, Color newColor, double newRadius)
- {
- LogManager.WriteLog($"[兼容性警告] 使用了已过时的UpdateMarker方法，请使用UpdatePointInPath方法");
- // 由于新系统没有直接的序号对应关系，这个方法不再有效
- }
-
///
/// 渲染预览点（灰色显示）
///
@@ -1171,40 +1043,6 @@ namespace NavisworksTransport
}
}
- ///
- /// 渲染预览路径的连线
- ///
- /// 预览路径
- private void RenderPreviewPathLines(PathRoute previewRoute)
- {
- try
- {
- ClearPreviewLines();
-
- for (int i = 0; i < previewRoute.Points.Count - 1; i++)
- {
- var startPoint = previewRoute.Points[i];
- var endPoint = previewRoute.Points[i + 1];
-
- var lineMarker = new LineMarker
- {
- StartPoint = startPoint.Position,
- EndPoint = endPoint.Position,
- Color = Color.FromByteRGB(128, 128, 128), // 统一使用灰色预览连线
- Radius = GetLineRadius()
- };
-
- _previewLines.Add(lineMarker);
- }
-
- LogManager.WriteLog($"[预览路径连线] 已创建 {_previewLines.Count} 条预览连线");
- }
- catch (Exception ex)
- {
- LogManager.WriteLog($"[预览路径连线] 渲染预览连线失败: {ex.Message}");
- }
- }
-
///
/// 清理所有预览渲染
///
@@ -1232,8 +1070,6 @@ namespace NavisworksTransport
}
}
- #endregion
-
#region 私有辅助方法
///
diff --git a/src/UI/WPF/ViewModels/PathEditingViewModel.cs b/src/UI/WPF/ViewModels/PathEditingViewModel.cs
index cae6ff6..e955893 100644
--- a/src/UI/WPF/ViewModels/PathEditingViewModel.cs
+++ b/src/UI/WPF/ViewModels/PathEditingViewModel.cs
@@ -1157,7 +1157,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels
for (int i = 0; i < currentRoute.Points.Count; i++)
{
var currentPoint = currentRoute.Points[i];
- LogManager.Info($"检查路径点 [{i}] - Id: {currentPoint.Id}, 名称: {currentPoint.Name}");
+ //LogManager.Info($"检查路径点 [{i}] - Id: {currentPoint.Id}, 名称: {currentPoint.Name}");
if (currentPoint.Id == SelectedPathPoint.Id)
{