csi_team/CSI-Z420-Tablet-Multi-Function-Tester
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新122

Browse Source
This commit is contained in:
GukSang.Jin
2026-05-20 16:39:42 +08:00
parent 7c7339d72c
commit 4030c18dc8
5 changed files with 117 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
App.xaml
View File

@@ -1,6 +1,19 @@
<Application x:Class="TabletTester2025.App" <Application x:Class="TabletTester2025.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib">
<Application.Resources> <Application.Resources>
<sys:Double x:Key="SmallTextFontSize">14</sys:Double>
<sys:Double x:Key="TableFontSize">14</sys:Double>
<sys:Double x:Key="BaseFontSize">16</sys:Double>
<sys:Double x:Key="ButtonFontSize">16</sys:Double>
<sys:Double x:Key="TabFontSize">17</sys:Double>
<sys:Double x:Key="ParamValueFontSize">19</sys:Double>
<sys:Double x:Key="LargeInputFontSize">24</sys:Double>
<sys:Double x:Key="TitleFontSize">24</sys:Double>
<sys:Double x:Key="MetricValueFontSize">28</sys:Double>
<sys:Double x:Key="KeypadButtonFontSize">22</sys:Double>
<sys:Double x:Key="KeypadCommandFontSize">18</sys:Double>
<sys:Double x:Key="KeypadValueFontSize">28</sys:Double>
</Application.Resources> </Application.Resources>
</Application> </Application>

20
Views/HistoryWindow.xaml
View File

@@ -15,15 +15,17 @@
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>
<Setter Property="RowBackground" Value="White"/> <Setter Property="RowBackground" Value="White"/>
<Setter Property="AlternatingRowBackground" Value="#F8FAFC"/> <Setter Property="AlternatingRowBackground" Value="#F8FAFC"/>
<Setter Property="FontSize" Value="12"/> <Setter Property="FontSize" Value="{StaticResource TableFontSize}"/>
<Setter Property="HeadersVisibility" Value="Column"/> <Setter Property="HeadersVisibility" Value="Column"/>
<Setter Property="AutoGenerateColumns" Value="False"/> <Setter Property="AutoGenerateColumns" Value="False"/>
<Setter Property="CanUserResizeColumns" Value="True"/> <Setter Property="CanUserResizeColumns" Value="True"/>
<Setter Property="CanUserSortColumns" Value="True"/> <Setter Property="CanUserSortColumns" Value="True"/>
<Setter Property="GridLinesVisibility" Value="Horizontal"/> <Setter Property="GridLinesVisibility" Value="Horizontal"/>
<Setter Property="RowHeight" Value="32"/> <Setter Property="RowHeight" Value="38"/>
<Setter Property="SelectionMode" Value="Single"/> <Setter Property="SelectionMode" Value="Single"/>
<Setter Property="SelectionUnit" Value="FullRow"/> <Setter Property="SelectionUnit" Value="FullRow"/>
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
</Style> </Style>
<!-- 表头样式 --> <!-- 表头样式 -->
@@ -31,8 +33,8 @@
<Setter Property="Background" Value="#EFF3F6"/> <Setter Property="Background" Value="#EFF3F6"/>
<Setter Property="Foreground" Value="#1E293B"/> <Setter Property="Foreground" Value="#1E293B"/>
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="FontSize" Value="12"/> <Setter Property="FontSize" Value="{StaticResource TableFontSize}"/>
<Setter Property="Height" Value="36"/> <Setter Property="Height" Value="40"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/> <Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="BorderBrush" Value="#E2E8F0"/> <Setter Property="BorderBrush" Value="#E2E8F0"/>
<Setter Property="BorderThickness" Value="0,0,1,1"/> <Setter Property="BorderThickness" Value="0,0,1,1"/>
@@ -41,7 +43,7 @@
<!-- 按钮样式 --> <!-- 按钮样式 -->
<Style TargetType="Button" x:Key="ActionButton"> <Style TargetType="Button" x:Key="ActionButton">
<Setter Property="MinWidth" Value="80"/> <Setter Property="MinWidth" Value="80"/>
<Setter Property="Height" Value="34"/> <Setter Property="Height" Value="40"/>
<Setter Property="Margin" Value="6,0"/> <Setter Property="Margin" Value="6,0"/>
<Setter Property="Cursor" Value="Hand"/> <Setter Property="Cursor" Value="Hand"/>
<Setter Property="Background" Value="#FFFFFF"/> <Setter Property="Background" Value="#FFFFFF"/>
@@ -49,7 +51,7 @@
<Setter Property="BorderBrush" Value="#CBD5E1"/> <Setter Property="BorderBrush" Value="#CBD5E1"/>
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="FontSize" Value="12"/> <Setter Property="FontSize" Value="{StaticResource TableFontSize}"/>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
@@ -122,9 +124,9 @@
<Setter Property="BorderThickness" Value="0"/> <Setter Property="BorderThickness" Value="0"/>
</Style> </Style>
<Style TargetType="TabItem"> <Style TargetType="TabItem">
<Setter Property="FontSize" Value="13"/> <Setter Property="FontSize" Value="{StaticResource BaseFontSize}"/>
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="Padding" Value="16,8"/> <Setter Property="Padding" Value="18,10"/>
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
<Setter Property="Foreground" Value="#475569"/> <Setter Property="Foreground" Value="#475569"/>
<Setter Property="Template"> <Setter Property="Template">
@@ -165,7 +167,7 @@
<!-- 标题栏 --> <!-- 标题栏 -->
<Border Grid.Row="0" Background="#F8FAFC" CornerRadius="16,16,0,0" Padding="20,16"> <Border Grid.Row="0" Background="#F8FAFC" CornerRadius="16,16,0,0" Padding="20,16">
<TextBlock Text="📋 历史检测记录" FontSize="20" FontWeight="Bold" <TextBlock Text="📋 历史检测记录" FontSize="{StaticResource TitleFontSize}" FontWeight="Bold"
Foreground="#0F172A" HorizontalAlignment="Center"/> Foreground="#0F172A" HorizontalAlignment="Center"/>
</Border> </Border>

