This commit is contained in:
GukSang.Jin
2026-05-20 09:45:34 +08:00
parent 8f625a7a41
commit 070463ae8e
8 changed files with 240 additions and 502 deletions

View File

@@ -292,7 +292,13 @@
<GroupBox Header="测试结果" Grid.Row="0">
<StackPanel>
<UniformGrid Columns="6">
<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}"/>
@@ -330,7 +336,7 @@
</StackPanel>
</Border>
</UniformGrid>
<DataGrid ItemsSource="{Binding HardnessSamplePoints}"
<DataGrid ItemsSource="{Binding HardnessDisplaySamplePoints}"
AutoGenerateColumns="False"
CanUserAddRows="False"
CanUserDeleteRows="False"
@@ -339,6 +345,7 @@
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="*"/>
@@ -353,6 +360,7 @@
<Button Command="{Binding StartHardnessCommand}" Content="开始" Style="{StaticResource StartButton}"/>
<Button Command="{Binding StopHardnessCommand}" Content="停止" Style="{StaticResource StopButton}"/>
<Button Command="{Binding HardnessResetCommand}" Content="复位" Style="{StaticResource ResetButton}"/>
<Button Command="{Binding ClearHardnessRecordsCommand}" Content="清空记录" Style="{StaticResource SecondaryButton}"/>
</WrapPanel>
</Grid>
</TabItem>
@@ -702,15 +710,6 @@
TextTrimming="CharacterEllipsis"/>
</Grid>
</Border>
<Button Grid.Column="3"
Background="Transparent"
BorderThickness="0"
Opacity="0"
Width="18"
Height="18"
Margin="8,0,0,0"
Command="{Binding ShowDataCommand}"/>
</Grid>
</Border>
</Grid>