diff --git a/Correlator.sln.DotSettings.user b/Correlator.sln.DotSettings.user index f74df5c..4576cbb 100644 --- a/Correlator.sln.DotSettings.user +++ b/Correlator.sln.DotSettings.user @@ -6,6 +6,8 @@ <Assembly Path="C:\Users\Administrator\Desktop\dll\国内\CorrelatorSingle.dll" /> <Assembly Path="D:\Code\Rider Projects\相关仪\测试版\correlator\packages\log4net.2.0.15\lib\net45\log4net.dll" /> </AssemblyExplorer> + D:\Program Files\JetBrains\JetBrains Rider 2024.2.7\tools\MSBuild\Current\Bin\MSBuild.exe + 1114112 True True True \ No newline at end of file diff --git a/Correlator.sln.DotSettings.user b/Correlator.sln.DotSettings.user index f74df5c..4576cbb 100644 --- a/Correlator.sln.DotSettings.user +++ b/Correlator.sln.DotSettings.user @@ -6,6 +6,8 @@ <Assembly Path="C:\Users\Administrator\Desktop\dll\国内\CorrelatorSingle.dll" /> <Assembly Path="D:\Code\Rider Projects\相关仪\测试版\correlator\packages\log4net.2.0.15\lib\net45\log4net.dll" /> </AssemblyExplorer> + D:\Program Files\JetBrains\JetBrains Rider 2024.2.7\tools\MSBuild\Current\Bin\MSBuild.exe + 1114112 True True True \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2a39206..3c21298 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -260,6 +260,7 @@ + @@ -302,7 +303,6 @@ - diff --git a/Correlator.sln.DotSettings.user b/Correlator.sln.DotSettings.user index f74df5c..4576cbb 100644 --- a/Correlator.sln.DotSettings.user +++ b/Correlator.sln.DotSettings.user @@ -6,6 +6,8 @@ <Assembly Path="C:\Users\Administrator\Desktop\dll\国内\CorrelatorSingle.dll" /> <Assembly Path="D:\Code\Rider Projects\相关仪\测试版\correlator\packages\log4net.2.0.15\lib\net45\log4net.dll" /> </AssemblyExplorer> + D:\Program Files\JetBrains\JetBrains Rider 2024.2.7\tools\MSBuild\Current\Bin\MSBuild.exe + 1114112 True True True \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2a39206..3c21298 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -260,6 +260,7 @@ + @@ -302,7 +303,6 @@ - diff --git a/Correlator/Dialog/LoadingDialog.xaml b/Correlator/Dialog/LoadingDialog.xaml index fb137a1..387fbee 100644 --- a/Correlator/Dialog/LoadingDialog.xaml +++ b/Correlator/Dialog/LoadingDialog.xaml @@ -8,7 +8,6 @@ Width="400" Height="144" Background="White" - Closed="LoadingDialog_OnClosed" ResizeMode="NoResize" ShowInTaskbar="False" WindowStartupLocation="CenterOwner" @@ -21,11 +20,10 @@ + Text="数据计算中，请稍后......" /> - + \ No newline at end of file diff --git a/Correlator.sln.DotSettings.user b/Correlator.sln.DotSettings.user index f74df5c..4576cbb 100644 --- a/Correlator.sln.DotSettings.user +++ b/Correlator.sln.DotSettings.user @@ -6,6 +6,8 @@ <Assembly Path="C:\Users\Administrator\Desktop\dll\国内\CorrelatorSingle.dll" /> <Assembly Path="D:\Code\Rider Projects\相关仪\测试版\correlator\packages\log4net.2.0.15\lib\net45\log4net.dll" /> </AssemblyExplorer> + D:\Program Files\JetBrains\JetBrains Rider 2024.2.7\tools\MSBuild\Current\Bin\MSBuild.exe + 1114112 True True True \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2a39206..3c21298 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -260,6 +260,7 @@ + @@ -302,7 +303,6 @@ - diff --git a/Correlator/Dialog/LoadingDialog.xaml b/Correlator/Dialog/LoadingDialog.xaml index fb137a1..387fbee 100644 --- a/Correlator/Dialog/LoadingDialog.xaml +++ b/Correlator/Dialog/LoadingDialog.xaml @@ -8,7 +8,6 @@ Width="400" Height="144" Background="White" - Closed="LoadingDialog_OnClosed" ResizeMode="NoResize" ShowInTaskbar="False" WindowStartupLocation="CenterOwner" @@ -21,11 +20,10 @@ + Text="数据计算中，请稍后......" /> - + \ No newline at end of file diff --git a/Correlator/Dialog/LoadingDialog.xaml.cs b/Correlator/Dialog/LoadingDialog.xaml.cs index db1659f..bebd85e 100644 --- a/Correlator/Dialog/LoadingDialog.xaml.cs +++ b/Correlator/Dialog/LoadingDialog.xaml.cs @@ -1,37 +1,12 @@ -using System; -using System.Windows; -using System.Windows.Threading; +using System.Windows; namespace Correlator.Dialog { public partial class LoadingDialog : Window { - //运行时间Timer - private readonly DispatcherTimer _runningTimer = new DispatcherTimer - { - Interval = TimeSpan.FromSeconds(1) - }; - - //计算时间 - private int _runningSeconds; - - public LoadingDialog(string message) + public LoadingDialog() { InitializeComponent(); - _runningTimer.Tick += delegate - { - _runningSeconds++; - Application.Current.Dispatcher.Invoke(delegate - { - MessageTextBlock.Text = message + $"{_runningSeconds}s"; - }); - }; - _runningTimer.Start(); - } - - private void LoadingDialog_OnClosed(object sender, EventArgs e) - { - _runningTimer.Stop(); } } } \ No newline at end of file diff --git a/Correlator.sln.DotSettings.user b/Correlator.sln.DotSettings.user index f74df5c..4576cbb 100644 --- a/Correlator.sln.DotSettings.user +++ b/Correlator.sln.DotSettings.user @@ -6,6 +6,8 @@ <Assembly Path="C:\Users\Administrator\Desktop\dll\国内\CorrelatorSingle.dll" /> <Assembly Path="D:\Code\Rider Projects\相关仪\测试版\correlator\packages\log4net.2.0.15\lib\net45\log4net.dll" /> </AssemblyExplorer> + D:\Program Files\JetBrains\JetBrains Rider 2024.2.7\tools\MSBuild\Current\Bin\MSBuild.exe + 1114112 True True True \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2a39206..3c21298 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -260,6 +260,7 @@ + @@ -302,7 +303,6 @@ - diff --git a/Correlator/Dialog/LoadingDialog.xaml b/Correlator/Dialog/LoadingDialog.xaml index fb137a1..387fbee 100644 --- a/Correlator/Dialog/LoadingDialog.xaml +++ b/Correlator/Dialog/LoadingDialog.xaml @@ -8,7 +8,6 @@ Width="400" Height="144" Background="White" - Closed="LoadingDialog_OnClosed" ResizeMode="NoResize" ShowInTaskbar="False" WindowStartupLocation="CenterOwner" @@ -21,11 +20,10 @@ + Text="数据计算中，请稍后......" /> - + \ No newline at end of file diff --git a/Correlator/Dialog/LoadingDialog.xaml.cs b/Correlator/Dialog/LoadingDialog.xaml.cs index db1659f..bebd85e 100644 --- a/Correlator/Dialog/LoadingDialog.xaml.cs +++ b/Correlator/Dialog/LoadingDialog.xaml.cs @@ -1,37 +1,12 @@ -using System; -using System.Windows; -using System.Windows.Threading; +using System.Windows; namespace Correlator.Dialog { public partial class LoadingDialog : Window { - //运行时间Timer - private readonly DispatcherTimer _runningTimer = new DispatcherTimer - { - Interval = TimeSpan.FromSeconds(1) - }; - - //计算时间 - private int _runningSeconds; - - public LoadingDialog(string message) + public LoadingDialog() { InitializeComponent(); - _runningTimer.Tick += delegate - { - _runningSeconds++; - Application.Current.Dispatcher.Invoke(delegate - { - MessageTextBlock.Text = message + $"{_runningSeconds}s"; - }); - }; - _runningTimer.Start(); - } - - private void LoadingDialog_OnClosed(object sender, EventArgs e) - { - _runningTimer.Stop(); } } } \ No newline at end of file diff --git a/Correlator/Events/ShowLoadingDialogEvent.cs b/Correlator/Events/ShowLoadingDialogEvent.cs new file mode 100644 index 0000000..24f591b --- /dev/null +++ b/Correlator/Events/ShowLoadingDialogEvent.cs @@ -0,0 +1,8 @@ +using Prism.Events; + +namespace Correlator.Events +{ + public class ShowLoadingDialogEvent : PubSubEvent + { + } +} \ No newline at end of file diff --git a/Correlator.sln.DotSettings.user b/Correlator.sln.DotSettings.user index f74df5c..4576cbb 100644 --- a/Correlator.sln.DotSettings.user +++ b/Correlator.sln.DotSettings.user @@ -6,6 +6,8 @@ <Assembly Path="C:\Users\Administrator\Desktop\dll\国内\CorrelatorSingle.dll" /> <Assembly Path="D:\Code\Rider Projects\相关仪\测试版\correlator\packages\log4net.2.0.15\lib\net45\log4net.dll" /> </AssemblyExplorer> + D:\Program Files\JetBrains\JetBrains Rider 2024.2.7\tools\MSBuild\Current\Bin\MSBuild.exe + 1114112 True True True \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2a39206..3c21298 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -260,6 +260,7 @@ + @@ -302,7 +303,6 @@ - diff --git a/Correlator/Dialog/LoadingDialog.xaml b/Correlator/Dialog/LoadingDialog.xaml index fb137a1..387fbee 100644 --- a/Correlator/Dialog/LoadingDialog.xaml +++ b/Correlator/Dialog/LoadingDialog.xaml @@ -8,7 +8,6 @@ Width="400" Height="144" Background="White" - Closed="LoadingDialog_OnClosed" ResizeMode="NoResize" ShowInTaskbar="False" WindowStartupLocation="CenterOwner" @@ -21,11 +20,10 @@ + Text="数据计算中，请稍后......" /> - + \ No newline at end of file diff --git a/Correlator/Dialog/LoadingDialog.xaml.cs b/Correlator/Dialog/LoadingDialog.xaml.cs index db1659f..bebd85e 100644 --- a/Correlator/Dialog/LoadingDialog.xaml.cs +++ b/Correlator/Dialog/LoadingDialog.xaml.cs @@ -1,37 +1,12 @@ -using System; -using System.Windows; -using System.Windows.Threading; +using System.Windows; namespace Correlator.Dialog { public partial class LoadingDialog : Window { - //运行时间Timer - private readonly DispatcherTimer _runningTimer = new DispatcherTimer - { - Interval = TimeSpan.FromSeconds(1) - }; - - //计算时间 - private int _runningSeconds; - - public LoadingDialog(string message) + public LoadingDialog() { InitializeComponent(); - _runningTimer.Tick += delegate - { - _runningSeconds++; - Application.Current.Dispatcher.Invoke(delegate - { - MessageTextBlock.Text = message + $"{_runningSeconds}s"; - }); - }; - _runningTimer.Start(); - } - - private void LoadingDialog_OnClosed(object sender, EventArgs e) - { - _runningTimer.Stop(); } } } \ No newline at end of file diff --git a/Correlator/Events/ShowLoadingDialogEvent.cs b/Correlator/Events/ShowLoadingDialogEvent.cs new file mode 100644 index 0000000..24f591b --- /dev/null +++ b/Correlator/Events/ShowLoadingDialogEvent.cs @@ -0,0 +1,8 @@ +using Prism.Events; + +namespace Correlator.Events +{ + public class ShowLoadingDialogEvent : PubSubEvent + { + } +} \ No newline at end of file diff --git a/Correlator/Util/DialogHub.cs b/Correlator/Util/DialogHub.cs deleted file mode 100644 index fa0ee21..0000000 --- a/Correlator/Util/DialogHub.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Windows; -using Correlator.Dialog; - -namespace Correlator.Util -{ - public class DialogHub - { - #region 懒汉单例模式 - - private static readonly Lazy Lazy = new Lazy(() => new DialogHub()); - - public static DialogHub Get => Lazy.Value; - - - private DialogHub() - { - } - - #endregion - - private LoadingDialog _loadingDialog; - - public void ShowLoadingDialog(Window owner, string message) - { - Application.Current.Dispatcher.Invoke(delegate - { - _loadingDialog = new LoadingDialog(message) - { - Owner = owner - }; - _loadingDialog.Show(); - }); - } - - public void DismissLoadingDialog() - { - Application.Current.Dispatcher.Invoke(delegate { _loadingDialog?.Close(); }); - } - } -} \ No newline at end of file diff --git a/Correlator.sln.DotSettings.user b/Correlator.sln.DotSettings.user index f74df5c..4576cbb 100644 --- a/Correlator.sln.DotSettings.user +++ b/Correlator.sln.DotSettings.user @@ -6,6 +6,8 @@ <Assembly Path="C:\Users\Administrator\Desktop\dll\国内\CorrelatorSingle.dll" /> <Assembly Path="D:\Code\Rider Projects\相关仪\测试版\correlator\packages\log4net.2.0.15\lib\net45\log4net.dll" /> </AssemblyExplorer> + D:\Program Files\JetBrains\JetBrains Rider 2024.2.7\tools\MSBuild\Current\Bin\MSBuild.exe + 1114112 True True True \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2a39206..3c21298 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -260,6 +260,7 @@ + @@ -302,7 +303,6 @@ - diff --git a/Correlator/Dialog/LoadingDialog.xaml b/Correlator/Dialog/LoadingDialog.xaml index fb137a1..387fbee 100644 --- a/Correlator/Dialog/LoadingDialog.xaml +++ b/Correlator/Dialog/LoadingDialog.xaml @@ -8,7 +8,6 @@ Width="400" Height="144" Background="White" - Closed="LoadingDialog_OnClosed" ResizeMode="NoResize" ShowInTaskbar="False" WindowStartupLocation="CenterOwner" @@ -21,11 +20,10 @@ + Text="数据计算中，请稍后......" /> - + \ No newline at end of file diff --git a/Correlator/Dialog/LoadingDialog.xaml.cs b/Correlator/Dialog/LoadingDialog.xaml.cs index db1659f..bebd85e 100644 --- a/Correlator/Dialog/LoadingDialog.xaml.cs +++ b/Correlator/Dialog/LoadingDialog.xaml.cs @@ -1,37 +1,12 @@ -using System; -using System.Windows; -using System.Windows.Threading; +using System.Windows; namespace Correlator.Dialog { public partial class LoadingDialog : Window { - //运行时间Timer - private readonly DispatcherTimer _runningTimer = new DispatcherTimer - { - Interval = TimeSpan.FromSeconds(1) - }; - - //计算时间 - private int _runningSeconds; - - public LoadingDialog(string message) + public LoadingDialog() { InitializeComponent(); - _runningTimer.Tick += delegate - { - _runningSeconds++; - Application.Current.Dispatcher.Invoke(delegate - { - MessageTextBlock.Text = message + $"{_runningSeconds}s"; - }); - }; - _runningTimer.Start(); - } - - private void LoadingDialog_OnClosed(object sender, EventArgs e) - { - _runningTimer.Stop(); } } } \ No newline at end of file diff --git a/Correlator/Events/ShowLoadingDialogEvent.cs b/Correlator/Events/ShowLoadingDialogEvent.cs new file mode 100644 index 0000000..24f591b --- /dev/null +++ b/Correlator/Events/ShowLoadingDialogEvent.cs @@ -0,0 +1,8 @@ +using Prism.Events; + +namespace Correlator.Events +{ + public class ShowLoadingDialogEvent : PubSubEvent + { + } +} \ No newline at end of file diff --git a/Correlator/Util/DialogHub.cs b/Correlator/Util/DialogHub.cs deleted file mode 100644 index fa0ee21..0000000 --- a/Correlator/Util/DialogHub.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Windows; -using Correlator.Dialog; - -namespace Correlator.Util -{ - public class DialogHub - { - #region 懒汉单例模式 - - private static readonly Lazy Lazy = new Lazy(() => new DialogHub()); - - public static DialogHub Get => Lazy.Value; - - - private DialogHub() - { - } - - #endregion - - private LoadingDialog _loadingDialog; - - public void ShowLoadingDialog(Window owner, string message) - { - Application.Current.Dispatcher.Invoke(delegate - { - _loadingDialog = new LoadingDialog(message) - { - Owner = owner - }; - _loadingDialog.Show(); - }); - } - - public void DismissLoadingDialog() - { - Application.Current.Dispatcher.Invoke(delegate { _loadingDialog?.Close(); }); - } - } -} \ No newline at end of file diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index a57d4ef..f1c0f28 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -933,7 +933,7 @@ /// private void StartCalculateData(bool isImportData) { - DialogHub.Get.ShowLoadingDialog(_mainWindow, "数据计算中，请稍后..."); + _eventAggregator.GetEvent().Publish(); //开始计算就不收集收据了且不能点击开始按钮 StartButtonEnabled = false; using (var manager = new DataBaseManager()) @@ -1214,9 +1214,8 @@ catch (Exception ex) { Console.WriteLine(ex.StackTrace); + _eventAggregator.GetEvent().Publish(); _runningTimer.Stop(); - DialogHub.Get.DismissLoadingDialog(); - Application.Current.Dispatcher.Invoke(delegate { var result = MessageBox.Show( @@ -1238,8 +1237,6 @@ private void Worker_OnRunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) { "MainWindowViewModel".WriteLog("计算结束"); - DialogHub.Get.DismissLoadingDialog(); - var array = (MWArray[])e.Result; //数据绑定 var snr = Convert.ToDouble(array[0].ToString()); //信噪比 diff --git a/Correlator.sln.DotSettings.user b/Correlator.sln.DotSettings.user index f74df5c..4576cbb 100644 --- a/Correlator.sln.DotSettings.user +++ b/Correlator.sln.DotSettings.user @@ -6,6 +6,8 @@ <Assembly Path="C:\Users\Administrator\Desktop\dll\国内\CorrelatorSingle.dll" /> <Assembly Path="D:\Code\Rider Projects\相关仪\测试版\correlator\packages\log4net.2.0.15\lib\net45\log4net.dll" /> </AssemblyExplorer> + D:\Program Files\JetBrains\JetBrains Rider 2024.2.7\tools\MSBuild\Current\Bin\MSBuild.exe + 1114112 True True True \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 2a39206..3c21298 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -260,6 +260,7 @@ + @@ -302,7 +303,6 @@ - diff --git a/Correlator/Dialog/LoadingDialog.xaml b/Correlator/Dialog/LoadingDialog.xaml index fb137a1..387fbee 100644 --- a/Correlator/Dialog/LoadingDialog.xaml +++ b/Correlator/Dialog/LoadingDialog.xaml @@ -8,7 +8,6 @@ Width="400" Height="144" Background="White" - Closed="LoadingDialog_OnClosed" ResizeMode="NoResize" ShowInTaskbar="False" WindowStartupLocation="CenterOwner" @@ -21,11 +20,10 @@ + Text="数据计算中，请稍后......" /> - + \ No newline at end of file diff --git a/Correlator/Dialog/LoadingDialog.xaml.cs b/Correlator/Dialog/LoadingDialog.xaml.cs index db1659f..bebd85e 100644 --- a/Correlator/Dialog/LoadingDialog.xaml.cs +++ b/Correlator/Dialog/LoadingDialog.xaml.cs @@ -1,37 +1,12 @@ -using System; -using System.Windows; -using System.Windows.Threading; +using System.Windows; namespace Correlator.Dialog { public partial class LoadingDialog : Window { - //运行时间Timer - private readonly DispatcherTimer _runningTimer = new DispatcherTimer - { - Interval = TimeSpan.FromSeconds(1) - }; - - //计算时间 - private int _runningSeconds; - - public LoadingDialog(string message) + public LoadingDialog() { InitializeComponent(); - _runningTimer.Tick += delegate - { - _runningSeconds++; - Application.Current.Dispatcher.Invoke(delegate - { - MessageTextBlock.Text = message + $"{_runningSeconds}s"; - }); - }; - _runningTimer.Start(); - } - - private void LoadingDialog_OnClosed(object sender, EventArgs e) - { - _runningTimer.Stop(); } } } \ No newline at end of file diff --git a/Correlator/Events/ShowLoadingDialogEvent.cs b/Correlator/Events/ShowLoadingDialogEvent.cs new file mode 100644 index 0000000..24f591b --- /dev/null +++ b/Correlator/Events/ShowLoadingDialogEvent.cs @@ -0,0 +1,8 @@ +using Prism.Events; + +namespace Correlator.Events +{ + public class ShowLoadingDialogEvent : PubSubEvent + { + } +} \ No newline at end of file diff --git a/Correlator/Util/DialogHub.cs b/Correlator/Util/DialogHub.cs deleted file mode 100644 index fa0ee21..0000000 --- a/Correlator/Util/DialogHub.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Windows; -using Correlator.Dialog; - -namespace Correlator.Util -{ - public class DialogHub - { - #region 懒汉单例模式 - - private static readonly Lazy Lazy = new Lazy(() => new DialogHub()); - - public static DialogHub Get => Lazy.Value; - - - private DialogHub() - { - } - - #endregion - - private LoadingDialog _loadingDialog; - - public void ShowLoadingDialog(Window owner, string message) - { - Application.Current.Dispatcher.Invoke(delegate - { - _loadingDialog = new LoadingDialog(message) - { - Owner = owner - }; - _loadingDialog.Show(); - }); - } - - public void DismissLoadingDialog() - { - Application.Current.Dispatcher.Invoke(delegate { _loadingDialog?.Close(); }); - } - } -} \ No newline at end of file diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index a57d4ef..f1c0f28 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -933,7 +933,7 @@ /// private void StartCalculateData(bool isImportData) { - DialogHub.Get.ShowLoadingDialog(_mainWindow, "数据计算中，请稍后..."); + _eventAggregator.GetEvent().Publish(); //开始计算就不收集收据了且不能点击开始按钮 StartButtonEnabled = false; using (var manager = new DataBaseManager()) @@ -1214,9 +1214,8 @@ catch (Exception ex) { Console.WriteLine(ex.StackTrace); + _eventAggregator.GetEvent().Publish(); _runningTimer.Stop(); - DialogHub.Get.DismissLoadingDialog(); - Application.Current.Dispatcher.Invoke(delegate { var result = MessageBox.Show( @@ -1238,8 +1237,6 @@ private void Worker_OnRunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) { "MainWindowViewModel".WriteLog("计算结束"); - DialogHub.Get.DismissLoadingDialog(); - var array = (MWArray[])e.Result; //数据绑定 var snr = Convert.ToDouble(array[0].ToString()); //信噪比 diff --git a/Correlator/Views/MainWindow.xaml b/Correlator/Views/MainWindow.xaml index 40ebec9..a0c4107 100644 --- a/Correlator/Views/MainWindow.xaml +++ b/Correlator/Views/MainWindow.xaml @@ -24,7 +24,8 @@ - + @@ -67,7 +68,7 @@ - -