From fe2aa4880d5c9fd88088ad0ed81ebaca05629f5f Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 02 十一月 2026 17:59:45 +0800
Subject: [PATCH] feat: 集成CAN驱动/模拟器 + 仪器仪表注册/硬件调试模块

---
 Plugin.TestResult/DataTable.xaml |   44 ++++++++++++++++++++++++++++++++------------
 1 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/Plugin.TestResult/DataTable.xaml b/Plugin.TestResult/DataTable.xaml
index 65344ce..13e0adf 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>
@@ -33,12 +35,12 @@
                 <RowDefinition/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            
+
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            
+
             <TextBlock FontSize="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=UserControl}, 
 Converter={StaticResource FontSizeConverter}, ConverterParameter='20,940'}"
                    FontWeight="Bold"
@@ -49,6 +51,7 @@
             <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"
@@ -72,14 +75,14 @@
         <!--<local:Chart Grid.Row="2" x:Name="chart" BorderThickness="0,1,0,1" BorderBrush="Black" 
                       MouseDoubleClick="chart_MouseDoubleClick"/>-->
 
-        <StatusBar FontSize="18" Grid.Row="3">
+        <StatusBar FontSize="14" Grid.Row="3">
             <StatusBar.ItemsPanel>
                 <ItemsPanelTemplate>
                     <DockPanel/>
                 </ItemsPanelTemplate>
             </StatusBar.ItemsPanel>
             <StatusBarItem DockPanel.Dock="Left">
-                <Button Style="{StaticResource LinkButton}" Click="Button_Click_1">鎵爜鏋缃�</Button>
+                <Button Style="{StaticResource LinkButton}" Click="Button_Click_1" Content="{DynamicResource App.ScannerSetting}"/>
             </StatusBarItem>
 
             <StatusBarItem DockPanel.Dock="Right">
@@ -108,24 +111,42 @@
                 </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 >
-                <TextBox IsReadOnly="True" Background="Transparent" BorderThickness="0" Text="{Binding statusText}"/>
+                <TextBox IsReadOnly="True" FontSize="16" Background="Transparent" BorderThickness="0" Text="{Binding statusText}"/>
             </StatusBarItem>
         </StatusBar>
 
-        <Grid Grid.Row="4">
-            <Grid.ColumnDefinitions>
+        <UniformGrid Grid.Row="4" Rows="1">
+            <!--<UniformGrid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition/>
+                <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
+            </UniformGrid.ColumnDefinitions>-->
             <Button Click="ScanWindow_Click" Style="{StaticResource PrimaryButton}"
+                    IsEnabled="{Binding IsTesting,Converter={StaticResource reverseBool}}"
         Content="{DynamicResource Tr.Scan}"/>
             <Button Grid.Column="1" Click="ClearAllSnr_Click" Style="{StaticResource DangerButton}"
+                    IsEnabled="{Binding IsTesting,Converter={StaticResource reverseBool}}"
 Content="{DynamicResource Tr.ClearAllSNR}"/>
             <!--<Button Grid.Column="2" Click="SetStationGlobal_Click" Style="{StaticResource SuccessButton}"
-        Content="{DynamicResource App.Start}"/>-->
-            <Button Grid.Column="2" Click="StartSingleClick">
+        Content="{DynamicResource App.Start}"/> Background="#1296db"-->
+
+            <Button Grid.Column="2" Click="Abort_Click" x:Name="abortBtn"
+        Style="{DynamicResource DangerButton}" Background="#1296db" Content="Abort"/>
+
+            <Button Grid.Column="3" Click="StartSingleClick">
                 <Button.Style>
                     <Style TargetType="Button" BasedOn="{StaticResource SuccessButton}">
                         <Setter Property="Content" Value="{DynamicResource App.Start}"/>
@@ -138,7 +159,6 @@
                     </Style>
                 </Button.Style>
             </Button>
-        </Grid>
-        
+        </UniformGrid>
     </Grid>
 </UserControl>
\ No newline at end of file

--
Gitblit v1.9.1