From 6dcd27708d76e31a34c9e59a3afbe3c5db26df98 Mon Sep 17 00:00:00 2001
From: tian <11429339@qq.com>
Date: Sat, 17 Jan 2026 14:39:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=A9=E5=B0=8F=E6=8F=92=E4=BB=B6UI=E7=95=8C?=
=?UTF-8?q?=E9=9D=A2=E5=AE=BD=E5=BA=A6=EF=BC=8C=E4=BC=98=E5=8C=96=E5=B8=83?=
=?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/UI/WPF/Resources/MediaControlIcons.xaml | 1 -
src/UI/WPF/Resources/NavisworksStyles.xaml | 27 ++-
.../ViewModels/LayerManagementViewModel.cs | 16 +-
src/UI/WPF/Views/AnimationControlView.xaml | 172 +++++++-----------
src/UI/WPF/Views/LayerManagementView.xaml | 8 +-
src/UI/WPF/Views/MediaControlBar.xaml | 14 +-
src/UI/WPF/Views/PathEditingView.xaml | 102 ++++-------
7 files changed, 137 insertions(+), 203 deletions(-)
diff --git a/src/UI/WPF/Resources/MediaControlIcons.xaml b/src/UI/WPF/Resources/MediaControlIcons.xaml
index 3c90a20..77b8ef9 100644
--- a/src/UI/WPF/Resources/MediaControlIcons.xaml
+++ b/src/UI/WPF/Resources/MediaControlIcons.xaml
@@ -234,7 +234,6 @@
-
\ No newline at end of file
diff --git a/src/UI/WPF/Resources/NavisworksStyles.xaml b/src/UI/WPF/Resources/NavisworksStyles.xaml
index 6855eac..23b951c 100644
--- a/src/UI/WPF/Resources/NavisworksStyles.xaml
+++ b/src/UI/WPF/Resources/NavisworksStyles.xaml
@@ -33,7 +33,6 @@ NavisworksTransport 共享样式资源字典 - Navisworks 2026风格
-
@@ -41,11 +40,10 @@ NavisworksTransport 共享样式资源字典 - Navisworks 2026风格
-
-
-
-
+
+
+
@@ -53,10 +51,10 @@ NavisworksTransport 共享样式资源字典 - Navisworks 2026风格
-
-
-
-
+
+
+
+
@@ -68,23 +66,20 @@ NavisworksTransport 共享样式资源字典 - Navisworks 2026风格
@@ -95,7 +90,7 @@ NavisworksTransport 共享样式资源字典 - Navisworks 2026风格
-
+
diff --git a/src/UI/WPF/ViewModels/LayerManagementViewModel.cs b/src/UI/WPF/ViewModels/LayerManagementViewModel.cs
index a86bfc2..bfbcc01 100644
--- a/src/UI/WPF/ViewModels/LayerManagementViewModel.cs
+++ b/src/UI/WPF/ViewModels/LayerManagementViewModel.cs
@@ -68,7 +68,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels
private string _currentSelectionText = "未选择项目";
private string _currentOperationText = "";
private double _progressPercentage;
- private string _selectedSplitStrategy = "智能检测楼层";
+ private string _selectedSplitStrategy = "智能检测";
private string _selectedCustomLayerOption = "按楼层";
private bool _showCustomLayerOptions = false;
@@ -252,8 +252,8 @@ namespace NavisworksTransport.UI.WPF.ViewModels
public ThreadSafeObservableCollection SplitStrategies { get; } =
new ThreadSafeObservableCollection
{
- "智能检测楼层",
- "按自定义分层"
+ "智能检测",
+ "自定义"
};
///
@@ -266,8 +266,8 @@ namespace NavisworksTransport.UI.WPF.ViewModels
{
if (SetPropertyThreadSafe(ref _selectedSplitStrategy, value))
{
- // 当选择"按自定义分层"时显示二级选项
- ShowCustomLayerOptions = value == "按自定义分层";
+ // 当选择"自定义"时显示二级选项
+ ShowCustomLayerOptions = value == "自定义";
OnPropertyChanged(nameof(CanPreviewSplit));
OnPropertyChanged(nameof(CanExecuteSplit));
@@ -2631,9 +2631,9 @@ namespace NavisworksTransport.UI.WPF.ViewModels
{
switch (strategy)
{
- case "智能检测楼层":
+ case "智能检测":
return ModelSplitterManager.SplitStrategy.BySmartFloorDetection;
- case "按自定义分层":
+ case "自定义":
// 根据二级选项决定具体的自定义分层策略
switch (SelectedCustomLayerOption)
{
@@ -2656,7 +2656,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels
///
public string GetFullStrategyDescription()
{
- if (SelectedSplitStrategy == "按自定义分层" && !string.IsNullOrEmpty(SelectedCustomLayerOption))
+ if (SelectedSplitStrategy == "自定义" && !string.IsNullOrEmpty(SelectedCustomLayerOption))
{
return $"{SelectedSplitStrategy} - {SelectedCustomLayerOption}";
}
diff --git a/src/UI/WPF/Views/AnimationControlView.xaml b/src/UI/WPF/Views/AnimationControlView.xaml
index 959eb28..0d3ee5d 100644
--- a/src/UI/WPF/Views/AnimationControlView.xaml
+++ b/src/UI/WPF/Views/AnimationControlView.xaml
@@ -48,12 +48,12 @@ NavisworksTransport 检测动画页签视图 - 采用与类别设置和分层管
-
+
-
+
@@ -66,17 +66,14 @@ NavisworksTransport 检测动画页签视图 - 采用与类别设置和分层管
-
-
-
+ SelectedItem="{Binding SelectedFrameRate}"/>
+
+
+ Text="{Binding AnimationDuration, StringFormat=0.0###}"
+ Style="{StaticResource ParameterInputStyle}"/>
@@ -84,19 +81,21 @@ NavisworksTransport 检测动画页签视图 - 采用与类别设置和分层管
-
+
-
+
-
-
+
+
@@ -110,14 +109,12 @@ NavisworksTransport 检测动画页签视图 - 采用与类别设置和分层管
Style="{StaticResource SliderStyle}"/>
+ VerticalAlignment="Center"/>
-
+
@@ -125,17 +122,17 @@ NavisworksTransport 检测动画页签视图 - 采用与类别设置和分层管
-
-
-
@@ -145,13 +142,12 @@ NavisworksTransport 检测动画页签视图 - 采用与类别设置和分层管
-
+
-
-
+
+
+ Style="{StaticResource StatusTextStyle}"/>
-
+
+ Style="{StaticResource SecondaryButtonStyle}"/>
+ Foreground="#FF8B0000"/>
+ IsEnabled="{Binding HasManualCollisionTargets}"/>
-
@@ -200,7 +193,7 @@ NavisworksTransport 检测动画页签视图 - 采用与类别设置和分层管
BorderThickness="1">
-
+
@@ -211,7 +204,7 @@ NavisworksTransport 检测动画页签视图 - 采用与类别设置和分层管
-
+
-
+
+ Foreground="#FF8B0000"/>
@@ -497,8 +465,8 @@ NavisworksTransport 检测动画页签视图 - 采用与类别设置和分层管
-
-
+
+
@@ -510,10 +478,7 @@ NavisworksTransport 检测动画页签视图 - 采用与类别设置和分层管
+ Style="{StaticResource SecondaryButtonStyle}"/>
-
+
@@ -564,12 +529,12 @@ NavisworksTransport 检测动画页签视图 - 采用与类别设置和分层管
-
+
-
+
@@ -578,8 +543,7 @@ NavisworksTransport 检测动画页签视图 - 采用与类别设置和分层管
+ Foreground="#FF2B579A"/>
-
-
-
-
+
+
+
+
@@ -185,24 +185,24 @@
Minimum="0"
Maximum="{Binding TimelineDuration}"
Style="{StaticResource TimelineSliderStyle}"
- Width="300"
+ Width="200"
TickFrequency="1"
IsSnapToTickEnabled="True"
ToolTip="点击或拖动跳转到指定位置"/>
-
+
+ MinWidth="40"/>
+ MinWidth="40"
+ TextAlignment="Left"
+ Margin="5,0,5,0"/>
diff --git a/src/UI/WPF/Views/PathEditingView.xaml b/src/UI/WPF/Views/PathEditingView.xaml
index e241fd6..1fac318 100644
--- a/src/UI/WPF/Views/PathEditingView.xaml
+++ b/src/UI/WPF/Views/PathEditingView.xaml
@@ -40,37 +40,31 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
-
+
-
-
+
+
+ Style="{StaticResource SecondaryButtonStyle}"/>
+ Style="{StaticResource ReadOnlyTextBoxStyle}"/>
-
+
+ Style="{StaticResource SecondaryButtonStyle}"/>
+ Style="{StaticResource ReadOnlyTextBoxStyle}"/>
-
+
@@ -78,8 +72,6 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
-
-
@@ -90,43 +82,38 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
-
+ Style="{StaticResource ParameterInputStyle}"/>
+
+ Style="{StaticResource ParameterInputStyle}"/>
-
+ Style="{StaticResource ParameterInputStyle}"/>
+
+ Style="{StaticResource ParameterInputStyle}"/>
-
+
-
+
-
+
@@ -150,7 +137,6 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
@@ -171,7 +157,7 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
Text="{Binding GridSize, StringFormat={}{0:F1}}"
VerticalAlignment="Center"
Margin="10,0,0,0"
- Width="40"/>
+ Width="30"/>
@@ -188,7 +174,7 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
-
+
-
+
-
+
+ Style="{StaticResource ActionButtonStyle}"/>
+ HorizontalAlignment="Right"/>
@@ -238,7 +222,8 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
SelectedItem="{Binding SelectedPathRoute}"
Height="120"
BorderBrush="#FFCCCCCC"
- BorderThickness="1">
+ BorderThickness="1"
+ Margin="0,5,0,0">
@@ -272,12 +257,12 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
-
+
-
+
-
+
@@ -313,7 +298,7 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
Foreground="{Binding SelectedPathRoute, Converter={x:Null}, TargetNullValue='#FF999999'}"
Background="#FFF5F5F5"
Padding="5,3"
- Margin="5,0"/>
+ Margin="0,5,0,0"/>
@@ -321,7 +306,8 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
SelectedItem="{Binding SelectedPathPoint}"
Height="150"
BorderBrush="#FFCCCCCC"
- BorderThickness="1">
+ BorderThickness="1"
+ Margin="0,5,0,0">
@@ -367,12 +353,12 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
-
+
-
+
@@ -394,12 +380,12 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
-
+
-
+
@@ -408,7 +394,6 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
-
+
@@ -447,7 +429,6 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
@@ -476,7 +455,7 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
-
+
@@ -485,7 +464,6 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
-
+
@@ -524,7 +501,6 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管
-