From 3dd8c309048d1d2c69a5b183950c38aa56ba3888 Mon Sep 17 00:00:00 2001
From: "GukSang.Jin" <guksang_chen@163.com>
Date: Fri, 30 Jan 2026 19:18:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CSI-H238M/CSI-H238M/Views/SettingsPage.xaml | 67 ++++++++++++++-------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/CSI-H238M/CSI-H238M/Views/SettingsPage.xaml b/CSI-H238M/CSI-H238M/Views/SettingsPage.xaml
index c4fa2ee..5dbf301 100644
--- a/CSI-H238M/CSI-H238M/Views/SettingsPage.xaml
+++ b/CSI-H238M/CSI-H238M/Views/SettingsPage.xaml
@@ -51,29 +51,50 @@
                             </Button.Style>
                         </Button>
                     </Grid>
-                    <TextBlock Text="{Binding Lang.Standard}" Margin="0,10,0,5" FontSize="13"/>
-                    <ComboBox SelectedValue="{Binding Parameters.Standard, Mode=TwoWay}" SelectedValuePath="Content" Margin="0,0,0,15" Height="40" VerticalContentAlignment="Center" FontSize="13">
-                        <ComboBox.ItemContainerStyle>
-                            <Style TargetType="ComboBoxItem">
-                                <Setter Property="HorizontalContentAlignment" Value="Left"/>
-                                <Setter Property="VerticalContentAlignment" Value="Center"/>
-                                <Setter Property="Padding" Value="10,8"/>
-                                <Setter Property="MinHeight" Value="40"/>
-                            </Style>
-                        </ComboBox.ItemContainerStyle>
-                        <ComboBoxItem Content="GB 10006"/>
-                        <ComboBoxItem Content="ISO 8295"/>
-                        <ComboBoxItem Content="ASTM D1894"/>
-                        <ComboBoxItem Content="GB/T 22895"/>
-                        <ComboBoxItem Content="TAPPI T816"/>
-                        <ComboBoxItem Content="GB/T 2792"/>
-                        <ComboBoxItem Content="GB/T 17200"/>
-                        <ComboBoxItem Content="Custom"/>
-                    </ComboBox>
-                    <TextBlock Text="{Binding Lang.TestSpeed}" Margin="0,10,0,5" FontSize="13"/>
-                    <TextBox Text="{Binding Parameters.TestSpeed, StringFormat={}{0:F1} mm/min, Mode=OneWay}" Margin="0,0,0,15" IsReadOnly="True" Background="#F5F5F5" Height="40" VerticalContentAlignment="Center" FontSize="13"/>
-                    <TextBlock Text="{Binding Lang.TestDuration}" Margin="0,10,0,5" FontSize="13"/>
-                    <TextBox Text="{Binding Parameters.TestDuration, StringFormat={}{0:F1} s, Mode=OneWay}" Margin="0,0,0,15" IsReadOnly="True" Background="#F5F5F5" Height="40" VerticalContentAlignment="Center" FontSize="13"/>
+                    
+                    <!-- 水平测试速度 (只读，从寄存器读取) -->
+                    <TextBlock Text="{Binding Lang.HorizontalTestSpeed}" Margin="0,10,0,5" FontSize="13" Foreground="{StaticResource GrayBrush}"/>
+                    <TextBox Text="{Binding Parameters.HorizontalTestSpeed, StringFormat={}{0:F1} mm/min, Mode=OneWay}" 
+                             Margin="0,0,0,15" 
+                             IsReadOnly="True" 
+                             Background="#F5F5F5" 
+                             Height="40" 
+                             VerticalContentAlignment="Center" 
+                             FontSize="13"
+                             BorderBrush="#E0E0E0"/>
+                    
+                    <!-- 水平测试位移 (只读，从寄存器读取) -->
+                    <TextBlock Text="{Binding Lang.HorizontalTestDisplacement}" Margin="0,10,0,5" FontSize="13" Foreground="{StaticResource GrayBrush}"/>
+                    <TextBox Text="{Binding Parameters.HorizontalTestDisplacement, StringFormat={}{0:F1} mm, Mode=OneWay}" 
+                             Margin="0,0,0,15" 
+                             IsReadOnly="True" 
+                             Background="#F5F5F5" 
+                             Height="40" 
+                             VerticalContentAlignment="Center" 
+                             FontSize="13"
+                             BorderBrush="#E0E0E0"/>
+                    
+                    <!-- 升降测试速度 (只读，从寄存器读取) -->
+                    <TextBlock Text="{Binding Lang.VerticalTestSpeed}" Margin="0,10,0,5" FontSize="13" Foreground="{StaticResource GrayBrush}"/>
+                    <TextBox Text="{Binding Parameters.VerticalTestSpeed, StringFormat={}{0:F1} mm/min, Mode=OneWay}" 
+                             Margin="0,0,0,15" 
+                             IsReadOnly="True" 
+                             Background="#F5F5F5" 
+                             Height="40" 
+                             VerticalContentAlignment="Center" 
+                             FontSize="13"
+                             BorderBrush="#E0E0E0"/>
+                    
+                    <!-- 升降测试位移 (只读，从寄存器读取) -->
+                    <TextBlock Text="{Binding Lang.VerticalTestDisplacement}" Margin="0,10,0,5" FontSize="13" Foreground="{StaticResource GrayBrush}"/>
+                    <TextBox Text="{Binding Parameters.VerticalTestDisplacement, StringFormat={}{0:F1} mm, Mode=OneWay}" 
+                             Margin="0,0,0,15" 
+                             IsReadOnly="True" 
+                             Background="#F5F5F5" 
+                             Height="40" 
+                             VerticalContentAlignment="Center" 
+                             FontSize="13"
+                             BorderBrush="#E0E0E0"/>
                 </StackPanel>
             </Border>