From 2e54b439c64e0adbb7e010243c1f33aa5fc5f503 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 11 三月 2025 14:08:57 +0800
Subject: [PATCH] 完善程序； Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject
---
Plugin.TestResult/ViewControl.xaml | 73 ++++++++----------------------------
1 files changed, 16 insertions(+), 57 deletions(-)
diff --git a/Plugin.TestResult/ViewControl.xaml b/Plugin.TestResult/ViewControl.xaml
index 1d320b9..3059599 100644
--- a/Plugin.TestResult/ViewControl.xaml
+++ b/Plugin.TestResult/ViewControl.xaml
@@ -1,9 +1,15 @@
-锘�<UserControl x:Class="Plugin.TestResult_WPF.ViewControl"
+锘�<hb:PluginControl x:Class="Plugin.TestResult_WPF.ViewControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Plugin.TestResult_WPF"
+ xmlns:hb="clr-namespace:HMI.Base;assembly=HMI.Base"
+ xmlns:uic="clr-namespace:HMI.UI.Converter;assembly=HMI.UI"
+xmlns:ui="clr-namespace:HMI.UI;assembly=HMI.UI"
+xmlns:pw="https://opensource.panuon.com/wpf"
+xmlns:pu="https://opensource.panuon.com/wpf-ui"
+xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
mc:Ignorable="d"
Loaded="UserControl_Loaded"
d:DesignHeight="450" d:DesignWidth="800">
@@ -11,7 +17,7 @@
<local:FontSizeConverter x:Key="FontSizeConverter"/>
<Style TargetType="GroupBox">
<Setter Property="FontSize" Value="{Binding ActualWidth,RelativeSource={RelativeSource AncestorType=UserControl},
-Converter={StaticResource FontSizeConverter}, ConverterParameter='30,1920'}" />
+Converter={StaticResource FontSizeConverter}, ConverterParameter='20,1920'}" />
</Style>
<Style TargetType="Button">
@@ -34,7 +40,8 @@
<local:TestResultView x:Name="testResultView" Grid.Column="0" Loaded="testResultView_Loaded" />
<StackPanel Grid.Column="1" Background="#FFF">
<GroupBox Header="浜у搧淇℃伅">
- <ComboBox x:Name="modelSelect" SelectionChanged="modelSelect_SelectionChanged"></ComboBox>
+ <ComboBox x:Name="modelSelect" Style="{StaticResource FormComboxStyle}"
+ SelectionChanged="modelSelect_SelectionChanged"></ComboBox>
</GroupBox>
<GroupBox Header="鐢熶骇缁熻">
<StackPanel>
@@ -86,69 +93,21 @@
</StackPanel>
</GroupBox>
<GroupBox Header="鎿嶄綔">
- <StackPanel>
- <Button x:Name="btnStart" Click="Start_Click">
+ <StackPanel dp:StackPanelHelper.ChildSpace="20">
+ <Button x:Name="btnStart" Click="Start_Click" Style="{StaticResource SuccessButton}">
<Button.Content>鍚姩</Button.Content>
- <Button.Style>
- <Style TargetType="Button">
- <Setter Property="Background" Value="Green"/>
- <Setter Property="Foreground" Value="White"/>
- <Setter Property="Margin" Value="0,10"/>
- <Setter Property="Padding" Value="5"/>
- <Style.Triggers>
- <Trigger Property="IsEnabled" Value="False">
- <Setter Property="Foreground" Value="Gray"/>
- </Trigger>
- </Style.Triggers>
- </Style>
- </Button.Style>
</Button>
- <Button x:Name="btnStop" Click="Stop_Click">
+ <Button x:Name="btnStop" Click="Stop_Click" Style="{StaticResource DangerButton}">
<Button.Content>鍋滄</Button.Content>
- <Button.Style>
- <Style TargetType="Button">
- <Setter Property="Background" Value="Red"/>
- <Setter Property="Foreground" Value="White"/>
- <Setter Property="Margin" Value="0,10"/>
- <Setter Property="Padding" Value="5"/>
- <Style.Triggers>
- <Trigger Property="IsEnabled" Value="False">
- <Setter Property="Foreground" Value="Gray"/>
- </Trigger>
- </Style.Triggers>
- </Style>
- </Button.Style>
</Button>
- <Button x:Name="btnScan1" Click="Scan_Click_1">
+ <Button x:Name="btnScan1" Click="Scan_Click_1" Style="{StaticResource PrimaryButton}">
<Button.Content>涓�鍖烘壂鐮�</Button.Content>
- <Button.Style>
- <Style TargetType="Button">
- <Setter Property="Margin" Value="0,10"/>
- <Setter Property="Padding" Value="5"/>
- <Style.Triggers>
- <Trigger Property="IsEnabled" Value="False">
- <Setter Property="Foreground" Value="Gray"/>
- </Trigger>
- </Style.Triggers>
- </Style>
- </Button.Style>
</Button>
- <Button x:Name="btnScan2" Click="Scan_Click_2">
+ <Button x:Name="btnScan2" Click="Scan_Click_2" Style="{StaticResource PrimaryButton}">
<Button.Content>浜屽尯鎵爜</Button.Content>
- <Button.Style>
- <Style TargetType="Button">
- <Setter Property="Margin" Value="0,10"/>
- <Setter Property="Padding" Value="5"/>
- <Style.Triggers>
- <Trigger Property="IsEnabled" Value="False">
- <Setter Property="Foreground" Value="Gray"/>
- </Trigger>
- </Style.Triggers>
- </Style>
- </Button.Style>
</Button>
<!-- <Button Content="璁℃暟娓呴浂"/>
<Button Content="鎵爜"/>
@@ -158,4 +117,4 @@
</GroupBox>
</StackPanel>
</Grid>
-</UserControl>
+</hb:PluginControl>
--
Gitblit v1.9.1