From 3a471ae651b228231bebb3a2d438baa1d4ac0261 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 21 十一月 2025 08:57:52 +0800
Subject: [PATCH] 优化
---
Plugin.TestResult/SingleCell.xaml | 72 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 11 deletions(-)
diff --git a/Plugin.TestResult/SingleCell.xaml b/Plugin.TestResult/SingleCell.xaml
index 8db4b23..327493f 100644
--- a/Plugin.TestResult/SingleCell.xaml
+++ b/Plugin.TestResult/SingleCell.xaml
@@ -5,8 +5,10 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Plugin.TestResult_WPF"
mc:Ignorable="d"
+ xmlns:pw="https://opensource.panuon.com/wpf"
+xmlns:pu="https://opensource.panuon.com/wpf-ui"
+xmlns:ui="clr-namespace:HMI.UI;assembly=HMI.UI"
x:Name="uc"
- Padding="5"
MouseDoubleClick="UserControl_MouseDoubleClick"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
@@ -16,6 +18,13 @@
<!--<UserControl.ToolTip>
<ToolTip Padding="5" BorderThickness="1" BorderBrush="Black" Background="Yellow" Content="{Binding tooltipContent}"/>
</UserControl.ToolTip>-->
+
+ <UserControl.ContextMenu>
+ <ContextMenu>
+ <!--<MenuItem IsCheckable="True" IsChecked="{Binding CellIsDisabled,Mode=TwoWay}" Header="绂佺敤"/>-->
+ <MenuItem IsCheckable="False" x:Name="clearSNRItem" Click="MenuItem_Click" Header="娓呴櫎鏉＄爜"/>
+ </ContextMenu>
+ </UserControl.ContextMenu>
<UserControl.Style>
<Style TargetType="UserControl">
@@ -36,7 +45,7 @@
<Setter Property="Background" Value="#1296db"/>
</DataTrigger>
<DataTrigger Binding="{Binding status}" Value="waiting">
- <Setter Property="Background" Value="#6e6e6e"/>
+ <Setter Property="Background" Value="#A5A5A5"/>
</DataTrigger>
<DataTrigger Binding="{Binding status}" Value="alert">
<Setter Property="Background" Value="#e04733"/>
@@ -47,24 +56,62 @@
<DataTrigger Binding="{Binding status}" Value="hadCode">
<Setter Property="Background" Value="#FFF"/>
</DataTrigger>
+ <DataTrigger Binding="{Binding status}" Value="abort">
+ <Setter Property="Background" Value="Black"/>
+ </DataTrigger>
</Style.Triggers>
</Style>
</UserControl.Style>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
- <RowDefinition/>
+ <RowDefinition Height="18"/>
</Grid.RowDefinitions>
- <!--<TextBox Grid.Row="0" IsReadOnly="True" TextAlignment="Center" Margin="0,0,0,3" FontSize="15"
- Background="Transparent" BorderThickness="0" Text="{Binding title}"/>-->
- <Label Grid.Row="0" HorizontalContentAlignment="Left" VerticalContentAlignment="Center" Padding="0" Margin="0,0,0,3"
- FontSize="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=UserControl},
- Converter={StaticResource FontSizeConverter}, ConverterParameter='15,103'}"
- FontWeight="Bold"
- Background="Transparent" BorderThickness="0" Content="{Binding title}"/>
- <Image Grid.Row="1">
+ <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="鎺㈤拡棰勮">
+ <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'}"
+ FontWeight="Bold"
+Background="Transparent" BorderThickness="0" Content="{Binding title}">
+ <Label.Style>
+ <Style TargetType="Label">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding status}" Value="abort">
+ <Setter Property="Foreground" Value="#FFF"/>
+ </DataTrigger>
+ </Style.Triggers>
+ </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.Style>
<Style TargetType="Image">
+ <Setter Property="HorizontalAlignment" Value="Center"/>
+ <Setter Property="VerticalAlignment" Value="Top"/>
<Style.Triggers>
<DataTrigger Binding="{Binding status}" Value="ok">
<Setter Property="Source" Value="Resource/ok2.png"/>
@@ -93,6 +140,9 @@
<DataTrigger Binding="{Binding status}" Value="hadCode">
<Setter Property="Source" Value="Resource/barcode.png"/>
</DataTrigger>
+ <DataTrigger Binding="{Binding status}" Value="abort">
+ <Setter Property="Source" Value="Resource/abort.png"/>
+ </DataTrigger>
</Style.Triggers>
</Style>
</Image.Style>
--
Gitblit v1.9.1