修改终端安装仿真UI，升级数据库版本号
This commit is contained in:
parent
015a2863ea
commit
c9a926356c
@ -300,8 +300,8 @@ namespace NavisworksTransport
|
||||
|
||||
// 12. 设置数据库版本（SQLite内置user_version）
|
||||
// 版本号格式：主版本*10000 + 次版本*100 + 修订号
|
||||
// 例如：2.1.3 = 20103
|
||||
ExecuteNonQuery("PRAGMA user_version = 20103"); // v2.1.3 - 重命名DetectionToleranceMeters为DetectionTolerance
|
||||
// 例如：2.1.4 = 20104
|
||||
ExecuteNonQuery("PRAGMA user_version = 20104"); // v2.1.4 - ClashDetective碰撞对象位姿字段扩展与Rail三维恢复链路调整
|
||||
|
||||
// 创建索引
|
||||
ExecuteNonQuery("CREATE INDEX IF NOT EXISTS idx_reports_route ON CollisionReports(RouteId)");
|
||||
|
||||
@ -1302,7 +1302,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels
|
||||
RenderAssemblyReferenceLine(referenceLine);
|
||||
FocusOnAssemblyReferenceArea(referenceLine.StartPoint, referenceLine.EndPoint);
|
||||
|
||||
UpdateMainStatus("已生成直线装配参考杆，请在三维视图中确认终点锚点、方向、外端位置和杆体贴合情况");
|
||||
UpdateMainStatus("已生成终端安装辅助线，请在三维视图中确认终点锚点、方向、外端位置和辅助线贴合情况");
|
||||
OnPropertyChanged(nameof(CanSelectAssemblyStartPoint));
|
||||
LogManager.Info(
|
||||
$"[直线装配] 已生成参考杆: {AssemblyTerminalObjectName}, " +
|
||||
@ -1310,7 +1310,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels
|
||||
$"参考线外端=({referenceLine.StartPoint.X:F2}, {referenceLine.StartPoint.Y:F2}, {referenceLine.StartPoint.Z:F2}), " +
|
||||
$"方向=({referenceLine.Direction.X:F3}, {referenceLine.Direction.Y:F3}, {referenceLine.Direction.Z:F3}), " +
|
||||
$"资源={AssemblyReferencePathManager.Instance.ReferenceResourceName}");
|
||||
}, "生成装配参考杆");
|
||||
}, "生成终端安装辅助线");
|
||||
}
|
||||
|
||||
private async Task ExecuteSelectAssemblyStartPointAsync()
|
||||
@ -1329,7 +1329,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels
|
||||
|
||||
if (!AssemblyReferencePathManager.Instance.HasReferenceLine)
|
||||
{
|
||||
throw new InvalidOperationException("请先生成直线装配参考杆");
|
||||
throw new InvalidOperationException("请先生成终端安装辅助线");
|
||||
}
|
||||
|
||||
CleanupAssemblyReferenceSelection();
|
||||
@ -1348,9 +1348,9 @@ namespace NavisworksTransport.UI.WPF.ViewModels
|
||||
}
|
||||
|
||||
_pathPlanningManager.StartClickTool(PathPointType.StartPoint);
|
||||
UpdateMainStatus("请在参考杆附近点击一个起点，系统会自动吸附到参考线上并生成直线路径");
|
||||
UpdateMainStatus("请在辅助线附近点击一个起点，系统会自动吸附到辅助线上并生成直线路径");
|
||||
LogManager.Info("[直线装配] 已进入起点拾取模式");
|
||||
}, "选择直线装配起点");
|
||||
}, "选择终端安装起点");
|
||||
}
|
||||
|
||||
private void ExecuteClearAssemblyReferenceRod()
|
||||
@ -1364,12 +1364,12 @@ namespace NavisworksTransport.UI.WPF.ViewModels
|
||||
ClearAssemblyReferenceLine();
|
||||
AssemblyStartPointText = "未选择";
|
||||
OnPropertyChanged(nameof(CanSelectAssemblyStartPoint));
|
||||
UpdateMainStatus("已隐藏直线装配参考线");
|
||||
LogManager.Info("[直线装配] 已隐藏参考线");
|
||||
UpdateMainStatus("已隐藏终端安装辅助线");
|
||||
LogManager.Info("[直线装配] 已隐藏辅助线");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogManager.Error($"[直线装配] 隐藏参考线失败: {ex.Message}");
|
||||
LogManager.Error($"[直线装配] 隐藏辅助线失败: {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1393,13 +1393,13 @@ namespace NavisworksTransport.UI.WPF.ViewModels
|
||||
{
|
||||
CreateAssemblyLinearRoute(projectedStartPoint);
|
||||
CleanupAssemblyReferenceSelection();
|
||||
UpdateMainStatus("已根据参考杆起点生成直线装配路径");
|
||||
}, "生成直线装配路径");
|
||||
UpdateMainStatus("已根据辅助线起点生成终端安装路径");
|
||||
}, "生成终端安装路径");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogManager.Error($"[直线装配] 处理起点拾取失败: {ex.Message}", ex);
|
||||
UpdateMainStatus($"直线装配起点拾取失败: {ex.Message}");
|
||||
UpdateMainStatus($"终端安装起点拾取失败: {ex.Message}");
|
||||
CleanupAssemblyReferenceSelection();
|
||||
}
|
||||
}
|
||||
@ -1521,7 +1521,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels
|
||||
if (referenceStartPoint != null && referenceEndPoint != null)
|
||||
{
|
||||
AssemblyTerminalObjectInfo = string.Format(
|
||||
"中心=({0:F2}, {1:F2}, {2:F2})，尺寸=({3:F2}, {4:F2}, {5:F2})，{6}，{7}点=({8:F2}, {9:F2}, {10:F2})，垂直偏移={11:F3}m，参考杆起点=({12:F2}, {13:F2}, {14:F2})",
|
||||
"中心=({0:F2}, {1:F2}, {2:F2})，尺寸=({3:F2}, {4:F2}, {5:F2})，{6}，{7}点=({8:F2}, {9:F2}, {10:F2})，垂直偏移={11:F3}m，辅助线外端=({12:F2}, {13:F2}, {14:F2})",
|
||||
bounds.Center.X,
|
||||
bounds.Center.Y,
|
||||
bounds.Center.Z,
|
||||
|
||||
@ -305,10 +305,10 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
|
||||
BorderBrush="#FFD4E7FF"
|
||||
BorderThickness="1">
|
||||
<StackPanel>
|
||||
<TextBlock Text="直线装配参考"
|
||||
<TextBlock Text="终端安装仿真"
|
||||
FontWeight="SemiBold"
|
||||
Foreground="#FF2B579A"/>
|
||||
<TextBlock Text="推荐优先使用这套流程：先选择终点处已安装箱体，再生成一根可点击的参考杆。"
|
||||
<TextBlock Text="推荐流程：先选择终点处已安装箱体，再生成一条可点击的辅助线。"
|
||||
Style="{StaticResource StatusTextStyle}"
|
||||
Margin="0,4,0,0"/>
|
||||
<Grid Margin="0,6,0,0">
|
||||
@ -366,10 +366,6 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
|
||||
Text="{Binding AssemblyTerminalObjectName}"
|
||||
Style="{StaticResource ReadOnlyTextBoxStyle}"/>
|
||||
</Grid>
|
||||
<TextBlock Text="{Binding AssemblyTerminalObjectInfo}"
|
||||
Style="{StaticResource StatusTextStyle}"
|
||||
TextWrapping="Wrap"
|
||||
Margin="0,4,0,0"/>
|
||||
<Grid Margin="0,6,0,0">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
@ -394,7 +390,7 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Label Grid.Column="0"
|
||||
Content="参考杆长度:"
|
||||
Content="辅助线长度:"
|
||||
Style="{StaticResource ParameterLabelStyle}"
|
||||
VerticalAlignment="Center"/>
|
||||
<TextBox Grid.Column="1"
|
||||
@ -418,7 +414,7 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
|
||||
<Button Content="捕获终点箱体"
|
||||
Command="{Binding CaptureAssemblyTerminalObjectCommand}"
|
||||
Style="{StaticResource SecondaryButtonStyle}"/>
|
||||
<Button Content="生成参考杆"
|
||||
<Button Content="生成辅助线"
|
||||
Command="{Binding GenerateAssemblyReferenceRodCommand}"
|
||||
Style="{StaticResource ActionButtonStyle}"
|
||||
IsEnabled="{Binding CanGenerateAssemblyReferenceRod}"/>
|
||||
@ -426,7 +422,7 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
|
||||
Command="{Binding SelectAssemblyStartPointCommand}"
|
||||
Style="{StaticResource ActionButtonStyle}"
|
||||
IsEnabled="{Binding CanSelectAssemblyStartPoint}"/>
|
||||
<Button Content="隐藏参考杆"
|
||||
<Button Content="隐藏辅助线"
|
||||
Command="{Binding ClearAssemblyReferenceRodCommand}"
|
||||
Style="{StaticResource SecondaryButtonStyle}"/>
|
||||
</StackPanel>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user