更新2026
This commit is contained in:
@@ -284,77 +284,89 @@
|
||||
</UniformGrid>
|
||||
</GroupBox>
|
||||
|
||||
<Grid Grid.Row="1">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<GroupBox Header="测试结果" Grid.Row="1">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<GroupBox Header="测试结果" Grid.Row="0">
|
||||
<StackPanel>
|
||||
<UniformGrid Columns="4">
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="实时力(N)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding HardnessShishilizhi, StringFormat=F1}" Foreground="#C62828" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="最大力值(N)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding HardnessMax, StringFormat=F1}" Foreground="#1565C0" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="最小力值(N)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding HardnessMin, StringFormat=F1}" Foreground="#2E7D32" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="平均值(N)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding HardnessAvg, StringFormat=F1}" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="平均偏差(N)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding HardnessAverageDeviation, StringFormat=F2}" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="RSD(%)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding HardnessRSD, StringFormat=F2}" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="测试次数" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding HardnessCurrentCount}" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
</UniformGrid>
|
||||
<DataGrid ItemsSource="{Binding HardnessDisplaySamplePoints}"
|
||||
AutoGenerateColumns="False"
|
||||
CanUserAddRows="False"
|
||||
CanUserDeleteRows="False"
|
||||
IsReadOnly="True"
|
||||
HeadersVisibility="Column"
|
||||
Margin="10,8,10,10"
|
||||
MaxHeight="190">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="组号" Binding="{Binding GroupNo}" Width="70"/>
|
||||
<DataGridTextColumn Header="序号" Binding="{Binding SequenceNo}" Width="80"/>
|
||||
<DataGridTextColumn Header="硬度值(N)" Binding="{Binding Value, StringFormat=F1}" Width="*"/>
|
||||
<DataGridTextColumn Header="与平均值偏差(N)" Binding="{Binding DeviationFromAverage, StringFormat=F2}" Width="*"/>
|
||||
<DataGridTextColumn Header="记录时间" Binding="{Binding RecordedAt, StringFormat=HH:mm:ss}" Width="120"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
</StackPanel>
|
||||
</GroupBox>
|
||||
</Grid>
|
||||
<UniformGrid Grid.Row="0" Columns="4">
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="实时力(N)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding HardnessShishilizhi, StringFormat=F1}" Foreground="#C62828" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="最大力值(N)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding HardnessMax, StringFormat=F1}" Foreground="#1565C0" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="最小力值(N)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding HardnessMin, StringFormat=F1}" Foreground="#2E7D32" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="平均值(N)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding HardnessAvg, StringFormat=F1}" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="平均偏差(N)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding HardnessAverageDeviation, StringFormat=F2}" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="RSD(%)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding HardnessRSD, StringFormat=F2}" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="本组次数" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding HardnessCurrentCount}" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="累计次数" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding HardnessTotalCount}" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
</UniformGrid>
|
||||
|
||||
<DataGrid Grid.Row="1"
|
||||
ItemsSource="{Binding HardnessDisplaySamplePoints}"
|
||||
AutoGenerateColumns="False"
|
||||
CanUserAddRows="False"
|
||||
CanUserDeleteRows="False"
|
||||
IsReadOnly="True"
|
||||
HeadersVisibility="Column"
|
||||
Margin="10,8,10,10"
|
||||
MinHeight="160"
|
||||
ScrollViewer.VerticalScrollBarVisibility="Auto"
|
||||
ScrollViewer.HorizontalScrollBarVisibility="Auto">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="累计次数" Binding="{Binding CumulativeNo}" Width="85"/>
|
||||
<DataGridTextColumn Header="组号" Binding="{Binding GroupNo}" Width="65"/>
|
||||
<DataGridTextColumn Header="组内序号" Binding="{Binding SequenceNo}" Width="80"/>
|
||||
<DataGridTextColumn Header="硬度值(N)" Binding="{Binding Value, StringFormat=F1}" Width="95"/>
|
||||
<DataGridTextColumn Header="与平均值偏差(N)" Binding="{Binding DeviationFromAverage, StringFormat=F2}" Width="125"/>
|
||||
<DataGridTextColumn Header="组平均值(N)" Binding="{Binding GroupAverage, StringFormat=F1}" Width="105"/>
|
||||
<DataGridTextColumn Header="组平均偏差(N)" Binding="{Binding GroupAverageDeviation, StringFormat=F2}" Width="120"/>
|
||||
<DataGridTextColumn Header="组RSD(%)" Binding="{Binding GroupRSD, StringFormat=F2}" Width="95"/>
|
||||
<DataGridTextColumn Header="记录时间" Binding="{Binding RecordedAt, StringFormat=HH:mm:ss}" Width="105"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
<WrapPanel Grid.Row="2" Style="{StaticResource CommandBar}">
|
||||
|
||||
<Button Command="{Binding StartHardnessCommand}" Content="开始" Style="{StaticResource StartButton}"/>
|
||||
@@ -420,7 +432,7 @@
|
||||
</Border>
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="脆碎度(%)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="失重率(%)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding LossPercent, StringFormat=F2}" Foreground="#1565C0" Style="{StaticResource MetricValue}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
@@ -631,11 +643,20 @@
|
||||
</GroupBox>
|
||||
|
||||
<GroupBox Header="测试结果" Grid.Row="1">
|
||||
<UniformGrid Columns="2">
|
||||
<UniformGrid Columns="1">
|
||||
<Border Style="{StaticResource MetricCard}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="崩解时间(秒)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBlock Text="{Binding DisintegrationSeconds}" Style="{StaticResource MetricValue}"/>
|
||||
<TextBlock Text="实际崩解时间(秒)" Style="{StaticResource MetricLabel}"/>
|
||||
<TextBox Text="{Binding DisintegrationActualSecondsText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
||||
Width="160"
|
||||
Height="46"
|
||||
Margin="0,8,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
IsEnabled="{Binding CanSaveDisintegrationResult}"
|
||||
TextAlignment="Center"
|
||||
FontSize="26"
|
||||
FontWeight="SemiBold"
|
||||
Foreground="{StaticResource ValueBrush}"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<!--<Border Style="{StaticResource MetricCard}">
|
||||
@@ -650,6 +671,7 @@
|
||||
<WrapPanel Grid.Row="2" Style="{StaticResource CommandBar}">
|
||||
<Button Command="{Binding StartDisintegrationCommand}" Content="开始" Style="{StaticResource StartButton}"/>
|
||||
<Button Command="{Binding StopDisintegrationCommand}" Content="停止" Style="{StaticResource StopButton}"/>
|
||||
<Button Command="{Binding SaveDisintegrationResultCommand}" Content="保存记录" Style="{StaticResource SecondaryButton}" IsEnabled="{Binding CanSaveDisintegrationResult}"/>
|
||||
<!--<Button Command="{Binding ResetDisintegrationCommand}" Content="复位" Style="{StaticResource ResetButton}"/>-->
|
||||
</WrapPanel>
|
||||
</Grid>
|
||||
|
||||
Reference in New Issue
Block a user