From b988428caad9d9f2694e7bf53a3c175ce3515425 Mon Sep 17 00:00:00 2001
From: xyy <544939200@qq.com>
Date: Tue, 12 May 2026 15:02:57 +0800
Subject: [PATCH]

---
 Resources/Strings.en-US.xaml |  5 +++++
 Resources/Strings.zh-CN.xaml |  6 ++++--
 Window2.xaml                 | 12 ++++++------
 Window3.xaml                 |  4 ++--
 Window4.xaml                 |  2 +-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Resources/Strings.en-US.xaml b/Resources/Strings.en-US.xaml
index 2fa98a4..54bc30b 100644
--- a/Resources/Strings.en-US.xaml
+++ b/Resources/Strings.en-US.xaml
@@ -282,4 +282,9 @@
     <system:String x:Key="Peak test (peak force)">Peak test (peak force)</system:String>
     <system:String x:Key="customize">customize</system:String>
 
+
+    <Thickness x:Key="Margin1">-120</Thickness>
+    <Thickness x:Key="Margin2">-150,0,0,0</Thickness>
+    <Thickness x:Key="Margin3">-90,0,0,0</Thickness>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Resources/Strings.zh-CN.xaml b/Resources/Strings.zh-CN.xaml
index 7f78876..3b3ceff 100644
--- a/Resources/Strings.zh-CN.xaml
+++ b/Resources/Strings.zh-CN.xaml
@@ -23,7 +23,7 @@
     <system:String x:Key="Deformation test results">测试停止</system:String>
     <system:String x:Key="Peak force test result(N)">连接口压力</system:String>
     <!-- 测试结果区域 -->
-    <system:String x:Key="TestResults">鼻口压力:</system:String>
+    <system:String x:Key="TestResults">鼻口压力</system:String>
     <system:String x:Key="Next">气阻测试</system:String>
     <system:String x:Key="Deformation1">设定流量</system:String>
     <system:String x:Key="Deformation2">连接口校准</system:String>
@@ -70,7 +70,9 @@
 
 
 
-
+    <Thickness x:Key="Margin1">5,0,0,0</Thickness>
+    <Thickness x:Key="Margin2">-40,0,0,0</Thickness>
+    <Thickness x:Key="Margin3">-45,0,0,0</Thickness>
 
     <system:String x:Key="setFlow">呼气/吸气</system:String>
     <system:String x:Key="setFlow1">呼气</system:String>
diff --git a/Window2.xaml b/Window2.xaml
index 09c1f83..50993ad 100644
--- a/Window2.xaml
+++ b/Window2.xaml
@@ -89,10 +89,10 @@
                         <!-- 按钮列 -->
                     </Grid.ColumnDefinitions>
 
-                    <TextBlock Text="{DynamicResource Peak force test result(N)}" VerticalAlignment="Center" Foreground="Black" Margin="-120"/>
+                    <TextBlock Text="{DynamicResource Peak force test result(N)}" VerticalAlignment="Center" Foreground="Black" Margin="{DynamicResource Margin1}"/>
 
                     <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-                        <TextBox Name="RealTimePressureTextBox" Width="80" Style="{StaticResource MyTextBoxStyle}" IsEnabled="false"/>
+                        <TextBox Name="RealTimePressureTextBox" Width="80" Style="{StaticResource MyTextBoxStyle}" Margin="0" IsEnabled="false"/>
                         <TextBlock Text="pa" VerticalAlignment="Center" Foreground="Black" Margin="5,0,0,0"/>
                     </StackPanel>
 
@@ -107,10 +107,10 @@
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <TextBlock Text="{DynamicResource TestResults}" VerticalAlignment="Center" Foreground="Black"  Margin="-120"/>
+                    <TextBlock Text="{DynamicResource TestResults}" VerticalAlignment="Center" Foreground="Black"  Margin="{DynamicResource Margin2}"/>
 
                     <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-                        <TextBox Name="NoseTxt" Width="80" Style="{StaticResource MyTextBoxStyle}" Foreground="Black" IsEnabled="false"/>
+                        <TextBox Name="NoseTxt" Width="80" Style="{StaticResource MyTextBoxStyle}" Foreground="Black" IsEnabled="false"  Margin="-50"  />
                         <TextBlock Text="pa" VerticalAlignment="Center" Foreground="Black" Margin="5,0,0,0"/>
                     </StackPanel>
 
@@ -125,10 +125,10 @@
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <TextBlock Text="{DynamicResource Deformation1}" VerticalAlignment="Center" Foreground="Black" Margin="-60"/>
+                    <TextBlock Text="{DynamicResource Deformation1}" VerticalAlignment="Center" Foreground="Black" Margin="{DynamicResource Margin3}"/>
 
                     <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-                        <TextBox Name="FowlTxt1" Width="120" Style="{StaticResource MyTextBoxStyle}" Foreground="Black" IsReadOnly="True"/>
+                        <TextBox Name="FowlTxt1" Width="120" Style="{StaticResource MyTextBoxStyle}" Foreground="Black" IsReadOnly="True"  />
                         <TextBlock Text="L/min" VerticalAlignment="Center" Foreground="Black" Margin="5,0,0,0"/>
                     </StackPanel>
 
diff --git a/Window3.xaml b/Window3.xaml
index cf62162..27f4f8e 100644
--- a/Window3.xaml
+++ b/Window3.xaml
@@ -182,8 +182,8 @@
             </StackPanel>
 
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10">
-                <Button Content="{DynamicResource SetPressure}" Style="{StaticResource MyButtonStyle}" Width="220" Margin="10"  Click="Button_Click_3" Visibility="Hidden"/>
-                <Button Content="{DynamicResource ResetDistance}" Style="{StaticResource MyButtonStyle}" Width="220" Margin="10" Click="Button_Click_9" Visibility="Hidden"/>
+                <Button Content="{DynamicResource SetPressure}" Style="{StaticResource MyButtonStyle}" Width="220" Margin="10"  Click="Button_Click_3" Visibility="Collapsed"/>
+                <Button Content="{DynamicResource ResetDistance}" Style="{StaticResource MyButtonStyle}" Width="220" Margin="10" Click="Button_Click_9" Visibility="Collapsed"/>
             </StackPanel>
 
             <StackPanel Margin="0,10,0,0">
diff --git a/Window4.xaml b/Window4.xaml
index 7230fc5..db91059 100644
--- a/Window4.xaml
+++ b/Window4.xaml
@@ -155,7 +155,7 @@
 
 
 
-                <Grid Margin="10" HorizontalAlignment="Left" MinWidth="400" Width="728">
+                <Grid Margin="10" HorizontalAlignment="Center" MinWidth="400" Width="728">
 
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="203"/>