116
Views/MainWindow.xaml
View File

@@ -23,15 +23,15 @@
<SolidColorBrush x:Key="ValueBrush" Color="#102A43"/> <SolidColorBrush x:Key="ValueBrush" Color="#102A43"/>
<Style TargetType="Button" x:Key="ActionButton"> <Style TargetType="Button" x:Key="ActionButton">
<Setter Property="MinWidth" Value="112"/> <Setter Property="MinWidth" Value="116"/>
<Setter Property="Height" Value="42"/> <Setter Property="Height" Value="44"/>
<Setter Property="Margin" Value="6"/> <Setter Property="Margin" Value="5"/>
<Setter Property="Padding" Value="14,0"/> <Setter Property="Padding" Value="16,0"/>
<Setter Property="Cursor" Value="Hand"/> <Setter Property="Cursor" Value="Hand"/>
<Setter Property="Background" Value="{StaticResource PrimaryBrush}"/> <Setter Property="Background" Value="{StaticResource PrimaryBrush}"/>
<Setter Property="Foreground" Value="White"/> <Setter Property="Foreground" Value="White"/>
<Setter Property="BorderThickness" Value="0"/> <Setter Property="BorderThickness" Value="0"/>
<Setter Property="FontSize" Value="15"/> <Setter Property="FontSize" Value="{StaticResource ButtonFontSize}"/>
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
@@ -78,9 +78,9 @@
</Style> </Style>
<Style TargetType="TabItem"> <Style TargetType="TabItem">
<Setter Property="FontSize" Value="16"/> <Setter Property="FontSize" Value="{StaticResource TabFontSize}"/>
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="Padding" Value="24,12"/> <Setter Property="Padding" Value="24,13"/>
<Setter Property="Foreground" Value="#465A6E"/> <Setter Property="Foreground" Value="#465A6E"/>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
@@ -109,44 +109,56 @@
<Style TargetType="GroupBox"> <Style TargetType="GroupBox">
<Setter Property="BorderBrush" Value="{StaticResource PanelBorderBrush}"/> <Setter Property="BorderBrush" Value="{StaticResource PanelBorderBrush}"/>
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>
<Setter Property="Padding" Value="14"/> <Setter Property="Padding" Value="16"/>
<Setter Property="Margin" Value="0,0,0,12"/> <Setter Property="Margin" Value="0,0,0,12"/>
<Setter Property="FontSize" Value="15"/> <Setter Property="FontSize" Value="{StaticResource BaseFontSize}"/>
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="Background" Value="{StaticResource PanelBackgroundBrush}"/> <Setter Property="Background" Value="{StaticResource PanelBackgroundBrush}"/>
</Style> </Style>
<Style TargetType="TextBox"> <Style TargetType="TextBox">
<Setter Property="Width" Value="130"/> <Setter Property="Width" Value="130"/>
<Setter Property="Height" Value="40"/> <Setter Property="Height" Value="42"/>
<Setter Property="Padding" Value="8,2"/> <Setter Property="Padding" Value="8,2"/>
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="BorderBrush" Value="#B7C4D2"/> <Setter Property="BorderBrush" Value="#B7C4D2"/>
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>
<Setter Property="FontSize" Value="15"/> <Setter Property="FontSize" Value="{StaticResource BaseFontSize}"/>
<Setter Property="helpers:NumericInput.IsEnabled" Value="True"/> <Setter Property="helpers:NumericInput.IsEnabled" Value="True"/>
</Style> </Style>
<Style TargetType="DataGrid">
<Setter Property="FontSize" Value="{StaticResource TableFontSize}"/>
<Setter Property="RowHeight" Value="36"/>
<Setter Property="ColumnHeaderHeight" Value="38"/>
</Style>
<Style TargetType="DataGridColumnHeader">
<Setter Property="FontSize" Value="{StaticResource TableFontSize}"/>
<Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
</Style>
<Style TargetType="RadioButton"> <Style TargetType="RadioButton">
<Setter Property="FontSize" Value="15"/> <Setter Property="FontSize" Value="{StaticResource BaseFontSize}"/>
<Setter Property="Margin" Value="0,0,22,0"/> <Setter Property="Margin" Value="0,0,22,0"/>
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center"/>
</Style> </Style>
<Style TargetType="TextBlock" x:Key="ParamLabel"> <Style TargetType="TextBlock" x:Key="ParamLabel">
<Setter Property="Width" Value="250"/> <Setter Property="Width" Value="260"/>
<Setter Property="VerticalAlignment" Value="Center"/> <Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Foreground" Value="{StaticResource LabelBrush}"/> <Setter Property="Foreground" Value="{StaticResource LabelBrush}"/>
<Setter Property="FontSize" Value="15"/> <Setter Property="FontSize" Value="{StaticResource BaseFontSize}"/>
<Setter Property="FontWeight" Value="Normal"/> <Setter Property="FontWeight" Value="Normal"/>
<Setter Property="TextWrapping" Value="Wrap"/> <Setter Property="TextWrapping" Value="Wrap"/>
</Style> </Style>
<Style TargetType="StackPanel" x:Key="ParamRow"> <Style TargetType="StackPanel" x:Key="ParamRow">
<Setter Property="Orientation" Value="Horizontal"/> <Setter Property="Orientation" Value="Horizontal"/>
<Setter Property="Margin" Value="0,6,26,6"/> <Setter Property="Margin" Value="0,7,26,7"/>
<Setter Property="VerticalAlignment" Value="Center"/> <Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="MinWidth" Value="400"/> <Setter Property="MinWidth" Value="430"/>
</Style> </Style>
<Style TargetType="Border" x:Key="MetricCard"> <Style TargetType="Border" x:Key="MetricCard">
@@ -154,14 +166,14 @@
<Setter Property="BorderBrush" Value="#E0E7EF"/> <Setter Property="BorderBrush" Value="#E0E7EF"/>
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>
<Setter Property="CornerRadius" Value="6"/> <Setter Property="CornerRadius" Value="6"/>
<Setter Property="Padding" Value="12,10"/> <Setter Property="Padding" Value="14,12"/>
<Setter Property="Margin" Value="6"/> <Setter Property="Margin" Value="6"/>
<Setter Property="MinHeight" Value="86"/> <Setter Property="MinHeight" Value="94"/>
</Style> </Style>
<Style TargetType="TextBlock" x:Key="MetricLabel"> <Style TargetType="TextBlock" x:Key="MetricLabel">
<Setter Property="Foreground" Value="{StaticResource LabelBrush}"/> <Setter Property="Foreground" Value="{StaticResource LabelBrush}"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="{StaticResource BaseFontSize}"/>
<Setter Property="FontWeight" Value="Normal"/> <Setter Property="FontWeight" Value="Normal"/>
<Setter Property="HorizontalAlignment" Value="Center"/> <Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="TextAlignment" Value="Center"/> <Setter Property="TextAlignment" Value="Center"/>
@@ -170,7 +182,7 @@
<Style TargetType="TextBlock" x:Key="MetricValue"> <Style TargetType="TextBlock" x:Key="MetricValue">
<Setter Property="Foreground" Value="{StaticResource ValueBrush}"/> <Setter Property="Foreground" Value="{StaticResource ValueBrush}"/>
<Setter Property="FontSize" Value="26"/> <Setter Property="FontSize" Value="{StaticResource MetricValueFontSize}"/>
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="HorizontalAlignment" Value="Center"/> <Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="TextAlignment" Value="Center"/> <Setter Property="TextAlignment" Value="Center"/>
@@ -194,14 +206,14 @@
<Style TargetType="TextBlock" x:Key="FooterLabel"> <Style TargetType="TextBlock" x:Key="FooterLabel">
<Setter Property="Foreground" Value="#647487"/> <Setter Property="Foreground" Value="#647487"/>
<Setter Property="FontSize" Value="13"/> <Setter Property="FontSize" Value="{StaticResource SmallTextFontSize}"/>
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="VerticalAlignment" Value="Center"/> <Setter Property="VerticalAlignment" Value="Center"/>
</Style> </Style>
<Style TargetType="TextBlock" x:Key="FooterValue"> <Style TargetType="TextBlock" x:Key="FooterValue">
<Setter Property="Foreground" Value="#102A43"/> <Setter Property="Foreground" Value="#102A43"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="15"/>
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="VerticalAlignment" Value="Center"/> <Setter Property="VerticalAlignment" Value="Center"/>
</Style> </Style>
@@ -220,7 +232,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Text="{Binding LocalAlarm}" <TextBlock Text="{Binding LocalAlarm}"
FontSize="15" FontSize="{StaticResource BaseFontSize}"
FontWeight="SemiBold" FontWeight="SemiBold"
Margin="0,0,0,8" Margin="0,0,0,8"
HorizontalAlignment="Center"> HorizontalAlignment="Center">
@@ -258,7 +270,7 @@
</TextBlock.Style> </TextBlock.Style>
</TextBlock> </TextBlock>
<TabControl Grid.Row="1" FontSize="13" BorderThickness="0"> <TabControl Grid.Row="1" FontSize="{StaticResource BaseFontSize}" BorderThickness="0">
<TabItem Header="硬度"> <TabItem Header="硬度">
<ScrollViewer VerticalScrollBarVisibility="Auto" <ScrollViewer VerticalScrollBarVisibility="Auto"
HorizontalScrollBarVisibility="Disabled"> HorizontalScrollBarVisibility="Disabled">
@@ -273,15 +285,15 @@
<UniformGrid Columns="3" Margin="10"> <UniformGrid Columns="3" Margin="10">
<!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,18,0"> <!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,18,0">
<TextBlock Text="内控下限(N)：" Width="130" VerticalAlignment="Center"/> <TextBlock Text="内控下限(N)：" Width="130" VerticalAlignment="Center"/>
<TextBlock Text="{Binding HardnessInternalMin, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/> <TextBlock Text="{Binding HardnessInternalMin, StringFormat=F1}" FontSize="{StaticResource ParamValueFontSize}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,18,0"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,18,0">
<TextBlock Text="内控上限(N)：" Width="130" VerticalAlignment="Center"/> <TextBlock Text="内控上限(N)：" Width="130" VerticalAlignment="Center"/>
<TextBlock Text="{Binding HardnessInternalMax, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/> <TextBlock Text="{Binding HardnessInternalMax, StringFormat=F1}" FontSize="{StaticResource ParamValueFontSize}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel>--> </StackPanel>-->
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,10,0,0">
<TextBlock Text="测试次数：" Width="110" VerticalAlignment="Center"/> <TextBlock Text="测试次数：" Width="110" VerticalAlignment="Center"/>
<TextBlock Text="{Binding HardnessTestCount}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/> <TextBlock Text="{Binding HardnessTestCount}" FontSize="{StaticResource ParamValueFontSize}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel> </StackPanel>
</UniformGrid> </UniformGrid>
</GroupBox> </GroupBox>
@@ -476,15 +488,15 @@
<WrapPanel> <WrapPanel>
<StackPanel Style="{StaticResource ParamRow}"> <StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="转速设置(r/min)：" Style="{StaticResource ParamLabel}"/> <TextBlock Text="转速设置(r/min)：" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding FriabilityTargetRpm, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/> <TextBlock Text="{Binding FriabilityTargetRpm, StringFormat=F1}" FontSize="{StaticResource ParamValueFontSize}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel> </StackPanel>
<StackPanel Style="{StaticResource ParamRow}"> <StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="试验转数(转)：" Style="{StaticResource ParamLabel}"/> <TextBlock Text="试验转数(转)：" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding FriabilityTargetRounds}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/> <TextBlock Text="{Binding FriabilityTargetRounds}" FontSize="{StaticResource ParamValueFontSize}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel> </StackPanel>
<StackPanel Style="{StaticResource ParamRow}"> <StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="失重率限度(%)：" Style="{StaticResource ParamLabel}"/> <TextBlock Text="失重率限度(%)：" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding FriabilityMaxLossPercent, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/> <TextBlock Text="{Binding FriabilityMaxLossPercent, StringFormat=F1}" FontSize="{StaticResource ParamValueFontSize}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel> </StackPanel>
</WrapPanel> </WrapPanel>
</GroupBox> </GroupBox>
@@ -502,7 +514,7 @@
<TextBlock Text="脆碎前质量(g)" Style="{StaticResource MetricLabel}"/> <TextBlock Text="脆碎前质量(g)" Style="{StaticResource MetricLabel}"/>
<TextBox Text="{Binding WeightBefore, Mode=TwoWay, UpdateSourceTrigger=LostFocus, StringFormat=F3}" <TextBox Text="{Binding WeightBefore, Mode=TwoWay, UpdateSourceTrigger=LostFocus, StringFormat=F3}"
Width="150" Width="150"
FontSize="22" FontSize="{StaticResource LargeInputFontSize}"
FontWeight="SemiBold" FontWeight="SemiBold"
HorizontalContentAlignment="Center" HorizontalContentAlignment="Center"
Margin="0,8,0,0"/> Margin="0,8,0,0"/>
@@ -513,7 +525,7 @@
<TextBlock Text="脆碎后质量(g)" Style="{StaticResource MetricLabel}"/> <TextBlock Text="脆碎后质量(g)" Style="{StaticResource MetricLabel}"/>
<TextBox Text="{Binding WeightAfter, Mode=TwoWay, UpdateSourceTrigger=LostFocus, StringFormat=F3}" <TextBox Text="{Binding WeightAfter, Mode=TwoWay, UpdateSourceTrigger=LostFocus, StringFormat=F3}"
Width="150" Width="150"
FontSize="22" FontSize="{StaticResource LargeInputFontSize}"
FontWeight="SemiBold" FontWeight="SemiBold"
HorizontalContentAlignment="Center" HorizontalContentAlignment="Center"
Margin="0,8,0,0"/> Margin="0,8,0,0"/>
@@ -558,23 +570,23 @@
<WrapPanel> <WrapPanel>
<StackPanel Style="{StaticResource ParamRow}"> <StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="溶出1时间(min)：" Style="{StaticResource ParamLabel}"/> <TextBlock Text="溶出1时间(min)：" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding Dissolution1TimeMin}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/> <TextBlock Text="{Binding Dissolution1TimeMin}" FontSize="{StaticResource ParamValueFontSize}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel> </StackPanel>
<StackPanel Style="{StaticResource ParamRow}"> <StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="溶出2时间(min)：" Style="{StaticResource ParamLabel}"/> <TextBlock Text="溶出2时间(min)：" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding Dissolution2TimeMin}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/> <TextBlock Text="{Binding Dissolution2TimeMin}" FontSize="{StaticResource ParamValueFontSize}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel> </StackPanel>
<StackPanel Style="{StaticResource ParamRow}"> <StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="溶出1间隔取样时间(min)：" Style="{StaticResource ParamLabel}"/> <TextBlock Text="溶出1间隔取样时间(min)：" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding Dissolution1SampleIntervalMin, StringFormat=F0}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/> <TextBlock Text="{Binding Dissolution1SampleIntervalMin, StringFormat=F0}" FontSize="{StaticResource ParamValueFontSize}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel> </StackPanel>
<StackPanel Style="{StaticResource ParamRow}"> <StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="溶出2间隔取样时间(min)：" Style="{StaticResource ParamLabel}"/> <TextBlock Text="溶出2间隔取样时间(min)：" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding Dissolution2SampleIntervalMin, StringFormat=F0}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/> <TextBlock Text="{Binding Dissolution2SampleIntervalMin, StringFormat=F0}" FontSize="{StaticResource ParamValueFontSize}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel> </StackPanel>
<StackPanel Style="{StaticResource ParamRow}"> <StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="介质温度(℃)：" Style="{StaticResource ParamLabel}"/> <TextBlock Text="介质温度(℃)：" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding DisintegrationTemp, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/> <TextBlock Text="{Binding DisintegrationTemp, StringFormat=F1}" FontSize="{StaticResource ParamValueFontSize}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel> </StackPanel>
</WrapPanel> </WrapPanel>
</GroupBox> </GroupBox>
@@ -647,12 +659,12 @@
<oxy:PlotView Grid.Row="0" Model="{Binding DissolutionPlotModel}" Margin="4"/> <oxy:PlotView Grid.Row="0" Model="{Binding DissolutionPlotModel}" Margin="4"/>
<WrapPanel Grid.Row="1" Margin="4,8,4,2"> <WrapPanel Grid.Row="1" Margin="4,8,4,2">
<TextBlock Text="{Binding Dissolution1RSquared, StringFormat='溶出1 R² = {0:F4}'}" <TextBlock Text="{Binding Dissolution1RSquared, StringFormat='溶出1 R² = {0:F4}'}"
FontSize="15" FontSize="{StaticResource BaseFontSize}"
FontWeight="SemiBold" FontWeight="SemiBold"
Foreground="#2E7D32" Foreground="#2E7D32"
Margin="0,0,28,0"/> Margin="0,0,28,0"/>
<TextBlock Text="{Binding Dissolution2RSquared, StringFormat='溶出2 R² = {0:F4}'}" <TextBlock Text="{Binding Dissolution2RSquared, StringFormat='溶出2 R² = {0:F4}'}"
FontSize="15" FontSize="{StaticResource BaseFontSize}"
FontWeight="SemiBold" FontWeight="SemiBold"
Foreground="#1565C0"/> Foreground="#1565C0"/>
</WrapPanel> </WrapPanel>
@@ -674,8 +686,8 @@
IsReadOnly="True" IsReadOnly="True"
MinHeight="150" MinHeight="150"
MaxHeight="240" MaxHeight="240"
RowHeight="34" RowHeight="36"
FontSize="14" FontSize="{StaticResource TableFontSize}"
GridLinesVisibility="Horizontal"> GridLinesVisibility="Horizontal">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn Header="通道" Binding="{Binding ChannelName}" Width="90"/> <DataGridTextColumn Header="通道" Binding="{Binding ChannelName}" Width="90"/>
@@ -713,11 +725,11 @@
<WrapPanel> <WrapPanel>
<StackPanel Style="{StaticResource ParamRow}"> <StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="崩解时间(min)：" Style="{StaticResource ParamLabel}"/> <TextBlock Text="崩解时间(min)：" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding DisintegrationTimeMin, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/> <TextBlock Text="{Binding DisintegrationTimeMin, StringFormat=F1}" FontSize="{StaticResource ParamValueFontSize}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel> </StackPanel>
<StackPanel Style="{StaticResource ParamRow}"> <StackPanel Style="{StaticResource ParamRow}">
<TextBlock Text="介质温度(℃)：" Style="{StaticResource ParamLabel}"/> <TextBlock Text="介质温度(℃)：" Style="{StaticResource ParamLabel}"/>
<TextBlock Text="{Binding DisintegrationTemp, StringFormat=F1}" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center"/> <TextBlock Text="{Binding DisintegrationTemp, StringFormat=F1}" FontSize="{StaticResource ParamValueFontSize}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel> </StackPanel>
</WrapPanel> </WrapPanel>
</GroupBox> </GroupBox>
@@ -729,12 +741,12 @@
<TextBlock Text="实际崩解时间(秒)" Style="{StaticResource MetricLabel}"/> <TextBlock Text="实际崩解时间(秒)" Style="{StaticResource MetricLabel}"/>
<TextBox Text="{Binding DisintegrationActualSecondsText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" <TextBox Text="{Binding DisintegrationActualSecondsText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Width="160" Width="160"
Height="46" Height="50"
Margin="0,8,0,0" Margin="0,8,0,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
IsEnabled="{Binding CanSaveDisintegrationResult}" IsEnabled="{Binding CanSaveDisintegrationResult}"
TextAlignment="Center" TextAlignment="Center"
FontSize="26" FontSize="{StaticResource MetricValueFontSize}"
FontWeight="SemiBold" FontWeight="SemiBold"
Foreground="{StaticResource ValueBrush}"/> Foreground="{StaticResource ValueBrush}"/>
</StackPanel> </StackPanel>
@@ -771,12 +783,18 @@
<Border Background="#0F3D68" CornerRadius="6" Margin="0,0,0,8" Padding="12,10"> <Border Background="#0F3D68" CornerRadius="6" Margin="0,0,0,8" Padding="12,10">
<Grid> <Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Text="片剂四用仪 硬度 · 脆碎度 · 溶出 · 崩解" <TextBlock Text="片剂四用仪 硬度 · 脆碎度 · 溶出 · 崩解"
FontSize="22" FontSize="{StaticResource TitleFontSize}"
FontWeight="Bold" FontWeight="Bold"
Foreground="White" Foreground="White"
VerticalAlignment="Center"/> VerticalAlignment="Center"
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center"> TextTrimming="CharacterEllipsis"
Margin="0,0,12,0"/>
<StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
<Button Command="{Binding OpenSettingsCommand}" Content="参数设置" Style="{StaticResource ActionButton}"/> <Button Command="{Binding OpenSettingsCommand}" Content="参数设置" Style="{StaticResource ActionButton}"/>
<Button Command="{Binding OpenHistoryCommand}" Content="历史记录" Style="{StaticResource ActionButton}"/> <Button Command="{Binding OpenHistoryCommand}" Content="历史记录" Style="{StaticResource ActionButton}"/>
<Button Command="{Binding ExportAllCommand}" Content="导出报告" Style="{StaticResource ActionButton}"/> <Button Command="{Binding ExportAllCommand}" Content="导出报告" Style="{StaticResource ActionButton}"/>
@@ -836,7 +854,7 @@
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
Text="{Binding GlobalAlarm}" Text="{Binding GlobalAlarm}"
Foreground="#C62828" Foreground="#C62828"
FontSize="14" FontSize="{StaticResource SmallTextFontSize}"
FontWeight="SemiBold" FontWeight="SemiBold"
VerticalAlignment="Center" VerticalAlignment="Center"
TextTrimming="CharacterEllipsis"/> TextTrimming="CharacterEllipsis"/>

