diff --git a/CHANGELOG.md b/CHANGELOG.md index e3f3c1c..521a88a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,13 @@ - **自动调整内部统一使用模型单位**:`ObjectPassageProjectionOptimizationResult.ComputedLiftOffsetMeters` 改为 `ComputedLiftOffsetModelUnits`,移除中间 `ConvertToMeters`/`ConvertFromMeters` 的反复转换,只在 UI 边界(`EditRotationWindow.OnAutoAdjustClick`)做一次转换。 -- **调整物体窗口等待光标**:`OnAutoAdjustClick` 添加 `try/finally` 包裹,执行时设置 `Cursors.Wait`,参照项目现有模式。 +- **删除动画控制视图无用控件**:移除 `AnimationControlView.xaml` 中无绑定的"选择模型物体" RadioButton。 + +- **碰撞检测报告截图 + 按钮始终可见**:`CollisionReportDialog.xaml` 缩略图区域的 `Visibility` 绑定从外层 `Border` 移到内层 `ItemsControl`(缩略图),`+` 按钮始终可见。 + +- **Rail 路径重选起点时清除安装辅助线**:`ExecuteSelectAssemblyStartPointAsync` 和 `ExecuteRepositionRailStartPointAsync` 进入起点选择前调用 `ClearAssemblyInstallationReferenceVisuals()` 隐藏安装点辅助线。 + +- **数据库初始化设置版本号**:`PathDatabase.InitializeDatabase()` 创建表后执行 `PRAGMA user_version = 10000`,使"修复数据库"正确显示版本信息。 --- diff --git a/src/Core/PathDatabase.cs b/src/Core/PathDatabase.cs index 16d8944..cd921c3 100644 --- a/src/Core/PathDatabase.cs +++ b/src/Core/PathDatabase.cs @@ -446,6 +446,9 @@ namespace NavisworksTransport ) "); SafeCreateIndex("CREATE INDEX IF NOT EXISTS idx_detection_manual_record ON CollisionDetectionManualTargets(DetectionRecordId)", "CollisionDetectionManualTargets", "DetectionRecordId"); + + // 设置数据库版本 + ExecuteNonQuery("PRAGMA user_version = 10000"); } /// diff --git a/src/UI/WPF/ViewModels/PathEditingViewModel.cs b/src/UI/WPF/ViewModels/PathEditingViewModel.cs index 31ae3c1..7ab11c4 100644 --- a/src/UI/WPF/ViewModels/PathEditingViewModel.cs +++ b/src/UI/WPF/ViewModels/PathEditingViewModel.cs @@ -2202,6 +2202,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels throw new InvalidOperationException("请先选择安装点,系统生成终端安装辅助线后才能取起点"); } + ClearAssemblyInstallationReferenceVisuals(); BeginAssemblyStartPointSelection( statusMessage: "请在辅助线附近点击一个起点,系统会自动吸附到辅助线上并生成直线路径", logMessage: "[直线装配] 已进入起点拾取模式", @@ -2236,6 +2237,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels throw new InvalidOperationException("当前 Rail 路径无法生成辅助线,请先检查路径起点和终点。"); } + ClearAssemblyInstallationReferenceVisuals(); BeginAssemblyStartPointSelection( statusMessage: "请在辅助线附近点击新的起点位置,系统会自动吸附到辅助线上并更新当前 Rail 路径。", logMessage: "[Rail构型] 已进入起点重选模式", diff --git a/src/UI/WPF/Views/AnimationControlView.xaml b/src/UI/WPF/Views/AnimationControlView.xaml index eb9efcb..214e9ee 100644 --- a/src/UI/WPF/Views/AnimationControlView.xaml +++ b/src/UI/WPF/Views/AnimationControlView.xaml @@ -319,14 +319,10 @@ NavisworksTransport 检测动画页签视图 - 采用与类别设置和分层管 - + VerticalAlignment="Center"/> diff --git a/src/UI/WPF/Views/CollisionReportDialog.xaml b/src/UI/WPF/Views/CollisionReportDialog.xaml index 807a5bf..ce0c8c5 100644 --- a/src/UI/WPF/Views/CollisionReportDialog.xaml +++ b/src/UI/WPF/Views/CollisionReportDialog.xaml @@ -367,15 +367,15 @@ NavisworksTransport 碰撞检测报告对话框 - 采用与主界面一致的Nav + Padding="5"> + VerticalAlignment="Center" + Visibility="{Binding HasScreenshots, Converter={StaticResource BooleanToVisibilityConverter}}"> diff --git a/src/UI/WPF/Views/EditRotationWindow.xaml b/src/UI/WPF/Views/EditRotationWindow.xaml index e600534..7474a0f 100644 --- a/src/UI/WPF/Views/EditRotationWindow.xaml +++ b/src/UI/WPF/Views/EditRotationWindow.xaml @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:converters="clr-namespace:NavisworksTransport.UI.WPF.Converters" - Title="调整物体" Height="420" Width="470" + Title="调整物体" Height="430" Width="470" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" ShowInTaskbar="False"