diff --git a/Correlator/UserControlPage/AuditionUserControl.xaml.cs b/Correlator/UserControlPage/AuditionUserControl.xaml.cs index 2f2e88c..a7c8c78 100644 --- a/Correlator/UserControlPage/AuditionUserControl.xaml.cs +++ b/Correlator/UserControlPage/AuditionUserControl.xaml.cs @@ -17,18 +17,6 @@ var colorBrush = new SolidColorBrush(Color.FromArgb(255, 84, 84, 84)); const double strokeThickness = 1.5; - //水平线 - // TopHorizontalLineGrid.Children.Add(new Line - // { - // X1 = 0, - // Y1 = 0, - // X2 = 1100, - // Y2 = 0, - // Stroke = colorBrush, - // StrokeThickness = strokeThickness, - // HorizontalAlignment = HorizontalAlignment.Center - // }); - //较高的刻度线 for (var i = 0; i <= 1100; i += 100) { @@ -60,18 +48,6 @@ TopHorizontalLineGrid.Children.Add(shorterScale); } - //水平线 - // BottomHorizontalLineGrid.Children.Add(new Line - // { - // X1 = 0, - // Y1 = 0, - // X2 = 1100, - // Y2 = 0, - // Stroke = colorBrush, - // StrokeThickness = strokeThickness, - // HorizontalAlignment = HorizontalAlignment.Center - // }); - //较高的刻度线 for (var i = 0; i <= 1100; i += 100) { diff --git a/Correlator/UserControlPage/AuditionUserControl.xaml.cs b/Correlator/UserControlPage/AuditionUserControl.xaml.cs index 2f2e88c..a7c8c78 100644 --- a/Correlator/UserControlPage/AuditionUserControl.xaml.cs +++ b/Correlator/UserControlPage/AuditionUserControl.xaml.cs @@ -17,18 +17,6 @@ var colorBrush = new SolidColorBrush(Color.FromArgb(255, 84, 84, 84)); const double strokeThickness = 1.5; - //水平线 - // TopHorizontalLineGrid.Children.Add(new Line - // { - // X1 = 0, - // Y1 = 0, - // X2 = 1100, - // Y2 = 0, - // Stroke = colorBrush, - // StrokeThickness = strokeThickness, - // HorizontalAlignment = HorizontalAlignment.Center - // }); - //较高的刻度线 for (var i = 0; i <= 1100; i += 100) { @@ -60,18 +48,6 @@ TopHorizontalLineGrid.Children.Add(shorterScale); } - //水平线 - // BottomHorizontalLineGrid.Children.Add(new Line - // { - // X1 = 0, - // Y1 = 0, - // X2 = 1100, - // Y2 = 0, - // Stroke = colorBrush, - // StrokeThickness = strokeThickness, - // HorizontalAlignment = HorizontalAlignment.Center - // }); - //较高的刻度线 for (var i = 0; i <= 1100; i += 100) { diff --git a/Correlator/ViewModel/HomePageViewModel.cs b/Correlator/ViewModel/HomePageViewModel.cs index 98fcb7e..e92a5c4 100644 --- a/Correlator/ViewModel/HomePageViewModel.cs +++ b/Correlator/ViewModel/HomePageViewModel.cs @@ -826,7 +826,7 @@ InterfereValue = "未设置"; PassTime = "0"; //复位时将波形图数据清空 - ColumnValues.Clear(); + ColumnValues?.Clear(); _runningSeconds = 0; _runningTimer.Stop(); }