8
Views/NumericKeypadWindow.xaml
View File

@@ -13,14 +13,14 @@
<Setter Property="MinWidth" Value="72"/> <Setter Property="MinWidth" Value="72"/>
<Setter Property="MinHeight" Value="58"/> <Setter Property="MinHeight" Value="58"/>
<Setter Property="Margin" Value="5"/> <Setter Property="Margin" Value="5"/>
<Setter Property="FontSize" Value="22"/> <Setter Property="FontSize" Value="{StaticResource KeypadButtonFontSize}"/>
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="Background" Value="White"/> <Setter Property="Background" Value="White"/>
<Setter Property="BorderBrush" Value="#C7D2DE"/> <Setter Property="BorderBrush" Value="#C7D2DE"/>
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>
</Style> </Style>
<Style TargetType="Button" x:Key="CommandButton" BasedOn="{StaticResource KeyButton}"> <Style TargetType="Button" x:Key="CommandButton" BasedOn="{StaticResource KeyButton}">
<Setter Property="FontSize" Value="18"/> <Setter Property="FontSize" Value="{StaticResource KeypadCommandFontSize}"/>
<Setter Property="Background" Value="#E9F1F8"/> <Setter Property="Background" Value="#E9F1F8"/>
</Style> </Style>
</Window.Resources> </Window.Resources>
@@ -36,7 +36,7 @@
Grid.Row="0" Grid.Row="0"
Height="58" Height="58"
Padding="12,0" Padding="12,0"
FontSize="28" FontSize="{StaticResource KeypadValueFontSize}"
FontWeight="SemiBold" FontWeight="SemiBold"
HorizontalContentAlignment="Right" HorizontalContentAlignment="Right"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
@@ -74,7 +74,7 @@
<TextBlock Grid.Row="2" <TextBlock Grid.Row="2"
Text="点击数字输入，确定后写入当前输入框" Text="点击数字输入，确定后写入当前输入框"
Foreground="#526273" Foreground="#526273"
FontSize="13" FontSize="{StaticResource SmallTextFontSize}"
HorizontalAlignment="Center"/> HorizontalAlignment="Center"/>
</Grid> </Grid>
</Window> </Window>

