diff --git a/Correlator/DataService/SerialPortServiceImpl.cs b/Correlator/DataService/SerialPortServiceImpl.cs index 364ee77..184206c 100644 --- a/Correlator/DataService/SerialPortServiceImpl.cs +++ b/Correlator/DataService/SerialPortServiceImpl.cs @@ -166,32 +166,32 @@ break; case 22543: - // if (receivedData[0] == 0xA3 && receivedData[1] == 0x20) - // { - // int index = receivedData[15]; - // //取出seq，确定收到的是第几包数据 - // RuntimeCache.SeqCaches.Add(index); - // - // var response = BitConverter.ToString(receivedData).Replace("-", ""); - // //收集数据 - // if (deviceId.Equals(RuntimeCache.Dev1)) - // { - // //原始数据 - // RuntimeCache.RedSensorOriginalResp.Add(index, response); - // //解析之后的数据 - // RuntimeCache.RedSensorResponseTags.Add(index, tags); - // } - // else - // { - // //原始数据 - // RuntimeCache.BlueSensorOriginalResp.Add(index, response); - // //解析之后的数据 - // RuntimeCache.BlueSensorResponseTags.Add(index, tags); - // } - // } + if (receivedData[0] == 0xA3 && receivedData[1] == 0x20) + { + int index = receivedData[15]; + //取出seq，确定收到的是第几包数据 + RuntimeCache.SeqCaches.Add(index); + + var response = BitConverter.ToString(receivedData).Replace("-", ""); + //收集数据 + if (deviceId.Equals(RuntimeCache.Dev1)) + { + //原始数据 + RuntimeCache.RedSensorOriginalResp.Add(index, response); + //解析之后的数据 + RuntimeCache.RedSensorResponseTags.Add(index, tags); + } + else + { + //原始数据 + RuntimeCache.BlueSensorOriginalResp.Add(index, response); + //解析之后的数据 + RuntimeCache.BlueSensorResponseTags.Add(index, tags); + } + } //TODO 采用水听器数据，但是模式是加速度计模式 - HandleCorrelatorData(deviceId, tags); + // HandleCorrelatorData(deviceId, tags); break; case 15024: //听音 HandleListenData(tags); @@ -210,9 +210,9 @@ var noiseTag = tags.GetUploadNoiseTag(); if (noiseTag != null) { - var num = noiseTag.Len / 3; - var realData = new double[num]; - for (var i = 0; i < num; i++) + var len = noiseTag.Len / 3; + var realData = new double[len]; + for (var i = 0; i < len; i++) { var dStr = new byte[3]; Array.Copy(noiseTag.DataValue, i * 3, dStr, 0, 3); @@ -317,10 +317,10 @@ var doubleArrays = new List>(); foreach (var tag in tags) { - var num = tag.Len / 3; //上传的噪声数据个数,修改末3个字节 + var len = tag.Len / 3; //上传的噪声数据个数,修改末3个字节 //单条数据得到的UploadTag转化为 List var realData = new List(); - for (var i = 0; i < num; i++) + for (var i = 0; i < len; i++) { var dStr = new byte[3]; Array.Copy(tag.DataValue, i * 3, dStr, 0, 3); @@ -340,7 +340,7 @@ var noiseValue = 0.0; Array.ForEach(realData, i => noiseValue += Math.Abs(i)); - _dataModel.RightNoiseSumValue = noiseValue * 2; + _dataModel.LeftNoiseSumValue = noiseValue * 2; } else { diff --git a/Correlator/DataService/SerialPortServiceImpl.cs b/Correlator/DataService/SerialPortServiceImpl.cs index 364ee77..184206c 100644 --- a/Correlator/DataService/SerialPortServiceImpl.cs +++ b/Correlator/DataService/SerialPortServiceImpl.cs @@ -166,32 +166,32 @@ break; case 22543: - // if (receivedData[0] == 0xA3 && receivedData[1] == 0x20) - // { - // int index = receivedData[15]; - // //取出seq，确定收到的是第几包数据 - // RuntimeCache.SeqCaches.Add(index); - // - // var response = BitConverter.ToString(receivedData).Replace("-", ""); - // //收集数据 - // if (deviceId.Equals(RuntimeCache.Dev1)) - // { - // //原始数据 - // RuntimeCache.RedSensorOriginalResp.Add(index, response); - // //解析之后的数据 - // RuntimeCache.RedSensorResponseTags.Add(index, tags); - // } - // else - // { - // //原始数据 - // RuntimeCache.BlueSensorOriginalResp.Add(index, response); - // //解析之后的数据 - // RuntimeCache.BlueSensorResponseTags.Add(index, tags); - // } - // } + if (receivedData[0] == 0xA3 && receivedData[1] == 0x20) + { + int index = receivedData[15]; + //取出seq，确定收到的是第几包数据 + RuntimeCache.SeqCaches.Add(index); + + var response = BitConverter.ToString(receivedData).Replace("-", ""); + //收集数据 + if (deviceId.Equals(RuntimeCache.Dev1)) + { + //原始数据 + RuntimeCache.RedSensorOriginalResp.Add(index, response); + //解析之后的数据 + RuntimeCache.RedSensorResponseTags.Add(index, tags); + } + else + { + //原始数据 + RuntimeCache.BlueSensorOriginalResp.Add(index, response); + //解析之后的数据 + RuntimeCache.BlueSensorResponseTags.Add(index, tags); + } + } //TODO 采用水听器数据，但是模式是加速度计模式 - HandleCorrelatorData(deviceId, tags); + // HandleCorrelatorData(deviceId, tags); break; case 15024: //听音 HandleListenData(tags); @@ -210,9 +210,9 @@ var noiseTag = tags.GetUploadNoiseTag(); if (noiseTag != null) { - var num = noiseTag.Len / 3; - var realData = new double[num]; - for (var i = 0; i < num; i++) + var len = noiseTag.Len / 3; + var realData = new double[len]; + for (var i = 0; i < len; i++) { var dStr = new byte[3]; Array.Copy(noiseTag.DataValue, i * 3, dStr, 0, 3); @@ -317,10 +317,10 @@ var doubleArrays = new List>(); foreach (var tag in tags) { - var num = tag.Len / 3; //上传的噪声数据个数,修改末3个字节 + var len = tag.Len / 3; //上传的噪声数据个数,修改末3个字节 //单条数据得到的UploadTag转化为 List var realData = new List(); - for (var i = 0; i < num; i++) + for (var i = 0; i < len; i++) { var dStr = new byte[3]; Array.Copy(tag.DataValue, i * 3, dStr, 0, 3); @@ -340,7 +340,7 @@ var noiseValue = 0.0; Array.ForEach(realData, i => noiseValue += Math.Abs(i)); - _dataModel.RightNoiseSumValue = noiseValue * 2; + _dataModel.LeftNoiseSumValue = noiseValue * 2; } else { diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml index 8f72801..58042c7 100644 --- a/Correlator/Dialog/ApplicationInfoDialog.xaml +++ b/Correlator/Dialog/ApplicationInfoDialog.xaml @@ -7,7 +7,7 @@ xmlns:prism="http://prismlibrary.com/" xmlns:vm="clr-namespace:Correlator.ViewModels" Width="420" - Height="275" + Height="295" d:DataContext="{d:DesignInstance Type=vm:ApplicationInfoDialogViewModel}" mc:Ignorable="d"> @@ -42,19 +42,25 @@ + + + + + + - + diff --git a/Correlator/DataService/SerialPortServiceImpl.cs b/Correlator/DataService/SerialPortServiceImpl.cs index 364ee77..184206c 100644 --- a/Correlator/DataService/SerialPortServiceImpl.cs +++ b/Correlator/DataService/SerialPortServiceImpl.cs @@ -166,32 +166,32 @@ break; case 22543: - // if (receivedData[0] == 0xA3 && receivedData[1] == 0x20) - // { - // int index = receivedData[15]; - // //取出seq，确定收到的是第几包数据 - // RuntimeCache.SeqCaches.Add(index); - // - // var response = BitConverter.ToString(receivedData).Replace("-", ""); - // //收集数据 - // if (deviceId.Equals(RuntimeCache.Dev1)) - // { - // //原始数据 - // RuntimeCache.RedSensorOriginalResp.Add(index, response); - // //解析之后的数据 - // RuntimeCache.RedSensorResponseTags.Add(index, tags); - // } - // else - // { - // //原始数据 - // RuntimeCache.BlueSensorOriginalResp.Add(index, response); - // //解析之后的数据 - // RuntimeCache.BlueSensorResponseTags.Add(index, tags); - // } - // } + if (receivedData[0] == 0xA3 && receivedData[1] == 0x20) + { + int index = receivedData[15]; + //取出seq，确定收到的是第几包数据 + RuntimeCache.SeqCaches.Add(index); + + var response = BitConverter.ToString(receivedData).Replace("-", ""); + //收集数据 + if (deviceId.Equals(RuntimeCache.Dev1)) + { + //原始数据 + RuntimeCache.RedSensorOriginalResp.Add(index, response); + //解析之后的数据 + RuntimeCache.RedSensorResponseTags.Add(index, tags); + } + else + { + //原始数据 + RuntimeCache.BlueSensorOriginalResp.Add(index, response); + //解析之后的数据 + RuntimeCache.BlueSensorResponseTags.Add(index, tags); + } + } //TODO 采用水听器数据，但是模式是加速度计模式 - HandleCorrelatorData(deviceId, tags); + // HandleCorrelatorData(deviceId, tags); break; case 15024: //听音 HandleListenData(tags); @@ -210,9 +210,9 @@ var noiseTag = tags.GetUploadNoiseTag(); if (noiseTag != null) { - var num = noiseTag.Len / 3; - var realData = new double[num]; - for (var i = 0; i < num; i++) + var len = noiseTag.Len / 3; + var realData = new double[len]; + for (var i = 0; i < len; i++) { var dStr = new byte[3]; Array.Copy(noiseTag.DataValue, i * 3, dStr, 0, 3); @@ -317,10 +317,10 @@ var doubleArrays = new List>(); foreach (var tag in tags) { - var num = tag.Len / 3; //上传的噪声数据个数,修改末3个字节 + var len = tag.Len / 3; //上传的噪声数据个数,修改末3个字节 //单条数据得到的UploadTag转化为 List var realData = new List(); - for (var i = 0; i < num; i++) + for (var i = 0; i < len; i++) { var dStr = new byte[3]; Array.Copy(tag.DataValue, i * 3, dStr, 0, 3); @@ -340,7 +340,7 @@ var noiseValue = 0.0; Array.ForEach(realData, i => noiseValue += Math.Abs(i)); - _dataModel.RightNoiseSumValue = noiseValue * 2; + _dataModel.LeftNoiseSumValue = noiseValue * 2; } else { diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml index 8f72801..58042c7 100644 --- a/Correlator/Dialog/ApplicationInfoDialog.xaml +++ b/Correlator/Dialog/ApplicationInfoDialog.xaml @@ -7,7 +7,7 @@ xmlns:prism="http://prismlibrary.com/" xmlns:vm="clr-namespace:Correlator.ViewModels" Width="420" - Height="275" + Height="295" d:DataContext="{d:DesignInstance Type=vm:ApplicationInfoDialogViewModel}" mc:Ignorable="d"> @@ -42,19 +42,25 @@ + + + + + + - + diff --git a/Correlator/Properties/AssemblyInfo.cs b/Correlator/Properties/AssemblyInfo.cs index 0c6d511..cbf0513 100644 --- a/Correlator/Properties/AssemblyInfo.cs +++ b/Correlator/Properties/AssemblyInfo.cs @@ -49,6 +49,6 @@ // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.4")] -[assembly: AssemblyFileVersion("1.0.0.4")] +[assembly: AssemblyVersion("1.0.0.5")] +[assembly: AssemblyFileVersion("1.0.0.5")] [assembly: log4net.Config.XmlConfigurator(Watch = true)] \ No newline at end of file diff --git a/Correlator/DataService/SerialPortServiceImpl.cs b/Correlator/DataService/SerialPortServiceImpl.cs index 364ee77..184206c 100644 --- a/Correlator/DataService/SerialPortServiceImpl.cs +++ b/Correlator/DataService/SerialPortServiceImpl.cs @@ -166,32 +166,32 @@ break; case 22543: - // if (receivedData[0] == 0xA3 && receivedData[1] == 0x20) - // { - // int index = receivedData[15]; - // //取出seq，确定收到的是第几包数据 - // RuntimeCache.SeqCaches.Add(index); - // - // var response = BitConverter.ToString(receivedData).Replace("-", ""); - // //收集数据 - // if (deviceId.Equals(RuntimeCache.Dev1)) - // { - // //原始数据 - // RuntimeCache.RedSensorOriginalResp.Add(index, response); - // //解析之后的数据 - // RuntimeCache.RedSensorResponseTags.Add(index, tags); - // } - // else - // { - // //原始数据 - // RuntimeCache.BlueSensorOriginalResp.Add(index, response); - // //解析之后的数据 - // RuntimeCache.BlueSensorResponseTags.Add(index, tags); - // } - // } + if (receivedData[0] == 0xA3 && receivedData[1] == 0x20) + { + int index = receivedData[15]; + //取出seq，确定收到的是第几包数据 + RuntimeCache.SeqCaches.Add(index); + + var response = BitConverter.ToString(receivedData).Replace("-", ""); + //收集数据 + if (deviceId.Equals(RuntimeCache.Dev1)) + { + //原始数据 + RuntimeCache.RedSensorOriginalResp.Add(index, response); + //解析之后的数据 + RuntimeCache.RedSensorResponseTags.Add(index, tags); + } + else + { + //原始数据 + RuntimeCache.BlueSensorOriginalResp.Add(index, response); + //解析之后的数据 + RuntimeCache.BlueSensorResponseTags.Add(index, tags); + } + } //TODO 采用水听器数据，但是模式是加速度计模式 - HandleCorrelatorData(deviceId, tags); + // HandleCorrelatorData(deviceId, tags); break; case 15024: //听音 HandleListenData(tags); @@ -210,9 +210,9 @@ var noiseTag = tags.GetUploadNoiseTag(); if (noiseTag != null) { - var num = noiseTag.Len / 3; - var realData = new double[num]; - for (var i = 0; i < num; i++) + var len = noiseTag.Len / 3; + var realData = new double[len]; + for (var i = 0; i < len; i++) { var dStr = new byte[3]; Array.Copy(noiseTag.DataValue, i * 3, dStr, 0, 3); @@ -317,10 +317,10 @@ var doubleArrays = new List>(); foreach (var tag in tags) { - var num = tag.Len / 3; //上传的噪声数据个数,修改末3个字节 + var len = tag.Len / 3; //上传的噪声数据个数,修改末3个字节 //单条数据得到的UploadTag转化为 List var realData = new List(); - for (var i = 0; i < num; i++) + for (var i = 0; i < len; i++) { var dStr = new byte[3]; Array.Copy(tag.DataValue, i * 3, dStr, 0, 3); @@ -340,7 +340,7 @@ var noiseValue = 0.0; Array.ForEach(realData, i => noiseValue += Math.Abs(i)); - _dataModel.RightNoiseSumValue = noiseValue * 2; + _dataModel.LeftNoiseSumValue = noiseValue * 2; } else { diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml index 8f72801..58042c7 100644 --- a/Correlator/Dialog/ApplicationInfoDialog.xaml +++ b/Correlator/Dialog/ApplicationInfoDialog.xaml @@ -7,7 +7,7 @@ xmlns:prism="http://prismlibrary.com/" xmlns:vm="clr-namespace:Correlator.ViewModels" Width="420" - Height="275" + Height="295" d:DataContext="{d:DesignInstance Type=vm:ApplicationInfoDialogViewModel}" mc:Ignorable="d"> @@ -42,19 +42,25 @@ + + + + + + - + diff --git a/Correlator/Properties/AssemblyInfo.cs b/Correlator/Properties/AssemblyInfo.cs index 0c6d511..cbf0513 100644 --- a/Correlator/Properties/AssemblyInfo.cs +++ b/Correlator/Properties/AssemblyInfo.cs @@ -49,6 +49,6 @@ // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.4")] -[assembly: AssemblyFileVersion("1.0.0.4")] +[assembly: AssemblyVersion("1.0.0.5")] +[assembly: AssemblyFileVersion("1.0.0.5")] [assembly: log4net.Config.XmlConfigurator(Watch = true)] \ No newline at end of file diff --git a/Correlator/ViewModels/MainWindowViewModel.cs b/Correlator/ViewModels/MainWindowViewModel.cs index 3b703ea..2c1d806 100644 --- a/Correlator/ViewModels/MainWindowViewModel.cs +++ b/Correlator/ViewModels/MainWindowViewModel.cs @@ -887,6 +887,7 @@ else { //TODO 加速度计模式导入数据 + ShowAlertMessageDialog(AlertType.Error, "操作错误", "仅支持水听器模式导入数据"); } popup.IsOpen = false; @@ -1197,7 +1198,8 @@ int.Parse(_pipeDiameter), int.Parse(_pipeDiameter), 1, -1, -1, -1, - int.Parse(_lowFrequency), int.Parse(_highFrequency) + int.Parse(_lowFrequency), int.Parse(_highFrequency), + RuntimeCache.WorkMode ); e.Result = array; }