From 03d13120f99d6ebd46d49b1691f767b07dbb5227 Mon Sep 17 00:00:00 2001
From: "GukSang.Jin" <guksang_chen@163.com>
Date: Sat, 13 Jun 2026 17:16:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B020260613?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DentistryHandpieces/MainWindow.xaml        |  8 ++++++--
 DentistryHandpieces/MainWindowViewModel.cs | 12 ++++++------
 DentistryHandpieces/Models.cs              |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/DentistryHandpieces/MainWindow.xaml b/DentistryHandpieces/MainWindow.xaml
index c9c03da..3ff6120 100644
--- a/DentistryHandpieces/MainWindow.xaml
+++ b/DentistryHandpieces/MainWindow.xaml
@@ -1064,11 +1064,15 @@
                     <Grid Grid.Row="1" Margin="0,14,0,0">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
-                              <Button Grid.Column="1"
-                                Content="{Binding NoLoadSpeedTestButtonText}"
+                        <Button Content="{Binding NoLoadSpeedTestButtonText}"
                                 Command="{Binding RecordNoLoadSpeedCommand}"
                                 Style="{StaticResource StartButtonStyle}"
+                                Margin="0,0,8,0" />
+                        <Button Grid.Column="1"
+                                Content="{Binding VentValveButtonText}"
+                                Command="{Binding ToggleVentValveCommand}"
                                 Margin="8,0,0,0" />
                     </Grid>
                 </Grid>
diff --git a/DentistryHandpieces/MainWindowViewModel.cs b/DentistryHandpieces/MainWindowViewModel.cs
index 3a4577b..3266e62 100644
--- a/DentistryHandpieces/MainWindowViewModel.cs
+++ b/DentistryHandpieces/MainWindowViewModel.cs
@@ -241,7 +241,7 @@ public sealed class MainWindowViewModel : ObservableObject
     private string _finalAxialForceText = "--";
     private string _realtimeSpeedText = "0 r/min";
     private string _realtimeTorqueText = $"0.00 {TorqueUnit}";
-    private string _realtimePressureText = "0.000 MPa";
+    private string _realtimePressureText = "0.000 kPa";
     private string _noLoadSpeedRecordText = "0 r/min";
     private string _noLoadSpeedErrorRateText = "0.00 %";
     private string _loadSpeedSettingInput = "0";
@@ -1359,7 +1359,7 @@ public sealed class MainWindowViewModel : ObservableObject
                 CreateRecordPoint("转速/扭矩实时测试", "压力系数", FormatConfigNumber(parameters.PressureCoefficient), string.Empty),
                 CreateRecordPoint("转速/扭矩实时测试", "末次采样转速", $"{FormatSpeed(lastSample?.RealtimeSpeedRpm ?? _realtimeSpeed)} r/min", "r/min"),
                 CreateRecordPoint("转速/扭矩实时测试", "末次采样扭矩", $"{FormatTorque(lastSample?.RealtimeTorqueMilliNewtonMeters ?? GetScaledTorque())} {TorqueUnit}", TorqueUnit),
-                CreateRecordPoint("转速/扭矩实时测试", "末次采样压力", $"{FormatPressure(lastSample?.RealtimePressureMpa ?? _realtimePressure)} MPa", "MPa"),
+                CreateRecordPoint("转速/扭矩实时测试", "末次采样压力", $"{FormatPressure(lastSample?.RealtimePressureKpa ?? _realtimePressure)} kPa", "kPa"),
                 CreateRecordPoint("转速/扭矩实时测试", "最大扭矩采集", $"{FormatTorque(peakTorque)} {TorqueUnit}", TorqueUnit),
                 CreateRecordPoint("转速/扭矩实时测试", "最大位移", $"{FormatDisplacement(maxDisplacement)} mm", "mm"),
                 CreateRecordPoint("转速/扭矩实时测试", "最终位移", finalDisplacement.HasValue ? $"{FormatDisplacement(finalDisplacement.Value)} mm" : "--", "mm", finalDisplacement.HasValue ? "记录" : "待停止"),