33
Views/SettingsWindow.xaml
View File

@@ -16,40 +16,47 @@
<Style TargetType="GroupBox"> <Style TargetType="GroupBox">
<Setter Property="Margin" Value="0,0,0,14"/> <Setter Property="Margin" Value="0,0,0,14"/>
<Setter Property="Padding" Value="14"/> <Setter Property="Padding" Value="16"/>
<Setter Property="Background" Value="White"/> <Setter Property="Background" Value="White"/>
<Setter Property="BorderBrush" Value="{StaticResource PanelBorderBrush}"/> <Setter Property="BorderBrush" Value="{StaticResource PanelBorderBrush}"/>
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>
<Setter Property="FontSize" Value="16"/> <Setter Property="FontSize" Value="{StaticResource BaseFontSize}"/>
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
</Style> </Style>
<Style TargetType="TextBlock" x:Key="ParamLabel"> <Style TargetType="TextBlock" x:Key="ParamLabel">
<Setter Property="Width" Value="220"/> <Setter Property="Width" Value="230"/>
<Setter Property="VerticalAlignment" Value="Center"/> <Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="Foreground" Value="#526273"/> <Setter Property="Foreground" Value="#526273"/>
<Setter Property="FontSize" Value="15"/> <Setter Property="FontSize" Value="{StaticResource BaseFontSize}"/>
<Setter Property="FontWeight" Value="Normal"/> <Setter Property="FontWeight" Value="Normal"/>
<Setter Property="TextWrapping" Value="Wrap"/>
</Style> </Style>
<Style TargetType="TextBox"> <Style TargetType="TextBox">
<Setter Property="Width" Value="180"/> <Setter Property="Width" Value="180"/>
<Setter Property="Height" Value="40"/> <Setter Property="Height" Value="42"/>
<Setter Property="Padding" Value="8,2"/> <Setter Property="Padding" Value="8,2"/>
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="FontSize" Value="15"/> <Setter Property="FontSize" Value="{StaticResource BaseFontSize}"/>
<Setter Property="helpers:NumericInput.IsEnabled" Value="True"/> <Setter Property="helpers:NumericInput.IsEnabled" Value="True"/>
</Style> </Style>
<Style TargetType="Button">
<Setter Property="FontSize" Value="{StaticResource ButtonFontSize}"/>
<Setter Property="MinHeight" Value="44"/>
<Setter Property="Padding" Value="16,0"/>
</Style>
<Style TargetType="StackPanel" x:Key="ParamRow"> <Style TargetType="StackPanel" x:Key="ParamRow">
<Setter Property="Orientation" Value="Horizontal"/> <Setter Property="Orientation" Value="Horizontal"/>
<Setter Property="Margin" Value="0,6,32,6"/> <Setter Property="Margin" Value="0,7,32,7"/>
<Setter Property="VerticalAlignment" Value="Center"/> <Setter Property="VerticalAlignment" Value="Center"/>
</Style> </Style>
<Style TargetType="TextBlock" x:Key="StandardNote"> <Style TargetType="TextBlock" x:Key="StandardNote">
<Setter Property="Foreground" Value="#6A7888"/> <Setter Property="Foreground" Value="#6A7888"/>
<Setter Property="FontSize" Value="13"/> <Setter Property="FontSize" Value="{StaticResource SmallTextFontSize}"/>
<Setter Property="FontWeight" Value="Normal"/> <Setter Property="FontWeight" Value="Normal"/>
<Setter Property="TextWrapping" Value="Wrap"/> <Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="Margin" Value="0,10,0,0"/> <Setter Property="Margin" Value="0,10,0,0"/>
@@ -66,7 +73,7 @@
<Border Background="#0F3D68" CornerRadius="6" Padding="14,10" Margin="0,0,0,14"> <Border Background="#0F3D68" CornerRadius="6" Padding="14,10" Margin="0,0,0,14">
<TextBlock Text="参数设置" <TextBlock Text="参数设置"
Foreground="White" Foreground="White"
FontSize="22" FontSize="{StaticResource TitleFontSize}"
FontWeight="Bold"/> FontWeight="Bold"/>
</Border> </Border>
@@ -184,8 +191,8 @@
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,16,0,0"> <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,16,0,0">
<Button x:Name="SaveButton" <Button x:Name="SaveButton"
Content="保存" Content="保存"
Width="110" Width="116"
Height="40" Height="44"
Margin="6" Margin="6"
Click="SaveButton_Click" Click="SaveButton_Click"
Background="{StaticResource PrimaryBrush}" Background="{StaticResource PrimaryBrush}"
@@ -194,8 +201,8 @@
FontWeight="SemiBold"/> FontWeight="SemiBold"/>
<Button x:Name="CancelButton" <Button x:Name="CancelButton"
Content="取消" Content="取消"
Width="110" Width="116"
Height="40" Height="44"
Margin="6" Margin="6"
Click="CancelButton_Click" Click="CancelButton_Click"
Background="#687789" Background="#687789"