This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
<UserControl x:Class="ASTM_D7896_Tester.Views.D7896View"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:oxy="http://oxyplot.org/wpf"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
mc:Ignorable="d"
|
||||
@@ -103,8 +104,9 @@
|
||||
<!-- <converters:InverseBooleanConverter x:Key="InverseBooleanConverter"/> -->
|
||||
</UserControl.Resources>
|
||||
|
||||
|
||||
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Background="#F2F2F2">
|
||||
<Grid Margin="15">
|
||||
<Grid Margin="10">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
@@ -113,145 +115,138 @@
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<!-- 样品基本信息栏(卡片) -->
|
||||
<Border Grid.Row="0" Background="White" CornerRadius="6" Padding="12" Margin="0,0,0,10" Effect="{StaticResource CardShadow}">
|
||||
<WrapPanel>
|
||||
<TextBlock Text="样品ID:" VerticalAlignment="Center" FontWeight="SemiBold" Margin="0,0,8,0"/>
|
||||
<TextBox Text="{Binding SampleId}" Width="140" Margin="0,0,25,0"/>
|
||||
<TextBlock Text="测试温度(℃):" VerticalAlignment="Center" FontWeight="SemiBold" Margin="0,0,8,0"/>
|
||||
<TextBox Text="{Binding TestTemperature}" Width="70" IsReadOnly="True" Background="#F0F8FF" Margin="0,0,25,0"/>
|
||||
<TextBlock Text="日期:" VerticalAlignment="Center" FontWeight="SemiBold" Margin="0,0,8,0"/>
|
||||
<TextBox Text="{Binding TestDateTime}" Width="150" IsReadOnly="True" Background="#F0F8FF" Margin="0,0,25,0"/>
|
||||
<TextBlock Text="状态:" VerticalAlignment="Center" FontWeight="SemiBold" Margin="0,0,8,0"/>
|
||||
<TextBox Text="{Binding StatusMessage}" Width="210" IsReadOnly="True" Background="#FFF7E6"/>
|
||||
</WrapPanel>
|
||||
</Border>
|
||||
|
||||
<!-- 样品体积卡片 -->
|
||||
<Border Grid.Row="1" Background="White" CornerRadius="6" Padding="12" Margin="0,5" Effect="{StaticResource CardShadow}">
|
||||
<WrapPanel>
|
||||
<TextBlock Text="样品体积 (mL) [7.5]:" VerticalAlignment="Center" Width="140" FontWeight="SemiBold"/>
|
||||
<TextBox Text="{Binding SampleVolume}" Width="80" Margin="5,0"/>
|
||||
<TextBlock Text="(标准要求约40 mL)" Foreground="#777777" VerticalAlignment="Center" Margin="15,0,0,0"/>
|
||||
</WrapPanel>
|
||||
</Border>
|
||||
|
||||
<!-- 合规性确认区域(卡片) -->
|
||||
<Border Grid.Row="2" Background="White" CornerRadius="6" Padding="12" Margin="0,5" Effect="{StaticResource CardShadow}">
|
||||
<!-- 1. 样品信息 + 复选框(合并的4项确认) -->
|
||||
<Border Grid.Row="0" Background="White" CornerRadius="6" Padding="10" Margin="0,0,0,8" Effect="{StaticResource CardShadow}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="测试前确认(依据 ASTM D7896-19)" FontWeight="Bold" FontSize="14" Margin="0,0,0,12" Foreground="#1E4F7A"/>
|
||||
<WrapPanel Margin="0,0,0,8">
|
||||
<TextBlock Text="样品ID:" VerticalAlignment="Center" FontWeight="SemiBold" Margin="0,0,8,0"/>
|
||||
<TextBox Text="{Binding SampleId}" Width="120" Margin="0,0,20,0"/>
|
||||
<TextBlock Text="测试温度(℃):" VerticalAlignment="Center" FontWeight="SemiBold" Margin="0,0,8,0"/>
|
||||
<TextBox Text="{Binding TestTemperature}" Width="70" IsReadOnly="True" Background="#F0F8FF" Margin="0,0,20,0"/>
|
||||
<TextBlock Text="日期:" VerticalAlignment="Center" FontWeight="SemiBold" Margin="0,0,8,0"/>
|
||||
<TextBox Text="{Binding TestDateTime}" Width="140" IsReadOnly="True" Background="#F0F8FF"/>
|
||||
</WrapPanel>
|
||||
<WrapPanel>
|
||||
<!-- 清洁确认 -->
|
||||
<Border BorderBrush="#DDDDDD" BorderThickness="1" Padding="8" Margin="0,0,12,0" Width="210" CornerRadius="4" Background="#FEFEFE">
|
||||
<StackPanel>
|
||||
<TextBlock Text="章节7.1:采样池清洁" FontWeight="SemiBold" Margin="0,0,0,6"/>
|
||||
<TextBox Text="{Binding CleanerName}" Width="120" Margin="0,4" ToolTip="请输入清洁人姓名"/>
|
||||
<Button Content="确认清洁" Command="{Binding ConfirmCleanCommand}" Margin="0,4" Width="100"/>
|
||||
<TextBlock Text="{Binding IsCleanConfirmed, StringFormat='已确认: {0}'}" FontSize="11" TextAlignment="Center" Margin="0,4"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<!-- 排气泡确认 -->
|
||||
<Border BorderBrush="#DDDDDD" BorderThickness="1" Padding="8" Margin="0,0,12,0" Width="210" CornerRadius="4" Background="#FEFEFE">
|
||||
<StackPanel>
|
||||
<TextBlock Text="章节7.6:清除气泡" FontWeight="SemiBold" Margin="0,0,0,6"/>
|
||||
<Button Content="确认已清除气泡" Command="{Binding ConfirmBubbleRemovedCommand}" Margin="0,8" Width="120"/>
|
||||
<TextBlock Text="{Binding BubbleRemoved, StringFormat='已确认: {0}'}" FontSize="11" TextAlignment="Center" Margin="0,4"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<!-- 铂兼容性 -->
|
||||
<Border BorderBrush="#DDDDDD" BorderThickness="1" Padding="8" Margin="0,0,12,0" Width="210" CornerRadius="4" Background="#FEFEFE">
|
||||
<StackPanel>
|
||||
<TextBlock Text="章节1.4:铂反应性" FontWeight="SemiBold" Margin="0,0,0,6"/>
|
||||
<Button Content="确认液体与铂兼容" Command="{Binding ConfirmPlatinumCompatibleCommand}" Margin="0,4" Width="132"/>
|
||||
<TextBox Text="{Binding LiquidReactivityNote}" Width="120" Margin="0,4" ToolTip="备注(可选)"/>
|
||||
<TextBlock Text="{Binding PlatinumCompatible, StringFormat='已确认: {0}'}" FontSize="11" TextAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<!-- 环境温度校准 -->
|
||||
<Border BorderBrush="#DDDDDD" BorderThickness="1" Padding="8" Width="210" CornerRadius="4" Background="#FEFEFE">
|
||||
<StackPanel>
|
||||
<TextBlock Text="章节8.1:环境温度校准" FontWeight="SemiBold" Margin="0,0,0,6"/>
|
||||
<Button Content="开始校准" Command="{Binding CalibrateAmbientCommand}" Margin="0,8" Width="100"/>
|
||||
<TextBlock Text="{Binding AmbientTemperature, StringFormat='温度: {0:F1} °C'}" TextAlignment="Center" Margin="0,4"/>
|
||||
<TextBlock Text="{Binding AmbientCalibrated, StringFormat='校准状态: {0}'}" FontSize="11" TextAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<!-- 四个确认复选框,默认勾选 -->
|
||||
<CheckBox IsChecked="{Binding IsCleanConfirmed}" Content="采样池清洁 (7.1)" Margin="0,0,15,0"/>
|
||||
<CheckBox IsChecked="{Binding BubbleRemoved}" Content="气泡清除 (7.6)" Margin="0,0,15,0"/>
|
||||
<CheckBox IsChecked="{Binding PlatinumCompatible}" Content="铂兼容性 (1.4)" Margin="0,0,15,0"/>
|
||||
<CheckBox IsChecked="{Binding AmbientCalibrated}" Content="环境温度校准 (8.1)" Margin="0,0,15,0"/>
|
||||
<TextBlock Text="状态:" VerticalAlignment="Center" Margin="20,0,5,0"/>
|
||||
<TextBox Text="{Binding StatusMessage}" Width="200" IsReadOnly="True" Background="#FFF7E6"/>
|
||||
</WrapPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<!-- 加压设置卡片 -->
|
||||
<Border Grid.Row="3" Background="White" CornerRadius="6" Padding="12" Margin="0,5" Effect="{StaticResource CardShadow}">
|
||||
<!-- 2. 核心参数仪表盘(温度、电压、电阻、压力) -->
|
||||
<Border Grid.Row="1" Background="White" CornerRadius="6" Padding="10" Margin="0,5" Effect="{StaticResource CardShadow}">
|
||||
<WrapPanel>
|
||||
<CheckBox IsChecked="{Binding UsePressure}" Content="使用加压测试 (附录A2)" VerticalAlignment="Center" Width="200" Margin="0,0,20,0"/>
|
||||
<TextBlock Text="压力 (kPa):" VerticalAlignment="Center" Margin="0,0,8,0"/>
|
||||
<TextBox Text="{Binding PressureValue}" Width="80" IsEnabled="{Binding UsePressure}" Margin="0,0,20,0"/>
|
||||
<TextBlock Text="(当液体蒸气压 >33.8 kPa时必须加压)" Foreground="#777777" VerticalAlignment="Center"/>
|
||||
<Border Background="#E8F0FE" Padding="6" CornerRadius="4" Margin="0,0,15,0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="🌡️ 样品温度:" FontWeight="SemiBold" Margin="0,0,5,0"/>
|
||||
<TextBox Text="{Binding TestTemperature, StringFormat=F2}" Width="60" IsReadOnly="True"/>
|
||||
<TextBlock Text="℃" Margin="3,0,0,0"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Background="#E8F0FE" Padding="6" CornerRadius="4" Margin="0,0,15,0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="⚡ 铂丝电压:" FontWeight="SemiBold" Margin="0,0,5,0"/>
|
||||
<TextBox Text="{Binding PlatinumVoltage, StringFormat=F4}" Width="70" IsReadOnly="True"/>
|
||||
<TextBlock Text="V" Margin="3,0,0,0"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Background="#E8F0FE" Padding="6" CornerRadius="4" Margin="0,0,15,0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="🔌 铂丝电阻:" FontWeight="SemiBold" Margin="0,0,5,0"/>
|
||||
<TextBox Text="{Binding PlatinumResistance, StringFormat=F4}" Width="70" IsReadOnly="True"/>
|
||||
<TextBlock Text="Ω" Margin="3,0,0,0"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Background="#E8F0FE" Padding="6" CornerRadius="4" Margin="0,0,15,0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="⏲️ 压力:" FontWeight="SemiBold" Margin="0,0,5,0"/>
|
||||
<TextBox Text="{Binding ChamberPressure, StringFormat=F1}" Width="60" IsReadOnly="True"/>
|
||||
<TextBlock Text="kPa" Margin="3,0,0,0"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
</WrapPanel>
|
||||
</Border>
|
||||
|
||||
<!-- 测量数据表格(卡片内嵌表格) -->
|
||||
<Border Grid.Row="4" Background="White" CornerRadius="6" Padding="8" Margin="0,8" Effect="{StaticResource CardShadow}">
|
||||
<!-- 3. 样品体积 + 加压设置(合并到一行) -->
|
||||
<Border Grid.Row="2" Background="White" CornerRadius="6" Padding="10" Margin="0,5" Effect="{StaticResource CardShadow}">
|
||||
<WrapPanel>
|
||||
<TextBlock Text="样品体积 (mL):" VerticalAlignment="Center" Width="100"/>
|
||||
<TextBox Text="{Binding SampleVolume}" Width="60" Margin="0,0,20,0"/>
|
||||
<CheckBox IsChecked="{Binding UsePressure}" Content="加压测试" VerticalAlignment="Center" Margin="0,0,15,0"/>
|
||||
<TextBlock Text="压力 (kPa):" VerticalAlignment="Center" Margin="0,0,5,0"/>
|
||||
<TextBox Text="{Binding PressureValue}" Width="60" IsEnabled="{Binding UsePressure}" Margin="0,0,20,0"/>
|
||||
<TextBlock Text="(蒸气压>33.8kPa时需加压)" Foreground="Gray" VerticalAlignment="Center"/>
|
||||
</WrapPanel>
|
||||
</Border>
|
||||
|
||||
<!-- 4. 温升曲线图(核心新增) -->
|
||||
<Border Grid.Row="3" Background="White" CornerRadius="6" Padding="8" Margin="0,5" Effect="{StaticResource CardShadow}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="{Binding CurveTitle}" FontWeight="Bold" FontSize="13" Margin="0,0,0,5" Foreground="#1E4F7A"/>
|
||||
<oxy:PlotView Model="{Binding TemperatureCurveModel}" Height="220"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<!-- 5. 测量数据表格(占用剩余高度) -->
|
||||
<Border Grid.Row="4" Background="White" CornerRadius="6" Padding="8" Margin="0,5" Effect="{StaticResource CardShadow}">
|
||||
<DataGrid ItemsSource="{Binding Measurements}" AutoGenerateColumns="False"
|
||||
CanUserAddRows="False" IsReadOnly="True"
|
||||
HeadersVisibility="Column" GridLinesVisibility="Horizontal"
|
||||
RowHeight="28" MinHeight="180">
|
||||
RowHeight="28" MinHeight="150">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="序号" Binding="{Binding Index}" Width="60" IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="热导率 (W/m·K)" Binding="{Binding ThermalConductivity, StringFormat=F5}" Width="*" IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="热扩散率 (×10⁻⁶ m²/s)" Binding="{Binding ThermalDiffusivity, StringFormat=F5}" Width="*" IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="体积热容 (kJ/m³·K)" Binding="{Binding VolumetricHeatCapacity, StringFormat=F2}" Width="*" IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="序号" Binding="{Binding Index}" Width="60"/>
|
||||
<DataGridTextColumn Header="热导率 (W/m·K)" Binding="{Binding ThermalConductivity, StringFormat=F5}" Width="*"/>
|
||||
<DataGridTextColumn Header="热扩散率 (×10⁻⁶ m²/s)" Binding="{Binding ThermalDiffusivity, StringFormat=F5}" Width="*"/>
|
||||
<DataGridTextColumn Header="体积热容 (kJ/m³·K)" Binding="{Binding VolumetricHeatCapacity, StringFormat=F2}" Width="*"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
</Border>
|
||||
|
||||
<!-- 平均值显示卡片(高亮) -->
|
||||
<Border Grid.Row="5" Background="#E8F0FE" CornerRadius="6" Padding="12" Margin="0,8" Effect="{StaticResource CardShadow}">
|
||||
<!-- 6. 平均值 + 操作按钮 -->
|
||||
<Border Grid.Row="5" Background="#E8F0FE" CornerRadius="6" Padding="10" Margin="0,5" Effect="{StaticResource CardShadow}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="测量平均值" FontWeight="Bold" FontSize="14" Margin="0,0,0,8" Foreground="#1E4F7A"/>
|
||||
<WrapPanel>
|
||||
<WrapPanel Margin="0,0,0,8">
|
||||
<TextBlock Text="平均热导率:" Width="100" FontWeight="SemiBold"/>
|
||||
<TextBox Text="{Binding AverageThermalConductivity, StringFormat=F5}" Width="100" IsReadOnly="True" Background="White"/>
|
||||
<TextBox Text="{Binding AverageThermalConductivity, StringFormat=F5}" Width="100" IsReadOnly="True"/>
|
||||
<TextBlock Text="W/m·K" Margin="6,0,30,0"/>
|
||||
<TextBlock Text="平均热扩散率:" Width="120" FontWeight="SemiBold"/>
|
||||
<TextBox Text="{Binding AverageThermalDiffusivity, StringFormat=F5}" Width="100" IsReadOnly="True" Background="White"/>
|
||||
<TextBox Text="{Binding AverageThermalDiffusivity, StringFormat=F5}" Width="100" IsReadOnly="True"/>
|
||||
<TextBlock Text="×10⁻⁶ m²/s" Margin="6,0,30,0"/>
|
||||
<TextBlock Text="平均体积热容:" Width="100" FontWeight="SemiBold"/>
|
||||
<TextBox Text="{Binding AverageVolumetricHeatCapacity, StringFormat=F2}" Width="100" IsReadOnly="True" Background="White"/>
|
||||
<TextBox Text="{Binding AverageVolumetricHeatCapacity, StringFormat=F2}" Width="100" IsReadOnly="True"/>
|
||||
<TextBlock Text="kJ/m³·K" Margin="6,0,0,0"/>
|
||||
</WrapPanel>
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<Button Content="▶ 开始测试" Command="{Binding StartTestCommand}" Width="130" Height="36" Margin="8"
|
||||
IsEnabled="{Binding IsTesting, Converter={StaticResource InverseBooleanConverter}}"
|
||||
Background="{StaticResource PrimaryButtonBrush}"/>
|
||||
<Button Content="⟳ 重置" Command="{Binding ResetCommand}" Width="100" Height="36" Margin="8"/>
|
||||
<Button Content="📄 生成报告" Command="{Binding GenerateReportCommand}" Width="110" Height="36" Margin="8"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<!-- 系统校准卡片 -->
|
||||
<Border Grid.Row="6" Background="White" CornerRadius="6" Padding="12" Margin="0,5" Effect="{StaticResource CardShadow}">
|
||||
<!-- 7. 系统校准(可选,可收起到折叠区域,为节省空间放在底部) -->
|
||||
<Border Grid.Row="6" Background="White" CornerRadius="6" Padding="8" Margin="0,5" Effect="{StaticResource CardShadow}">
|
||||
<StackPanel>
|
||||
<TextBlock Text="系统校准 (附录A3)" FontWeight="Bold" FontSize="14" Margin="0,0,0,8" Foreground="#1E4F7A"/>
|
||||
<WrapPanel VerticalAlignment="Center">
|
||||
<TextBlock Text="系统校准 (附录A3)" FontWeight="Bold" Margin="0,0,0,5"/>
|
||||
<WrapPanel>
|
||||
<TextBlock Text="参考液:" VerticalAlignment="Center"/>
|
||||
<ComboBox ItemsSource="{Binding ReferenceLiquids}" SelectedItem="{Binding SelectedReferenceLiquid}" Width="110" Margin="8,0" Background="White"/>
|
||||
<TextBlock Text="参考热导率 (W/m·K):" VerticalAlignment="Center" Margin="15,0,5,0"/>
|
||||
<TextBox Text="{Binding ReferenceConductivity}" Width="80" Margin="0,0,15,0"/>
|
||||
<Button Content="开始校准" Command="{Binding PerformSystemCalibrationCommand}" Width="100"
|
||||
IsEnabled="{Binding IsCalibrating, Converter={StaticResource InverseBooleanConverter}}"/>
|
||||
<ComboBox ItemsSource="{Binding ReferenceLiquids}" SelectedItem="{Binding SelectedReferenceLiquid}" Width="100" Margin="5,0"/>
|
||||
<TextBlock Text="参考热导率 (W/m·K):" VerticalAlignment="Center" Margin="10,0,5,0"/>
|
||||
<TextBox Text="{Binding ReferenceConductivity}" Width="70" Margin="0,0,10,0"/>
|
||||
<Button Content="开始校准" Command="{Binding PerformSystemCalibrationCommand}" Width="100"/>
|
||||
</WrapPanel>
|
||||
<TextBlock Text="{Binding CalibrationStatus}" FontSize="11" Foreground="#0066CC" Margin="0,8,0,0"/>
|
||||
<TextBlock Text="注:使用已知热导率的参考液(如蒸馏水,0.606 W/m·K @25℃)验证系统精度,误差应在±2%以内。"
|
||||
FontSize="10" Foreground="#666666" Margin="0,5,0,0"/>
|
||||
<TextBlock Text="{Binding CalibrationStatus}" FontSize="11" Foreground="Blue" Margin="0,5,0,0"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<!-- 操作按钮 -->
|
||||
<StackPanel Grid.Row="7" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,15,0,10">
|
||||
<Button Content="▶ 开始测试" Command="{Binding StartTestCommand}" Width="130" Height="38" Margin="8"
|
||||
IsEnabled="{Binding IsTesting, Converter={StaticResource InverseBooleanConverter}}"
|
||||
Background="{StaticResource PrimaryButtonBrush}"/>
|
||||
<Button Content="⟳ 重置" Command="{Binding ResetCommand}" Width="100" Height="38" Margin="8"/>
|
||||
<Button Content="📄 生成报告" Command="{Binding GenerateReportCommand}" Width="110" Height="38" Margin="8"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</ScrollViewer>
|
||||
</UserControl>
|
||||
Reference in New Issue
Block a user