From 247c04b1f5e365f7973b47097c75e163d0596571 Mon Sep 17 00:00:00 2001
From: rain <rain888899@outlook.com>
Date: Fri, 8 May 2026 11:25:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BF=BB=E8=AF=91=EF=BC=8C?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=90=AF=E5=8A=A8=E8=BF=98=E7=95=99=E7=9D=80?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Resources/Strings.en-US.xaml |  23 ++++++++
 Resources/Strings.zh-CN.xaml |  25 ++++++++-
 Window4.xaml                 | 102 +++++++++++++++++------------------
 3 files changed, 97 insertions(+), 53 deletions(-)

diff --git a/Resources/Strings.en-US.xaml b/Resources/Strings.en-US.xaml
index 4f306bc..853b167 100644
--- a/Resources/Strings.en-US.xaml
+++ b/Resources/Strings.en-US.xaml
@@ -69,12 +69,35 @@
     <system:String x:Key="Sample No">Sample No:</system:String>
     <system:String x:Key="Systemparameter">System Parameter</system:String>
     <system:String x:Key="Test speed (mm/min)">Test speed (mm/min)</system:String>
+    
+    
+    
+    <!--zhangjing-->
+    <system:String x:Key="setFlow">Exhalation/Inhalation</system:String>
+    <system:String x:Key="setFlow1">exhale</system:String>
+    <system:String x:Key="setFlow11">Inhale</system:String>
+    <system:String x:Key="setFlow111">Breathing category</system:String>
+    <system:String x:Key="setFlow2">Single fault air resistance test</system:String>
+    <system:String x:Key="setFlow3">Set traffic</system:String>
+    <system:String x:Key="setFlow4">Settings</system:String>
+    <system:String x:Key="setFlow5">Nasal and oral pressure</system:String>
+    <system:String x:Key="setFlow6">Calibration</system:String>
+    <system:String x:Key="setFlow7">Data traffic volume</system:String>
+    <system:String x:Key="setFlow8">Record exhalation resistance</system:String>
+    <system:String x:Key="setFlow9">Inflow rate</system:String>
+    <system:String x:Key="setFlow10">Record the resistance during inhalation</system:String>
+    <system:String x:Key="setFlow112">Exhalation resistance</system:String>
+    <system:String x:Key="setFlow12">Inhalation resistance</system:String>
+
+
+
     <system:String x:Key="Workstation curve description">Workstation curve description:</system:String>
     <system:String x:Key="Test Status">Test Status</system:String>
     <system:String x:Key="Experimental Report">Experimental Report</system:String>
     <system:String x:Key="Constant pressure (N)">Constant pressure (N)</system:String>
     <system:String x:Key="All workstation tests have been completed">All workstation tests have been completed</system:String>
 
+
     <system:String x:Key="RealTimeData">real time data</system:String>
     <system:String x:Key="PressureDeformationCurve">Pressure-deformation relationship curve</system:String>
     <!-- Other Text Resources -->
diff --git a/Resources/Strings.zh-CN.xaml b/Resources/Strings.zh-CN.xaml
index 7f02647..d1a89c0 100644
--- a/Resources/Strings.zh-CN.xaml
+++ b/Resources/Strings.zh-CN.xaml
@@ -21,7 +21,7 @@
     <system:String x:Key="Deformation">主页</system:String>
     <system:String x:Key="Maximumforcevaluetestresult(N)">测试启动</system:String>
     <system:String x:Key="Deformation test results">测试停止</system:String>
-    <system:String x:Key="Peak force test result(N)">连接口压力：</system:String>
+    <system:String x:Key="Peak force test result(N)">连接口压力</system:String>
     <!-- 测试结果区域 -->
     <system:String x:Key="TestResults">鼻口压力:</system:String>
     <system:String x:Key="Next">气阻测试</system:String>
@@ -67,6 +67,29 @@
     <system:String x:Key="Down">下降</system:String>
     <system:String x:Key="Zero">清零</system:String>
     <!-- 底部导航 -->
