From e3868d4d61ded0e76fc8fe3fdacdd9e6d9113cf1 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 13 十月 2025 08:50:15 +0800
Subject: [PATCH] 优化HMI;
---
Plugin.TestResult/DataTable.xaml | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/Plugin.TestResult/DataTable.xaml b/Plugin.TestResult/DataTable.xaml
index 5e5d6a8..501ee89 100644
--- a/Plugin.TestResult/DataTable.xaml
+++ b/Plugin.TestResult/DataTable.xaml
@@ -28,22 +28,23 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
- <Grid x:Name="infoGrid" Grid.Row="0" Background="LightBlue">
+ <Grid x:Name="infoGrid" Grid.Row="0" Background="#a1eafb">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
-
+
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
+
<TextBlock FontSize="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=UserControl},
Converter={StaticResource FontSizeConverter}, ConverterParameter='30,940'}"
FontWeight="Bold"
Margin="0"
HorizontalAlignment="Center"
- VerticalAlignment="Center" Background="Transparent" Text="{Binding title}"/>
+ VerticalAlignment="Center" Text="{Binding title}"/>
<ComboBox Grid.Row="1" FontSize="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=UserControl},
Converter={StaticResource FontSizeConverter}, ConverterParameter='15,940'}"
@@ -63,7 +64,7 @@
Converter={StaticResource FontSizeConverter}, ConverterParameter='15,940'}"></local:InfoTable>
</Grid>
- <UniformGrid x:Name="mainGrid" Grid.Row="1" Columns="6" dp:UniformGridHelper.InnerBorder="1"
+ <UniformGrid x:Name="mainGrid" Grid.Row="1" dp:UniformGridHelper.InnerBorder="1"
dp:UniformGridHelper.InnerBorderIgnore="Left,Right,Bottom">
</UniformGrid>
@@ -76,25 +77,33 @@
<DockPanel/>
</ItemsPanelTemplate>
</StatusBar.ItemsPanel>
+ <StatusBarItem DockPanel.Dock="Left">
+ <Button Style="{StaticResource LinkButton}" Click="Button_Click_1">鎵爜鏋缃�</Button>
+ </StatusBarItem>
+
<StatusBarItem DockPanel.Dock="Right">
- <StackPanel Orientation="Horizontal">
- <Ellipse Width="10" Height="10">
- <Ellipse.Style>
- <Style TargetType="Ellipse">
- <Setter Property="Fill" Value="Gray"/>
- <Style.Triggers>
- <DataTrigger Binding="{Binding TcpServerStatus,ElementName=control}" Value="ERROR">
- <Setter Property="Fill" Value="Red"/>
- </DataTrigger>
- <DataTrigger Binding="{Binding TcpServerStatus,ElementName=control}" Value="RUNNING">
- <Setter Property="Fill" Value="Green"/>
- </DataTrigger>
- </Style.Triggers>
- </Style>
- </Ellipse.Style>
- </Ellipse>
- <TextBlock Text="{Binding TcpServerInfo}"/>
- <Button Padding="0" Margin="0" BorderThickness="0" Click="Button_Click">馃攧</Button>
+ <StackPanel Orientation="Horizontal" dp:StackPanelHelper.ChildSpace="8">
+ <Button Style="{StaticResource DeleteLink}" Click="Button_Click_2" Content="鍋滄娴嬭瘯"/>
+
+ <StackPanel Orientation="Horizontal">
+ <Ellipse Width="10" Height="10">
+ <Ellipse.Style>
+ <Style TargetType="Ellipse">
+ <Setter Property="Fill" Value="LightGray"/>
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding TcpServerStatus,ElementName=control}" Value="ERROR">
+ <Setter Property="Fill" Value="Red"/>
+ </DataTrigger>
+ <DataTrigger Binding="{Binding TcpServerStatus,ElementName=control}" Value="RUNNING">
+ <Setter Property="Fill" Value="Green"/>
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Ellipse.Style>
+ </Ellipse>
+ <TextBlock Text="{Binding TcpServerInfo}"/>
+ <Button Padding="0" Margin="0" BorderThickness="0" Click="Button_Click">馃攧</Button>
+ </StackPanel>
</StackPanel>
</StatusBarItem>
@@ -103,14 +112,17 @@
</StatusBarItem>
</StatusBar>
- <Grid Grid.Row="4" >
+ <Grid Grid.Row="4">
<Grid.ColumnDefinitions>
+ <ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Button Click="ScanWindow_Click" Style="{StaticResource PrimaryButton}"
Content="{DynamicResource Tr.Scan}"/>
- <Button Grid.Column="1" Click="SetStationGlobal_Click" Style="{StaticResource SuccessButton}"
+ <Button Grid.Column="1" Click="ClearAllSnr_Click" Style="{StaticResource DangerButton}"
+Content="{DynamicResource Tr.ClearAllSNR}"/>
+ <Button Grid.Column="2" Click="SetStationGlobal_Click" Style="{StaticResource SuccessButton}"
Content="{DynamicResource App.Start}"/>
</Grid>
--
Gitblit v1.9.1