diff --git a/ViewModels/D7896ViewModel.cs b/ViewModels/D7896ViewModel.cs index ff7f78d..c37426a 100644 --- a/ViewModels/D7896ViewModel.cs +++ b/ViewModels/D7896ViewModel.cs @@ -294,7 +294,7 @@ public partial class D7896ViewModel : ObservableObject { attemptCount++; CurrentMeasurementIndex = attemptCount; // 显示当前尝试次数(不是有效次数) - StatusMessage = $"正在执行第 {attemptCount} 次测量(有效:{validCount}/{requiredCount})..."; + //StatusMessage = $"正在执行第{validCount}次测量)..."; // --- 步骤1:基线采集(加热前)--- await _th1963Ustd.PrepareBatchAsync(50); @@ -391,7 +391,7 @@ public partial class D7896ViewModel : ObservableObject double vhc = lambda / alpha; // kJ/(m³·K) double cp = vhc / SampleDensity; // J/(kg·K) - Logger.Log($"测量 {attemptCount} 结果: λ={lambda:F6} W/(m·K), α={alpha:E6} m²/s, Cp={cp:F2} J/(kg·K)"); + Logger.Log($"测量 {validCount} 结果: λ={lambda:F6} W/(m·K), α={alpha:E6} m²/s, Cp={cp:F2} J/(kg·K)"); // ---- 异常值检测 ---- bool isOutlier = false; @@ -719,7 +719,7 @@ public partial class D7896ViewModel : ObservableObject { if (TemperatureCurveModel == null) { - TemperatureCurveModel = new PlotModel { Title = "温升与冷却曲线", Background = OxyColors.White }; + TemperatureCurveModel = new PlotModel { }; TemperatureCurveModel.Axes.Add(new LinearAxis { Position = AxisPosition.Bottom, Title = "时间 (s)" }); TemperatureCurveModel.Axes.Add(new LinearAxis { Position = AxisPosition.Left, Title = "温升 (℃)" }); } diff --git a/Views/D7896View.xaml b/Views/D7896View.xaml index cb23601..61c96c5 100644 --- a/Views/D7896View.xaml +++ b/Views/D7896View.xaml @@ -109,15 +109,15 @@ - + - - - + + + @@ -204,16 +204,20 @@ - + - + + CanUserAddRows="False" IsReadOnly="True" + HeadersVisibility="Column" GridLinesVisibility="Horizontal" + RowHeight="24" + Height="120" + VerticalAlignment="Stretch" + ScrollViewer.VerticalScrollBarVisibility="Auto" + ScrollViewer.HorizontalScrollBarVisibility="Disabled"> @@ -247,10 +251,12 @@ - + + - + + @@ -261,21 +267,31 @@ - -