ASTM D7896-19瞬态热线法.csproj

@@ -22,6 +22,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
     <PackageReference Include="NModbus4.NetCore" Version="4.0.0" />
     <PackageReference Include="OxyPlot.Wpf" Version="2.2.0" />
+    <PackageReference Include="PdfSharpCore" Version="1.3.67" />
   </ItemGroup>
 
   <ItemGroup>

Models/AppConfig.cs

@@ -46,7 +46,7 @@ public class TestParameters
     public int MeasurementCount { get; set; } = 10;
     [Range(5, 300)]
     public int IntervalSeconds { get; set; } = 30;
-    public double PlatinumWireLength { get; set; } = 0.056; // 默认 5.6 cm
+    public double PlatinumWireLength { get; set; } = 0.04; // 默认 5.6 cm
     public double PlatinumWireDiameter { get; set; } = 0.00006;
     public string ReportOutputPath { get; set; } = "Reports\\";
 
@@ -91,8 +91,6 @@ public class CalibrationCoefficients
     public ushort PressureProtection { get; set; }
     public ushort TemperatureCoefficient { get; set; }
     public ushort ResistanceCoefficient { get; set; }
-
-    //public double ThermalConductivityCorrection { get; set; } = 69;//乙二醇
-    public double ThermalConductivityCorrection { get; set; } = 100;//乙二醇
-    public double ThermalDiffusivityCorrection { get; set; } = 19.9;
+    public double ThermalConductivityCorrection { get; set; } = 37;//蒸馏水   比热率修正
+    public double ThermalDiffusivityCorrection { get; set; } = 0.45;//导热率修正
 }

Services/LanScpiSocket.cs

@@ -94,7 +94,7 @@ namespace ASTM_D7896_Tester.Services
             await SendCommandAsync($"VOLT:DC:RANG {DefaultVoltageRange}");
 
             // 3. 设置积分时间 0.02PLC（最快速度）
-            await SendCommandAsync("VOLT:DC:NPLC 0.02");
+            await SendCommandAsync("VOLT:DC:NPLC 0.1");
 
             // 4. 关闭自动归零（提高速度）
             await SendCommandAsync("VOLT:DC:ZERO:AUTO OFF");

ViewModels/D7896ViewModel.cs

@@ -6,6 +6,9 @@ using CommunityToolkit.Mvvm.Input;
 using OxyPlot;
 using OxyPlot.Axes;
 using OxyPlot.Series;
+using OxyPlot.Wpf;
+using PdfSharpCore.Drawing;
+using PdfSharpCore.Pdf;
 using System;
 using System.Collections.ObjectModel;
 using System.IO;
@@ -38,7 +41,7 @@ public partial class D7896ViewModel : ObservableObject
     private const double StandardResistor = 1.0;
 
     // 铂丝电阻温度系数 (纯铂)
-    private const double AlphaPt = 0.00385; // /°C
+    private const double AlphaPt = 0.0040; // /°C
 
     // 加热功率 Q 计算相关
     private double _heatingCurrent;   // 实际加热电流平均值
@@ -49,7 +52,7 @@ public partial class D7896ViewModel : ObservableObject
     [ObservableProperty] private PlotModel _temperatureCurveModel;
 
     // UI 绑定属性 (与之前一致)
-    public ObservableCollection<string> ReferenceLiquids { get; } = new() { "蒸馏水", "甲苯", "乙二醇" };
+    public ObservableCollection<string> ReferenceLiquids { get; } = new() { "蒸馏水" };
     [ObservableProperty] private string _sampleId = "未命名样品";
     [ObservableProperty] private double _testTemperature = 25.0;
     [ObservableProperty] private string _testDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -91,7 +94,7 @@ public partial class D7896ViewModel : ObservableObject
     private const double EulerGamma = 0.5772156649;   // 欧拉常数
     //private const double WireRadius = 0.00003;        // 铂丝半径 (0.03 mm)
     [ObservableProperty] private double _sampleDensity = 1000.0;   // 新增，密度默认值1000 kg/m³（水）
