diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml index aebf808..2a98b32 100644 --- a/Correlator/Dialog/ApplicationInfoDialog.xaml +++ b/Correlator/Dialog/ApplicationInfoDialog.xaml @@ -20,13 +20,20 @@ - + + + + + diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml index aebf808..2a98b32 100644 --- a/Correlator/Dialog/ApplicationInfoDialog.xaml +++ b/Correlator/Dialog/ApplicationInfoDialog.xaml @@ -20,13 +20,20 @@ - + + + + + diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 3b0926a..87a509b 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -607,7 +607,7 @@ { try { - Console.WriteLine(@"MainWindowViewModel => 开始计算"); + "MainWindowViewModel".WriteLog("开始计算"); var array = LazyCorrelator.Value.locating( 11, (MWNumericArray)dataModel.LeftDeviceDataArray, (MWNumericArray)dataModel.RightDeviceDataArray, @@ -621,7 +621,7 @@ -1, -1, int.Parse(_lowFrequency), int.Parse(_highFrequency) ); - Console.WriteLine(@"MainWindowViewModel => 计算结束"); + "MainWindowViewModel".WriteLog("计算结束"); DialogHub.Get.DismissLoadingDialog(); //数据绑定 diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml index aebf808..2a98b32 100644 --- a/Correlator/Dialog/ApplicationInfoDialog.xaml +++ b/Correlator/Dialog/ApplicationInfoDialog.xaml @@ -20,13 +20,20 @@ - + + + + + diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 3b0926a..87a509b 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -607,7 +607,7 @@ { try { - Console.WriteLine(@"MainWindowViewModel => 开始计算"); + "MainWindowViewModel".WriteLog("开始计算"); var array = LazyCorrelator.Value.locating( 11, (MWNumericArray)dataModel.LeftDeviceDataArray, (MWNumericArray)dataModel.RightDeviceDataArray, @@ -621,7 +621,7 @@ -1, -1, int.Parse(_lowFrequency), int.Parse(_highFrequency) ); - Console.WriteLine(@"MainWindowViewModel => 计算结束"); + "MainWindowViewModel".WriteLog("计算结束"); DialogHub.Get.DismissLoadingDialog(); //数据绑定 diff --git a/Correlator/Views/MainWindow.xaml.cs b/Correlator/Views/MainWindow.xaml.cs index 5233d3a..63aa8ef 100644 --- a/Correlator/Views/MainWindow.xaml.cs +++ b/Correlator/Views/MainWindow.xaml.cs @@ -108,7 +108,6 @@ { Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(delegate { - "MainWindow".WriteLog("清空波形图"); ScottplotView.Plot.Clear(); crosshair = ScottplotView.Plot.AddCrosshair(0, 0); ShowCrossLineCheckBox.IsChecked = true;