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/SingleCell.xaml | 66 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/Plugin.TestResult/SingleCell.xaml b/Plugin.TestResult/SingleCell.xaml
index f3d8cca..9a6c1dc 100644
--- a/Plugin.TestResult/SingleCell.xaml
+++ b/Plugin.TestResult/SingleCell.xaml
@@ -9,6 +9,7 @@
xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:ui="clr-namespace:HMI.UI;assembly=HMI.UI"
x:Name="uc"
+ PreviewMouseRightButtonDown="OnPreviewMouseRightButtonDown"
MouseDoubleClick="UserControl_MouseDoubleClick"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
@@ -19,13 +20,19 @@
<ToolTip Padding="5" BorderThickness="1" BorderBrush="Black" Background="Yellow" Content="{Binding tooltipContent}"/>
</UserControl.ToolTip>-->
- <UserControl.ContextMenu>
+ <!--<UserControl.ContextMenu>
<ContextMenu>
- <!--<MenuItem IsCheckable="True" IsChecked="{Binding CellIsDisabled,Mode=TwoWay}" Header="绂佺敤"/>-->
- <MenuItem IsCheckable="False" x:Name="clearSNRItem" Click="MenuItem_Click" Header="{DynamicResource Tr.ClearSNR}"/>
+ <MenuItem IsCheckable="False" DataContext="{Binding table}" IsEnabled="{Binding IsTesting,Converter={StaticResource reverseBool}}" x:Name="clearSNRItem" Click="MenuItem_Click" Header="{DynamicResource Tr.ClearSNR}"/>
<MenuItem IsCheckable="False" x:Name="exportCSVItem" Click="MenuItem_Click" Header="{DynamicResource App.ExportCSV}"/>
+ <MenuItem IsCheckable="False" x:Name="manualDebugItem" Click="MenuItem_Click" Header="鎵嬪姩璋冭瘯">
+ <MenuItem.Style>
+ <Style TargetType="MenuItem" BasedOn="{StaticResource {x:Static pu:StyleKeys.MenuItemStyle}}">
+
+ </Style>
+ </MenuItem.Style>
+ </MenuItem>
</ContextMenu>
- </UserControl.ContextMenu>
+ </UserControl.ContextMenu>-->
<UserControl.Style>
<Style TargetType="UserControl">
@@ -65,32 +72,14 @@
</UserControl.Style>
<Grid>
<Grid.RowDefinitions>
- <RowDefinition Height="Auto"/>
- <RowDefinition Height="18"/>
+ <RowDefinition />
+ <RowDefinition Height="14"/>
+ <RowDefinition Height="14"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
- <StackPanel Orientation="Horizontal" Background="LightGray" Grid.Row="1" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Right">
- <TextBlock Foreground="Red" Text="{DynamicResource Ts.ProbeAlarm}">
- <TextBlock.Style>
- <Style TargetType="TextBlock">
- <Setter Property="Visibility" Value="Collapsed"/>
- <Style.Triggers>
- <DataTrigger Binding="{Binding probeAlarm}" Value="True">
- <Setter Property="Visibility" Value="Visible"/>
- </DataTrigger>
- </Style.Triggers>
- </Style>
- </TextBlock.Style>
- </TextBlock>
- <TextBlock Margin="0">
- <Run Text="{Binding ProbeCount}"/>
- <Run Text="/"/>
- <Run Text="{Binding ProbeWarn}"/>
- </TextBlock>
- </StackPanel>
<Label Grid.Row="0" Grid.Column="0" HorizontalContentAlignment="Left" VerticalContentAlignment="Top" Padding="0" Margin="5,5,0,0"
FontSize="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=UserControl},
Converter={StaticResource FontSizeConverter}, ConverterParameter='8,103'}"
@@ -106,9 +95,10 @@
</Style>
</Label.Style>
</Label>
- <ui:ScrollLabel Grid.Row="1" Grid.Column="0" Margin="3,0,0,5" Padding="0" Value="{Binding sn}"/>
- <Image Grid.Row="0" Grid.Column="1" Width="30" HorizontalAlignment="Right" Height="30" Margin="0,5,5,0">
+ <Image Grid.Row="0" Grid.Column="1" Width="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=UserControl},
+ Converter={StaticResource FontSizeConverter}, ConverterParameter='10,20'}" HorizontalAlignment="Right"
+ Margin="0,5,5,0">
<Image.Style>
<Style TargetType="Image">
<Setter Property="HorizontalAlignment" Value="Center"/>
@@ -148,5 +138,27 @@
</Style>
</Image.Style>
</Image>
+
+ <ui:ScrollLabel Grid.Row="1" Grid.Column="0" FontSize="10" Grid.ColumnSpan="2" Margin="3,0,0,0" Padding="0" Value="{Binding sn}"/>
+
+ <StackPanel Orientation="Horizontal" Background="LightGray" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Top" HorizontalAlignment="Right">
+ <TextBlock Foreground="Red" Text="{DynamicResource Ts.ProbeAlarm}" FontSize="10">
+ <TextBlock.Style>
+ <Style TargetType="TextBlock">
+ <Setter Property="Visibility" Value="Collapsed"/>
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding probeAlarm}" Value="True">
+ <Setter Property="Visibility" Value="Visible"/>
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </TextBlock.Style>
+ </TextBlock>
+ <TextBlock Margin="0" FontSize="10">
+ <Run Text="{Binding ProbeCount}"/>
+ <Run Text="/"/>
+ <Run Text="{Binding ProbeWarn}"/>
+ </TextBlock>
+ </StackPanel>
</Grid>
</UserControl>
--
Gitblit v1.9.1