diff --git a/Correlator/DataService/SerialPortServiceImpl.cs b/Correlator/DataService/SerialPortServiceImpl.cs index 6cc9b26..f48caec 100644 --- a/Correlator/DataService/SerialPortServiceImpl.cs +++ b/Correlator/DataService/SerialPortServiceImpl.cs @@ -6,13 +6,11 @@ using Correlator.Model; using Correlator.SensorHubTag; using Correlator.Util; -using Prism.Events; namespace Correlator.DataService { public class SerialPortServiceImpl : ISerialPortService { - private readonly IEventAggregator _eventAggregator; private readonly IAudioService _audioService; private readonly ICommandService _commandService; private readonly IApplicationDataService _dataService; @@ -29,10 +27,9 @@ public event EventHandler CheckResponseEvent; public event EventHandler ResponseIndexReceivedEvent; - public SerialPortServiceImpl(IEventAggregator eventAggregator, IAudioService audioService, - ICommandService commandService, IApplicationDataService dataService) + public SerialPortServiceImpl(IAudioService audioService, ICommandService commandService, + IApplicationDataService dataService) { - _eventAggregator = eventAggregator; _audioService = audioService; _commandService = commandService; _dataService = dataService; @@ -237,7 +234,8 @@ { if (RuntimeCache.IsDetectNoise) { - var eventArgs = new CorrelatorDataEventArgs(_dataModel.LeftNoiseSumValue, _dataModel.RightNoiseSumValue); + var eventArgs = new CorrelatorDataEventArgs(_dataModel.LeftNoiseSumValue, + _dataModel.RightNoiseSumValue); DetectNoiseEvent?.Invoke(this, eventArgs); } else diff --git a/Correlator/DataService/SerialPortServiceImpl.cs b/Correlator/DataService/SerialPortServiceImpl.cs index 6cc9b26..f48caec 100644 --- a/Correlator/DataService/SerialPortServiceImpl.cs +++ b/Correlator/DataService/SerialPortServiceImpl.cs @@ -6,13 +6,11 @@ using Correlator.Model; using Correlator.SensorHubTag; using Correlator.Util; -using Prism.Events; namespace Correlator.DataService { public class SerialPortServiceImpl : ISerialPortService { - private readonly IEventAggregator _eventAggregator; private readonly IAudioService _audioService; private readonly ICommandService _commandService; private readonly IApplicationDataService _dataService; @@ -29,10 +27,9 @@ public event EventHandler CheckResponseEvent; public event EventHandler ResponseIndexReceivedEvent; - public SerialPortServiceImpl(IEventAggregator eventAggregator, IAudioService audioService, - ICommandService commandService, IApplicationDataService dataService) + public SerialPortServiceImpl(IAudioService audioService, ICommandService commandService, + IApplicationDataService dataService) { - _eventAggregator = eventAggregator; _audioService = audioService; _commandService = commandService; _dataService = dataService; @@ -237,7 +234,8 @@ { if (RuntimeCache.IsDetectNoise) { - var eventArgs = new CorrelatorDataEventArgs(_dataModel.LeftNoiseSumValue, _dataModel.RightNoiseSumValue); + var eventArgs = new CorrelatorDataEventArgs(_dataModel.LeftNoiseSumValue, + _dataModel.RightNoiseSumValue); DetectNoiseEvent?.Invoke(this, eventArgs); } else diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml index b5b632e..16af825 100644 --- a/Correlator/Dialog/AddSoundSpeedDialog.xaml +++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml @@ -7,9 +7,10 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:prism="http://prismlibrary.com/" xmlns:vm="clr-namespace:Correlator.ViewModels" - Width="600" + Width="500" Height="330" d:DataContext="{d:DesignInstance Type=vm:AddSoundSpeedDialogViewModel}" + Background="White" mc:Ignorable="d"> @@ -17,134 +18,122 @@ - - - + - - - - - + + + + + + + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -