From db162f3be37a54093adfe4b72bb68fce4b0f6742 Mon Sep 17 00:00:00 2001
From: YONGYE <xguo0302@gmail.com>
Date: Fri, 10 Oct 2025 17:49:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E6=9B=B2=E7=BA=BF=E4=B8=8A=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=82=B9=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E7=BA=BF=E6=9D=A1=E7=B2=97?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MainWindow.xaml    |  9 +++++----
 MainWindow.xaml.cs | 23 ++++++++++++++++++++---
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index 2f9a386..2cb57de 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -279,7 +279,8 @@
 
                         <lvc:CartesianChart Grid.Row="1"
                             x:Name="myChart"
-                            Margin="0,0,0,5"/>
+                            Margin="0,0,0,5">
+                        </lvc:CartesianChart>
                     </Grid>
 
                     <!-- 图2：传感器2 -->
@@ -352,13 +353,13 @@
                             <ComboBoxItem Content="中等" IsSelected="True"/>
                             <ComboBoxItem Content="高等"/>
                         </ComboBox>
-                        <RadioButton Content="日志记录" VerticalAlignment="Center" Margin="10,0,0,0" Foreground="Black"/>
+                        <!--<RadioButton Content="日志记录" VerticalAlignment="Center" Margin="10,0,0,0" Foreground="Black"/>-->
                     </StackPanel>
 
                     <!-- 中间状态显示 -->
                     <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,10,0">
-                        <Button Content="保存至Cg&amp;Cgk" Width="100" Height="30" Margin="5,0"/>
-                        <Button Content="保存至R&amp;R" Width="80" Height="30" Margin="5,0"/>
+                        <!--<Button Content="保存至Cg&amp;Cgk" Width="100" Height="30" Margin="5,0"/>
+                        <Button Content="保存至R&amp;R" Width="80" Height="30" Margin="5,0"/>-->
                     </StackPanel>
 
                     <!-- 右侧按钮组 -->
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 4211225..c0947e7 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -52,6 +52,8 @@ namespace WpfApp
                 {
                     Title = "标准1",
                     Values = new ChartValues<double> { 5, 5, 5, 5, 5 },
+                    DataLabels = true,
+                    LabelPoint = value => value.Y.ToString("0.##") + " Hz",
                     StrokeThickness = 2,
                     Fill = System.Windows.Media.Brushes.Transparent
                 },
@@ -60,6 +62,11 @@ namespace WpfApp
                 {
                     Title = "标准2",
                     Values = new ChartValues<double> { 10, 10, 10, 10, 10 },
+                    DataLabels = true,
+                    LabelPoint = value => value.Y.ToString("0.##") + " Hz",
+                    //Foreground = System.Windows.Media.Brushes.Blue,// 标签颜色
+                    //FontSize = 14,// 字体大小
+                    // StrokeThickness = 2, // 线条粗细
                     StrokeThickness = 2,
                     Stroke = System.Windows.Media.Brushes.Green,
                     Fill = System.Windows.Media.Brushes.Transparent
@@ -69,6 +76,8 @@ namespace WpfApp
                 {
                     Title = "标准3",
                     Values = new ChartValues<double> { 30, 30, 30, 30, 30 },
+                    DataLabels = true,
+                    LabelPoint = value => value.Y.ToString("0.##") + " Hz",
                     StrokeThickness = 2,
                     Stroke = System.Windows.Media.Brushes.Red,
                     Fill = System.Windows.Media.Brushes.Transparent
@@ -211,6 +220,11 @@ namespace WpfApp
         {
             this.Title = newTitle;
         }
+
+
+
+
+        #region 菜单点击按钮
         // 在 MainWindow 内部
         /// <summary>
         /// 按钮点击触发文件页面
@@ -276,9 +290,9 @@ namespace WpfApp
         {
             StandardPage standardPage = new StandardPage();
             NavigationWindow navWin = new NavigationWindow();
-            navWin.Width = 1440;
-            navWin.Height = 960;
-            navWin.ResizeMode = ResizeMode.NoResize;
+            navWin.Width = 972;
+            navWin.Height = 648;
+            //navWin.ResizeMode = ResizeMode.NoResize;
             navWin.Content = standardPage;
             navWin.ShowsNavigationUI = false;
             navWin.Title = "主标定";
@@ -368,7 +382,9 @@ namespace WpfApp
             navWin.ShowDialog();
         }
 
+        #endregion
 
+        #region 关闭和测试按钮
         /// <summary>
         /// 按钮点击触发关闭页面
         /// </summary>
@@ -391,5 +407,6 @@ namespace WpfApp
             //LineBarChartDemo lineBarChartDemo = new LineBarChartDemo();
             //lineBarChartDemo.Show();
         }
+        #endregion
     }
 }
\ No newline at end of file