@@ -1600,7 +1600,7 @@ public sealed class MainWindowViewModel : ObservableObject
             "采集数据1-1(mm)", "采集数据1-2(mm)", "数据差值1(mm)",
             "轴向力显示(N)", "1号当前位置(mm)", "1号相对位移(mm)",
             $"最大扭矩采集({TorqueUnit})", $"扭矩显示({TorqueUnit})",
-            "转速显示(r/min)", "压力显示(MPa)", "空载转速记录(r/min)",
+            "转速显示(r/min)", "压力显示(kPa)", "空载转速记录(r/min)",
             "转速误差率(%)", "扭矩完成", "复位使能1号", "复位完成1号",
             "复位使能2号", "复位完成2号", "参数快照"
         ];
@@ -1627,7 +1627,7 @@ public sealed class MainWindowViewModel : ObservableObject
                 sheet.Cell(row, 14).Value = sample.SpeedTorquePeakTorqueMilliNewtonMeters;
                 sheet.Cell(row, 15).Value = sample.RealtimeTorqueMilliNewtonMeters;
                 sheet.Cell(row, 16).Value = sample.RealtimeSpeedRpm;
-                sheet.Cell(row, 17).Value = sample.RealtimePressureMpa;
+                sheet.Cell(row, 17).Value = sample.RealtimePressureKpa;
                 sheet.Cell(row, 18).Value = sample.NoLoadSpeedRpm;
                 sheet.Cell(row, 19).Value = sample.NoLoadSpeedErrorRatePercent;
                 sheet.Cell(row, 20).Value = sample.SpeedTorqueDone ? 1 : 0;
@@ -3398,7 +3398,7 @@ public sealed class MainWindowViewModel : ObservableObject
     {
         RealtimeSpeedText = $"{FormatSpeed(_realtimeSpeed)} r/min";
         RealtimeTorqueText = $"{FormatTorque(GetScaledTorque())} {TorqueUnit}";
-        RealtimePressureText = $"{FormatPressure(_realtimePressure)} MPa";
+        RealtimePressureText = $"{FormatPressure(_realtimePressure)} kPa";
         string finalSpeed = _finalSpeed.HasValue ? $"{FormatSpeed(_finalSpeed.Value)} r/min" : "--";
         string finalTorque = _finalTorque.HasValue ? $"{FormatTorque(_finalTorque.Value)} {TorqueUnit}" : "--";
         FinalSpeedTorqueText = $"最终：{finalSpeed} / {finalTorque}";
@@ -3630,7 +3630,7 @@ public sealed class MainWindowViewModel : ObservableObject
             SpeedTorquePeakTorqueMilliNewtonMeters = _speedTorquePeakTorque,
             RealtimeTorqueMilliNewtonMeters = GetScaledTorque(),
             RealtimeSpeedRpm = _realtimeSpeed,
-            RealtimePressureMpa = _realtimePressure,
+            RealtimePressureKpa = _realtimePressure,
             NoLoadSpeedRpm = _noLoadSpeedRecord,
             NoLoadSpeedErrorRatePercent = _noLoadSpeedErrorRate,
             SpeedTorqueDone = ReadCoilValue(coilValues, SpeedTorqueDoneCoil),
diff --git a/DentistryHandpieces/Models.cs b/DentistryHandpieces/Models.cs
index a9b0624..2021d01 100644
--- a/DentistryHandpieces/Models.cs
+++ b/DentistryHandpieces/Models.cs
@@ -296,7 +296,7 @@ public sealed class RealtimeSamplePayload
 
     public double RealtimeSpeedRpm { get; init; }
 
-    public double RealtimePressureMpa { get; init; }
+    public double RealtimePressureKpa { get; init; }
 
     public double NoLoadSpeedRpm { get; init; }