-    int samples = 1000; // 1秒 * 1000点/秒
+    int samples = 200; // 1秒 * 1000点/秒
     double heatingDuration = 1;        // 加热时间 0.8 秒（需与您的加热脉冲宽度一致）
     double totalDuration = 2;            // 总采样时间（加热 + 冷却）
     public D7896ViewModel()
@@ -140,6 +143,7 @@ public partial class D7896ViewModel : ObservableObject
             Application.Current?.Dispatcher.Invoke(() => ChamberPressure = rawPressure);
 
             float rawTemp = await _plcService.ReadFloatAsync(_config.PlcRegisterAddresses.Temperature);
+            rawTemp *= 1.0435f;
             Application.Current?.Dispatcher.Invoke(() => CurrentTestTemperature = rawTemp);
         }
         catch { }
@@ -300,7 +304,7 @@ public partial class D7896ViewModel : ObservableObject
                 double[] ustdBase = await _th1963Ustd.FetchBatchAsync();
                 double[] uptBase = await _th1953Ustd.FetchBatchAsync();
 
-                double dynamicR0 = 2.45; // 默认值
+                double dynamicR0 = 1.476979; // 默认值
                 if (ustdBase != null && ustdBase.Length > 0 && uptBase != null && uptBase.Length > 0)
                 {
                     double sumR0 = 0; int cnt = 0;
@@ -345,7 +349,7 @@ public partial class D7896ViewModel : ObservableObject
                 double[] ustd = await _th1963Ustd.FetchBatchAsync();
                 double[] upt = await _th1953Ustd.FetchBatchAsync();
 
-                if (dynamicR0 == 2.45) // 基线无效
+                if (dynamicR0 == 1.476979) // 基线无效
                 {
                     double sumR0 = 0; int cnt = 0;
                     for (int j = 2; j < Math.Min(6, ustd.Length); j++)
@@ -436,7 +440,7 @@ public partial class D7896ViewModel : ObservableObject
                 // 测量间隔（即使舍弃也等待，让样品恢复）
                 if (validCount < requiredCount && !_stopRequested && attemptCount < maxAttempts)
                 {
-                    try { await Task.Delay(_config.TestParameters.IntervalSeconds * 500, _testCts.Token); } catch (OperationCanceledException) { break; }
+                    try { await Task.Delay(_config.TestParameters.IntervalSeconds * 100, _testCts.Token); } catch (OperationCanceledException) { break; }
                 }
             }
 
@@ -579,6 +583,7 @@ public partial class D7896ViewModel : ObservableObject
             lambda = _config.TestParameters.FixedLambda;
             Logger.Log($"使用固定 lambda={lambda:F6} W/(m·K)");
         }
+        lambda *= _config.TestParameters.CalibrationCoefficients.ThermalDiffusivityCorrection;
         Logger.Log($"constantCurrent(avg)={avgCurrent:E6} A, avgResistance={avgResistance:F6} Ω, powerPerLength={powerPerLength:E6} W/m, 斜率 B = {slope:F5}");
 
         // 计算热扩散率
@@ -608,22 +613,22 @@ public partial class D7896ViewModel : ObservableObject
                 coolingPoints.Add(new DataPoint(time[i], deltaT[i]));
 
         // 导出CSV