+    
+    
+    
+    
+    
+     <!--zhangjing-->
+    <system:String x:Key="setFlow">呼气/吸气</system:String>
+    <system:String x:Key="setFlow1">呼气</system:String>
+    <system:String x:Key="setFlow11">吸气</system:String>
+    <system:String x:Key="setFlow111">呼吸类别</system:String>
+    <system:String x:Key="setFlow2">单一故障气阻测试</system:String>
+    <system:String x:Key="setFlow3">设置流量</system:String>
+    <system:String x:Key="setFlow4">设置</system:String>
+    <system:String x:Key="setFlow6">校准</system:String>
+    <system:String x:Key="setFlow7">呼流量</system:String>
+    <system:String x:Key="setFlow8">记录呼气阻力</system:String>
+    <system:String x:Key="setFlow5">鼻口压力</system:String>
+    <system:String x:Key="setFlow9">吸流量</system:String>
+    <system:String x:Key="setFlow10">记录吸气阻力</system:String>
+    <system:String x:Key="setFlow112">呼气阻力</system:String>
+    <system:String x:Key="setFlow12">吸气阻力</system:String>
+
+
     <system:String x:Key="PositionToPressure">定位移测压力</system:String>
     <system:String x:Key="PressureToDisplacement">定压力测位移</system:String>
     <system:String x:Key="PeakTest">峰值测试</system:String>
diff --git a/Window4.xaml b/Window4.xaml
index c95235a..70470bc 100644
--- a/Window4.xaml
+++ b/Window4.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="ShanghaiEnvironmentalTechnology.Window4"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="单一故障气阻测试" Height="768" Width="1024" 
+        Title="{DynamicResource setFlow2}" Height="768" Width="1024" 
         Loaded="Window_Loaded" 
         WindowStartupLocation="CenterScreen">
     <Window.Resources>
@@ -16,7 +16,7 @@
             <Setter Property="BorderThickness" Value="0"/>
             <Setter Property="Cursor" Value="Hand"/>
             <Setter Property="Height" Value="40"/>
-            <Setter Property="Width" Value="120"/>
+            <Setter Property="Width" Value="180"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
@@ -127,97 +127,95 @@
     <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="0">
         <Grid Margin="20">
             <StackPanel>
-          
-                <TextBlock Text="呼气/吸气" 
+
+                <TextBlock Text="{DynamicResource setFlow}" 
                            FontSize="24" 
                            FontWeight="Bold" 
                            HorizontalAlignment="Center" 
                            Margin="0,0,0,10"/>
-      
+
 
                 <ComboBox x:Name="CaptureModeComboBox" 
                           Style="{StaticResource MyComboBoxStyle}" 
                           HorizontalAlignment="Center" 
                           SelectionChanged="CaptureModeComboBox_SelectionChanged"
                           Margin="0,0,0,10">
-                    <ComboBoxItem  Content="呼吸类别" IsEnabled="False"/>
-                    <ComboBoxItem Content="呼气" IsSelected="True"/>
-                    <ComboBoxItem Content="吸气"/>
+                    <ComboBoxItem  Content="{DynamicResource setFlow111}" IsEnabled="False"/>
+                    <ComboBoxItem Content="{DynamicResource setFlow1}" IsSelected="True"/>
+                    <ComboBoxItem Content="{DynamicResource setFlow11}"/>
                 </ComboBox>
 
-                <TextBlock Text="单一故障气阻测试" 
+                <TextBlock Text="{DynamicResource setFlow2}" 
                            FontSize="24" 
                            FontWeight="Bold" 
                            HorizontalAlignment="Center" 
                            Margin="0,10,0,10"/>
-   
 
 
 
 
-                <Grid Margin="10" HorizontalAlignment="Left" MinWidth="400">
-          
+
+                <Grid Margin="10" HorizontalAlignment="Left" MinWidth="400" Width="728">
+
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition Width="203"/>
                         <!-- 标签列 -->
