From 6bcafc823e836ecd5790f87178a906333699f868 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 10 四月 2025 10:46:47 +0800
Subject: [PATCH] 优化插件结构；
---
Plugin.TestResult/InfoWindow.xaml | 102 ++++++++++++++++++++++++++++++---------------------
1 files changed, 60 insertions(+), 42 deletions(-)
diff --git a/Plugin.TestResult/InfoWindow.xaml b/Plugin.TestResult/InfoWindow.xaml
index bc7020a..290ba69 100644
--- a/Plugin.TestResult/InfoWindow.xaml
+++ b/Plugin.TestResult/InfoWindow.xaml
@@ -14,49 +14,67 @@
xmlns:cc="clr-namespace:HMI.Core;assembly=HMI.Core"
InteropOwnersMask="False"
Topmost="False"
+ Loaded="Window_Loaded"
+ Unloaded="Window_Unloaded"
+ SizeChanged="Window_SizeChanged"
pu:WindowXModalDialog.Buttons="{x:Null}"
Title="{Binding title}" Height="500" Width="800">
- <DataGrid ItemsSource="{Binding dataSource}"
- Style="{StaticResource DefaultDataGrid}">
- <DataGrid.Columns>
- <DataGridTemplateColumn Header="#" CanUserResize="False">
- <DataGridTemplateColumn.CellTemplate>
- <DataTemplate>
- <TextBlock Text="{Binding Converter={StaticResource rowNumber},
+ <Grid x:Name="mainGrid">
+ <Grid.RowDefinitions>
+ <RowDefinition/>
+ <RowDefinition Height="Auto"/>
+ <RowDefinition Height="Auto"/>
+ </Grid.RowDefinitions>
+ <DataGrid ItemsSource="{Binding dataSource}" AutoGenerateColumns="False"
+ CanUserAddRows="False"
+ CanUserDeleteRows="False"
+ IsReadOnly="True"
+ ColumnWidth="*"
+ VirtualizingStackPanel.VirtualizationMode="Standard"
+ FontSize="16">
+ <DataGrid.Columns>
+ <!--<DataGridTemplateColumn Header="#" CanUserResize="False" Width="Auto">
+ <DataGridTemplateColumn.CellTemplate>
+ <DataTemplate>
+ <TextBlock Text="{Binding Converter={StaticResource rowNumber},
RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"/>
- </DataTemplate>
- </DataGridTemplateColumn.CellTemplate>
- </DataGridTemplateColumn>
- <DataGridTextColumn Width="*" Binding="{Binding step}">
- <DataGridTextColumn.Header>
- <TextBlock Text="{DynamicResource Test.Name}"/>
- </DataGridTextColumn.Header>
- </DataGridTextColumn>
- <DataGridTextColumn Width="*" Binding="{Binding value}">
- <DataGridTextColumn.Header>
- <TextBlock Text="{DynamicResource Test.Value}"/>
- </DataGridTextColumn.Header>
- </DataGridTextColumn>
- <DataGridTextColumn Width="*" Binding="{Binding result}">
- <DataGridTextColumn.Header>
- <TextBlock Text="{DynamicResource Test.Result}"/>
- </DataGridTextColumn.Header>
- </DataGridTextColumn>
- <DataGridTextColumn Width="*" Binding="{Binding range}">
- <DataGridTextColumn.Header>
- <TextBlock Text="{DynamicResource Test.Range}"/>
- </DataGridTextColumn.Header>
- </DataGridTextColumn>
- <DataGridTextColumn Width="*" Binding="{Binding condition}">
- <DataGridTextColumn.Header>
- <TextBlock Text="{DynamicResource Test.Condition}"/>
- </DataGridTextColumn.Header>
- </DataGridTextColumn>
- <DataGridTextColumn Width="*" Binding="{Binding updateTime}">
- <DataGridTextColumn.Header>
- <TextBlock Text="{DynamicResource Test.UpdateTime}"/>
- </DataGridTextColumn.Header>
- </DataGridTextColumn>
- </DataGrid.Columns>
- </DataGrid>
+ </DataTemplate>
+ </DataGridTemplateColumn.CellTemplate>
+ </DataGridTemplateColumn>-->
+ <DataGridTextColumn Header="娴嬭瘯椤瑰悕绉�" Binding="{Binding step}"/>
+ <DataGridTextColumn Header="娴嬭瘯鍊�" Binding="{Binding value}"/>
+ <DataGridTextColumn Header="娴嬭瘯缁撴灉" Binding="{Binding result}"/>
+ <DataGridTextColumn Header="娴嬭瘯鑼冨洿" Binding="{Binding range}"/>
+ <DataGridTextColumn Header="娴嬭瘯鏉′欢" Binding="{Binding condition}"/>
+ <DataGridTextColumn Header="鏇存柊鏃堕棿" Binding="{Binding updateTime}"/>
+ </DataGrid.Columns>
+ </DataGrid>
+
+ <Grid Background="#f1eded" Grid.Row="2" Height="25">
+ <DockPanel>
+ <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Margin="0,0,30,0">
+ <Label Padding="0" FontSize="12"
+VerticalAlignment="Center"
+VerticalContentAlignment="Center" Content="鎺㈤拡浣跨敤娆℃暟:"/>
+ <Label Padding="0" FontSize="12" Margin="0,0,15,0"
+VerticalAlignment="Center"
+VerticalContentAlignment="Center" Content="{Binding ProbeCount}"/>
+
+
+ <Label x:Name="alarmLabel" Padding="0" FontSize="12"
+VerticalAlignment="Center"
+VerticalContentAlignment="Center" Content="棰勮娆℃暟:"/>
+ <Label x:Name="alarmValue" Padding="0" FontSize="12"
+VerticalAlignment="Center"
+VerticalContentAlignment="Center" Content="{Binding ProbeWarn}"/>
+
+ <Button Style="{StaticResource LinkButton}" Margin="10,0,0,0" Click="Button_Click" >娓呯┖</Button>
+ </StackPanel>
+
+ <Label x:Name="probeCountAlarm" Visibility="Collapsed" DockPanel.Dock="Left" Padding="30,0" FontSize="12" Foreground="Red"
+VerticalAlignment="Center"
+VerticalContentAlignment="Center" Content="鎺㈤拡浣跨敤宸茶揪鍒伴璀︽鏁帮紝璇锋敞鎰忥紒"/>
+ </DockPanel>
+ </Grid>
+ </Grid>
</pu:WindowX>
--
Gitblit v1.9.1