-        try
-        {
-            string tmp = Path.GetTempPath();
-            string baseName = $"measure_{SampleId}_{DateTime.Now:yyyyMMdd_HHmmss}_{CurrentMeasurementIndex}";
-            string dataPath = Path.Combine(tmp, baseName + ".csv");
-            ExportMeasurementCsv(dataPath, time, ustd, upt, deltaT, startIdx, endIdx);
-            Logger.Log($"已导出测量数据 CSV: {dataPath}");
+        //try
+        //{
+        //    string tmp = Path.GetTempPath();
+        //    string baseName = $"measure_{SampleId}_{DateTime.Now:yyyyMMdd_HHmmss}_{CurrentMeasurementIndex}";
+        //    string dataPath = Path.Combine(tmp, baseName + ".csv");
+        //    ExportMeasurementCsv(dataPath, time, ustd, upt, deltaT, startIdx, endIdx);
+        //    Logger.Log($"已导出测量数据 CSV: {dataPath}");
 
-            string winPath = Path.Combine(tmp, baseName + "_windows.csv");
-            ExportCandidateWindowsCsv(winPath, time, deltaT, startIdx, endIdx);
-            Logger.Log($"已导出候选拟合窗 CSV: {winPath}");
-        }
-        catch (Exception ex)
-        {
-            Logger.Log($"导出CSV失败: {ex.Message}");
-        }
+        //    string winPath = Path.Combine(tmp, baseName + "_windows.csv");
+        //    ExportCandidateWindowsCsv(winPath, time, deltaT, startIdx, endIdx);
+        //    Logger.Log($"已导出候选拟合窗 CSV: {winPath}");
+        //}
+        //catch (Exception ex)
+        //{
+        //    Logger.Log($"导出CSV失败: {ex.Message}");
+        //}
 
         return (lambda, alpha, deltaT, coolingPoints);
     }
@@ -805,6 +810,40 @@ public partial class D7896ViewModel : ObservableObject
         TemperatureCurveModel = null;
     }
 
+    //[RelayCommand]
+    //private async Task GenerateReportAsync()
+    //{
+    //    if (Measurements.Count == 0)
+    //    {
+    //        MessageBox.Show("没有测试数据", "提示");
+    //        return;
+    //    }
+    //    try
+    //    {
+    //        var extraParams = new Dictionary<string, object>
+    //        {
+    //            ["SampleVolume"] = SampleVolume,
+    //            ["BubbleRemoved"] = BubbleRemoved,
+    //            ["UsePressure"] = UsePressure,
+    //            ["PressureValue"] = PressureValue,
+    //            ["IsCleanConfirmed"] = IsCleanConfirmed,
+    //            ["CleanerName"] = CleanerName,
+    //            ["AmbientTemperature"] = AmbientTemperature,
+    //            ["AmbientCalibrated"] = AmbientCalibrated,
+    //            ["PlatinumCompatible"] = PlatinumCompatible,
+    //            ["LiquidReactivityNote"] = LiquidReactivityNote,
+    //            ["InitialResistance"] = PlatinumResistance
+    //        };
+    //        string reportPath = await _reportService.GenerateReportAsync(SampleId, TestTemperature, Measurements.ToList(),
+    //            AverageThermalConductivity, AverageThermalDiffusivity, AverageVolumetricHeatCapacity,
+    //            _config.TestParameters, extraParams);
+    //        MessageBox.Show($"报告已生成: {reportPath}", "成功");
+    //    }
+    //    catch (Exception ex)
+    //    {
+    //        MessageBox.Show($"生成报告失败: {ex.Message}", "错误");
+    //    }
+    //}
     [RelayCommand]
     private async Task GenerateReportAsync()
     {
@@ -813,35 +852,136 @@ public partial class D7896ViewModel : ObservableObject
             MessageBox.Show("没有测试数据", "提示");
             return;
         }
+
+        // 选择保存路径
+        var saveFileDialog = new Microsoft.Win32.SaveFileDialog
+        {
+            Filter = "PDF files (*.pdf)|*.pdf",
+            DefaultExt = ".pdf",
+            FileName = $"报告_{SampleId}_{DateTime.Now:yyyyMMdd_HHmmss}.pdf"
+        };
+        if (saveFileDialog.ShowDialog() != true)
+            return;
+
+        string pdfPath = saveFileDialog.FileName;
+
         try
         {
-            var extraParams = new Dictionary<string, object>
-            {
-                ["SampleVolume"] = SampleVolume,
-                ["BubbleRemoved"] = BubbleRemoved,
-                ["UsePressure"] = UsePressure,
-                ["PressureValue"] = PressureValue,
-                ["IsCleanConfirmed"] = IsCleanConfirmed,
-                ["CleanerName"] = CleanerName,
-                ["AmbientTemperature"] = AmbientTemperature,
-                ["AmbientCalibrated"] = AmbientCalibrated,
-                ["PlatinumCompatible"] = PlatinumCompatible,
-                ["LiquidReactivityNote"] = LiquidReactivityNote,
-                ["InitialResistance"] = PlatinumResistance
-            };
-            string reportPath = await _reportService.GenerateReportAsync(SampleId, TestTemperature, Measurements.ToList(),
-                AverageThermalConductivity, AverageThermalDiffusivity, AverageVolumetricHeatCapacity,
-                _config.TestParameters, extraParams);
-            MessageBox.Show($"报告已生成: {reportPath}", "成功");
+            // 生成 PDF
+            await Task.Run(() => GeneratePdfReport(pdfPath));
+            MessageBox.Show($"报表已生成: {pdfPath}", "成功");
         }
         catch (Exception ex)
         {
-            MessageBox.Show($"生成报告失败: {ex.Message}", "错误");
+            MessageBox.Show($"生成报表失败: {ex.Message}", "错误");
         }
     }
 
 
 
