From 12e606635c42ea20f4b7c2bdda5204237a4b4c96 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 02 三月 2026 16:14:49 +0800
Subject: [PATCH] 优化
---
Plugin.TestResult/DataTable.xaml | 96 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 68 insertions(+), 28 deletions(-)
diff --git a/Plugin.TestResult/DataTable.xaml b/Plugin.TestResult/DataTable.xaml
index 5e5d6a8..1b28592 100644
--- a/Plugin.TestResult/DataTable.xaml
+++ b/Plugin.TestResult/DataTable.xaml
@@ -10,6 +10,7 @@
xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:ui="clr-namespace:HMI.UI;assembly=HMI.UI"
xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
+xmlns:dc="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
mc:Ignorable="d"
Background="#FFF"
BorderBrush="Black"
@@ -19,6 +20,7 @@
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
<local:FontSizeConverter x:Key="FontSizeConverter"/>
+ <dc:ReverseBoolConverter x:Key="reverseConverter"/>
</UserControl.Resources>
<Grid x:Name="grid">
<Grid.RowDefinitions>
@@ -28,28 +30,31 @@
<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'}"
+Converter={StaticResource FontSizeConverter}, ConverterParameter='20,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'}"
Style="{StaticResource FormComboxStyle}"
+ IsEnabled="{Binding IsTesting,Converter={StaticResource reverseConverter}}"
pu:ComboBoxHelper.ClearButtonVisibility="Collapsed"
BorderBrush="Black"
+ Height="26"
BorderThickness="0,1,0,0"
pu:ComboBoxHelper.Watermark="{DynamicResource Tr.ProductInfo}"
Width="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=UserControl},
@@ -60,42 +65,61 @@
<local:InfoTable x:Name="infoTable" Grid.Row="0" Grid.Column="1"
Grid.RowSpan="2"
FontSize="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=UserControl},
- Converter={StaticResource FontSizeConverter}, ConverterParameter='15,940'}"></local:InfoTable>
+ Converter={StaticResource FontSizeConverter}, ConverterParameter='12,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>
<!--<local:Chart Grid.Row="2" x:Name="chart" BorderThickness="0,1,0,1" BorderBrush="Black"
MouseDoubleClick="chart_MouseDoubleClick"/>-->
- <StatusBar Grid.Row="3">
+ <StatusBar FontSize="18" Grid.Row="3">
<StatusBar.ItemsPanel>
<ItemsPanelTemplate>
<DockPanel/>
</ItemsPanelTemplate>
</StatusBar.ItemsPanel>
+ <StatusBarItem DockPanel.Dock="Left">
+ <Button Style="{StaticResource LinkButton}" Click="Button_Click_1" Content="{DynamicResource App.ScannerSetting}"/>
+ </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>
+
+ <StatusBarItem DockPanel.Dock="Right">
+ <Button Click="Manual_Cooler_Opt" x:Name="coolerSetting">
+ <Button.Style>
+ <Style TargetType="Button" BasedOn="{StaticResource LinkButton}">
+ <Setter Property="Content" Value="{DynamicResource Tr.CoolerSetting}"/>
+ <Setter Property="Foreground" Value="{DynamicResource PrimaryColor}"/>
+ </Style>
+ </Button.Style>
+ </Button>
</StatusBarItem>
<StatusBarItem >
@@ -103,15 +127,31 @@
</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}"
- Content="{DynamicResource App.Start}"/>
+ <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}"/>-->
+ <Button Grid.Column="2" Click="StartSingleClick">
+ <Button.Style>
+ <Style TargetType="Button" BasedOn="{StaticResource SuccessButton}">
+ <Setter Property="Content" Value="{DynamicResource App.Start}"/>
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding IsTesting}" Value="True">
+ <Setter Property="Background" Value="{DynamicResource DangerVerBar}"/>
+ <Setter Property="Content" Value="鍋滄娴嬭瘯"/>
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Button.Style>
+ </Button>
</Grid>
</Grid>
--
Gitblit v1.9.1