diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 18139e5..0255b8b 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -1142,7 +1142,14 @@ //声速 var soundVelocity = _dataService.GetSoundVelocity(_materialName, Convert.ToInt32(_pipeDiameter)); + if (soundVelocity == 0) + { + MessageBox.Show("声速错误,请检查管径和管径参数", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); + return false; + } + SoundSpeed = soundVelocity.ToString(); + return true; } @@ -1155,6 +1162,7 @@ { try { + var startTime = DateTime.Now; "MainWindowViewModel".WriteLog("开始计算"); var array = LazyCorrelator.Value.locating( 11, @@ -1172,9 +1180,13 @@ RuntimeCache.WorkMode ); e.Result = array; + var endTime = DateTime.Now; + var diffTime = Convert.ToInt32(Math.Abs((endTime - startTime).TotalSeconds)); + Console.WriteLine($@"MATLAB计算时间是:{diffTime}秒"); } - catch (Exception) + catch (Exception ex) { + Console.WriteLine(ex.StackTrace); _runningTimer.Stop(); DialogHub.Get.DismissLoadingDialog(); diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 18139e5..0255b8b 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -1142,7 +1142,14 @@ //声速 var soundVelocity = _dataService.GetSoundVelocity(_materialName, Convert.ToInt32(_pipeDiameter)); + if (soundVelocity == 0) + { + MessageBox.Show("声速错误,请检查管径和管径参数", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Stop); + return false; + } + SoundSpeed = soundVelocity.ToString(); + return true; } @@ -1155,6 +1162,7 @@ { try { + var startTime = DateTime.Now; "MainWindowViewModel".WriteLog("开始计算"); var array = LazyCorrelator.Value.locating( 11, @@ -1172,9 +1180,13 @@ RuntimeCache.WorkMode ); e.Result = array; + var endTime = DateTime.Now; + var diffTime = Convert.ToInt32(Math.Abs((endTime - startTime).TotalSeconds)); + Console.WriteLine($@"MATLAB计算时间是:{diffTime}秒"); } - catch (Exception) + catch (Exception ex) { + Console.WriteLine(ex.StackTrace); _runningTimer.Stop(); DialogHub.Get.DismissLoadingDialog(); diff --git a/Correlator/Views/MainWindow.xaml.cs b/Correlator/Views/MainWindow.xaml.cs index d68fc3e..fac0947 100644 --- a/Correlator/Views/MainWindow.xaml.cs +++ b/Correlator/Views/MainWindow.xaml.cs @@ -82,6 +82,7 @@ { Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(delegate { + var startTime = DateTime.Now; "MainWindow".WriteLog("开始渲染计算结果"); //最大相关系数 var maxCorrelationCoefficient = Convert.ToDouble(array[3].ToString()); @@ -99,6 +100,9 @@ ); ScottplotView.Plot.AxisAuto(); ScottplotView.Refresh(); + var endTime = DateTime.Now; + var diffTime = Convert.ToInt32(Math.Abs((endTime - startTime).TotalSeconds)); + Console.WriteLine($@"渲染结果共花费:{diffTime}秒"); })); });