diff --git a/MainWindow.xaml b/MainWindow.xaml
index 2f9a386..2cb57de 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -279,7 +279,8 @@
+ Margin="0,0,0,5">
+
@@ -352,13 +353,13 @@
-
+
-
-
+
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 { 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 { 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 { 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 内部
///
/// 按钮点击触发文件页面
@@ -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 关闭和测试按钮
///
/// 按钮点击触发关闭页面
///
@@ -391,5 +407,6 @@ namespace WpfApp
//LineBarChartDemo lineBarChartDemo = new LineBarChartDemo();
//lineBarChartDemo.Show();
}
+ #endregion
}
}
\ No newline at end of file