+
+    private void GeneratePdfReport(string filePath)
+    {
+        // 1. 创建文档
+        using (var document = new PdfDocument())
+        {
+            // 2. 添加页面
+            var page = document.AddPage();
+            page.Width = XUnit.FromMillimeter(210);
+            page.Height = XUnit.FromMillimeter(297);
+
+            // 3. 开始绘制
+            using (var gfx = XGraphics.FromPdfPage(page))
+            {
+                // 创建字体
+                var titleFont = new XFont("Verdana", 16, XFontStyle.Bold);
+                var headerFont = new XFont("Verdana", 12, XFontStyle.Bold);
+                var normalFont = new XFont("Verdana", 10, XFontStyle.Regular);
+                double yPosition = 30;
+
+                // ---------- 4. 添加标题 ----------
+                gfx.DrawString("ASTM D7896-19 瞬态热线法测试报告", titleFont, XBrushes.Black,
+                    new XRect(0, yPosition, page.Width, 30), XStringFormats.TopCenter);
+                yPosition += 40;
+
+                // ---------- 5. 添加基础信息 ----------
+                gfx.DrawString($"样品名称: {SampleId}", normalFont, XBrushes.Black, new XPoint(40, yPosition)); yPosition += 25;
+                gfx.DrawString($"测试温度: {TestTemperature:F1} °C", normalFont, XBrushes.Black, new XPoint(40, yPosition)); yPosition += 25;
+                // ... 所有需要显示的基础信息
+
+                yPosition += 10;
+
+                // ---------- 6. 插入温升曲线图 ----------
+                if (TemperatureCurveModel != null)
+                {
+                    using (var stream = new MemoryStream())
+                    {
+                        var exporter = new PngExporter { Width = 600, Height = 400 };
+                        exporter.Export(TemperatureCurveModel, stream);
+                        stream.Position = 0;
+                        var imgStream = new MemoryStream(stream.ToArray(), 0, (int)stream.Length, false, true);
+                        var image = XImage.FromStream(() => imgStream);
+                        gfx.DrawImage(image, 40, yPosition, 500, 330);
+                        yPosition += 350;
+                    }
+                }
+
+                // ---------- 7. 创建表格 ----------
+                gfx.DrawString("测量结果明细", headerFont, XBrushes.Black, new XPoint(40, yPosition)); yPosition += 25;
+
+                // 表头
+                string[] headers = { "序号", "热导率λ(W/(m·K))", "热扩散率α(10⁻⁷ m²/s)", "体积热容VHC(kJ/(m³·K))", "比热容Cp(J/(kg·K))" };
+                double[] colWidths = { 50, 100, 100, 120, 100 };
+                double startX = 40;
+                double currentRowY = yPosition;
+
+                // 绘制表头
+                for (int i = 0; i < headers.Length; i++)
+                {
+                    double cellX = startX + colWidths.Take(i).Sum();
+                    gfx.DrawRectangle(XPens.Black, cellX, currentRowY, colWidths[i], 20);
+                    var textRect = new XRect(cellX, currentRowY, colWidths[i], 20);
+                    gfx.DrawString(headers[i], normalFont, XBrushes.Black, textRect, XStringFormats.Center);
+                }
+                currentRowY += 20;
+
+                // 填充数据行 (假设 Measurements 是列表)
+                for (int i = 0; i < Measurements.Count; i++)
+                {
+                    var m = Measurements[i];
+                    string[] rowData = {
+                    m.Index.ToString(),
+                    m.ThermalConductivity.ToString("F6"),
+                    (m.ThermalDiffusivity * 1e7).ToString("F3"),
+                    m.VolumetricHeatCapacity.ToString("F2"),
+                    m.SpecificHeatCapacity.ToString("F2")
+                };
+
+                    for (int j = 0; j < rowData.Length; j++)
+                    {
+                        double cellX = startX + colWidths.Take(j).Sum();
+                        gfx.DrawRectangle(XPens.Black, cellX, currentRowY, colWidths[j], 20);
+                        var textRect = new XRect(cellX, currentRowY, colWidths[j], 20);
+                        gfx.DrawString(rowData[j], normalFont, XBrushes.Black, textRect, XStringFormats.Center);
+                    }
+                    currentRowY += 20;
+                }
+                yPosition = currentRowY + 10;
+
+                // ---------- 8. 添加平均值 ----------
+                gfx.DrawString($"平均热导率: {AverageThermalConductivity:F6} W/(m·K)", normalFont, XBrushes.Black, new XPoint(40, yPosition)); yPosition += 20;
+                // ... 其他平均值
+
+                // ---------- 9. 添加生成时间和页脚 ----------
+                gfx.DrawString($"生成时间: {DateTime.Now:yyyy-MM-dd HH:mm:ss}", normalFont, XBrushes.Black, new XPoint(40, page.Height - 30));
+            }
+
+            // 10. 保存文档
+            document.Save(filePath);
+        }
+    }
+
+
     [RelayCommand]
     private async Task StopTest()
     {
@@ -909,7 +1049,7 @@ public partial class D7896ViewModel : ObservableObject
         try
         {
             float rawPressure = await _plcService.ReadFloatAsync(_config.PlcRegisterAddresses.Pressure);
-            ChamberPressure = rawPressure / 10.0;
+            ChamberPressure = rawPressure;
         }
         catch { }
     }