-                        <ColumnDefinition Width="150"/>
-                   
-                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="142"/>
+
+                        <ColumnDefinition/>
                         <!-- 按钮列 -->
                     </Grid.ColumnDefinitions>
 
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" MinHeight="35"/>
-                 
+
                         <RowDefinition Height="Auto" MinHeight="35"/>
                         <RowDefinition Height="Auto" MinHeight="35"/>
                         <RowDefinition Height="Auto" MinHeight="35"/>
                     </Grid.RowDefinitions>
 
                     <!-- 设置流量行 -->
-                    <TextBlock Grid.Row="0" Text="设置流量" 
+                    <TextBlock Text="{DynamicResource setFlow3}" 
                VerticalAlignment="Center" 
-               FontWeight="Bold" 
+               FontWeight="Bold"
                FontSize="16"
-               Margin="0,0,15,0"/>
+               Margin="0,0,1,0" Height="20"/>
 
-                    <StackPanel Grid.Row="0" Grid.Column="1" 
+                    <StackPanel Grid.Column="1" 
                 Orientation="Horizontal" 
                 VerticalAlignment="Center"
-                Margin="0,5"
-                Width="160">
-        
+                Margin="0,0,196,0" Grid.ColumnSpan="2" Height="50">
+
                         <TextBox Name="clostTxt" 
                  Style="{StaticResource MyTextBoxStyle}" 
                  IsReadOnly="True"
                  PreviewTextInput="ClostTxt_PreviewTextInput"
                  Width="80"/>
-           
+
                         <TextBlock Text="L/min" 
                    VerticalAlignment="Center" 
                    Margin="10,0,0,0"
                    MinWidth="50"/>
-                  
+
                     </StackPanel>
 
                     <Button Grid.Row="0" Grid.Column="2" 
-            Content="设置" 
+            Content="{DynamicResource setFlow4}" 
             Style="{StaticResource MyButtonStyle}" 
             Click="Button_Click"
-            Margin="15,5"/>
+            Margin="42,10,161,10"/>
 
                     <!-- 鼻口压力行 -->
-                    <TextBlock Grid.Row="1" Text="鼻口压力" 
+                    <TextBlock Grid.Row="1" Text="{DynamicResource setFlow5}" 
                VerticalAlignment="Center" 
                FontWeight="Bold" 
                FontSize="16"
-               Margin="0,0,15,0"/>
+               Margin="0,0,15,0" Height="20"/>
 
                     <StackPanel Grid.Row="1" Grid.Column="1" 
                 Orientation="Horizontal" 
                 VerticalAlignment="Center"
-                Margin="0,5"
-                Width="160">
+                Margin="0,0,196,0" Grid.ColumnSpan="2" Height="50">
                         <TextBox Name="NoseTxt" 
                  Style="{StaticResource MyTextBoxStyle}" 
                  Text="???" 
@@ -230,23 +228,22 @@
                     </StackPanel>
 
                     <Button Grid.Row="1" Grid.Column="2" 
-            Content="校准" 
+            Content="{DynamicResource setFlow6}" 
             Style="{StaticResource MyButtonStyle}" 
             Click="Button_Click_1"
-            Margin="15,5"/>
+            Margin="42,10,161,10"/>
 
                     <!-- 呼流量行 -->
-                    <TextBlock Grid.Row="2" Text="呼流量" 
+                    <TextBlock Grid.Row="2" Text="{DynamicResource setFlow7}" 
                VerticalAlignment="Center" 
                FontWeight="Bold" 
                FontSize="16"
-               Margin="0,0,15,0"/>
+               Margin="0,0,15,0" Height="20"/>
 
                     <StackPanel Grid.Row="2" Grid.Column="1" 
                 Orientation="Horizontal" 
                 VerticalAlignment="Center"
-                Margin="0,5"
-                Width="160">
+                Margin="0,0,196,0" Grid.ColumnSpan="2" Height="50">
                         <TextBox Name="outTxt" 
                  Style="{StaticResource MyTextBoxStyle}" 
                  Text="???"  