Views/D7896View.xaml

@@ -136,7 +136,7 @@
                         <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"/>
+                        <TextBox Text="{Binding StatusMessage}" Width="260" IsReadOnly="True" Background="#FFF7E6"/>
                     </WrapPanel>
                 </StackPanel>
             </Border>
@@ -218,7 +218,7 @@
                           CanUserAddRows="False" IsReadOnly="True" 
                           HeadersVisibility="Column" GridLinesVisibility="Horizontal"
                           RowHeight="28" MinHeight="150">
-                    
+
                     <DataGrid.Columns>
                         <DataGridTextColumn Header="序号" Binding="{Binding Index}" Width="60">
                             <DataGridTextColumn.ElementStyle>
@@ -324,7 +324,7 @@
                     <TextBlock Text="系统校准 (附录A3)" FontWeight="Bold" Margin="0,0,0,5"/>
                     <WrapPanel>
                         <TextBlock Text="参考液:" VerticalAlignment="Center"/>
-                        <ComboBox ItemsSource="{Binding ReferenceLiquids}" SelectedItem="{Binding SelectedReferenceLiquid}" Width="100" Margin="5,0"/>
+                        <ComboBox ItemsSource="{Binding ReferenceLiquids}"  IsReadOnly="True" 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"/>-->

appsettings.json

@@ -29,7 +29,7 @@
     //"PlatinumWireDiameter": 0.000032,
     //"PlatinumWireLength": 0.056, //铂丝长度（单位：米）
     //"PlatinumWireDiameter": 0.00006,
-    "PlatinumWireLength": 0.056, //铂丝长度（单位：米）
+    "PlatinumWireLength": 0.04, //铂丝长度（单位：米）
     "PlatinumWireDiameter": 0.00006,
     "ReportOutputPath": "Reports\\",
     "DefaultSampleVolume": 40.0,