@@ -259,23 +256,23 @@
                     </StackPanel>
 
                     <Button Grid.Row="2" Grid.Column="2" 
-            Content="记录呼气阻力" 
+            Content="{DynamicResource setFlow8}" 
             Style="{StaticResource MyButtonStyle}" 
             Click="Button_Click_5"
-            Margin="15,5"/>
+                            Width="300"
+            Margin="32,10,32,10"/>
 
                     <!-- 吸流量行 -->
-                    <TextBlock Grid.Row="3" Text="吸流量" 
+                    <TextBlock Grid.Row="3" Text="{DynamicResource setFlow9}" 
                VerticalAlignment="Center" 
                FontWeight="Bold" 
                FontSize="16"
-               Margin="0,0,15,0"/>
+               Margin="0,0,15,0" Height="20"/>
 
                     <StackPanel Grid.Row="3" Grid.Column="1" 
                 Orientation="Horizontal" 
                 VerticalAlignment="Center"
-                Margin="0,5"
-                Width="160">
+                Margin="0,0,196,0" Grid.ColumnSpan="2" Height="50">
                         <TextBox Name="InTxt" 
                  Style="{StaticResource MyTextBoxStyle}" 
                  Text="???" 
@@ -288,27 +285,28 @@
                     </StackPanel>
 
                     <Button Grid.Row="3" Grid.Column="2" 
-            Content="记录吸气阻力" 
+            Content="{DynamicResource setFlow10}" 
             Style="{StaticResource MyButtonStyle}" 
             Click="Button_Click_5"
-            Margin="15,5"/>
+                            Width="NaN"
+            Margin="42,10,42,10"/>
                 </Grid>
 
 
 
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10">
                     <!-- 减少边距（原20→10） -->
-                    <Button Content="主页" Style="{StaticResource MyButtonStyle}" Click="Button_Click_2"/>
-                    <Button Name="TestStartButton"  Content="测试启动" Style="{StaticResource MyButtonStyle}" Click="Button_Click_4"/>
-                    <Button Content="测试停止" Style="{StaticResource MyButtonStyle}" Click="Button_Click_3"/>
-                    <Button Content="记录画面" Style="{StaticResource MyButtonStyle}" Click="Button_Click_7"/>
+                    <Button Content="{DynamicResource Deformation}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_2"/>
+                    <Button Name="TestStartButton"  Content="{DynamicResource Maximumforcevaluetestresult(N)}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_4"/>
+                    <Button Content="{DynamicResource Deformation test results}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_3"/>
+                    <Button Content="{DynamicResource Peak force test result(N)}" Style="{StaticResource MyButtonStyle}" Click="Button_Click_7" Width="201"/>
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10">
-                    <TextBlock Text="呼气阻力"  VerticalAlignment="Center" FontWeight="Bold" FontSize="16" Margin="20 0 50 0"/>
+                    <TextBlock Text="{DynamicResource setFlow112}"  VerticalAlignment="Center" FontWeight="Bold" FontSize="16" Margin="20 0 50 0"/>
                     <TextBox Name="saveFlowOutTxt" Style="{StaticResource MyTextBoxStyle}" Text="???" Width="120" IsEnabled="False"/>
                     <TextBlock Text="pa" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                    <TextBlock Text="吸气阻力"  VerticalAlignment="Center" FontWeight="Bold" FontSize="16" Margin="20 0 50 0"/>
+                    <TextBlock Text="{DynamicResource setFlow12}"  VerticalAlignment="Center" FontWeight="Bold" FontSize="16" Margin="20 0 50 0"/>
                     <TextBox Name="saveFlowInTxt"  Style="{StaticResource MyTextBoxStyle}" Text="???" Width="120" IsEnabled="False"/>
                     <TextBlock Text="pa" VerticalAlignment="Center" Margin="10,0,0,0"/>
                 </StackPanel>